Browse Source

port packages mISDN, mISDNuser and capi4k-utils

mISDN still has some unresolved problems with sysfs object creation, to
be fixed.
Phil Sutter 10 năm trước cách đây
mục cha
commit
2c5a022d3e
29 tập tin đã thay đổi với 1659 bổ sung0 xóa
  1. 47 0
      package/capi4k-utils/Makefile
  2. 42 0
      package/capi4k-utils/patches/patch-Makefile
  3. 14 0
      package/capi4k-utils/patches/patch-avmb1_Makefile_in
  4. 11 0
      package/capi4k-utils/patches/patch-capi20_capi20_h
  5. 18 0
      package/capi4k-utils/patches/patch-capiinfo_Makefile_in
  6. 12 0
      package/capi4k-utils/patches/patch-pppdcapiplugin_Makefile
  7. 18 0
      package/capi4k-utils/patches/patch-pppdcapiplugin_Rules_make
  8. 23 0
      package/capi4k-utils/patches/patch-rcapid_Makefile_in
  9. 14 0
      package/capi4k-utils/src/pppdcapiplugin/ppp-2.4.5/Makefile
  10. 2 0
      package/capi4k-utils/src/pppdcapiplugin/ppp-2.4.5/pppd/patchlevel.h
  11. 909 0
      package/capi4k-utils/src/pppdcapiplugin/ppp-2.4.5/pppd/pppd.h
  12. 36 0
      package/mISDN/Makefile
  13. 53 0
      package/mISDN/patches/patch-Makefile
  14. 65 0
      package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_contr_c
  15. 75 0
      package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_core_c
  16. 19 0
      package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_core_h
  17. 49 0
      package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_debugtool_c
  18. 17 0
      package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_hfcs_usb_c
  19. 34 0
      package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_stack_c
  20. 30 0
      package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_sysfs_inst_c
  21. 33 0
      package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_sysfs_obj_c
  22. 18 0
      package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_sysfs_st_c
  23. 36 0
      package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_udevice_c
  24. 32 0
      package/mISDNuser/Makefile
  25. 16 0
      package/mISDNuser/patches/patch-Makefile
  26. 9 0
      package/mISDNuser/patches/patch-debugtool_Makefile
  27. 9 0
      package/mISDNuser/patches/patch-i4lnet_Makefile
  28. 9 0
      package/mISDNuser/patches/patch-lib_Makefile
  29. 9 0
      package/mISDNuser/patches/patch-suppserv_Makefile

+ 47 - 0
package/capi4k-utils/Makefile

