packages: capi4k-utils/capi4k-utils.spec, capi4k-utils/capi4k-utils-amd64.p...
evil
evil at pld-linux.org
Sat Feb 19 22:56:32 CET 2011
Author: evil Date: Sat Feb 19 21:56:32 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated amd64.patch
- added include/msg2str_safety/ppd244/ppd245/rcapid patches from gentoo
- finally builds
---- Files affected:
packages/capi4k-utils:
capi4k-utils.spec (1.22 -> 1.23) , capi4k-utils-amd64.patch (1.4 -> 1.5) , capi4k-utils-include.patch (NONE -> 1.1) (NEW), capi4k-utils-msg2str_safety.patch (NONE -> 1.1) (NEW), capi4k-utils-ppd244.patch (NONE -> 1.1) (NEW), capi4k-utils-ppd245.patch (NONE -> 1.1) (NEW), capi4k-utils-rcapid.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/capi4k-utils/capi4k-utils.spec
diff -u packages/capi4k-utils/capi4k-utils.spec:1.22 packages/capi4k-utils/capi4k-utils.spec:1.23
--- packages/capi4k-utils/capi4k-utils.spec:1.22 Sun Mar 22 23:33:44 2009
+++ packages/capi4k-utils/capi4k-utils.spec Sat Feb 19 22:56:27 2011
@@ -7,7 +7,7 @@
Summary(pl.UTF-8): Biblioteki i narzędzia konfiguracyjne CAPI 2.0
Name: capi4k-utils
Version: 2005.07.18
-Release: 2
+Release: 3
License: GPL
Group: Applications/Communications
Source0: ftp://ftp.in-berlin.de/pub/capi4linux/%{name}-2005-07-18.tar.gz
@@ -16,8 +16,13 @@
# Source1-md5: 03739a0170eba14f03f7dc7ccc58bba8
Source10: capi.conf
Source11: capi.init
-Patch0: %{name}-make.patch
-Patch1: %{name}-amd64.patch
+Patch0: %{name}-include.patch
+Patch1: %{name}-make.patch
+Patch2: %{name}-msg2str_safety.patch
+Patch3: %{name}-ppd244.patch
+Patch4: %{name}-ppd245.patch
+Patch5: %{name}-rcapid.patch
+Patch6: %{name}-amd64.patch
URL: ftp://ftp.in-berlin.de/pub/capi4linux/
BuildRequires: libtool
BuildRequires: ppp-plugin-devel
@@ -150,8 +155,13 @@
%prep
%setup -q -n %{name}
%patch0 -p1
-%if "%{_lib}" == "lib64"
%patch1 -p1
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
+%patch5 -p1
+%if "%{_lib}" == "lib64"
+%patch6 -p1
%endif
cat > .config << END
@@ -211,6 +221,7 @@
%attr(755,root,root) %{_bindir}/capiinfo
%attr(755,root,root) %{_sbindir}/capiinit
%attr(755,root,root) %{_sbindir}/avmcapictrl
+%ghost %{_libdir}/libcapi20.so.3
%attr(755,root,root) %{_libdir}/lib*.so.*.*
%attr(754,root,root) /etc/rc.d/init.d/capi
%{_mandir}/man8/capiinfo.8*
@@ -254,6 +265,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2011/02/19 21:56:27 evil
+- updated amd64.patch
+- added include/msg2str_safety/ppd244/ppd245/rcapid patches from gentoo
+- finally builds
+
Revision 1.22 2009/03/22 22:33:44 baggins
- unified: removed _initrddir macro usage
================================================================
Index: packages/capi4k-utils/capi4k-utils-amd64.patch
diff -u packages/capi4k-utils/capi4k-utils-amd64.patch:1.4 packages/capi4k-utils/capi4k-utils-amd64.patch:1.5
--- packages/capi4k-utils/capi4k-utils-amd64.patch:1.4 Wed Dec 22 20:52:02 2004
+++ packages/capi4k-utils/capi4k-utils-amd64.patch Sat Feb 19 22:56:27 2011
@@ -55,3 +55,123 @@
userpass.so: userpass.o
$(CC) -o $@ $(LDFLAGS) $(CFLAGS) -nostdlib userpass.o
+diff -r -u ../capi4k-utils.orig/pppdcapiplugin/Makefile.template ./pppdcapiplugin/Makefile.template
+--- ../capi4k-utils.orig/pppdcapiplugin/Makefile.template 2001-05-01 14:43:49.000000000 +0200
++++ ./pppdcapiplugin/Makefile.template 2011-02-19 22:45:36.613077158 +0100
+@@ -8,7 +8,7 @@
+ # as published by the Free Software Foundation; either version
+ # 2 of the License, or (at your option) any later version.
+
+-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
+
+ include $(TOPDIR)/Rules.make
+
+diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.3.11/Makefile ./pppdcapiplugin/ppp-2.3.11/Makefile
+--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.3.11/Makefile 2001-05-01 14:43:49.000000000 +0200
++++ ./pppdcapiplugin/ppp-2.3.11/Makefile 2011-02-19 22:45:36.609744073 +0100
+@@ -8,7 +8,7 @@
+ # as published by the Free Software Foundation; either version
+ # 2 of the License, or (at your option) any later version.
+
+-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
+
+ include $(TOPDIR)/Rules.make
+
+diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.0/Makefile ./pppdcapiplugin/ppp-2.4.0/Makefile
+--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.0/Makefile 2001-05-01 14:43:50.000000000 +0200
++++ ./pppdcapiplugin/ppp-2.4.0/Makefile 2011-02-19 22:45:36.616410243 +0100
+@@ -8,7 +8,7 @@
+ # as published by the Free Software Foundation; either version
+ # 2 of the License, or (at your option) any later version.
+
+-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
+
+ include $(TOPDIR)/Rules.make
+
+diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1/Makefile ./pppdcapiplugin/ppp-2.4.1/Makefile
+--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1/Makefile 2001-05-01 14:43:50.000000000 +0200
++++ ./pppdcapiplugin/ppp-2.4.1/Makefile 2011-02-19 22:45:36.619743328 +0100
+@@ -8,7 +8,7 @@
+ # as published by the Free Software Foundation; either version
+ # 2 of the License, or (at your option) any later version.
+
+-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
+
+ include $(TOPDIR)/Rules.make
+
+diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b1/Makefile ./pppdcapiplugin/ppp-2.4.1b1/Makefile
+--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b1/Makefile 2001-05-01 14:43:51.000000000 +0200
++++ ./pppdcapiplugin/ppp-2.4.1b1/Makefile 2011-02-19 22:45:36.623076413 +0100
+@@ -8,7 +8,7 @@
+ # as published by the Free Software Foundation; either version
+ # 2 of the License, or (at your option) any later version.
+
+-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
+
+ include $(TOPDIR)/Rules.make
+
+diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b2/Makefile ./pppdcapiplugin/ppp-2.4.1b2/Makefile
+--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b2/Makefile 2001-05-01 14:43:52.000000000 +0200
++++ ./pppdcapiplugin/ppp-2.4.1b2/Makefile 2011-02-19 22:45:36.626409498 +0100
+@@ -8,7 +8,7 @@
+ # as published by the Free Software Foundation; either version
+ # 2 of the License, or (at your option) any later version.
+
+-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
+
+ include $(TOPDIR)/Rules.make
+
+diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2b3/Makefile ./pppdcapiplugin/ppp-2.4.2b3/Makefile
+--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2b3/Makefile 2003-05-18 22:11:15.000000000 +0200
++++ ./pppdcapiplugin/ppp-2.4.2b3/Makefile 2011-02-19 22:45:36.586412480 +0100
+@@ -8,7 +8,7 @@
+ # as published by the Free Software Foundation; either version
+ # 2 of the License, or (at your option) any later version.
+
+-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
+
+ include $(TOPDIR)/Rules.make
+
+diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.3/Makefile ./pppdcapiplugin/ppp-2.4.3/Makefile
+--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.3/Makefile 2004-12-13 23:05:14.000000000 +0100
++++ ./pppdcapiplugin/ppp-2.4.3/Makefile 2011-02-19 22:45:36.626409498 +0100
+@@ -8,7 +8,7 @@
+ # as published by the Free Software Foundation; either version
+ # 2 of the License, or (at your option) any later version.
+
+-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
+
+ include $(TOPDIR)/Rules.make
+
+diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.4/Makefile ./pppdcapiplugin/ppp-2.4.4/Makefile
+--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.4/Makefile 2011-02-19 22:45:02.235639872 +0100
++++ ./pppdcapiplugin/ppp-2.4.4/Makefile 2011-02-19 22:45:36.629742583 +0100
+@@ -8,7 +8,7 @@
+ # as published by the Free Software Foundation; either version
+ # 2 of the License, or (at your option) any later version.
+
+-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
+
+ include $(TOPDIR)/Rules.make
+
+diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.5/Makefile ./pppdcapiplugin/ppp-2.4.5/Makefile
+--- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.5/Makefile 2011-02-19 22:45:02.242306040 +0100
++++ ./pppdcapiplugin/ppp-2.4.5/Makefile 2011-02-19 22:45:36.633075668 +0100
+@@ -8,7 +8,7 @@
+ # as published by the Free Software Foundation; either version
+ # 2 of the License, or (at your option) any later version.
+
+-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
+
+ include $(TOPDIR)/Rules.make
+
================================================================
Index: packages/capi4k-utils/capi4k-utils-include.patch
diff -u /dev/null packages/capi4k-utils/capi4k-utils-include.patch:1.1
--- /dev/null Sat Feb 19 22:56:32 2011
+++ packages/capi4k-utils/capi4k-utils-include.patch Sat Feb 19 22:56:27 2011
@@ -0,0 +1,11 @@
+--- capi4k-utils.orig/capi20/capi20.h 2000-11-19 11:15:01.000000000 +0100
++++ capi4k-utils/capi20/capi20.h 2007-11-20 21:37:13.000000000 +0100
+@@ -21,6 +21,8 @@
+ #define __CAPI20_H__
+
+ #include <sys/time.h>
++#include <sys/types.h>
++#include <stdlib.h>
+
+ #ifdef __cplusplus
+ extern "C" {
================================================================
Index: packages/capi4k-utils/capi4k-utils-msg2str_safety.patch
diff -u /dev/null packages/capi4k-utils/capi4k-utils-msg2str_safety.patch:1.1
--- /dev/null Sat Feb 19 22:56:32 2011
+++ packages/capi4k-utils/capi4k-utils-msg2str_safety.patch Sat Feb 19 22:56:27 2011
@@ -0,0 +1,34 @@
+diff -Naur capi20.orig/capiutils.h capi20/capiutils.h
+--- capi20.orig/capiutils.h 2005-03-22 16:16:34.000000000 +0100
++++ capi20/capiutils.h 2007-03-15 01:18:09.000000000 +0100
+@@ -308,6 +308,10 @@
+ #define capi20_cmd2str capi_cmd2str
+ char *capi_cmd2str(_cbyte cmd, _cbyte subcmd);
+
++/*
++ * WARNING: The following two functions use a single static buffer and
++ * are not thread-safe.
++ */
+ #define capi20_cmsg2str capi_cmsg2str
+ char *capi_cmsg2str(_cmsg * cmsg);
+
+diff -Naur capi20.orig/convert.c capi20/convert.c
+--- capi20.orig/convert.c 2005-05-09 10:23:01.000000000 +0200
++++ capi20/convert.c 2007-03-15 01:20:13.000000000 +0100
+@@ -894,10 +894,14 @@
+ static void bufprint(char *fmt,...)
+ {
+ va_list f;
++ size_t space = buf + sizeof(buf) - p, len;
+ va_start(f, fmt);
+- vsprintf(p, fmt, f);
++ len = vsnprintf(p, space, fmt, f);
+ va_end(f);
+- p += strlen(p);
++ if (len < space - 1)
++ p += len;
++ else
++ p += space - 1;
+ }
+
+ static void printstructlen(_cbyte * m, unsigned len)
================================================================
Index: packages/capi4k-utils/capi4k-utils-ppd244.patch
diff -u /dev/null packages/capi4k-utils/capi4k-utils-ppd244.patch:1.1
--- /dev/null Sat Feb 19 22:56:32 2011
+++ packages/capi4k-utils/capi4k-utils-ppd244.patch Sat Feb 19 22:56:27 2011
@@ -0,0 +1,942 @@
+diff -Naur pppdcapiplugin.orig/ppp-2.4.4/Makefile pppdcapiplugin/ppp-2.4.4/Makefile
+--- pppdcapiplugin.orig/ppp-2.4.4/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ pppdcapiplugin/ppp-2.4.4/Makefile 2010-09-08 14:04:50.084126916 +0200
+@@ -0,0 +1,14 @@
++# Makefile for the capiplugin for pppd(8).
++#
++# Copyright 2000 Carsten Paeth (calle at calle.in-berlin.de)
++# Copyright 2000 AVM GmbH Berlin (info at 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
++
+diff -Naur pppdcapiplugin.orig/ppp-2.4.4/pppd/patchlevel.h pppdcapiplugin/ppp-2.4.4/pppd/patchlevel.h
+--- pppdcapiplugin.orig/ppp-2.4.4/pppd/patchlevel.h 1970-01-01 01:00:00.000000000 +0100
++++ pppdcapiplugin/ppp-2.4.4/pppd/patchlevel.h 2010-09-08 14:03:42.820273428 +0200
+@@ -0,0 +1,4 @@
++/* $Id$ */
++
++#define VERSION "2.4.4"
++#define DATE "28 June 2006"
+diff -Naur pppdcapiplugin.orig/ppp-2.4.4/pppd/pppd.h pppdcapiplugin/ppp-2.4.4/pppd/pppd.h
+--- pppdcapiplugin.orig/ppp-2.4.4/pppd/pppd.h 1970-01-01 01:00:00.000000000 +0100
++++ pppdcapiplugin/ppp-2.4.4/pppd/pppd.h 2010-09-08 14:03:48.717172923 +0200
+@@ -0,0 +1,912 @@
++/*
++ * 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 at 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$
++ */
++
++/*
++ * 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 /* OR in argument to value */
++#define OPT_INC 0x800 /* 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_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 0x10000 /* for o_special, keep list of values */
++#define OPT_A2CLRB 0x10000 /* o_bool, clr val bits in *(u_char *)addr2 */
++#define OPT_NOINCR 0x20000 /* value mustn't be increased */
++#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 char pidfilename[]; /* name of pid file */
++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 defaultmetric; /* Metric of the default route */
++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 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 bool killoldaddr; /* If our IP is reassigned on
++ reconnect, kill active TCP
++ connections using the old IP. */
++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 */
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/capi4k-utils/capi4k-utils.spec?r1=1.22&r2=1.23&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/capi4k-utils/capi4k-utils-amd64.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list