@@ -0,0 +1,47 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		capi4k-utils
+PKG_VERSION:=		2005-07-18
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c745759b6b3d64e19763727176648cdf
+PKG_DESCR:=		CAPI4Linux Utils
+PKG_SECTION:=		net/voip
+PKG_URL:=		ftp://ftp.in-berlin.de/pub/capi4linux/
+PKG_SITES:=		ftp://ftp.in-berlin.de/pub/capi4linux/
+WRKDIST=		${WRKDIR}/${PKG_NAME}
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,CAPI4K_UTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+XAKE_FLAGS+=		PPPVERSIONS=2.4.5
+
+do-configure:
+	echo "CONFIG_KERNELDIR='${LINUX_DIR}'" >${WRKDIST}/.config
+	echo "CONFIG_BINDIR='/usr/bin'" >>${WRKDIST}/.config
+	echo "CONFIG_SBINDIR='/usr/sbin'" >>${WRKDIST}/.config
+	echo "CONFIG_MANDIR='/usr/man'" >>${WRKDIST}/.config
+	#echo "CONFIG_AVMCAPICTRL=y" >>${WRKDIST}/.config
+	#echo "CONFIG_CAPIFAX=y" >>${WRKDIST}/.config
+	echo "CONFIG_RCAPID=y" >>${WRKDIST}/.config
+	echo "CONFIG_PPPDCAPIPLUGIN=y" >>${WRKDIST}/.config
+	(cd ${WRKDIST}; \
+		cp Makefile Makefile.tmp; \
+		${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} -f Makefile.tmp subconfig; \
+		rm -f Makefile.tmp; \
+	)
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_CAPI4K_UTILS)/usr/{bin,lib/pppd/2.4.5}
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/capiinfo \
+		$(IDIR_CAPI4K_UTILS)/usr/bin
+	${CP} $(WRKINST)/usr/lib/libcapi20.so* \
+		$(IDIR_CAPI4K_UTILS)/usr/lib
+	$(INSTALL_DATA) $(WRKINST)/usr/lib/pppd/2.4.5/*.so \
+		$(IDIR_CAPI4K_UTILS)/usr/lib/pppd/2.4.5
+
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 42 - 0
package/capi4k-utils/patches/patch-Makefile

@@ -0,0 +1,42 @@
+	- pass CC, CFLAGS and LDFLAGS when running subdir configure and make
+	- install without root-permissions, do not create device nodes
+	- need to pass PPPVERSIONS to subtargets
+--- capi4k-utils.orig/Makefile	2002-11-20 14:45:14.000000000 +0100
++++ capi4k-utils/Makefile	2011-07-15 14:15:21.446001582 +0200
+@@ -53,7 +53,7 @@ ifneq ($(SUBDIRS),)
+ endif
+ 
+ subtargets: $(CONFIGURATION)
+-	set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i all; done
++	set -e; for i in `echo $(SUBDIRS)`; do CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" PPPVERSIONS="${PPPVERSIONS}" $(MAKE) -C $$i all; done
+ 
+ rootperm:
+ 	@echo 'main(int argc,char**argv){unlink(argv[0]);return(getuid()==0);}'>g
+@@ -62,16 +62,10 @@ rootperm:
+ 		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; \
+-	then \
+-		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
+ 
+ #
+@@ -134,7 +128,7 @@ subconfig: scripts/autoconf.h
+ 	@set -e; for i in `echo $(SUBDIRS)`; do \
+ 		if [ -x $$i/configure ] ; then \
+ 			echo -e "\nRunning configure in $$i ...\n"; sleep 1; \
+-			(cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
++			(cd $$i; CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
+ 		elif [ -f $$i/Makefile.in ] ; then \
+ 			echo -e "\nRunning make -f Makefile.in config in $$i ...\n"; sleep 1; \
+ 			$(MAKE) -C $$i -f Makefile.in config; \

+ 14 - 0
package/capi4k-utils/patches/patch-avmb1_Makefile_in

@@ -0,0 +1,14 @@
+	- do not set uid/gid while installing
+--- capi4k-utils.orig/avmb1/Makefile.in	2002-10-26 21:27:40.000000000 +0200
++++ capi4k-utils/avmb1/Makefile.in	2011-07-14 19:14:42.879001566 +0200
+@@ -15,8 +15,8 @@ SBINDIR			= @CONFIG_SBINDIR@
+ 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@

+ 11 - 0
package/capi4k-utils/patches/patch-capi20_capi20_h

@@ -0,0 +1,11 @@
+	- somehow this header misses sys/types.h (for size_t definition)
+--- capi4k-utils.orig/capi20/capi20.h	2000-11-19 11:15:01.000000000 +0100
++++ capi4k-utils/capi20/capi20.h	2011-07-14 17:26:51.680001337 +0200
+@@ -21,6 +21,7 @@
+ #define __CAPI20_H__
+ 
+ #include <sys/time.h>
++#include <sys/types.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {

+ 18 - 0
package/capi4k-utils/patches/patch-capiinfo_Makefile_in

@@ -0,0 +1,18 @@
+	allow CFLAGS override
+--- capi4k-utils.orig/capiinfo/Makefile.in	2002-11-27 09:08:04.000000000 +0100
++++ capi4k-utils/capiinfo/Makefile.in	2011-07-14 18:55:40.657001559 +0200
+@@ -72,10 +72,10 @@ CLEANFILES = *~ comperr
+ MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in 			  stamp-h.in comperr
+ 
+ 
+-INCLUDES = -I../capi20 $(all_includes)
+-CFLAGS = -Wall -O2
+-LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
+-LDADD = -lcapi20
++INCLUDES += -I../capi20 $(all_includes)
++CFLAGS += -Wall -O2
++LDFLAGS += -L../capi20/.libs -L../capi20 $(all_libraries)
++LDADD += -lcapi20
+ 
+ bin_PROGRAMS = capiinfo
+ 

+ 12 - 0
package/capi4k-utils/patches/patch-pppdcapiplugin_Makefile

@@ -0,0 +1,12 @@
+	- do not set uid when installing
+--- capi4k-utils.orig/pppdcapiplugin/Makefile	2005-07-18 11:11:25.000000000 +0200
++++ capi4k-utils/pppdcapiplugin/Makefile	2011-07-14 19:22:54.660001648 +0200
+@@ -12,7 +12,7 @@ export TOPDIR=$(shell pwd)
+ 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
+ 
+ PPPSRCDIRS=/src/isdn/pppd

+ 18 - 0
package/capi4k-utils/patches/patch-pppdcapiplugin_Rules_make

@@ -0,0 +1,18 @@
+	allow CC, CFLAGS and LDFLAGS override
+--- capi4k-utils.orig/pppdcapiplugin/Rules.make	2001-05-01 14:43:49.000000000 +0200
++++ capi4k-utils/pppdcapiplugin/Rules.make	2011-07-14 17:13:53.567001779 +0200
+@@ -10,11 +10,11 @@
+ 
+ vpath %.c $(TOPDIR)
+ 
+-CC	= gcc
++CC	?= gcc
+ INC     = -I$(TOPDIR) -I$(CAPIINC) -Ipppd
+ DEFS    = -DPPPVER=$(shell $(TOPDIR)/pversion $(PPPVERSION))
+-CFLAGS	= -O2 -Wall -fPIC $(DEFS) $(INC) -L$(CAPILIB)
+-LDFLAGS	= -shared -L$(CAPILIB)
++CFLAGS	+= -O2 -Wall -fPIC $(DEFS) $(INC) -L$(CAPILIB)
++LDFLAGS	+= -shared -L$(CAPILIB)
+ 
+ ALL = capiplugin.so userpass.so
+ 

+ 23 - 0
package/capi4k-utils/patches/patch-rcapid_Makefile_in

@@ -0,0 +1,23 @@
+	allow overriding things
+--- capi4k-utils.orig/rcapid/Makefile.in	2003-06-16 13:44:29.000000000 +0200
++++ capi4k-utils/rcapid/Makefile.in	2011-07-14 19:01:46.376001436 +0200
+@@ -57,7 +57,7 @@ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-CC = @CC@
++CC ?= @CC@
+ CONFIG_MANDIR = @CONFIG_MANDIR@
+ CONFIG_SBINDIR = @CONFIG_SBINDIR@
+ CPP = @CPP@
+@@ -72,8 +72,8 @@ MAINTAINERCLEANFILES = configure aclocal
+ 
+ 
+ INCLUDES = -I../capi20 $(all_includes)
+-CFLAGS = -Wall -O2
+-LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
++CFLAGS += -Wall -O2
++LDFLAGS += -L../capi20/.libs -L../capi20 $(all_libraries)
+ LDADD = -lcapi20
+ 
+ sbin_PROGRAMS = rcapid

+ 14 - 0
package/capi4k-utils/src/pppdcapiplugin/ppp-2.4.5/Makefile

@@ -0,0 +1,14 @@
+# Makefile for the capiplugin for pppd(8).
+#
+# Copyright 2000 Carsten Paeth (calle@calle.in-berlin.de)
+# Copyright 2000 AVM GmbH Berlin (info@avm.de)
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version
+#  2 of the License, or (at your option) any later version.
+
+PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+
+include $(TOPDIR)/Rules.make
+

+ 2 - 0
package/capi4k-utils/src/pppdcapiplugin/ppp-2.4.5/pppd/patchlevel.h

@@ -0,0 +1,2 @@
+#define VERSION		"2.4.5"
+#define DATE		"17 November 2009"

+ 909 - 0
package/capi4k-utils/src/pppdcapiplugin/ppp-2.4.5/pppd/pppd.h

@@ -0,0 +1,909 @@
+/*
+ * pppd.h - PPP daemon global declarations.
+ *
+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Office of Technology Transfer
+ *      Carnegie Mellon University
+ *      5000 Forbes Avenue
+ *      Pittsburgh, PA  15213-3890
+ *      (412) 268-4387, fax: (412) 268-7395
+ *      tech-transfer@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: pppd.h,v 1.96 2008/06/23 11:47:18 paulus Exp $
+ */
+
+/*
+ * TODO:
+ */
+
+#ifndef __PPPD_H__
+#define __PPPD_H__
+
+#include <stdio.h>		/* for FILE */
+#include <limits.h>		/* for NGROUPS_MAX */
+#include <sys/param.h>		/* for MAXPATHLEN and BSD4_4, if defined */
+#include <sys/types.h>		/* for u_int32_t, if defined */
+#include <sys/time.h>		/* for struct timeval */
+#include <net/ppp_defs.h>
+#include "patchlevel.h"
+
+#if defined(__STDC__)
+#include <stdarg.h>
+#define __V(x)	x
+#else
+#include <varargs.h>
+#define __V(x)	(va_alist) va_dcl
+#define const
+#define volatile
+#endif
+
+#ifdef INET6
+#include "eui64.h"
+#endif
+
+/*
+ * Limits.
+ */
+
+#define NUM_PPP		1	/* One PPP interface supported (per process) */
+#define MAXWORDLEN	1024	/* max length of word in file (incl null) */
+#define MAXARGS		1	/* max # args to a command */
+#define MAXNAMELEN	256	/* max length of hostname or name for auth */
+#define MAXSECRETLEN	256	/* max length of password or secret */
+
+/*
+ * Option descriptor structure.
+ */
+
+typedef unsigned char	bool;
+
+enum opt_type {
+	o_special_noarg = 0,
+	o_special = 1,
+	o_bool,
+	o_int,
+	o_uint32,
+	o_string,
+	o_wild
+};
+
+typedef struct {
+	char	*name;		/* name of the option */
+	enum opt_type type;
+	void	*addr;
+	char	*description;
+	unsigned int flags;
+	void	*addr2;
+	int	upper_limit;
+	int	lower_limit;
+	const char *source;
+	short int priority;
+	short int winner;
+} option_t;
+
+/* Values for flags */
+#define OPT_VALUE	0xff	/* mask for presupplied value */
+#define OPT_HEX		0x100	/* int option is in hex */
+#define OPT_NOARG	0x200	/* option doesn't take argument */
+#define OPT_OR		0x400	/* for u32, OR in argument to value */
+#define OPT_INC		0x400	/* for o_int, increment value */
+#define OPT_A2OR	0x800	/* for o_bool, OR arg to *(u_char *)addr2 */
+#define OPT_PRIV	0x1000	/* privileged option */
+#define OPT_STATIC	0x2000	/* string option goes into static array */
+#define OPT_NOINCR	0x2000	/* for o_int, value mustn't be increased */
+#define OPT_LLIMIT	0x4000	/* check value against lower limit */
+#define OPT_ULIMIT	0x8000	/* check value against upper limit */
+#define OPT_LIMITS	(OPT_LLIMIT|OPT_ULIMIT)
+#define OPT_ZEROOK	0x10000	/* 0 value is OK even if not within limits */
+#define OPT_HIDE	0x10000	/* for o_string, print value as ?????? */
+#define OPT_A2LIST	0x20000 /* for o_special, keep list of values */
+#define OPT_A2CLRB	0x20000 /* o_bool, clr val bits in *(u_char *)addr2 */
+#define OPT_ZEROINF	0x40000	/* with OPT_NOINCR, 0 == infinity */
+#define OPT_PRIO	0x80000	/* process option priorities for this option */
+#define OPT_PRIOSUB	0x100000 /* subsidiary member of priority group */
+#define OPT_ALIAS	0x200000 /* option is alias for previous option */
+#define OPT_A2COPY	0x400000 /* addr2 -> second location to rcv value */
+#define OPT_ENABLE	0x800000 /* use *addr2 as enable for option */
+#define OPT_A2CLR	0x1000000 /* clear *(bool *)addr2 */
+#define OPT_PRIVFIX	0x2000000 /* user can't override if set by root */
+#define OPT_INITONLY	0x4000000 /* option can only be set in init phase */
+#define OPT_DEVEQUIV	0x8000000 /* equiv to device name */
+#define OPT_DEVNAM	(OPT_INITONLY | OPT_DEVEQUIV)
+#define OPT_A2PRINTER	0x10000000 /* *addr2 is a fn for printing option */
+#define OPT_A2STRVAL	0x20000000 /* *addr2 points to current string value */
+#define OPT_NOPRINT	0x40000000 /* don't print this option at all */
+
+#define OPT_VAL(x)	((x) & OPT_VALUE)
+
+/* Values for priority */
+#define OPRIO_DEFAULT	0	/* a default value */
+#define OPRIO_CFGFILE	1	/* value from a configuration file */
+#define OPRIO_CMDLINE	2	/* value from the command line */
+#define OPRIO_SECFILE	3	/* value from options in a secrets file */
+#define OPRIO_ROOT	100	/* added to priority if OPT_PRIVFIX && root */
+
+#ifndef GIDSET_TYPE
+#define GIDSET_TYPE	gid_t
+#endif
+
+/* Structure representing a list of permitted IP addresses. */
+struct permitted_ip {
+    int		permit;		/* 1 = permit, 0 = forbid */
+    u_int32_t	base;		/* match if (addr & mask) == base */
+    u_int32_t	mask;		/* base and mask are in network byte order */
+};
+
+/*
+ * Unfortunately, the linux kernel driver uses a different structure
+ * for statistics from the rest of the ports.
+ * This structure serves as a common representation for the bits
+ * pppd needs.
+ */
+struct pppd_stats {
+    unsigned int	bytes_in;
+    unsigned int	bytes_out;
+    unsigned int	pkts_in;
+    unsigned int	pkts_out;
+};
+
+/* Used for storing a sequence of words.  Usually malloced. */
+struct wordlist {
+    struct wordlist	*next;
+    char		*word;
+};
+
+/* An endpoint discriminator, used with multilink. */
+#define MAX_ENDP_LEN	20	/* maximum length of discriminator value */
+struct epdisc {
+    unsigned char	class;
+    unsigned char	length;
+    unsigned char	value[MAX_ENDP_LEN];
+};
+
+/* values for epdisc.class */
+#define EPD_NULL	0	/* null discriminator, no data */
+#define EPD_LOCAL	1
+#define EPD_IP		2
+#define EPD_MAC		3
+#define EPD_MAGIC	4
+#define EPD_PHONENUM	5
+
+typedef void (*notify_func) __P((void *, int));
+
+struct notifier {
+    struct notifier *next;
+    notify_func	    func;
+    void	    *arg;
+};
+
+/*
+ * Global variables.
+ */
+
+extern int	hungup;		/* Physical layer has disconnected */
+extern int	ifunit;		/* Interface unit number */
+extern char	ifname[];	/* Interface name */
+extern char	hostname[];	/* Our hostname */
+extern u_char	outpacket_buf[]; /* Buffer for outgoing packets */
+extern int	devfd;		/* fd of underlying device */
+extern int	fd_ppp;		/* fd for talking PPP */
+extern int	phase;		/* Current state of link - see values below */
+extern int	baud_rate;	/* Current link speed in bits/sec */
+extern char	*progname;	/* Name of this program */
+extern int	redirect_stderr;/* Connector's stderr should go to file */
+extern char	peer_authname[];/* Authenticated name of peer */
+extern int	auth_done[NUM_PPP]; /* Methods actually used for auth */
+extern int	privileged;	/* We were run by real-uid root */
+extern int	need_holdoff;	/* Need holdoff period after link terminates */
+extern char	**script_env;	/* Environment variables for scripts */
+extern int	detached;	/* Have detached from controlling tty */
+extern GIDSET_TYPE groups[NGROUPS_MAX];	/* groups the user is in */
+extern int	ngroups;	/* How many groups valid in groups */
+extern struct pppd_stats link_stats; /* byte/packet counts etc. for link */
+extern int	link_stats_valid; /* set if link_stats is valid */
+extern unsigned	link_connect_time; /* time the link was up for */
+extern int	using_pty;	/* using pty as device (notty or pty opt.) */
+extern int	log_to_fd;	/* logging to this fd as well as syslog */
+extern bool	log_default;	/* log_to_fd is default (stdout) */
+extern char	*no_ppp_msg;	/* message to print if ppp not in kernel */
+extern volatile int status;	/* exit status for pppd */
+extern bool	devnam_fixed;	/* can no longer change devnam */
+extern int	unsuccess;	/* # unsuccessful connection attempts */
+extern int	do_callback;	/* set if we want to do callback next */
+extern int	doing_callback;	/* set if this is a callback */
+extern int	error_count;	/* # of times error() has been called */
+extern char	ppp_devnam[MAXPATHLEN];
+extern char     remote_number[MAXNAMELEN]; /* Remote telephone number, if avail. */
+extern int      ppp_session_number; /* Session number (eg PPPoE session) */
+extern int	fd_devnull;	/* fd open to /dev/null */
+
+extern int	listen_time;	/* time to listen first (ms) */
+extern bool	doing_multilink;
+extern bool	multilink_master;
+extern bool	bundle_eof;
+extern bool	bundle_terminating;
+
+extern struct notifier *pidchange;   /* for notifications of pid changing */
+extern struct notifier *phasechange; /* for notifications of phase changes */
+extern struct notifier *exitnotify;  /* for notification that we're exiting */
+extern struct notifier *sigreceived; /* notification of received signal */
+extern struct notifier *ip_up_notifier; /* IPCP has come up */
+extern struct notifier *ip_down_notifier; /* IPCP has gone down */
+extern struct notifier *auth_up_notifier; /* peer has authenticated */
+extern struct notifier *link_down_notifier; /* link has gone down */
+extern struct notifier *fork_notifier;	/* we are a new child process */
+
+/* Values for do_callback and doing_callback */
+#define CALLBACK_DIALIN		1	/* we are expecting the call back */
+#define CALLBACK_DIALOUT	2	/* we are dialling out to call back */
+
+/*
+ * Variables set by command-line options.
+ */
+
+extern int	debug;		/* Debug flag */
+extern int	kdebugflag;	/* Tell kernel to print debug messages */
+extern int	default_device;	/* Using /dev/tty or equivalent */
+extern char	devnam[MAXPATHLEN];	/* Device name */
+extern int	crtscts;	/* Use hardware flow control */
+extern bool	modem;		/* Use modem control lines */
+extern int	inspeed;	/* Input/Output speed requested */
+extern u_int32_t netmask;	/* IP netmask to set on interface */
+extern bool	lockflag;	/* Create lock file to lock the serial dev */
+extern bool	nodetach;	/* Don't detach from controlling tty */
+extern bool	updetach;	/* Detach from controlling tty when link up */
+extern char	*initializer;	/* Script to initialize physical link */
+extern char	*connect_script; /* Script to establish physical link */
+extern char	*disconnect_script; /* Script to disestablish physical link */
+extern char	*welcomer;	/* Script to welcome client after connection */
+extern char	*ptycommand;	/* Command to run on other side of pty */
+extern int	maxconnect;	/* Maximum connect time (seconds) */
+extern char	user[MAXNAMELEN];/* Our name for authenticating ourselves */
+extern char	passwd[MAXSECRETLEN];	/* Password for PAP or CHAP */
+extern bool	auth_required;	/* Peer is required to authenticate */
+extern bool	persist;	/* Reopen link after it goes down */
+extern bool	uselogin;	/* Use /etc/passwd for checking PAP */
+extern bool	session_mgmt;	/* Do session management (login records) */
+extern char	our_name[MAXNAMELEN];/* Our name for authentication purposes */
+extern char	remote_name[MAXNAMELEN]; /* Peer's name for authentication */
+extern bool	explicit_remote;/* remote_name specified with remotename opt */
+extern bool	demand;		/* Do dial-on-demand */
+extern char	*ipparam;	/* Extra parameter for ip up/down scripts */
+extern bool	cryptpap;	/* Others' PAP passwords are encrypted */
+extern int	idle_time_limit;/* Shut down link if idle for this long */
+extern int	holdoff;	/* Dead time before restarting */
+extern bool	holdoff_specified; /* true if user gave a holdoff value */
+extern bool	notty;		/* Stdin/out is not a tty */
+extern char	*pty_socket;	/* Socket to connect to pty */
+extern char	*record_file;	/* File to record chars sent/received */
+extern bool	sync_serial;	/* Device is synchronous serial device */
+extern int	maxfail;	/* Max # of unsuccessful connection attempts */
+extern char	linkname[MAXPATHLEN]; /* logical name for link */
+extern bool	tune_kernel;	/* May alter kernel settings as necessary */
+extern int	connect_delay;	/* Time to delay after connect script */
+extern int	max_data_rate;	/* max bytes/sec through charshunt */
+extern int	req_unit;	/* interface unit number to use */
+extern bool	multilink;	/* enable multilink operation */
+extern bool	noendpoint;	/* don't send or accept endpt. discrim. */
+extern char	*bundle_name;	/* bundle name for multilink */
+extern bool	dump_options;	/* print out option values */
+extern bool	dryrun;		/* check everything, print options, exit */
+extern int	child_wait;	/* # seconds to wait for children at end */
+
+#ifdef MAXOCTETS
+extern unsigned int maxoctets;	     /* Maximum octetes per session (in bytes) */
+extern int       maxoctets_dir;      /* Direction :
+				      0 - in+out (default)
+				      1 - in 
+				      2 - out
+				      3 - max(in,out) */
+extern int       maxoctets_timeout;  /* Timeout for check of octets limit */
+#define PPP_OCTETS_DIRECTION_SUM        0
+#define PPP_OCTETS_DIRECTION_IN         1
+#define PPP_OCTETS_DIRECTION_OUT        2
+#define PPP_OCTETS_DIRECTION_MAXOVERAL  3
+/* same as previos, but little different on RADIUS side */
+#define PPP_OCTETS_DIRECTION_MAXSESSION 4	
+#endif
+
+#ifdef PPP_FILTER
+extern struct	bpf_program pass_filter;   /* Filter for pkts to pass */
+extern struct	bpf_program active_filter; /* Filter for link-active pkts */
+#endif
+
+#ifdef MSLANMAN
+extern bool	ms_lanman;	/* Use LanMan password instead of NT */
+				/* Has meaning only with MS-CHAP challenges */
+#endif
+
+/* Values for auth_pending, auth_done */
+#define PAP_WITHPEER	0x1
+#define PAP_PEER	0x2
+#define CHAP_WITHPEER	0x4
+#define CHAP_PEER	0x8
+#define EAP_WITHPEER	0x10
+#define EAP_PEER	0x20
+
+/* Values for auth_done only */
+#define CHAP_MD5_WITHPEER	0x40
+#define CHAP_MD5_PEER		0x80
+#define CHAP_MS_SHIFT		8	/* LSB position for MS auths */
+#define CHAP_MS_WITHPEER	0x100
+#define CHAP_MS_PEER		0x200
+#define CHAP_MS2_WITHPEER	0x400
+#define CHAP_MS2_PEER		0x800
+
+extern char *current_option;	/* the name of the option being parsed */
+extern int  privileged_option;	/* set iff the current option came from root */
+extern char *option_source;	/* string saying where the option came from */
+extern int  option_priority;	/* priority of current options */
+
+/*
+ * Values for phase.
+ */
+#define PHASE_DEAD		0
+#define PHASE_INITIALIZE	1
+#define PHASE_SERIALCONN	2
+#define PHASE_DORMANT		3
+#define PHASE_ESTABLISH		4
+#define PHASE_AUTHENTICATE	5
+#define PHASE_CALLBACK		6
+#define PHASE_NETWORK		7
+#define PHASE_RUNNING		8
+#define PHASE_TERMINATE		9
+#define PHASE_DISCONNECT	10
+#define PHASE_HOLDOFF		11
+#define PHASE_MASTER		12
+
+/*
+ * The following struct gives the addresses of procedures to call
+ * for a particular protocol.
+ */
+struct protent {
+    u_short protocol;		/* PPP protocol number */
+    /* Initialization procedure */
+    void (*init) __P((int unit));
+    /* Process a received packet */
+    void (*input) __P((int unit, u_char *pkt, int len));
+    /* Process a received protocol-reject */
+    void (*protrej) __P((int unit));
+    /* Lower layer has come up */
+    void (*lowerup) __P((int unit));
+    /* Lower layer has gone down */
+    void (*lowerdown) __P((int unit));
+    /* Open the protocol */
+    void (*open) __P((int unit));
+    /* Close the protocol */
+    void (*close) __P((int unit, char *reason));
+    /* Print a packet in readable form */
+    int  (*printpkt) __P((u_char *pkt, int len,
+			  void (*printer) __P((void *, char *, ...)),
+			  void *arg));
+    /* Process a received data packet */
+    void (*datainput) __P((int unit, u_char *pkt, int len));
+    bool enabled_flag;		/* 0 iff protocol is disabled */
+    char *name;			/* Text name of protocol */
+    char *data_name;		/* Text name of corresponding data protocol */
+    option_t *options;		/* List of command-line options */
+    /* Check requested options, assign defaults */
+    void (*check_options) __P((void));
+    /* Configure interface for demand-dial */
+    int  (*demand_conf) __P((int unit));
+    /* Say whether to bring up link for this pkt */
+    int  (*active_pkt) __P((u_char *pkt, int len));
+};
+
+/* Table of pointers to supported protocols */
+extern struct protent *protocols[];
+
+/*
+ * This struct contains pointers to a set of procedures for
+ * doing operations on a "channel".  A channel provides a way
+ * to send and receive PPP packets - the canonical example is
+ * a serial port device in PPP line discipline (or equivalently
+ * with PPP STREAMS modules pushed onto it).
+ */
+struct channel {
+	/* set of options for this channel */
+	option_t *options;
+	/* find and process a per-channel options file */
+	void (*process_extra_options) __P((void));
+	/* check all the options that have been given */
+	void (*check_options) __P((void));
+	/* get the channel ready to do PPP, return a file descriptor */
+	int  (*connect) __P((void));
+	/* we're finished with the channel */
+	void (*disconnect) __P((void));
+	/* put the channel into PPP `mode' */
+	int  (*establish_ppp) __P((int));
+	/* take the channel out of PPP `mode', restore loopback if demand */
+	void (*disestablish_ppp) __P((int));
+	/* set the transmit-side PPP parameters of the channel */
+	void (*send_config) __P((int, u_int32_t, int, int));
+	/* set the receive-side PPP parameters of the channel */
+	void (*recv_config) __P((int, u_int32_t, int, int));
+	/* cleanup on error or normal exit */
+	void (*cleanup) __P((void));
+	/* close the device, called in children after fork */
+	void (*close) __P((void));
+};
+
+extern struct channel *the_channel;
+
+/*
+ * Prototypes.
+ */
+
+/* Procedures exported from main.c. */
+void set_ifunit __P((int));	/* set stuff that depends on ifunit */
+void detach __P((void));	/* Detach from controlling tty */
+void die __P((int));		/* Cleanup and exit */
+void quit __P((void));		/* like die(1) */
+void novm __P((char *));	/* Say we ran out of memory, and die */
+void timeout __P((void (*func)(void *), void *arg, int s, int us));
+				/* Call func(arg) after s.us seconds */
+void untimeout __P((void (*func)(void *), void *arg));
+				/* Cancel call to func(arg) */
+void record_child __P((int, char *, void (*) (void *), void *, int));
+pid_t safe_fork __P((int, int, int));	/* Fork & close stuff in child */
+int  device_script __P((char *cmd, int in, int out, int dont_wait));
+				/* Run `cmd' with given stdin and stdout */
+pid_t run_program __P((char *prog, char **args, int must_exist,
+		       void (*done)(void *), void *arg, int wait));
+				/* Run program prog with args in child */
+void reopen_log __P((void));	/* (re)open the connection to syslog */
+void print_link_stats __P((void)); /* Print stats, if available */
+void reset_link_stats __P((int)); /* Reset (init) stats when link goes up */
+void update_link_stats __P((int)); /* Get stats at link termination */
+void script_setenv __P((char *, char *, int));	/* set script env var */
+void script_unsetenv __P((char *));		/* unset script env var */
+void new_phase __P((int));	/* signal start of new phase */
+void add_notifier __P((struct notifier **, notify_func, void *));
+void remove_notifier __P((struct notifier **, notify_func, void *));
+void notify __P((struct notifier *, int));
+int  ppp_send_config __P((int, int, u_int32_t, int, int));
+int  ppp_recv_config __P((int, int, u_int32_t, int, int));
+const char *protocol_name __P((int));
+void remove_pidfiles __P((void));
+void lock_db __P((void));
+void unlock_db __P((void));
+
+/* Procedures exported from tty.c. */
+void tty_init __P((void));
+
+/* Procedures exported from utils.c. */
+void log_packet __P((u_char *, int, char *, int));
+				/* Format a packet and log it with syslog */
+void print_string __P((char *, int,  void (*) (void *, char *, ...),
+		void *));	/* Format a string for output */
+int slprintf __P((char *, int, char *, ...));		/* sprintf++ */
+int vslprintf __P((char *, int, char *, va_list));	/* vsprintf++ */
+size_t strlcpy __P((char *, const char *, size_t));	/* safe strcpy */
+size_t strlcat __P((char *, const char *, size_t));	/* safe strncpy */
+void dbglog __P((char *, ...));	/* log a debug message */
+void info __P((char *, ...));	/* log an informational message */
+void notice __P((char *, ...));	/* log a notice-level message */
+void warn __P((char *, ...));	/* log a warning message */
+void error __P((char *, ...));	/* log an error message */
+void fatal __P((char *, ...));	/* log an error message and die(1) */
+void init_pr_log __P((const char *, int)); /* initialize for using pr_log */
+void pr_log __P((void *, char *, ...));	/* printer fn, output to syslog */
+void end_pr_log __P((void));	/* finish up after using pr_log */
+void dump_packet __P((const char *, u_char *, int));
+				/* dump packet to debug log if interesting */
+ssize_t complete_read __P((int, void *, size_t));
+				/* read a complete buffer */
+
+/* Procedures exported from auth.c */
+void link_required __P((int));	  /* we are starting to use the link */
+void start_link __P((int));	  /* bring the link up now */
+void link_terminated __P((int));  /* we are finished with the link */
+void link_down __P((int));	  /* the LCP layer has left the Opened state */
+void upper_layers_down __P((int));/* take all NCPs down */
+void link_established __P((int)); /* the link is up; authenticate now */
+void start_networks __P((int));   /* start all the network control protos */
+void continue_networks __P((int)); /* start network [ip, etc] control protos */
+void np_up __P((int, int));	  /* a network protocol has come up */
+void np_down __P((int, int));	  /* a network protocol has gone down */
+void np_finished __P((int, int)); /* a network protocol no longer needs link */
+void auth_peer_fail __P((int, int));
+				/* peer failed to authenticate itself */
+void auth_peer_success __P((int, int, int, char *, int));
+				/* peer successfully authenticated itself */
+void auth_withpeer_fail __P((int, int));
+				/* we failed to authenticate ourselves */
+void auth_withpeer_success __P((int, int, int));
+				/* we successfully authenticated ourselves */
+void auth_check_options __P((void));
+				/* check authentication options supplied */
+void auth_reset __P((int));	/* check what secrets we have */
+int  check_passwd __P((int, char *, int, char *, int, char **));
+				/* Check peer-supplied username/password */
+int  get_secret __P((int, char *, char *, char *, int *, int));
+				/* get "secret" for chap */
+int  get_srp_secret __P((int unit, char *client, char *server, char *secret,
+    int am_server));
+int  auth_ip_addr __P((int, u_int32_t));
+				/* check if IP address is authorized */
+int  auth_number __P((void));	/* check if remote number is authorized */
+int  bad_ip_adrs __P((u_int32_t));
+				/* check if IP address is unreasonable */
+
+/* Procedures exported from demand.c */
+void demand_conf __P((void));	/* config interface(s) for demand-dial */
+void demand_block __P((void));	/* set all NPs to queue up packets */
+void demand_unblock __P((void)); /* set all NPs to pass packets */
+void demand_discard __P((void)); /* set all NPs to discard packets */
+void demand_rexmit __P((int));	/* retransmit saved frames for an NP */
+int  loop_chars __P((unsigned char *, int)); /* process chars from loopback */
+int  loop_frame __P((unsigned char *, int)); /* should we bring link up? */
+
+/* Procedures exported from multilink.c */
+#ifdef HAVE_MULTILINK
+void mp_check_options __P((void)); /* Check multilink-related options */
+int  mp_join_bundle __P((void));  /* join our link to an appropriate bundle */
+void mp_exit_bundle __P((void));  /* have disconnected our link from bundle */
+void mp_bundle_terminated __P((void));
+char *epdisc_to_str __P((struct epdisc *)); /* string from endpoint discrim. */
+int  str_to_epdisc __P((struct epdisc *, char *)); /* endpt disc. from str */
+#else
+#define mp_bundle_terminated()	/* nothing */
+#define mp_exit_bundle()	/* nothing */
+#define doing_multilink		0
+#define multilink_master	0
+#endif
+
+/* Procedures exported from sys-*.c */
+void sys_init __P((void));	/* Do system-dependent initialization */
+void sys_cleanup __P((void));	/* Restore system state before exiting */
+int  sys_check_options __P((void)); /* Check options specified */
+void sys_close __P((void));	/* Clean up in a child before execing */
+int  ppp_available __P((void));	/* Test whether ppp kernel support exists */
+int  get_pty __P((int *, int *, char *, int));	/* Get pty master/slave */
+int  open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */
+int  tty_establish_ppp __P((int));  /* Turn serial port into a ppp interface */
+void tty_disestablish_ppp __P((int)); /* Restore port to normal operation */
+void generic_disestablish_ppp __P((int dev_fd)); /* Restore device setting */
+int  generic_establish_ppp __P((int dev_fd)); /* Make a ppp interface */
+void make_new_bundle __P((int, int, int, int)); /* Create new bundle */
+int  bundle_attach __P((int));	/* Attach link to existing bundle */
+void cfg_bundle __P((int, int, int, int)); /* Configure existing bundle */
+void destroy_bundle __P((void)); /* Tell driver to destroy bundle */
+void clean_check __P((void));	/* Check if line was 8-bit clean */
+void set_up_tty __P((int, int)); /* Set up port's speed, parameters, etc. */
+void restore_tty __P((int));	/* Restore port's original parameters */
+void setdtr __P((int, int));	/* Raise or lower port's DTR line */
+void output __P((int, u_char *, int)); /* Output a PPP packet */
+void wait_input __P((struct timeval *));
+				/* Wait for input, with timeout */
+void add_fd __P((int));		/* Add fd to set to wait for */
+void remove_fd __P((int));	/* Remove fd from set to wait for */
+int  read_packet __P((u_char *)); /* Read PPP packet */
+int  get_loop_output __P((void)); /* Read pkts from loopback */
+void tty_send_config __P((int, u_int32_t, int, int));
+				/* Configure i/f transmit parameters */
+void tty_set_xaccm __P((ext_accm));
+				/* Set extended transmit ACCM */
+void tty_recv_config __P((int, u_int32_t, int, int));
+				/* Configure i/f receive parameters */
+int  ccp_test __P((int, u_char *, int, int));
+				/* Test support for compression scheme */
+void ccp_flags_set __P((int, int, int));
+				/* Set kernel CCP state */
+int  ccp_fatal_error __P((int)); /* Test for fatal decomp error in kernel */
+int  get_idle_time __P((int, struct ppp_idle *));
+				/* Find out how long link has been idle */
+int  get_ppp_stats __P((int, struct pppd_stats *));
+				/* Return link statistics */
+void netif_set_mtu __P((int, int)); /* Set PPP interface MTU */
+int  netif_get_mtu __P((int));      /* Get PPP interface MTU */
+int  sifvjcomp __P((int, int, int, int));
+				/* Configure VJ TCP header compression */
+int  sifup __P((int));		/* Configure i/f up for one protocol */
+int  sifnpmode __P((int u, int proto, enum NPmode mode));
+				/* Set mode for handling packets for proto */
+int  sifdown __P((int));	/* Configure i/f down for one protocol */
+int  sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t));
+				/* Configure IPv4 addresses for i/f */
+int  cifaddr __P((int, u_int32_t, u_int32_t));
+				/* Reset i/f IP addresses */
+#ifdef INET6
+int  sif6addr __P((int, eui64_t, eui64_t));
+				/* Configure IPv6 addresses for i/f */
+int  cif6addr __P((int, eui64_t, eui64_t));
+				/* Remove an IPv6 address from i/f */
+#endif
+int  sifdefaultroute __P((int, u_int32_t, u_int32_t));
+				/* Create default route through i/f */
+int  cifdefaultroute __P((int, u_int32_t, u_int32_t));
+				/* Delete default route through i/f */
+int  sifproxyarp __P((int, u_int32_t));
+				/* Add proxy ARP entry for peer */
+int  cifproxyarp __P((int, u_int32_t));
+				/* Delete proxy ARP entry for peer */
+u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */
+int  lock __P((char *));	/* Create lock file for device */
+int  relock __P((int));		/* Rewrite lock file with new pid */
+void unlock __P((void));	/* Delete previously-created lock file */
+void logwtmp __P((const char *, const char *, const char *));
+				/* Write entry to wtmp file */
+int  get_host_seed __P((void));	/* Get host-dependent random number seed */
+int  have_route_to __P((u_int32_t)); /* Check if route to addr exists */
+#ifdef PPP_FILTER
+int  set_filters __P((struct bpf_program *pass, struct bpf_program *active));
+				/* Set filter programs in kernel */
+#endif
+#ifdef IPX_CHANGE
+int  sipxfaddr __P((int, unsigned long, unsigned char *));
+int  cipxfaddr __P((int));
+#endif
+int  get_if_hwaddr __P((u_char *addr, char *name));
+char *get_first_ethernet __P((void));
+
+/* Procedures exported from options.c */
+int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */
+int  parse_args __P((int argc, char **argv));
+				/* Parse options from arguments given */
+int  options_from_file __P((char *filename, int must_exist, int check_prot,
+			    int privileged));
+				/* Parse options from an options file */
+int  options_from_user __P((void)); /* Parse options from user's .ppprc */
+int  options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */
+int  options_from_list __P((struct wordlist *, int privileged));
+				/* Parse options from a wordlist */
+int  getword __P((FILE *f, char *word, int *newlinep, char *filename));
+				/* Read a word from a file */
+void option_error __P((char *fmt, ...));
+				/* Print an error message about an option */
+int int_option __P((char *, int *));
+				/* Simplified number_option for decimal ints */
+void add_options __P((option_t *)); /* Add extra options */
+void check_options __P((void));	/* check values after all options parsed */
+int  override_value __P((const char *, int, const char *));
+				/* override value if permitted by priority */
+void print_options __P((void (*) __P((void *, char *, ...)), void *));
+				/* print out values of all options */
+
+int parse_dotted_ip __P((char *, u_int32_t *));
+
+/*
+ * Hooks to enable plugins to change various things.
+ */
+extern int (*new_phase_hook) __P((int));
+extern int (*idle_time_hook) __P((struct ppp_idle *));
+extern int (*holdoff_hook) __P((void));
+extern int (*pap_check_hook) __P((void));
+extern int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp,
+				 struct wordlist **paddrs,
+				 struct wordlist **popts));
+extern void (*pap_logout_hook) __P((void));
+extern int (*pap_passwd_hook) __P((char *user, char *passwd));
+extern int (*allowed_address_hook) __P((u_int32_t addr));
+extern void (*ip_up_hook) __P((void));
+extern void (*ip_down_hook) __P((void));
+extern void (*ip_choose_hook) __P((u_int32_t *));
+
+extern int (*chap_check_hook) __P((void));
+extern int (*chap_passwd_hook) __P((char *user, char *passwd));
+extern void (*multilink_join_hook) __P((void));
+
+/* Let a plugin snoop sent and received packets.  Useful for L2TP */
+extern void (*snoop_recv_hook) __P((unsigned char *p, int len));
+extern void (*snoop_send_hook) __P((unsigned char *p, int len));
+
+/*
+ * Inline versions of get/put char/short/long.
+ * Pointer is advanced; we assume that both arguments
+ * are lvalues and will already be in registers.
+ * cp MUST be u_char *.
+ */
+#define GETCHAR(c, cp) { \
+	(c) = *(cp)++; \
+}
+#define PUTCHAR(c, cp) { \
+	*(cp)++ = (u_char) (c); \
+}
+
+
+#define GETSHORT(s, cp) { \
+	(s) = *(cp)++ << 8; \
+	(s) |= *(cp)++; \
+}
+#define PUTSHORT(s, cp) { \
+	*(cp)++ = (u_char) ((s) >> 8); \
+	*(cp)++ = (u_char) (s); \
+}
+
+#define GETLONG(l, cp) { \
+	(l) = *(cp)++ << 8; \
+	(l) |= *(cp)++; (l) <<= 8; \
+	(l) |= *(cp)++; (l) <<= 8; \
+	(l) |= *(cp)++; \
+}
+#define PUTLONG(l, cp) { \
+	*(cp)++ = (u_char) ((l) >> 24); \
+	*(cp)++ = (u_char) ((l) >> 16); \
+	*(cp)++ = (u_char) ((l) >> 8); \
+	*(cp)++ = (u_char) (l); \
+}
+
+#define INCPTR(n, cp)	((cp) += (n))
+#define DECPTR(n, cp)	((cp) -= (n))
+
+/*
+ * System dependent definitions for user-level 4.3BSD UNIX implementation.
+ */
+
+#define TIMEOUT(r, f, t)	timeout((r), (f), (t), 0)
+#define UNTIMEOUT(r, f)		untimeout((r), (f))
+
+#define BCOPY(s, d, l)		memcpy(d, s, l)
+#define BZERO(s, n)		memset(s, 0, n)
+#define	BCMP(s1, s2, l)		memcmp(s1, s2, l)
+
+#define PRINTMSG(m, l)		{ info("Remote message: %0.*v", l, m); }
+
+/*
+ * MAKEHEADER - Add Header fields to a packet.
+ */
+#define MAKEHEADER(p, t) { \
+    PUTCHAR(PPP_ALLSTATIONS, p); \
+    PUTCHAR(PPP_UI, p); \
+    PUTSHORT(t, p); }
+
+/*
+ * Exit status values.
+ */
+#define EXIT_OK			0
+#define EXIT_FATAL_ERROR	1
+#define EXIT_OPTION_ERROR	2
+#define EXIT_NOT_ROOT		3
+#define EXIT_NO_KERNEL_SUPPORT	4
+#define EXIT_USER_REQUEST	5
+#define EXIT_LOCK_FAILED	6
+#define EXIT_OPEN_FAILED	7
+#define EXIT_CONNECT_FAILED	8
+#define EXIT_PTYCMD_FAILED	9
+#define EXIT_NEGOTIATION_FAILED	10
+#define EXIT_PEER_AUTH_FAILED	11
+#define EXIT_IDLE_TIMEOUT	12
+#define EXIT_CONNECT_TIME	13
+#define EXIT_CALLBACK		14
+#define EXIT_PEER_DEAD		15
+#define EXIT_HANGUP		16
+#define EXIT_LOOPBACK		17
+#define EXIT_INIT_FAILED	18
+#define EXIT_AUTH_TOPEER_FAILED	19
+#ifdef MAXOCTETS
+#define EXIT_TRAFFIC_LIMIT	20
+#endif
+#define EXIT_CNID_AUTH_FAILED	21
+
+/*
+ * Debug macros.  Slightly useful for finding bugs in pppd, not particularly
+ * useful for finding out why your connection isn't being established.
+ */
+#ifdef DEBUGALL
+#define DEBUGMAIN	1
+#define DEBUGFSM	1
+#define DEBUGLCP	1
+#define DEBUGIPCP	1
+#define DEBUGIPV6CP	1
+#define DEBUGUPAP	1
+#define DEBUGCHAP	1
+#endif
+
+#ifndef LOG_PPP			/* we use LOG_LOCAL2 for syslog by default */
+#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUGSYS) \
+  || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \
+  || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP)
+#define LOG_PPP LOG_LOCAL2
+#else
+#define LOG_PPP LOG_DAEMON
+#endif
+#endif /* LOG_PPP */
+
+#ifdef DEBUGMAIN
+#define MAINDEBUG(x)	if (debug) dbglog x
+#else
+#define MAINDEBUG(x)
+#endif
+
+#ifdef DEBUGSYS
+#define SYSDEBUG(x)	if (debug) dbglog x
+#else
+#define SYSDEBUG(x)
+#endif
+
+#ifdef DEBUGFSM
+#define FSMDEBUG(x)	if (debug) dbglog x
+#else
+#define FSMDEBUG(x)
+#endif
+
+#ifdef DEBUGLCP
+#define LCPDEBUG(x)	if (debug) dbglog x
+#else
+#define LCPDEBUG(x)
+#endif
+
+#ifdef DEBUGIPCP
+#define IPCPDEBUG(x)	if (debug) dbglog x
+#else
+#define IPCPDEBUG(x)
+#endif
+
+#ifdef DEBUGIPV6CP
+#define IPV6CPDEBUG(x)  if (debug) dbglog x
+#else
+#define IPV6CPDEBUG(x)
+#endif
+
+#ifdef DEBUGUPAP
+#define UPAPDEBUG(x)	if (debug) dbglog x
+#else
+#define UPAPDEBUG(x)
+#endif
+
+#ifdef DEBUGCHAP
+#define CHAPDEBUG(x)	if (debug) dbglog x
+#else
+#define CHAPDEBUG(x)
+#endif
+
+#ifdef DEBUGIPXCP
+#define IPXCPDEBUG(x)	if (debug) dbglog x
+#else
+#define IPXCPDEBUG(x)
+#endif
+
+#ifndef SIGTYPE
+#if defined(sun) || defined(SYSV) || defined(POSIX_SOURCE)
+#define SIGTYPE void
+#else
+#define SIGTYPE int
+#endif /* defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) */
+#endif /* SIGTYPE */
+
+#ifndef MIN
+#define MIN(a, b)	((a) < (b)? (a): (b))
+#endif
+#ifndef MAX
+#define MAX(a, b)	((a) > (b)? (a): (b))
+#endif
+
+#ifndef offsetof
+#define offsetof(type, member) ((size_t) &((type *)0)->member)
+#endif
+
+#endif /* __PPP_H__ */

+ 36 - 0
package/mISDN/Makefile

@@ -0,0 +1,36 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		mISDN
+PKG_VERSION:=		1_1_9_2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		f9ec111fcc40c9ef48fc1822317998be
+PKG_DESCR:=		mISDN is the new ISDN stack of the linux kernel 2.6, this is the out-of-tree 1.X version
+PKG_SECTION:=		net/voip
+PKG_URL:=		http://www.misdn.org
+PKG_SITES:=		http://www.misdn.org/downloads/releases/
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
+include $(ADK_TOPDIR)/mk/kernel-ver.mk
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,MISDN,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+XAKE_FLAGS+=		LINUX=${LINUX_DIR} KVERS=${KERNEL_VERSION}
+FAKE_FLAGS+=		INSTALL_PREFIX=${WRKINST}
+
+#do-configure:
+#	$(SED) 's/CONFIG_MISDN_AVM_FRITZ=y/CONFIG_MISDN_AVM_FRITZ=n/' ${WRKDIR}/add.config
+#	$(SED) 's/CONFIG_MISDN_AVM_FRITZ=y/CONFIG_MISDN_AVM_FRITZ=n/' ${WRKDIR}/add.config
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_MISDN)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/{mISDN,misdn-init} \
+		$(IDIR_MISDN)/usr/sbin
+	${INSTALL_DIR} ${IDIR_MISDN}/lib
+	mv ${WRKINST}/lib/modules ${IDIR_MISDN}/lib
+
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 53 - 0
package/mISDN/patches/patch-Makefile

@@ -0,0 +1,53 @@
+	- do not use /lib for kernel source dir detection
+	- drop some non-compiling card drivers
+	- do not run depmod and stuff
+--- mISDN-1_1_9_2.orig/Makefile	2009-06-09 10:41:07.000000000 +0200
++++ mISDN-1_1_9_2/Makefile	2011-07-11 15:04:00.996001762 +0200
+@@ -14,9 +14,14 @@ ifndef KVERS
+ KVERS:=$(shell uname -r)
+ endif
+ 
++ifndef LINUX
+ MODS=/lib/modules/$(KVERS)
+ LINUX=$(MODS)/build
+ LINUX_SOURCE=$(MODS)/source
++else
++LINUX_SOURCE=${LINUX}
++endif
++
+ UPDATE_MODULES=$(shell which update-modules)
+ MODULES_UPDATE=$(shell which modules-update)
+ DEPMOD=$(shell which depmod)
+@@ -30,15 +35,15 @@ MISDN_SRC=$(MISDNDIR)/drivers/isdn/hardw
+ 
+ CONFIGS+=CONFIG_MISDN_DRV=m 
+ CONFIGS+=CONFIG_MISDN_DSP=m 
+-CONFIGS+=CONFIG_MISDN_HFCMULTI=m 
+-CONFIGS+=CONFIG_MISDN_HFCPCI=m
++#CONFIGS+=CONFIG_MISDN_HFCMULTI=m 
++#CONFIGS+=CONFIG_MISDN_HFCPCI=m
+ CONFIGS+=CONFIG_MISDN_HFCUSB=m
+ CONFIGS+=CONFIG_MISDN_XHFC=m
+-CONFIGS+=CONFIG_MISDN_HFCMINI=m
+-CONFIGS+=CONFIG_MISDN_W6692=m
+-CONFIGS+=CONFIG_MISDN_SPEEDFAX=m
+-CONFIGS+=CONFIG_MISDN_AVM_FRITZ=m
+-CONFIGS+=CONFIG_MISDN_NETJET=m
++#CONFIGS+=CONFIG_MISDN_HFCMINI=m
++#CONFIGS+=CONFIG_MISDN_W6692=m
++#CONFIGS+=CONFIG_MISDN_SPEEDFAX=m
++#CONFIGS+=CONFIG_MISDN_AVM_FRITZ=m
++#CONFIGS+=CONFIG_MISDN_NETJET=m
+ CONFIGS+=CONFIG_MISDN_DEBUGTOOL=m 
+ 
+ #CONFIGS+=CONFIG_MISDN_NETDEV=y
+@@ -52,9 +57,6 @@ all: VERSION test_old_misdn test_new_mis
+ 	export MINCLUDES=$(MISDNDIR)/include ; export MISDNVERSION=$(MISDNVERSION); make -C $(LINUX) SUBDIRS=$(MISDN_SRC) modules $(CONFIGS)  
+ 
+ install: all modules-install misdn-init
+-	$(DEPMOD) 
+-	$(UPDATE_MODULES)
+-	$(MODULES_UPDATE)
+ 	make -C config install
+ 
+ modules-install:

+ 65 - 0
package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_contr_c

@@ -0,0 +1,65 @@
+	- capi_ctr_reseted has been renamed in linux kernel commit
+	  4e329972052c3649367b91de783f6293b8653cb2
+	- kernel now wants a struc file_operations for proc files
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/contr.c	2009-01-22 14:36:34.000000000 +0100
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/contr.c	2011-07-15 18:33:55.765001537 +0200
+@@ -367,17 +367,12 @@ procinfo(struct capi_ctr *ctrl)
+ }
+ 
+ static int
+-read_proc(char *page, char **start, off_t off, int count, int *eof, struct capi_ctr *ctrl)
++proc_show(struct seq_file *file, void *data)
+ {
+-       int len = 0;
++	struct capi_ctr *ctrl = file->private;
+ 
+-       len += sprintf(page+len, "mISDN_read_proc\n");
+-       if (off+count >= len)
+-          *eof = 1;
+-       if (len < off)
+-           return 0;
+-       *start = page + off;
+-       return ((count < len-off) ? count : len-off);
++       seq_printf(file, "mISDN_proc_show\n");
++       return 0;
+ };
+ 
+ 
+@@ -399,7 +394,7 @@ ResetController(struct capi_ctr *ctrl)
+ #ifdef OLDCAPI_DRIVER_INTERFACE
+ 	contr->ctrl->reseted(contr->ctrl);
+ #else
+-	capi_ctr_reseted(contr->ctrl);
++	capi_ctr_down(contr->ctrl);
+ #endif
+ }
+ 
+@@ -601,6 +596,19 @@ ControllerPutStatus(Controller_t *contr,
+ 	contrDebug(contr, CAPI_DBG_CONTR, "%s: %s", __FUNCTION__, msg);
+ }
+ 
++static int misdn_proc_open(struct inode *inode, struct file *file)
++{
++	return single_open(file, proc_show, PDE(inode)->data);
++}
++
++static const struct file_operations misdn_proc_fops = {
++	.owner		= THIS_MODULE,
++	.open		= misdn_proc_open,
++	.read		= seq_read,
++	.llseek		= seq_lseek,
++	.release	= single_release,
++};
++
+ int
+ ControllerConstr(Controller_t **contr_p, mISDNstack_t *st, mISDN_pid_t *pid, mISDNobject_t *ocapi)
+ {
+@@ -719,7 +727,7 @@ ControllerConstr(Controller_t **contr_p,
+ 	contr->ctrl->load_firmware = LoadFirmware;
+ 	contr->ctrl->reset_ctr = ResetController;
+ 	contr->ctrl->procinfo = procinfo;
+-	contr->ctrl->ctr_read_proc = read_proc;
++	contr->ctrl->proc_fops = &misdn_proc_fops;
+ 	retval = attach_capi_ctr(contr->ctrl);
+ #endif
+ 	if (!retval) {

+ 75 - 0
package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_core_c

@@ -0,0 +1,75 @@
+	- old lock initialisers got renamed
+	- init_MUTEX_LOCKED got dropped, use the real sema_init instead
+	- force sysfs-object creation
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/core.c	2009-06-09 10:08:45.000000000 +0200
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/core.c	2011-07-20 16:42:18.342001559 +0200
+@@ -23,10 +23,10 @@ static char		*mISDN_core_version = MISDN
+ static void (*dt_new_frame) (mISDNstack_t *stack, enum mISDN_dt_type type, struct sk_buff *skb, int duplicate_skb) = NULL;
+ 
+ LIST_HEAD(mISDN_objectlist);
+-static rwlock_t		mISDN_objects_lock = RW_LOCK_UNLOCKED;
++static rwlock_t		mISDN_objects_lock =  __RW_LOCK_UNLOCKED(old_style_rw_init);
+ 
+ LIST_HEAD(mISDN_modulelist);
+-static rwlock_t		mISDN_modules_lock = RW_LOCK_UNLOCKED;
++static rwlock_t		mISDN_modules_lock =  __RW_LOCK_UNLOCKED(old_style_rw_init);
+ struct modulelist {
+ 	struct list_head list;
+ 	struct module *module;
+@@ -35,7 +35,7 @@ struct modulelist {
+ int core_debug;
+ 
+ static u_char		entityarray[MISDN_MAX_ENTITY/8];
+-static spinlock_t	entity_lock = SPIN_LOCK_UNLOCKED;
++static spinlock_t	entity_lock = __SPIN_LOCK_UNLOCKED(old_style_spin_init);
+ 
+ static uint debug;
+ static int obj_id;
+@@ -724,7 +724,7 @@ int mISDN_register(mISDNobject_t *obj) {
+ 			obj->id);
+ 	if (core_debug & DEBUG_CORE_FUNC)
+ 		printk(KERN_DEBUG "mISDN_register: obj(%p)\n", obj);
+-#ifndef SYSFS_SUPPORT_2_6_24
++//#ifndef SYSFS_SUPPORT_2_6_24
+ 	retval = mISDN_register_sysfs_obj(obj);
+ 	if (retval) {
+ 		printk(KERN_ERR "mISDN_register class_device_register return(%d)\n", retval);
+@@ -732,7 +732,7 @@ int mISDN_register(mISDNobject_t *obj) {
+ 		list_del(&obj->list);
+ 		write_unlock_irqrestore(&mISDN_objects_lock, flags);
+ 	}
+-#endif
++//#endif
+ 	return(retval);
+ }
+ 
+@@ -758,9 +758,10 @@ int mISDN_unregister(mISDNobject_t *obj)
+ 	if (core_debug & DEBUG_CORE_FUNC)
+ 		printk(KERN_DEBUG "mISDN_unregister: mISDN_objectlist(%p<-%p->%p)\n",
+ 			mISDN_objectlist.prev, &mISDN_objectlist, mISDN_objectlist.next);
++	mISDN_unregister_sysfs_obj(obj);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+ #ifdef SYSFS_SUPPORT
+-        device_unregister(&obj->class_dev);
++        //device_unregister(&obj->class_dev);
+ #endif
+ #else
+         class_device_unregister(&obj->class_dev);
+@@ -774,7 +775,7 @@ mISDNInit(void)
+ 	struct semaphore sem;
+ 	int err;
+ 
+-	init_MUTEX_LOCKED(&sem);
++	sema_init(&sem, 0);
+ 
+ 	printk(KERN_INFO "Modular ISDN Stack core version (%s) revision (%s)\n", mISDN_core_version, mISDN_core_revision);
+ 	core_debug = debug;
+@@ -817,7 +818,7 @@ sysfs_fail:
+ void mISDN_cleanup(void) {
+ 	struct semaphore sem;
+ 
+-	init_MUTEX_LOCKED(&sem);
++	sema_init(&sem, 0);
+ 
+ 	free_mISDNdev();
+ 	if (!list_empty(&mISDN_objectlist)) {

+ 19 - 0
package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_core_h

@@ -0,0 +1,19 @@
+	- daemonize is defined in linux/sched.h
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/core.h	2009-01-22 14:36:34.000000000 +0100
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/core.h	2011-07-20 16:42:17.471001559 +0200
+@@ -4,6 +4,7 @@
+  *
+  */
+ 
++#include <linux/sched.h>
+ #include <linux/slab.h>
+ #include <linux/string.h>
+ #include <linux/mISDNif.h>
+@@ -61,6 +62,7 @@ extern mISDNinstance_t	*get_instance(mIS
+ 
+ /* from sysfs_obj.c */
+ extern int		mISDN_register_sysfs_obj(mISDNobject_t *);
++extern void		mISDN_unregister_sysfs_obj(mISDNobject_t *);
+ extern int		mISDN_sysfs_init(void);
+ extern void		mISDN_sysfs_cleanup(void);
+ 

+ 49 - 0
package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_debugtool_c

@@ -0,0 +1,49 @@
+	- big kernel lock unavailable
+	- CLASS_ATTR callbacks changed signature
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/debugtool.c	2009-01-22 14:36:34.000000000 +0100
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/debugtool.c	2011-07-11 14:46:28.845001528 +0200
+@@ -121,11 +121,11 @@ static void dt_run (void)
+ 	struct socket *sock;
+ 	struct sockaddr_in addr;
+ 
+-	lock_kernel();
++	//lock_kernel();
+ 	current->flags |= PF_NOFREEZE;
+ 	daemonize(MODULE_NAME);
+ 	allow_signal(SIGKILL);
+-	unlock_kernel();
++	//unlock_kernel();
+ 
+ 	/* init socket */
+ 	ret = sock_create(AF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock);
+@@ -181,12 +181,12 @@ static struct class dt_class = {
+ #endif
+ };
+ 
+-static ssize_t attr_show_enabled (struct class *class, char *buf)
++static ssize_t attr_show_enabled (struct class *class, struct class_attribute *attr, char *buf)
+ {
+ 	return sprintf(buf, "%d\n", dt_enabled);
+ }
+ 
+-static ssize_t attr_store_enabled (struct class *class, const char *buf, size_t count)
++static ssize_t attr_store_enabled (struct class *class, struct class_attribute *attr, const char *buf, size_t count)
+ {
+ 	if (count > 0 && *buf == '1') {
+ 		mISDN_dt_enable();
+@@ -241,13 +241,13 @@ void __exit dt_exit(void)
+ 	mISDN_module_unregister(THIS_MODULE);
+ 
+ 	if (thread) {
+-		lock_kernel();
++		//lock_kernel();
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+ 		ret = kill_pid(find_pid_ns(thread->pid, &init_pid_ns), SIGKILL, 1);
+ #else
+ 		ret = kill_proc(thread->pid, SIGKILL, 1);
+ #endif
+-		unlock_kernel();
++		//unlock_kernel();
+ 		if (ret < 0)
+ 			printk(KERN_INFO MODULE_NAME ": Unknown error (%d) while trying to terminate kernel thread!\n", -ret);
+ 		wake_up_interruptible(&skb_q_wait);

+ 17 - 0
package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_hfcs_usb_c

@@ -0,0 +1,17 @@
+	- add the viprinet ISDN USB device ID
+	- some debug output
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c	2009-01-22 14:36:34.000000000 +0100
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/hfcs_usb.c	2011-07-20 15:00:25.362001559 +0200
+@@ -208,6 +208,12 @@ static struct usb_device_id hfcsusb_idta
+ 	                  {LED_SCHEME1, {0x88, -64, -32, -16},
+ 	                   "ZyXEL OMNI.NET USB II"}),
+ 	},
++	{
++	 USB_DEVICE(0x18d8, 0x1020),
++	 .driver_info = (unsigned long) &((hfcsusb_vdata)
++			  {LED_SCHEME1, {0, 1, 0, 0},
++			   "Viprinet ISDN"}),
++	},
+ 	{ }
+ };
+ 

+ 34 - 0
package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_stack_c

@@ -0,0 +1,34 @@
+	- same as with core.c
+	- try forcing sysfs-object creation
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/stack.c	2009-01-22 14:36:34.000000000 +0100
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/stack.c	2011-07-20 16:43:13.224001559 +0200
+@@ -9,9 +9,9 @@
+ #include "core.h"
+ 
+ static LIST_HEAD(mISDN_stacklist);
+-static rwlock_t	stacklist_lock = RW_LOCK_UNLOCKED;
++static rwlock_t	stacklist_lock = __RW_LOCK_UNLOCKED(old_style_rw_init);
+ static LIST_HEAD(mISDN_instlist);
+-static rwlock_t	instlist_lock = RW_LOCK_UNLOCKED;
++static rwlock_t	instlist_lock = __RW_LOCK_UNLOCKED(old_style_rw_init);
+ 
+ int
+ get_stack_cnt(void)
+@@ -793,7 +793,7 @@ delete_stack(mISDNstack_t *st)
+ 	struct semaphore sem;
+ 	u_long	flags;
+ 
+-	init_MUTEX_LOCKED(&sem);
++	sema_init(&sem, 0);
+ 
+ 	if (core_debug & DEBUG_CORE_FUNC)
+ 		printk(KERN_DEBUG "%s: st(%p:%08x)\n", __FUNCTION__, st, st->id);
+@@ -1216,7 +1216,7 @@ clear_stack(mISDNstack_t *st, int wait) 
+ 
+ 	if (wait) {
+ 		struct semaphore sem;
+-		init_MUTEX_LOCKED(&sem);
++		sema_init(&sem, 0);
+ 
+ 		hhe->data[0] = &sem;
+ 		_queue_message(st, skb);

+ 30 - 0
package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_sysfs_inst_c

@@ -0,0 +1,30 @@
+	- see core.c
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/sysfs_inst.c	2009-06-09 10:09:20.000000000 +0200
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/sysfs_inst.c	2011-07-11 14:08:22.920000979 +0200
+@@ -82,7 +82,7 @@ static void release_mISDN_inst(struct de
+ #endif
+         if (core_debug & DEBUG_SYSFS)
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+-		printk(KERN_INFO "release instance class dev %s\n", dev->bus_id);
++		printk(KERN_INFO "release instance class dev %s\n", kobject_name(&dev->kobj));
+ #else
+                 printk(KERN_INFO "release instance class dev %s\n", dev->class_id);
+ #endif
+@@ -99,7 +99,7 @@ static void release_mISDN_inst(struct cl
+ #endif
+ 	if (core_debug & DEBUG_SYSFS)
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+-		printk(KERN_INFO "release instance class dev %s\n", dev->bus_id);
++		printk(KERN_INFO "release instance class dev %s\n", kobject_name(&dev->kobj));
+ #else
+ 		printk(KERN_INFO "release instance class dev %s\n", dev->class_id);
+ #endif
+@@ -127,7 +127,7 @@ mISDN_register_sysfs_inst(mISDNinstance_
+ 
+ 	inst->class_dev.class = &inst_dev_class;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+-	snprintf(inst->class_dev.bus_id, BUS_ID_SIZE, "inst-%08x", inst->id);
++	dev_set_name(&inst->class_dev, "inst-%08x", inst->id);
+ 	err = device_register(&inst->class_dev);
+ #else
+ 	snprintf(inst->class_dev.class_id, BUS_ID_SIZE, "inst-%08x", inst->id);

+ 33 - 0
package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_sysfs_obj_c

@@ -0,0 +1,33 @@
+	- bus_id field is gone from struct device now
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/sysfs_obj.c	2009-06-09 08:20:29.000000000 +0200
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/sysfs_obj.c	2011-07-20 16:49:35.771001557 +0200
+@@ -136,7 +136,7 @@ mISDN_register_sysfs_obj(mISDNobject_t *
+ 
+ 	obj->class_dev.class = &obj_dev_class;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+-        snprintf(obj->class_dev.bus_id, BUS_ID_SIZE, "obj-%d", obj->id);
++	dev_set_name(&obj->class_dev, "obj-%d", obj->id);
+         err = device_register(&obj->class_dev);
+ #else
+         snprintf(obj->class_dev.class_id, BUS_ID_SIZE, "obj-%d", obj->id);
+@@ -181,6 +181,20 @@ out:
+ 	return(err);
+ }
+ 
++void
++mISDN_unregister_sysfs_obj(mISDNobject_t *obj) {
++#ifdef SYSFS_SUPPORT
++	if (obj->owner)
++		sysfs_remove_link(&obj->class_dev.kobj, "module");
++	sysfs_remove_group(&obj->class_dev.kobj, &DPROTO_group);
++	sysfs_remove_group(&obj->class_dev.kobj, &BPROTO_group);
++#endif
++	device_remove_file(&obj->class_dev, &dev_attr_refcnt);
++	device_remove_file(&obj->class_dev, &dev_attr_name);
++	device_remove_file(&obj->class_dev, &dev_attr_id);
++        device_unregister(&obj->class_dev);
++}
++
+ int
+ mISDN_sysfs_init(void) {
+ 	int	err;

+ 18 - 0
package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_sysfs_st_c

@@ -0,0 +1,18 @@
+	yeah, same as always
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/sysfs_st.c	2009-06-09 10:10:16.000000000 +0200
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/sysfs_st.c	2011-07-11 14:10:50.061001669 +0200
+@@ -260,11 +260,11 @@ mISDN_register_sysfs_stack(mISDNstack_t 
+ 	st->class_dev.class = &stack_dev_class;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+         if (st->id & FLG_CHILD_STACK)
+-                snprintf(st->class_dev.bus_id, BUS_ID_SIZE, "chst-%08x", st->id);
++		dev_set_name(&st->class_dev, "chst-%08x", st->id);
+         else if (st->id & FLG_CLONE_STACK)
+-                snprintf(st->class_dev.bus_id, BUS_ID_SIZE, "clst-%08x", st->id);
++		dev_set_name(&st->class_dev, "clst-%08x", st->id);
+         else
+-                snprintf(st->class_dev.bus_id, BUS_ID_SIZE, "st-%08x", st->id);
++		dev_set_name(&st->class_dev, "st-%08x", st->id);
+         if (st->mgr)
+                 st->class_dev.parent = st->mgr->class_dev.parent;
+ 	err = device_register(&st->class_dev);

+ 36 - 0
package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_udevice_c

@@ -0,0 +1,36 @@
+	- same as with core.c
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/udevice.c	2009-01-22 14:36:34.000000000 +0100
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/udevice.c	2011-07-11 13:54:44.650001546 +0200
+@@ -57,7 +57,7 @@ typedef struct entity_item {
+ } entity_item_t;
+ 
+ static LIST_HEAD(mISDN_devicelist);
+-static rwlock_t	mISDN_device_lock = RW_LOCK_UNLOCKED;
++static rwlock_t	mISDN_device_lock = __RW_LOCK_UNLOCKED(old_style_rw_init);
+ 
+ static mISDNobject_t	udev_obj;
+ static char MName[] = "UserDevice";
+@@ -1458,7 +1458,7 @@ init_device(u_int minor) {
+ 		init_waitqueue_head(&dev->wport.procq);
+ 		skb_queue_head_init(&dev->rport.queue);
+ 		skb_queue_head_init(&dev->wport.queue);
+-		init_MUTEX(&dev->io_sema);
++		sema_init(&dev->io_sema, 1);
+ 		INIT_LIST_HEAD(&dev->layerlist);
+ 		INIT_LIST_HEAD(&dev->stacklist);
+ 		INIT_LIST_HEAD(&dev->timerlist);
+@@ -1557,12 +1557,12 @@ mISDN_open(struct inode *ino, struct fil
+ 		return(-ENOMEM);
+ 	dev->open_mode |= filep->f_mode & (FMODE_READ | FMODE_WRITE);
+ 	if (dev->open_mode & FMODE_READ){
+-		dev->rport.lock = SPIN_LOCK_UNLOCKED;
++		dev->rport.lock = __SPIN_LOCK_UNLOCKED(old_style_spin_init);
+ 		dev->rport.maxqlen = DEFAULT_PORT_QUEUELEN;
+ 		test_and_set_bit(FLG_mISDNPORT_OPEN, &dev->rport.Flag);
+ 	}
+ 	if (dev->open_mode & FMODE_WRITE) {
+-		dev->wport.lock = SPIN_LOCK_UNLOCKED;
++		dev->wport.lock = __SPIN_LOCK_UNLOCKED(old_style_spin_init);
+ 		dev->wport.maxqlen = DEFAULT_PORT_QUEUELEN;
+ 		test_and_set_bit(FLG_mISDNPORT_OPEN, &dev->wport.Flag);
+ 	}

+ 32 - 0
package/mISDNuser/Makefile

@@ -0,0 +1,32 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		mISDNuser
+PKG_VERSION:=		1_1_9
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e174a60e7040c88d1184364714e55c1b
+PKG_DESCR:=		mISDN (modular ISDN) kernel link library and includes, this is the out-of-tree 1.X version
+PKG_SECTION:=		net/voip
+PKG_DEPENDS:=		mISDN
+PKG_BUILDDEP:=		mISDN
+PKG_URL:=		http://www.misdn.org
+PKG_SITES:=		http://www.misdn.org/downloads/releases/
+PKG_NOPARALLEL:=	1
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,MISDNUSER,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+XAKE_FLAGS+=		MISDNDIR=${STAGING_TARGET_DIR}/usr INSTALL_PREFIX=${WRKINST}
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_MISDNUSER)/usr/{bin,lib}
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/{loadfirm,mISDNdebugtool,misdnportinfo} \
+		${WRKINST}/usr/bin/{sendhwctrl,testcon*,testlayer*} \
+		$(IDIR_MISDNUSER)/usr/bin/
+	${INSTALL_DATA} ${WRKINST}/usr/lib/*.so ${IDIR_MISDNUSER}/usr/lib/
+
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 16 - 0
package/mISDNuser/patches/patch-Makefile

@@ -0,0 +1,16 @@
+	allow CC override
+	allow CFLAGS enhancement
+--- mISDNuser-1_1_9.orig/Makefile	2009-01-21 18:06:34.000000000 +0100
++++ mISDNuser-1_1_9/Makefile	2011-07-11 17:14:13.425001831 +0200
+@@ -28,7 +28,10 @@ export INCLUDEDIR
+ LIBDIR=/usr/lib
+ export LIBDIR
+ 
+-CFLAGS:= -g -Wall -I $(INCLUDEDIR) -I $(MISDNINCLUDEDIR)
++CC ?= gcc
++export CC
++
++CFLAGS+= -g -Wall -I $(INCLUDEDIR) -I $(MISDNINCLUDEDIR)
+ CFLAGS+= -D CLOSE_REPORT=1
+ 
+ #disable this if your system does not support PIC (position independent code)

+ 9 - 0
package/mISDNuser/patches/patch-debugtool_Makefile

@@ -0,0 +1,9 @@
+	allow CC override
+--- mISDNuser-1_1_9.orig/debugtool/Makefile	2008-11-18 12:35:09.000000000 +0100
++++ mISDNuser-1_1_9/debugtool/Makefile	2011-07-11 17:12:13.520001533 +0200
+@@ -1,4 +1,4 @@
+-CC = gcc
++CC ?= gcc
+ 
+ CFLAGS += -Wall
+ 

+ 9 - 0
package/mISDNuser/patches/patch-i4lnet_Makefile

@@ -0,0 +1,9 @@
+	allow CC override
+--- mISDNuser-1_1_9.orig/i4lnet/Makefile	2008-11-18 12:35:09.000000000 +0100
++++ mISDNuser-1_1_9/i4lnet/Makefile	2011-07-11 17:12:22.313001562 +0200
+@@ -1,4 +1,4 @@
+-CC = gcc
++CC ?= gcc
+ AR = ar
+ RANLIB = ranlib
+ 

+ 9 - 0
package/mISDNuser/patches/patch-lib_Makefile

@@ -0,0 +1,9 @@
+	allow CC override
+--- mISDNuser-1_1_9.orig/lib/Makefile	2008-11-18 12:35:09.000000000 +0100
++++ mISDNuser-1_1_9/lib/Makefile	2011-07-11 17:12:25.341001554 +0200
+@@ -1,4 +1,4 @@
+-CC = gcc
++CC ?= gcc
+ AR = ar
+ RANLIB = ranlib
+ 

+ 9 - 0
package/mISDNuser/patches/patch-suppserv_Makefile

@@ -0,0 +1,9 @@
+	allow CC override
+--- mISDNuser-1_1_9.orig/suppserv/Makefile	2008-11-18 12:35:09.000000000 +0100
++++ mISDNuser-1_1_9/suppserv/Makefile	2011-07-11 17:12:30.613001557 +0200
+@@ -1,4 +1,4 @@
+-CC = gcc
++CC ?= gcc
+ AR = ar
+ RANLIB = ranlib
+