Hello community,
here is the log from the commit of package i4l-base
checked in at Mon Sep 1 14:59:26 CEST 2008.
--------
--- i4l-base/i4l-base.changes 2008-08-26 16:22:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/i4l-base/i4l-base.changes 2008-09-01 13:31:05.672449000 +0200
@@ -1,0 +2,7 @@
+Sun Aug 31 13:49:54 CEST 2008 - kkeil@suse.de
+
+- update to isdn4k-utils v3.13
+ * includes all our patches
+- fix loading for HFC USB
+
+-------------------------------------------------------------------
Old:
----
isdn4k-utils.v3.12.tar.bz2
New:
----
isdn4k-utils.v3.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ i4l-base.spec ++++++
--- /var/tmp/diff_new_pack.O16259/_old 2008-09-01 14:57:46.000000000 +0200
+++ /var/tmp/diff_new_pack.O16259/_new 2008-09-01 14:57:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package i4l-base (Version 2008.8.26)
+# spec file for package i4l-base (Version 2008.9.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,17 +19,17 @@
Name: i4l-base
-BuildRequires: atk-devel cairo-devel freetype2 gcc-c++ glib2-devel glitz-devel gtk2-devel libpcap-devel libpng-devel libsndfile-devel ncurses-devel openssl-devel ppp-devel sgmltool tcl-devel tk xorg-x11 xorg-x11-devel
+BuildRequires: atk-devel cairo-devel freetype2-devel gcc-c++ glib2-devel glitz-devel gtk2-devel libpcap-devel libpng-devel libsndfile-devel ncurses-devel openssl-devel ppp-devel sgmltool tcl-devel tk-devel xorg-x11 xorg-x11-devel
Url: http://www.isdn4linux.de
License: GPL v2 or later
Group: Hardware/ISDN
Provides: i4l
AutoReqProv: on
Obsoletes: i4l
-Version: 2008.8.26
+Version: 2008.9.1
Release: 1
Summary: ISDN for Linux Basic Utilities
-Source: isdn4k-utils.v3.12.tar.bz2
+Source: isdn4k-utils.v3.13.tar.bz2
Source1: i4l_suse.tar.bz2
Source2: firmware.tar.bz2
Source3: divactrl_2.1.tar.bz2
@@ -76,7 +76,7 @@
%package -n ppp-userpass
License: GPL v2 or later; LGPL v2.1 or later
-Version: 2008.8.26
+Version: 2008.9.1
Release: 1
Summary: Password plugin for pppd
Group: Productivity/Networking/PPP
@@ -97,7 +97,7 @@
%package -n capi4linux
License: GPL v2 or later; LGPL v2.1 or later
-Version: 2008.8.26
+Version: 2008.9.1
Release: 1
Summary: CAPI 2.0 library and associated tools
Group: Hardware/ISDN
@@ -126,7 +126,7 @@
%package -n capi4linux-devel
License: GPL v2 or later; LGPL v2.1 or later
-Version: 2008.8.26
+Version: 2008.9.1
Release: 1
Summary: CAPI 2.0 library files for development
Group: Hardware/ISDN
@@ -149,8 +149,8 @@
and more
%package -n i4lfirm
-License: Contact author; No license agreement found in package
-Version: 2008.8.26
+License: GPL v2 or later; freely distributable, no modification
+Version: 2008.9.1
Release: 1
Summary: ISDN firmware for active ISDN cards
Group: Hardware/ISDN
@@ -178,7 +178,7 @@
%package -n i4l-vbox
License: GPL v2 or later
-Version: 2008.8.26
+Version: 2008.9.1
Release: 1
Obsoletes: vbox
Provides: vbox vbox2b4
@@ -207,7 +207,7 @@
%package -n ant-phone
License: GPL v2 or later
-Version: 2008.8.26
+Version: 2008.9.1
Release: 1
Summary: A telephone application
Group: Hardware/ISDN
@@ -229,7 +229,7 @@
%package -n i4l-isdnlog
License: GPL v2 or later
-Version: 2008.8.26
+Version: 2008.9.1
Release: 1
Summary: An ISDN line logging and control utility
Group: Hardware/ISDN
@@ -836,6 +836,10 @@
/lib/firmware/isdn/te*.qm*
%changelog
+* Sun Aug 31 2008 kkeil@suse.de
+- update to isdn4k-utils v3.13
+ * includes all our patches
+- fix loading for HFC USB
* Tue Aug 26 2008 kkeil@suse.de
- fix vbox to get correct CFLAGS
* Fri Aug 22 2008 kkeil@suse.de
++++++ i4l_suse.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/i4l_suse/etc/sysconfig/isdn/scripts/hotplug_usb new/i4l_suse/etc/sysconfig/isdn/scripts/hotplug_usb
--- old/i4l_suse/etc/sysconfig/isdn/scripts/hotplug_usb 2005-08-15 11:53:03.000000000 +0200
+++ new/i4l_suse/etc/sysconfig/isdn/scripts/hotplug_usb 2008-09-01 13:29:20.000000000 +0200
@@ -93,7 +93,7 @@
SCRIPT=hisaxusb
DRV="hisax_st5481"
;;
- "959/2bd0") # HFC usb
+ "959/2bd0"|"675/1688"|"7b0/6"|"7b0/7"|"742/2008"|"742/2009"|"742/200a"|"8e3/301"|"7fa/846"|"7fa/847"|"71d/1005")
SCRIPT=hisaxusb
DRV="hfc_usb"
;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/i4l_suse/etc/sysconfig/isdn/scripts/load-hisaxusb new/i4l_suse/etc/sysconfig/isdn/scripts/load-hisaxusb
--- old/i4l_suse/etc/sysconfig/isdn/scripts/load-hisaxusb 2005-08-15 11:52:58.000000000 +0200
+++ new/i4l_suse/etc/sysconfig/isdn/scripts/load-hisaxusb 2008-09-01 13:10:18.000000000 +0200
@@ -12,8 +12,14 @@
RET=$?
sleep 1
get_first_free_idx
+if [ $free_idx -gt 0 ]; then
+ free_idx=$(($free_idx - 1))
+fi
CONTR=${CONTR:-contr$free_idx}
if [ $RET -eq 0 -a $free_idx != -1 ]; then
+ get_i4l_id $free_idx
+ HCTRL="$card_id 1 0x4ff"
+ /sbin/hisaxctrl $HCTRL
start_isdnlog $free_idx ${CONTR}
echo "$free_idx" > /var/run/usb_isdn_${USBBUS}_${USBDEV}.idx
if [ -n "$EAZMAP" ]; then
++++++ isdn4k-utils.dif ++++++
--- /var/tmp/diff_new_pack.O16259/_old 2008-09-01 14:57:46.000000000 +0200
+++ /var/tmp/diff_new_pack.O16259/_new 2008-09-01 14:57:46.000000000 +0200
@@ -148,246 +148,3 @@
+CONFIG_GENMAN=y
+CONFIG_FAQ=y
+CONFIG_FAQDIR='/usr/share/doc/packages/i4l-base/faq'
-Index: Makefile
-===================================================================
---- Makefile.orig
-+++ Makefile
-@@ -9,6 +9,8 @@ export I4LVERSION = 3.12
-
- all: do-it-all
-
-+LIBDIR:=/usr/lib
-+
- #
- # Make "config" the default target if there is no configuration file.
- #
-@@ -130,9 +132,9 @@ 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; \
-+ @: || if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \
- then \
- /bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \
- else \
-@@ -202,7 +204,7 @@ subconfig: scripts/autoconf.h
- @set -e; for i in `echo $(BUILD_ONLY) $(SUBDIRS)`; do \
- if [ -x $$i/configure ] ; then \
- /bin/echo -e "\nRunning configure in $$i ...\n"; sleep 1; \
-- (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
-+ (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR) --libdir=$(LIBDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
- elif [ -f $$i/Makefile.in ] ; then \
- /bin/echo -e "\nRunning make -f Makefile.in config in $$i ...\n"; sleep 1; \
- $(MAKE) -C $$i -f Makefile.in config; \
-Index: imontty/Makefile
-===================================================================
---- imontty/Makefile.orig
-+++ imontty/Makefile
-@@ -52,10 +52,10 @@ install-man: $(MANPAGE)
- mkdir -p $(DESTDIR)$(MAN8DIR)
- $(INSTALL_MAN) $< $(DESTDIR)$(MAN8DIR)/$(MANPAGE)
-
--install: $(PROGS) rootperm install-man
-- install -s -o 0 -g 0 -m 0755 $(PROGS) $(DESTDIR)$(CONFIG_SBINDIR)
-+install: $(PROGS) install-man
-+ install -m 0755 $(PROGS) $(DESTDIR)$(CONFIG_SBINDIR)
-
--uninstall: rootperm
-+uninstall:
- for i in $(PROGS) ; do rm -f $(DESTDIR)$(CONFIG_SBINDIR)/$$i; done
-
- clean:
-Index: isdnlog/Makefile.in
-===================================================================
---- isdnlog/Makefile.in.orig
-+++ isdnlog/Makefile.in
-@@ -2036,7 +2036,7 @@ ifneq ($(NO_ROOTPERM), 1)
- fi
- endif
-
--uninstall: rootperm
-+uninstall:
- if ps x | fgrep $(ISDNLOG) >/dev/null; then kill `cat $(RUNDIR)/isdnlog.isdnctrl0.pid` 2>/dev/null; fi
- rm -f $(DESTDIR)$(SBINDIR)/$(ISDNLOG) \
- $(DESTDIR)$(BINDIR)/$(ISDNREP) \
-@@ -2058,7 +2058,7 @@ uninstall: rootperm
- $(DESTDIR)$(DATADIR)/dest.cdb
-
-
--installdirs: rootperm
-+installdirs:
- $(INSTALL_DIR) $(DESTDIR)$(I4LCONFDIR)
- $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
-@@ -2067,7 +2067,7 @@ installdirs: rootperm
- $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
- $(INSTALL_DIR) $(DESTDIR)$(DATADIR)
-
--install: all rootperm installdirs install-conf install-data install-progs
-+install: all installdirs install-conf install-data install-progs
-
- install-old-conf:
- @if [ -n "$(DESTDIR)$(OLDCONFDIR)" -a "$(DESTDIR)$(OLDCONFDIR)" != '/' ] ; then \
-@@ -2150,7 +2150,7 @@ install-data:
- $(INSTALL_DATA) $$f $(DESTDIR)$(DATADIR); \
- echo Installing $(DESTDIR)$(DATADIR)/$$f; \
- done
-- @(grep isdnlog $(SERVICEFILE) >/dev/null) || \
-+ @: || (grep isdnlog $(SERVICEFILE) >/dev/null) || \
- (echo "";echo "";echo "Add a line to the file $(SERVICEFILE)" ;echo "";echo ""; \
- echo "isdnlog $(SERV_PORT)/tcp isdnlog" >> $(SERVICEFILE))
-
-Index: isdnlog/tools/telrate/Makefile.in
-===================================================================
---- isdnlog/tools/telrate/Makefile.in.orig
-+++ isdnlog/tools/telrate/Makefile.in
-@@ -8,8 +8,8 @@ PROGRAM = telrate.cgi
- CGIDIR = @CGIDIR@
- TELDIR = @TELDIR@
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0755
--INSTALL_FILE = $(INSTALL) -o 0 -g 0 -m 0644
-+INSTALL_PROGRAM = $(INSTALL) -m 0755
-+INSTALL_FILE = $(INSTALL) -m 0644
-
- FILES = index.html info.html *.jpg *.gif tt.js
-
-Index: pppdcapiplugin/Makefile
-===================================================================
---- pppdcapiplugin/Makefile.orig
-+++ pppdcapiplugin/Makefile
-@@ -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
- export PPPINC=/usr/include/pppd
-
-Index: vbox/Makefile.in
-===================================================================
---- vbox/Makefile.in.orig
-+++ vbox/Makefile.in
-@@ -14,33 +14,33 @@
- # [*] Program to install binaries to the sbin directory (eg vboxgetty): #
- #----------------------------------------------------------------------------#
-
--INSTALL_SBIN = @INSTALL@ -m 750 -o root -g root -s
-+INSTALL_SBIN = @INSTALL@ -m 750
-
- #----------------------------------------------------------------------------#
- # [*] Program to install binaries to the bin directory (eg vboxconvert): #
- #----------------------------------------------------------------------------#
-
--INSTALL_BIN = @INSTALL@ -m 755 -o root -g root -s
-+INSTALL_BIN = @INSTALL@ -m 755
-
- #----------------------------------------------------------------------------#
- # [*] Program to install bash scripts to the bin directory (eg vboxplay): #
- #----------------------------------------------------------------------------#
-
--INSTALL_SHBIN = @INSTALL@ -m 755 -o root -g root
-+INSTALL_SHBIN = @INSTALL@ -m 755
-
- #----------------------------------------------------------------------------#
- # [*] Program to install binaries to the bin directory and set the suid bit #
- # (eg vboxbeep): #
- #----------------------------------------------------------------------------#
-
--INSTALL_UBIN = @INSTALL@ -m 4755 -o root -g root -s
-+INSTALL_UBIN = @INSTALL@ -m 4755
-
- #----------------------------------------------------------------------------#
- # [*] Program to install configurations to sysconf directory #
- # (eg vboxgetty.conf): #
- #----------------------------------------------------------------------------#
-
--INSTALL_SYSCONF = @INSTALL@ -m 640 -o root -g root
-+INSTALL_SYSCONF = @INSTALL@ -m 640
-
- #----------------------------------------------------------------------------#
- # [*] Program to create missing directories: #
-@@ -53,7 +53,7 @@ INSTALL_DIRS = @INSTALL@ -d
- #----------------------------------------------------------------------------#
-
- CC = @CC@
--CFLAGS = @CFLAGS@ @LINK_NCURSES_INCL@ @LINK_TCL_INCL@
-+VBOX_CFLAGS = @LINK_NCURSES_INCL@ @LINK_TCL_INCL@
- LDFLAGS = @LDFLAGS@
-
- #----------------------------------------------------------------------------#
-@@ -80,8 +80,8 @@ prefix = @prefix@
- exec_prefix = @exec_prefix@
- mandir = @CONFIG_MANDIR@
- bindir = @CONFIG_BINDIR@
--sbindir = @CONFIG_SBINDIR@
--sysconfdir = @CONFIG_I4LCONFDIR@
-+sbindir = /usr/sbin
-+sysconfdir = /etc/vbox
-
- LOGFILEDIR = @VBOX_LOGDIR@
- PIDFILEDIR = @VBOX_PIDDIR@
-@@ -119,6 +119,7 @@ endif
-
- export CC
- export CFLAGS
-+export VBOX_CFLAGS
- export LDFLAGS
- export AR
- export RANLIB
-Index: vbox/utils/vboxplay.in
-===================================================================
---- vbox/utils/vboxplay.in.orig
-+++ vbox/utils/vboxplay.in
-@@ -44,7 +44,7 @@ if [ ! -x $PLAY ]; then # try aplay (fro
- # if anyone has a better suggestion,
- # send email to isdnutils@packages.debian.org!
- # thankfully, aplay understands '-' to mean stdin
-- DOPLAY="$PLAY -q -u -"
-+ DOPLAY="$PLAY -q -"
- fi
- fi
- if [ ! -x $PLAY ]; then # use play (from sox) instead
-Index: xmonisdn/Imakefile
-===================================================================
---- xmonisdn/Imakefile.orig
-+++ xmonisdn/Imakefile
-@@ -7,7 +7,7 @@ LOCAL_LIBRARIES = XawClientLibs
- OBJS = xmonisdn.o Net.o
- HEADERS = NetP.h Net.h
-
-- INSTPGMFLAGS = -m 0755 -s
-+ INSTPGMFLAGS = -m 0755
-
- ComplexProgramTarget(xmonisdn)
-
-Index: ipppd/Makefile.in
-===================================================================
---- ipppd/Makefile.in.orig
-+++ ipppd/Makefile.in
-@@ -72,7 +72,7 @@ HEADERS := $(HEADERS) .depend
- endif
-
- DEBUG_FLAGS = @CONFIG_IPPPD_DEBUGFLAGS@
--COMPILE_FLAGS =
-+COMPILE_FLAGS = @CFLAGS@
- CFLAGS = -O2 -fomit-frame-pointer -Wall
- VER = 2.2.0
-
-Index: vbox/src/Makefile.in
-===================================================================
---- vbox/src/Makefile.in.orig
-+++ vbox/src/Makefile.in
-@@ -13,6 +13,8 @@ NCURSES_HAVE = @HAVE_NCURSES_PACK@
- TCL_LIBS = @LINK_TCL_LIBS@
- TCL_HAVE = @HAVE_TCL_PACK@
-
-+override CFLAGS += $(VBOX_CFLAGS)
-+
- #----------------------------------------------------------------------------#
- # Headers #
- #----------------------------------------------------------------------------#
++++++ isdn4k-utils.v3.12.tar.bz2 -> isdn4k-utils.v3.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/isdn4k-utils/eurofile/doc/eft_wuauth.5 new/isdn4k-utils/eurofile/doc/eft_wuauth.5
--- old/isdn4k-utils/eurofile/doc/eft_wuauth.5 1999-06-30 18:51:02.000000000 +0200
+++ new/isdn4k-utils/eurofile/doc/eft_wuauth.5 1970-01-01 01:00:00.000000000 +0100
@@ -1,182 +0,0 @@
-.\" $Id: eft_wuauth.5,v 1.1 1999/06/30 16:51:02 he Exp $
-.\" Copyright (c) 1985, 1988 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms are permitted provided
-.\" that: (1) source distributions retain this entire copyright notice and
-.\" comment, and (2) distributions including binaries display the following
-.\" acknowledgement: ``This product includes software developed by the
-.\" University of California, Berkeley and its contributors'' in the
-.\" documentation or other materials provided with the distribution and in
-.\" all advertising materials mentioning features or use of this software.
-.\" Neither the name of the University nor the names of its contributors may
-.\" be used to endorse or promote products derived from this software without
-.\" specific prior written permission.
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-.\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-.\"
-.\" ORIGINAL: ftpd.8 6.8 (Berkeley) 6/24/90
-.\"
-.\" @(#)$Original-Id: ftpd.8,v 1.5 1997/01/14 22:45:27 sob Exp sob $
-.\"
-.TH EFT_WUAUTH 5 "Jan 10, 1997"
-.UC 5
-.SH NAME
-eft_wuauth \- authentication for eftp4linux Eurofile server based on wuftpd.
-.SH DESCRIPTION
-If the eftp4linux Eurofile server
-.I eftd
-is compiled with the CONFIG_EFTD_WUAUTH configuration option,
-it uses user authentication code derived from
-.I wuftpd,
-the Washington University ftp daemon.
-.PP
-In that case
-.I eftd
-authenticates users according to four rules.
-.IP 1)
-The user name must be in the password data base,
-.IR /etc/passwd ,
-or whatever is appropriate for the operating system,
-and the password must not be null. In this case a password
-must be provided by the client before any file operations
-may be performed.
-.IP 2)
-The user name must not appear in the file
-.IR /etc/isdn/eftusers .
-.IP 3)
-The user must have a standard shell returned by
-.IR getusershell (3).
-If login failed for certain users, maybe that's because their login
-shell is not listed in /etc/shells.
-.IP 4)
-If the user name is ``anonymous'' or ``ftp'', an
-anonymous ftp account must be present in the password
-file (user ``ftp''). In this case the user is allowed
-to log in by specifying any password (by convention this
-is given as the client host's name).
-.PP
-In the last case,
-.I eftd
-takes special measures to restrict the client's access privileges.
-The server performs a
-.IR chroot (2)
-command to the home directory of the ``ftp'' user.
-In order that system security is not breached, it is recommended
-that the ``ftp'' subtree be constructed with care; the following
-rules are recommended.
-.IP ~ftp)
-Make the home directory owned by super-user and unwritable by anyone.
-.IP ~ftp/bin)
-Make this directory owned by the super-user and unwritable by
-anyone. This contains auxilary programs that might be forked by
-.IR eftd(8)
-or
-.IR ftpd(8).
-These programs should have mode 111.
-.IR eftd(8)
-currently does not need any auxilary programs. Thus, you only need to
-put files here if you also want to provide anonymous ftp service.
-.IP ~ftp/etc)
-Make this directory owned by the super-user and unwritable by
-anyone. The files
-.IR passwd (5)
-and
-.IR group (5)
-must be present for eftd
-to be able to produce owner names rather than numbers in file headers
-and extended format directory (T-DIR primitive) listings. Depending
-on the operating system, there may be other required files. Check your
-manual page for the
-.IR getpwent (3)
-library routine.
-The password field in
-.I passwd
-is not used, and should not contain real encrypted passwords.
-These files should be mode 444 and owned by the super-user.
-Don't use the system's /etc/passwd file as the password file or
-the system's /etc/group file as the group file in the ~ftp/etc directory.
-.IP ~ftp/pub)
-Create a subdirectory in ~ftp/pub
-with the appropriate mode (777 or 733) if you want to allow normal
-users to upload files.
-
-.PP
-The Eurofile file server also allows for finer grained access control
-by means of the files /etc/isdn/eftaccess and /etc/isdn/efthosts.
-
-.SH "COPYING"
-The main part of eftp4linux is licensed under the LGPL. However,
-eft servers using the wuauth authentication libray also contain code
-copyrighted by the University of California, Berkeley,
-by the Washington University in Saint Louis, and their contributors.
-That code is subject to a BSD style licences with advertisment clause:
-
-Copyright (c) 1990 The Regents of the University of California.
-All rights reserved.
-
-This code is derived from software contributed to Berkeley by
-Chris Torek.
-Redistribution and use in source and binary forms are permitted
-provided that: (1) source distributions retain this entire
-copyright notice and comment, and (2) distributions including binaries
-display the following acknowledgement: ``This product includes software
-developed by the University of California, Berkeley and its contributors''
-in the documentation or other materials provided with the distribution
-and in all advertising materials mentioning features or use of this
-software. Neither the name of the University nor the names of its
-contributors may be used to endorse or promote products derived
-from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-
-Copyright (c) 1993, 1994 Washington University in Saint Louis
-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. All advertising materials mentioning features or use of this
-software must display the following acknowledgement: This product
-includes software developed by the Washington University in Saint
-Louis and its contributors.
-4. Neither the name of the University nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY WASHINGTON UNIVERSITY AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASHINGTON
-UNIVERSITY OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-
-
-.SH "SEE ALSO"
-.BR eftd(1) ,
-.BR shells(5) ,
-.BR getusershell(3) ,
-.BR eftaccess(5) ,
-.BR efthosts(5) ,
-.BR eft_xferlog(5) ,
-.BR umask(2)
-.SH BUGS
-The anonymous account is inherently dangerous and should be
-avoided when possible.
-
-The eftaccess amd efthosts files are currently not yet working as documented.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/isdn4k-utils/eurofile/src/eft/fileheader.c.orig new/isdn4k-utils/eurofile/src/eft/fileheader.c.orig
--- old/isdn4k-utils/eurofile/src/eft/fileheader.c.orig 2007-03-05 19:04:35.000000000 +0100
+++ new/isdn4k-utils/eurofile/src/eft/fileheader.c.orig 1970-01-01 01:00:00.000000000 +0100
@@ -1,556 +0,0 @@
-/* $Id: fileheader.c,v 1.5 2007/03/05 18:04:35 keil Exp $ */
-/*
- Copyright 1998 by Henner Eisen
-
- This code is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This code is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-/*
- A (rather incomplete) implementation of the T-protocol
- defined in ETS 300 075.
-
- This file containing stuff used for processing of file headers.
-*/
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-
-#include
-#include "tdu.h"
-#include "fileheader.h"
-
-/* Table with various information on tdu file headers */
-
-static struct tdu_descr tdu_fh_descr[] = {
-{"FILE_TYPE", TDU_FH_FILE_TYPE, 0},
-{"EXECUTION_ORDER", TDU_FH_EXECUTION_ORDER, 0},
-{"TRANSFER_NAME", TDU_FH_TRANSFER_NAME, 0},
-{"FILE_NAME", TDU_FH_FILE_NAME, 0},
-{"DATE", TDU_FH_DATE, 0},
-{"FILE_LENGTH", TDU_FH_FILE_LENGTH, 0},
-{"DESTINATION_CODE", TDU_FH_DESTINATION_CODE, 0},
-{"FILE_CODING", TDU_FH_FILE_CODING, 0},
-{"DESTINATION_NAME", TDU_FH_DESTINATION_NAME, 0},
-{"COST", TDU_FH_COST, 0},
-{"USER_FIELD", TDU_FH_USER_FIELD, 0},
-{"LOAD_ADDRESS", TDU_FH_LOAD_ADDRESS, 0},
-{"EXEC_ADDRESS_ABS", TDU_FH_EXEC_ADDRESS_ABS, 0},
-{"EXEC_ADDRESS_REL", TDU_FH_EXEC_ADDRESS_REL, 0},
-{"COMPRESSION_MODE", TDU_FH_COMPRESSION_MODE, 0},
-{"DEVICE", TDU_FH_DEVICE, 0},
-{"FILE_CHECKSUM", TDU_FH_FILE_CHECKSUM, 0},
-{"AUTHOR_NAME", TDU_FH_AUTHOR_NAME, 0},
-{"FUTURE_FILE_LENGTH", TDU_FH_FUTURE_FILE_LENGTH, 0},
-{"PERMITTED_ACTIONS", TDU_FH_PERMITTED_ACTIONS, 0},
-{"LEGAL_QUALIFICATION", TDU_FH_LEGAL_QUALIFICATION, 0},
-{"CREATION", TDU_FH_CREATION, 0},
-{"LAST_READ_ACCESS", TDU_FH_LAST_READ_ACCESS, 0},
-{"ID_OF_LAST_MODIFIER", TDU_FH_ID_OF_LAST_MODIFIER, 0},
-{"ID_OF_LAST_READER", TDU_FH_ID_OF_LAST_READER, 0},
-{"RECIPIENT", TDU_FH_RECIPIENT, 0},
-{"TELEMATIC_FT_VERSION",TDU_FH_TELEMATIC_FT_VERSION, 0},
-{0,0,0}
-};
-
-
-static char * tdu_print_file_par( int ct, unsigned char *pkt, unsigned char *end,
- int level )
-{
- unsigned char pi, *ret;
- char *name;
- int len=0;
-
- if( pkt >= end ) goto packet_too_small;
-
- pi = *(pkt++);
- name = tdu_des(tdu_fh_descr,pi);
- tdu_printf( ct, " %s(", name ? name : "FIle header parameter unknown " );
-
- if( pkt >= end ) goto packet_too_small;
- if( (len = *(pkt++)) == 0xff ) {
- if( pkt+2 > end ) goto packet_too_small;
- len = 0x100 * pkt[0] + pkt[1];
- pkt += 2;
- }
- tdu_printf (ct,"len=%d)", len);
- ret = pkt + len;
- if( level < 3 ) {
- return ret;
- }
-
- tdu_printf(ct,"=");
- switch ( pi ) {
- case TDU_FH_TRANSFER_NAME:
- case TDU_FH_FILE_NAME:
- case TDU_FH_DATE:
- case TDU_FH_DESTINATION_NAME:
- case TDU_FH_COST:
- case TDU_FH_USER_FIELD:
- case TDU_FH_AUTHOR_NAME:
- case TDU_FH_LEGAL_QUALIFICATION:
- case TDU_FH_CREATION:
- case TDU_FH_LAST_READ_ACCESS:
- case TDU_FH_ID_OF_LAST_MODIFIER:
- case TDU_FH_ID_OF_LAST_READER:
- case TDU_FH_RECIPIENT:
- case TDU_FH_TELEMATIC_FT_VERSION:
- tdu_print_txt(ct,pkt,ret);
- break;
- case TDU_FH_FILE_LENGTH:
- case TDU_FH_FUTURE_FILE_LENGTH:
- case TDU_FH_FILE_CHECKSUM:
- tdu_print_li( ct, pkt, ret );
- break;
- default:
- tdu_print_hex ( ct, pkt,ret );
- };
- return ret;
-
- packet_too_small : tdu_printf( TDU_LOG_ERR, "FH packet to small!\n" );
- return end;
-}
-
-
-unsigned char * tdu_print_file_header( int ct, unsigned char *pkt, unsigned char *end, int level )
-{
- unsigned char ci;
- int len=0, garbage=0;
-
- if( pkt >= end ) goto packet_too_small;
-
- if( level < 1 ) {
- tdu_printf(ct,"\n");
- return pkt;
- }
- ci = *(pkt++);
-
- tdu_printf( ct, " %s(", ci == 0x30 ? "File_Header" : "FH magic unknown" );
-
- if( pkt < end ) len = *(pkt++);
- if( len == 0xff ) {
- if( pkt+2 >= end ) goto packet_too_small;
- len = 0x100 * *(pkt) + *(pkt+1);
- pkt += 2;
- }
-
- if( pkt+len < end ){
- garbage = end - pkt - len;
- /* remove trailing garbage */
- end = pkt + len;
- }
- tdu_printf (ct, "len=%d", len);
- if ( garbage ) tdu_printf(ct, "[+%d]", garbage);
- tdu_printf( ct, ")" );
-
- if( level < 2 ) {
- tdu_printf(ct,"\n");
- return pkt;
- }
- tdu_printf( ct, ": " );
-
- while( pkt < end ) pkt = tdu_print_file_par( ct, pkt, end, level );
- tdu_printf(ct,"\n");
- return pkt;
-
- packet_too_small : tdu_printf( TDU_LOG_ERR,"FH packet to small!\n" );
- return end;
-}
-
-/*
- * Header parser that just logs the header contents
- *
- * FIXME: integrate the logging functinality into the standard parser
- * and remove this when the latter is done and working.
- */
-int tdu_fh_parse_print(struct tdu_stream *ts, struct tdu_buf * tb, int maxlen)
-{
-
- unsigned char *fh_tail, *max_tail = tb->data + maxlen, *start=tb->data;
- unsigned char ci = *(tb->data++);
- int len;
-
- tdu_printf( TDU_LOG_FH, " %s", ci == TDU_PI_FILE_HEADER ?
- "File_Header" : "FH magic unknown" );
- if( (len = tdu_parse_le(tb)) < 0 ) goto oflow;
- tdu_printf( TDU_LOG_FH, "[%d](", len );
-
- /* FIXME: parse headers extending more than one buffer */
- fh_tail = tb->data + len;
- if( fh_tail > max_tail ) goto oflow;
-
- while( tb->data < fh_tail )
- tb->data = tdu_print_file_par(TDU_LOG_FH, tb->data, fh_tail,4);
- tdu_printf(TDU_LOG_FH,")\n");
- ts->hdr.len = fh_tail - start;
- ts->hdr.parse = NULL;
- return (fh_tail - start);
-
-oflow:
- ts->hdr.len = 0;
- ts->hdr.parse = NULL;
- tdu_printf( TDU_LOG_ERR,
- "Buffer overflow while parsing file header\n");
- return -TDU_RE_SYNTAX_ERROR;
-}
-
-/*
- * Parse an ETS 300-075 file header encoded time string and return
- * the equivalent unix epoche time_t type;
- *
- */
-static time_t fh2timet(unsigned char *ts, int len){
- int tmp;
- struct tm t={0,0,0,0,0,0,0,0,0,0};
- /*
- * FIXME: (or better fix ETS protocol :-) this is not y2k safe due to
- * limititations in ETSI protocol.
- *
- * The window boundary is chosen arbitrarily because I
- * currently don't know of any official ETSI recommendation.
- *
- * This should be changed as soon as an official value
- * agreed among all EUROFILE implementors is recommended.
- */
- int y2k_wrap=70;
-
- if(len>1){
- tmp = 10*(ts[0]-'0') + (ts[1]-'0');
- ts +=2;
- len-=2;
- /* y2k compatibilty hack */
- if( tmp < y2k_wrap ) tmp += 100;
- t.tm_year = tmp;
- }
-
- if(len>1){
- tmp = 10*(ts[0]-'0') + (ts[1]-'0');
- ts +=2;
- len-=2;
- t.tm_mon = tmp-1; /* tm_mon is in the range 0 to 11 */
- }
-
- if(len>1){
- tmp = 10*(ts[0]-'0') + (ts[1]-'0');
- ts +=2;
- len-=2;
- t.tm_mday = tmp;
- }
-
- if(len>1){
- tmp = 10*(ts[0]-'0') + (ts[1]-'0');
- ts +=2;
- len-=2;
- t.tm_hour = tmp;
- }
-
- if(len>1){
- tmp = 10*(ts[0]-'0') + (ts[1]-'0');
- ts +=2;
- len-=2;
- t.tm_min = tmp;
- }
-
- if(len>1){
- tmp = 10*(ts[0]-'0') + (ts[1]-'0');
- ts +=2;
- len-=2;
- t.tm_sec = tmp;
- }
- return mktime(&t);
-}
-
-/*
- * Header parser that stores parameters in a struct fileheader_par where
- * appropriate
- */
-int tdu_parse_fh(struct fileheader_par * par, struct tdu_buf * tb)
-{
- int ci, pi, len;
- char t[TDU_FH_PLEN_DATE+1];
- unsigned char * start = tb->data, *fh_tail;
-
- tdu_printf(TDU_LOG_TRC, "tdu_parse_fh()\n");
- ci = *(tb->data++);
- tdu_printf( TDU_LOG_DBG, " %s", ci == TDU_PI_FILE_HEADER ?
- "File_Header" : "FH magic unknown" );
- len = tdu_parse_le(tb);
- /* FIXME: parse headers extending more than one buffer */
- fh_tail = tb->data + len;
- if(fh_tail > tb->tail) {
- tdu_printf( TDU_LOG_ERR, "tdu_parse_fh: tb overflow\n");
- return -TDU_RE_SYNTAX_ERROR;
- }
- tdu_printf( TDU_LOG_DBG|TDU_LOG_FH, "[%d](", len );
- tb->pn = tb->data;
-
- while( tb->data < fh_tail ) {
- unsigned char * this = tb->data;
- pi = tdu_get_next_pi(tb);
- tdu_printf(TDU_LOG_DBG, "parsing parameter %d\n",pi);
- if( pi < 0 ) return -pi;
- switch( pi ){
- case TDU_FH_FILE_LENGTH:
- tdu_printf(TDU_LOG_DBG, "length\n");
- len = tdu_parse_li(tb);
- par->fh_s.st_size = len;
- break;
- case TDU_FH_TRANSFER_NAME:
- tdu_printf(TDU_LOG_DBG, "transfer name\n");
- len = tdu_parse_string(tb, par->fh_t_name,
- TDU_PLEN_DESIGNATION);
- par->fh_t_name[len]=0;
- break;
- case TDU_FH_FILE_NAME:
- tdu_printf(TDU_LOG_DBG, "file name\n");
- len = tdu_parse_string(tb, par->fh_name,
- TDU_FH_PLEN_NAME);
- par->fh_name[len]=0;
- break;
- case TDU_FH_DATE:
- tdu_printf(TDU_LOG_DBG, "date \n");
- len = tdu_parse_string(tb, t, TDU_FH_PLEN_DATE);
- t[len]=0;
- par->fh_s.st_mtime = fh2timet(t,len);
- break;
- case TDU_FH_FILE_TYPE:
- tdu_printf(TDU_LOG_DBG, "type \n");
- par->fh_type = tdu_parse_byte(tb);
- break;
- default:
- /* FIXME: parse more parameters */
- tdu_printf(TDU_LOG_DBG, "tdu_parse_fh(): skipping unexpected"
- " parameter '%s' ignored\n",
- tdu_param_descr(pi) );
- tb->data = tb->pn;
- };
- tdu_print_file_par(TDU_LOG_FH, this, fh_tail,4);
- }
- tdu_printf( TDU_LOG_DBG|TDU_LOG_FH, ")");
- return (tb->data - start);
-}
-
-/*
- * Header usable by a tdu_stream object as parse method to parse
- * a fileheader into file_header_par object. The tdu_streams hdr.data
- * must point to an instance of a struct file_header_par.
- */
-int tdu_fh_parse(struct tdu_stream *ts, struct tdu_buf * tb, int maxlen)
-{
- /* FIXME: parse headers extending several tb's */
- unsigned char *fh_tail, *start=tb->data;
- struct fileheader_par * par = ts->hdr.data;
- int len;
-
- len = tdu_parse_fh(par, tb);
- fh_tail = start + len;
- if( len < 0 ) {
- /* probably buffer overflow or other parse error */
- ts->hdr.len = 0;
- ts->hdr.parse = NULL;
- tdu_printf( TDU_LOG_ERR,
- "tdu_fh_parse: error when parsing file header\n");
- return len;
- }
-
- ts->hdr.len = fh_tail - start;
- ts->hdr.parse = NULL;
-
- return fh_tail - start;
-}
-
-/*
- * used by tdu_stream object as parse method to prepend an empty file
- * header to a file
- */
-int tdu_fh_get_zero_hdr(struct tdu_stream *ts, unsigned char * buf, int maxlen)
-{
- *(buf++) = TDU_PI_FILE_HEADER;
- *(buf++) = 0;
- ts->hdr.len = 2;
- ts->hdr.read = NULL;
- return 2;
-}
-
-/*
- * Make a fileheader from a struct fileheader_par and store it in a tdu_buf.
- */
-int tdu_fh_stat(struct tdu_buf * tb, struct fileheader_par * fh)
-{
- unsigned char t[13], t_fmt[]="%y%m%d%H%M%S", *owner,
- permissions[2];
- struct tm * tm_time;
- struct passwd * pwent;
- int t_len, coding, type;
-
- tm_time = gmtime(&fh->fh_s.st_atime);
- t_len = strftime( t, 13, t_fmt, tm_time);
- tdu_add_string_par(tb, TDU_FH_LAST_READ_ACCESS, t, t_len);
-
- tm_time = gmtime(&fh->fh_s.st_ctime);
- t_len = strftime( t, 13, t_fmt, tm_time);
- tdu_add_string_par(tb, TDU_FH_CREATION, t, t_len);
-
- pwent = getpwuid(fh->fh_s.st_uid);
- if( pwent == NULL ){
- snprintf(t,13,"%d",fh->fh_s.st_uid);
- owner = t;
- } else {
- owner = pwent->pw_name;
- }
- tdu_add_string_par(tb, TDU_FH_AUTHOR_NAME, owner, strlen(owner));
-/*
- * permitted actions to be added
- */
- permissions[0] = 0x40;
- permissions[1] = 0x00;
- if( access(fh->fh_name,R_OK) == 0 )
- permissions[1] |= TDU_FH_PERMITTED_ACTION_READ;
- if( access(fh->fh_name,W_OK) == 0 )
- permissions[1] |= (
- TDU_FH_PERMITTED_ACTION_EXTEND |
- TDU_FH_PERMITTED_ACTION_INSERT |
- TDU_FH_PERMITTED_ACTION_REPLACE ) ;
-/*
- * FIXME: additionally check permissions of the directory in order to set
- * the TDU_FH_PERMITTED_ACTION_ERASE flag appropriately.
- */
- tdu_add_string_par(tb, TDU_FH_PERMITTED_ACTIONS, permissions, 2);
-
-
-
- /*
- * several clients get confused when confronted with optional
- * parameters before the mandatory ones.
- * Unfortunatly, description file records and ordiary headers
- * have different mandatory attributes. Thus, we need
- * to support different order here.
- */
- if(! fh->fh_xdirrec){
- if(fh->fh_name[0] != 0 )
- tdu_add_string_par(tb, TDU_FH_FILE_NAME, fh->fh_name,
- strlen(fh->fh_name));
- if(fh->fh_t_name[0] != 0 )
- tdu_add_string_par(tb,TDU_FH_TRANSFER_NAME, fh->
- fh_t_name,strlen(fh->fh_t_name));
- }
-/*
- * file type/coding; default: data/bin,
- * directory: text/printable,
- * extended directory: description/not_present
- */
- switch(fh->fh_type){
- case TDU_FH_CLASS_EFT_DIR:
- case TDU_FH_CLASS_EFT_LIST:
- case TDU_FH_CLASS_EFT_STRING:
- coding = TDU_FH_FILE_CODING_VTX;
- type = TDU_FH_FILE_TYPE_TEXT;
- break;
- case TDU_FH_CLASS_EFT_DATA:
- coding = TDU_FH_FILE_CODING_BINARY;
- type = TDU_FH_FILE_TYPE_DATA;
- break;
- case TDU_FH_CLASS_EFT_XDIR:
- case TDU_FH_CLASS_EFT_DESCR:
- coding = -1 /* shall not be present */;
- type = TDU_FH_FILE_TYPE_DESCRIPTION;
- break;
- default:
- coding = TDU_FH_FILE_CODING_BINARY;
- type = fh->fh_type;
- };
-
- if( coding >= 0 )
- tdu_add_byte_par(tb, TDU_FH_FILE_CODING, coding);
- tdu_add_byte_par(tb, TDU_FH_FILE_TYPE, type);
-
- tm_time = gmtime(& fh->fh_s.st_mtime);
- t_len = strftime( t, 13, t_fmt, tm_time);
- tdu_add_string_par(tb, TDU_FH_DATE, t, t_len);
-
- tdu_add_int_par(tb, TDU_FH_FILE_LENGTH, fh->fh_s.st_size);
-
- if(fh->fh_xdirrec){
- if(fh->fh_name[0] != 0 )
- tdu_add_string_par(tb, TDU_FH_FILE_NAME, fh->fh_name,
- strlen(fh->fh_name));
- if(fh->fh_t_name[0] != 0 )
- tdu_add_string_par(tb,TDU_FH_TRANSFER_NAME, fh->
- fh_t_name,strlen(fh->fh_t_name));
- }
-
- tdu_add_ci_header(tb,TDU_PI_FILE_HEADER);
-
- return 0;
-}
-
-
-int tdu_fh_get_fd_hdr(struct tdu_stream *ts, unsigned char * buf, int maxlen)
-{
- struct tdu_buf tb[1];
-
- tdu_init_tb(tb);
- tdu_fh_stat(tb,ts->hdr.data);
- ts->hdr.len = tb->tail - tb->data;
- /* FIXME:
- * handle lenght appropriatly even when not
- * fitting in on hdr.read() request
- */
- if( ts->hdr.len <= maxlen ){
- memcpy(buf,tb->data,ts->hdr.len);
- } else {
- tdu_printf(TDU_LOG_ERR, "tdu_fh_get_fd_hdr(): "
- "header too long\n");
- return tdu_fh_get_zero_hdr(ts, buf, maxlen);
- }
- ts->hdr.read = NULL;
- return ts->hdr.len;
-}
-
-/*
- * writes a file header to a stream (useful for creating description files/
- * extended directory listings)
- */
-void eft_fh_fwrite( FILE * str, unsigned char * tname, unsigned char * fname,
- struct stat * s )
-{
- struct fileheader_par hp;
- struct tdu_buf tb[1];
-
- strncpy(hp.fh_t_name,tname, TDU_PLEN_DESIGNATION);
- hp.fh_t_name[TDU_PLEN_DESIGNATION]=0;
-
- strncpy(hp.fh_name, fname, TDU_FH_PLEN_NAME);
- hp.fh_name[TDU_FH_PLEN_NAME]=0;
-
- hp.fh_type = TDU_FH_CLASS_EFT_DATA;
- hp.fh_s = *s;
-
- hp.fh_xdirrec = 1;
-
- tdu_init_tb(tb);
- tdu_fh_stat(tb,&hp);
- fwrite(tb->data, 1, tb->tail-tb->data, str);
-}
-
-
-
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/isdn4k-utils/eurofile/src/testing/wuauth_test.c new/isdn4k-utils/eurofile/src/testing/wuauth_test.c
--- old/isdn4k-utils/eurofile/src/testing/wuauth_test.c 1999-06-30 19:19:22.000000000 +0200
+++ new/isdn4k-utils/eurofile/src/testing/wuauth_test.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-/* $Id: wuauth_test.c,v 1.1 1999/06/30 17:19:22 he Exp $ */
-
-# include
-# include
-
-extern int wuftp_check_user (char *user, char *pw, char *isdnno);
-extern char autherrmsg [];
-extern int use_accessfile;
-extern char * eft_access;
-
-
-#define BUFSIZE 512
-
-void main () {
- char bufus [BUFSIZE];
- char bufpw [BUFSIZE];
- char bufin [BUFSIZE];
- char *c;
- int x;
-
- printf("accessfile=%s\n",eft_access);
- use_accessfile=1;
-
- openlog("eftd", LOG_PID | LOG_NDELAY, LOG_DAEMON);
-
- for (;;) {
- puts ("Enter a username: ");
- /* Yes, gets() is not buffer overflow save, but this
- * is only a test program and can be used by root only*/
- c = gets (bufus);
- if ( c==NULL ) break;
- puts ("Enter a password: ");
- gets (bufpw);
- puts ("Enter a ISDN-Number: ");
- gets (bufin);
- x = wuftp_check_user (bufus, bufpw, bufin);
- printf ("check returned: %d\n", x);
- printf ("user-message: %s\n", autherrmsg);
- }
-}
-
-
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/isdn4k-utils/imontty/Makefile new/isdn4k-utils/imontty/Makefile
--- old/isdn4k-utils/imontty/Makefile 2006-01-15 16:08:55.000000000 +0100
+++ new/isdn4k-utils/imontty/Makefile 2008-08-31 12:49:38.000000000 +0200
@@ -2,7 +2,7 @@
#
# (c) 1995-97 Volker G�tz
#
-# $Id: Makefile,v 1.8 2006/01/15 15:08:55 keil Exp $
+# $Id: Makefile,v 1.9 2008/08/31 10:49:38 keil Exp $
ifeq (../.config,$(wildcard ../.config))
#
@@ -52,10 +52,10 @@
mkdir -p $(DESTDIR)$(MAN8DIR)
$(INSTALL_MAN) $< $(DESTDIR)$(MAN8DIR)/$(MANPAGE)
-install: $(PROGS) rootperm install-man
- install -s -o 0 -g 0 -m 0755 $(PROGS) $(DESTDIR)$(CONFIG_SBINDIR)
+install: $(PROGS) install-man
+ install -m 0755 $(PROGS) $(DESTDIR)$(CONFIG_SBINDIR)
-uninstall: rootperm
+uninstall:
for i in $(PROGS) ; do rm -f $(DESTDIR)$(CONFIG_SBINDIR)/$$i; done
clean:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/isdn4k-utils/ipppd/Makefile.in new/isdn4k-utils/ipppd/Makefile.in
--- old/isdn4k-utils/ipppd/Makefile.in 2006-01-15 16:11:52.000000000 +0100
+++ new/isdn4k-utils/ipppd/Makefile.in 2008-08-31 12:49:38.000000000 +0200
@@ -1,6 +1,6 @@
#
# ipppd makefile for Linux
-# $Id: Makefile.in,v 1.20 2006/01/15 15:11:52 keil Exp $
+# $Id: Makefile.in,v 1.21 2008/08/31 10:49:38 keil Exp $
#
HAVE_LIBSSL := @HAVE_LIBSSL@
@@ -72,7 +72,7 @@
endif
DEBUG_FLAGS = @CONFIG_IPPPD_DEBUGFLAGS@
-COMPILE_FLAGS =
+COMPILE_FLAGS = @CFLAGS@
CFLAGS = -O2 -fomit-frame-pointer -Wall
VER = 2.2.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/isdn4k-utils/isdnlog/Makefile.in new/isdn4k-utils/isdnlog/Makefile.in
--- old/isdn4k-utils/isdnlog/Makefile.in 2007-03-05 19:01:18.000000000 +0100
+++ new/isdn4k-utils/isdnlog/Makefile.in 2008-08-31 12:49:38.000000000 +0200
@@ -1,4 +1,4 @@
-## $Id: Makefile.in,v 1.224 2007/01/05 04:23:57 tobiasb Exp $
+## $Id: Makefile.in,v 1.225 2008/08/31 10:49:38 keil Exp $
##
## ISDN accounting for isdn4linux.
##
@@ -19,6 +19,10 @@
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
##
## $Log: Makefile.in,v $
+## Revision 1.225 2008/08/31 10:49:38 keil
+## - fix library directories
+## - build without root permissions
+##
## Revision 1.224 2007/01/05 04:23:57 tobiasb
## Made isdnrep and isdnrate buildable under cygwin. See ChangeLog for details.
##
@@ -2036,7 +2040,7 @@
fi
endif
-uninstall: rootperm
+uninstall:
if ps x | fgrep $(ISDNLOG) >/dev/null; then kill `cat $(RUNDIR)/isdnlog.isdnctrl0.pid` 2>/dev/null; fi
rm -f $(DESTDIR)$(SBINDIR)/$(ISDNLOG) \
$(DESTDIR)$(BINDIR)/$(ISDNREP) \
@@ -2058,7 +2062,7 @@
$(DESTDIR)$(DATADIR)/dest.cdb
-installdirs: rootperm
+installdirs:
$(INSTALL_DIR) $(DESTDIR)$(I4LCONFDIR)
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
@@ -2067,7 +2071,7 @@
$(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
$(INSTALL_DIR) $(DESTDIR)$(DATADIR)
-install: all rootperm installdirs install-conf install-data install-progs
+install: all installdirs install-conf install-data install-progs
install-old-conf:
@if [ -n "$(DESTDIR)$(OLDCONFDIR)" -a "$(DESTDIR)$(OLDCONFDIR)" != '/' ] ; then \
@@ -2150,7 +2154,7 @@
$(INSTALL_DATA) $$f $(DESTDIR)$(DATADIR); \
echo Installing $(DESTDIR)$(DATADIR)/$$f; \
done
- @(grep isdnlog $(SERVICEFILE) >/dev/null) || \
+ @: || (grep isdnlog $(SERVICEFILE) >/dev/null) || \
(echo "";echo "";echo "Add a line to the file $(SERVICEFILE)" ;echo "";echo ""; \
echo "isdnlog $(SERV_PORT)/tcp isdnlog" >> $(SERVICEFILE))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/isdn4k-utils/isdnlog/tools/telrate/Makefile.in new/isdn4k-utils/isdnlog/tools/telrate/Makefile.in
--- old/isdn4k-utils/isdnlog/tools/telrate/Makefile.in 1999-12-24 15:17:08.000000000 +0100
+++ new/isdn4k-utils/isdnlog/tools/telrate/Makefile.in 2008-08-31 12:49:38.000000000 +0200
@@ -8,8 +8,8 @@
CGIDIR = @CGIDIR@
TELDIR = @TELDIR@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0755
-INSTALL_FILE = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0755
+INSTALL_FILE = $(INSTALL) -m 0644
FILES = index.html info.html *.jpg *.gif tt.js
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/isdn4k-utils/Makefile new/isdn4k-utils/Makefile
--- old/isdn4k-utils/Makefile 2008-04-04 22:54:39.000000000 +0200
+++ new/isdn4k-utils/Makefile 2008-08-31 13:41:15.000000000 +0200
@@ -1,14 +1,16 @@
-# $Id: Makefile,v 1.63 2007/11/26 13:13:44 keil Exp $
+# $Id: Makefile,v 1.65 2008/08/31 11:38:16 keil Exp $
#
# Toplevel Makefile for isdn4k-utils
#
.EXPORT_ALL_VARIABLES:
-export I4LVERSION = 3.12
+export I4LVERSION = 3.13
all: do-it-all
+LIBDIR:=/usr/lib
+
#
# Make "config" the default target if there is no configuration file.
#
@@ -130,9 +132,9 @@
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; \
+ @: || if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \
then \
/bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \
else \
@@ -202,7 +204,7 @@
@set -e; for i in `echo $(BUILD_ONLY) $(SUBDIRS)`; do \
if [ -x $$i/configure ] ; then \
/bin/echo -e "\nRunning configure in $$i ...\n"; sleep 1; \
- (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
+ (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR) --libdir=$(LIBDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
elif [ -f $$i/Makefile.in ] ; then \
/bin/echo -e "\nRunning make -f Makefile.in config in $$i ...\n"; sleep 1; \
$(MAKE) -C $$i -f Makefile.in config; \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/isdn4k-utils/pppdcapiplugin/Makefile new/isdn4k-utils/pppdcapiplugin/Makefile
--- old/isdn4k-utils/pppdcapiplugin/Makefile 2006-08-08 20:17:21.000000000 +0200
+++ new/isdn4k-utils/pppdcapiplugin/Makefile 2008-08-31 12:59:55.000000000 +0200
@@ -12,7 +12,7 @@
export CAPIINC=$(TOPDIR)/../capi20
export CAPILIB=$(TOPDIR)/../capi20
export INSTALL=$(TOPDIR)/install-sh -c
-export INSTALLDATA=$(TOPDIR)/install-sh -c -o root -m 600
+export INSTALLDATA=$(TOPDIR)/install-sh -c -m 600
export MKDIR=$(TOPDIR)/mkinstalldirs
export PPPINC=/usr/include/pppd
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/isdn4k-utils/rcapid/Makefile new/isdn4k-utils/rcapid/Makefile
--- old/isdn4k-utils/rcapid/Makefile 2002-07-19 23:59:29.000000000 +0200
+++ new/isdn4k-utils/rcapid/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,367 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = /bin/sh
-
-srcdir = .
-top_srcdir = .
-
-prefix = /usr
-exec_prefix = ${prefix}
-
-bindir = ${exec_prefix}/bin
-sbindir = ${exec_prefix}/sbin
-libexecdir = ${exec_prefix}/libexec
-datadir = ${prefix}/share
-sysconfdir = ${prefix}/etc
-sharedstatedir = ${prefix}/com
-localstatedir = ${prefix}/var
-libdir = ${exec_prefix}/lib
-infodir = ${prefix}/info
-mandir = ${prefix}/man
-includedir = ${prefix}/include
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/rcapid
-pkglibdir = $(libdir)/rcapid
-pkgincludedir = $(includedir)/rcapid
-
-top_builddir = .
-
-ACLOCAL = aclocal-1.6
-AUTOCONF = autoconf
-AUTOMAKE = automake-1.6
-AUTOHEADER = autoheader
-
-INSTALL = /usr/bin/ginstall -c
-INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-transform = s,x,x,
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-CC = gcc
-CONFIG_MANDIR = /usr/man
-CONFIG_SBINDIR = /sbin
-CPP = gcc -E
-INSTALL = /usr/bin/ginstall -c
-MAKEINFO = makeinfo
-PACKAGE = rcapid
-VERSION = 1.2
-
-AUTOMAKE_OPTIONS = foreign
-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
-
-sbin_PROGRAMS = rcapid
-
-rcapid_SOURCES = rcapid.c
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-PROGRAMS = $(sbin_PROGRAMS)
-
-
-DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"rcapid\" -DVERSION=\"1.2\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_SYS_IOCTL_H=1 -DSTDC_HEADERS=1 -DRETSIGTYPE=void -DHAVE_SOCKET=1 -I. -I$(srcdir)
-CPPFLAGS =
-LIBS =
-rcapid_OBJECTS = rcapid.o
-rcapid_LDADD = $(LDADD)
-rcapid_DEPENDENCIES =
-rcapid_LDFLAGS =
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON = README Makefile.am Makefile.in acinclude.m4 aclocal.m4 \
-configure configure.in install-sh missing mkinstalldirs
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-DEP_FILES = .deps/rcapid.P
-SOURCES = $(rcapid_SOURCES)
-OBJECTS = $(rcapid_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): configure.in acinclude.m4
- cd $(srcdir) && $(ACLOCAL)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
- cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-sbinPROGRAMS:
-
-clean-sbinPROGRAMS:
- -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
-
-distclean-sbinPROGRAMS:
-
-maintainer-clean-sbinPROGRAMS:
-
-install-sbinPROGRAMS: $(sbin_PROGRAMS)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(sbindir)
- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
- if test -f $$p; then \
- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- else :; fi; \
- done
-
-uninstall-sbinPROGRAMS:
- @$(NORMAL_UNINSTALL)
- list='$(sbin_PROGRAMS)'; for p in $$list; do \
- rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- done
-
-.s.o:
- $(COMPILE) -c $<
-
-.S.o:
- $(COMPILE) -c $<
-
-mostlyclean-compile:
- -rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
- -rm -f *.tab.c
-
-maintainer-clean-compile:
-
-rcapid: $(rcapid_OBJECTS) $(rcapid_DEPENDENCIES)
- @rm -f rcapid
- $(LINK) $(rcapid_LDFLAGS) $(rcapid_OBJECTS) $(rcapid_LDADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- here=`pwd` && cd $(srcdir) \
- && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
- -rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration. Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
- -rm -rf $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
- mkdir $(distdir)/=build
- mkdir $(distdir)/=inst
- dc_install_base=`cd $(distdir)/=inst && pwd`; \
- cd $(distdir)/=build \
- && ../configure --srcdir=.. --prefix=$$dc_install_base \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) dist
- -rm -rf $(distdir)
- @banner="$(distdir).tar.gz is ready for distribution"; \
- dashes=`echo "$$banner" | sed s/./=/g`; \
- echo "$$dashes"; \
- echo "$$banner"; \
- echo "$$dashes"
-dist: distdir
- -chmod -R a+r $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
- -rm -rf $(distdir)
-dist-all: distdir
- -chmod -R a+r $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
- -rm -rf $(distdir)
-distdir: $(DISTFILES)
- -rm -rf $(distdir)
- mkdir $(distdir)
- -chmod 777 $(distdir)
- here=`cd $(top_builddir) && pwd`; \
- top_distdir=`cd $(distdir) && pwd`; \
- distdir=`cd $(distdir) && pwd`; \
- cd $(top_srcdir) \
- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
- else \
- test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
- fi; \
- done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
- -rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
- @echo '$(COMPILE) -c $<'; \
- $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-cp .deps/$(*F).pp .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm .deps/$(*F).pp
-
-%.lo: %.c
- @echo '$(LTCOMPILE) -c $<'; \
- $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
- < .deps/$(*F).pp > .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm -f .deps/$(*F).pp
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am: install-sbinPROGRAMS
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-sbinPROGRAMS
-uninstall: uninstall-am
-all-am: Makefile $(PROGRAMS)
-all-redirect: all-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
- $(mkinstalldirs) $(DESTDIR)$(sbindir)
-
-
-mostlyclean-generic:
-
-clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am: mostlyclean-sbinPROGRAMS mostlyclean-compile \
- mostlyclean-tags mostlyclean-depend mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am: clean-sbinPROGRAMS clean-compile clean-tags clean-depend \
- clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am: distclean-sbinPROGRAMS distclean-compile distclean-tags \
- distclean-depend distclean-generic clean-am
-
-distclean: distclean-am
- -rm -f config.status
-
-maintainer-clean-am: maintainer-clean-sbinPROGRAMS \
- maintainer-clean-compile maintainer-clean-tags \
- maintainer-clean-depend maintainer-clean-generic \
- distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
- -rm -f config.status
-
-.PHONY: mostlyclean-sbinPROGRAMS distclean-sbinPROGRAMS \
-clean-sbinPROGRAMS maintainer-clean-sbinPROGRAMS uninstall-sbinPROGRAMS \
-install-sbinPROGRAMS mostlyclean-compile distclean-compile \
-clean-compile maintainer-clean-compile tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/isdn4k-utils/vbox/Makefile.in new/isdn4k-utils/vbox/Makefile.in
--- old/isdn4k-utils/vbox/Makefile.in 2002-02-22 12:10:26.000000000 +0100
+++ new/isdn4k-utils/vbox/Makefile.in 2008-08-31 13:41:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.in,v 1.24 2002/01/31 20:05:40 paul Exp $
+# $Id: Makefile.in,v 1.26 2008/08/31 11:35:55 keil Exp $
#----------------------------------------------------------------------------#
# Things you can change to personalize the Makefile for your own site. Some #
@@ -14,33 +14,33 @@
# [*] Program to install binaries to the sbin directory (eg vboxgetty): #
#----------------------------------------------------------------------------#
-INSTALL_SBIN = @INSTALL@ -m 750 -o root -g root -s
+INSTALL_SBIN = @INSTALL@ -m 750
#----------------------------------------------------------------------------#
# [*] Program to install binaries to the bin directory (eg vboxconvert): #
#----------------------------------------------------------------------------#
-INSTALL_BIN = @INSTALL@ -m 755 -o root -g root -s
+INSTALL_BIN = @INSTALL@ -m 755
#----------------------------------------------------------------------------#
# [*] Program to install bash scripts to the bin directory (eg vboxplay): #
#----------------------------------------------------------------------------#
-INSTALL_SHBIN = @INSTALL@ -m 755 -o root -g root
+INSTALL_SHBIN = @INSTALL@ -m 755
#----------------------------------------------------------------------------#
# [*] Program to install binaries to the bin directory and set the suid bit #
# (eg vboxbeep): #
#----------------------------------------------------------------------------#
-INSTALL_UBIN = @INSTALL@ -m 4755 -o root -g root -s
+INSTALL_UBIN = @INSTALL@ -m 4755
#----------------------------------------------------------------------------#
# [*] Program to install configurations to sysconf directory #
# (eg vboxgetty.conf): #
#----------------------------------------------------------------------------#
-INSTALL_SYSCONF = @INSTALL@ -m 640 -o root -g root
+INSTALL_SYSCONF = @INSTALL@ -m 640
#----------------------------------------------------------------------------#
# [*] Program to create missing directories: #
@@ -53,7 +53,7 @@
#----------------------------------------------------------------------------#
CC = @CC@
-CFLAGS = @CFLAGS@ @LINK_NCURSES_INCL@ @LINK_TCL_INCL@
+VBOX_CFLAGS = @CFLAGS@ @LINK_NCURSES_INCL@ @LINK_TCL_INCL@
LDFLAGS = @LDFLAGS@
#----------------------------------------------------------------------------#
@@ -80,8 +80,8 @@
exec_prefix = @exec_prefix@
mandir = @CONFIG_MANDIR@
bindir = @CONFIG_BINDIR@
-sbindir = @CONFIG_SBINDIR@
-sysconfdir = @CONFIG_I4LCONFDIR@
+sbindir = /usr/sbin
+sysconfdir = /etc/vbox
LOGFILEDIR = @VBOX_LOGDIR@
PIDFILEDIR = @VBOX_PIDDIR@
@@ -119,6 +119,7 @@
export CC
export CFLAGS
+export VBOX_CFLAGS
export LDFLAGS
export AR
export RANLIB
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/isdn4k-utils/vbox/src/Makefile.in new/isdn4k-utils/vbox/src/Makefile.in
--- old/isdn4k-utils/vbox/src/Makefile.in 2000-10-05 22:46:04.000000000 +0200
+++ new/isdn4k-utils/vbox/src/Makefile.in 2008-08-31 13:41:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.in,v 1.12 2000/08/04 11:10:56 paul Exp $
+# $Id: Makefile.in,v 1.13 2008/08/31 11:35:56 keil Exp $
#----------------------------------------------------------------------------#
# The information below is modified by the configure script when Makefile is #
@@ -13,6 +13,8 @@
TCL_LIBS = @LINK_TCL_LIBS@
TCL_HAVE = @HAVE_TCL_PACK@
+override CFLAGS += $(VBOX_CFLAGS)
+
#----------------------------------------------------------------------------#
# Headers #
#----------------------------------------------------------------------------#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/isdn4k-utils/vbox/utils/vboxplay.in new/isdn4k-utils/vbox/utils/vboxplay.in
--- old/isdn4k-utils/vbox/utils/vboxplay.in 2002-02-22 12:10:26.000000000 +0100
+++ new/isdn4k-utils/vbox/utils/vboxplay.in 2008-08-31 13:12:24.000000000 +0200
@@ -44,7 +44,7 @@
# if anyone has a better suggestion,
# send email to isdnutils@packages.debian.org!
# thankfully, aplay understands '-' to mean stdin
- DOPLAY="$PLAY -q -u -"
+ DOPLAY="$PLAY -q -"
fi
fi
if [ ! -x $PLAY ]; then # use play (from sox) instead
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/isdn4k-utils/vbox_64.dif new/isdn4k-utils/vbox_64.dif
--- old/isdn4k-utils/vbox_64.dif 2007-05-17 16:59:37.000000000 +0200
+++ new/isdn4k-utils/vbox_64.dif 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
---- vbox/src/libvbox.h
-+++ vbox/src/libvbox.h
-@@ -8,6 +8,7 @@
- #define _VBOX_LIBVBOX_H 1
-
- #include
-+#include
-
- /**************************************************************************/
- /** VBOXD **/
-@@ -116,8 +117,8 @@ extern char *compressions[];
- typedef struct
- {
- char magic[4];
-- unsigned long int time;
-- unsigned long int compression;
-+ __u32 time;
-+ __u32 compression;
- char callerid[VAH_MAX_CALLERID + 1];
- char name[VAH_MAX_NAME + 1];
- char phone[VAH_MAX_PHONE + 1];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/isdn4k-utils/xmonisdn/Imakefile new/isdn4k-utils/xmonisdn/Imakefile
--- old/isdn4k-utils/xmonisdn/Imakefile 2002-01-30 02:17:19.000000000 +0100
+++ new/isdn4k-utils/xmonisdn/Imakefile 2008-08-31 13:12:24.000000000 +0200
@@ -7,7 +7,7 @@
OBJS = xmonisdn.o Net.o
HEADERS = NetP.h Net.h
- INSTPGMFLAGS = -m 0755 -s
+ INSTPGMFLAGS = -m 0755
ComplexProgramTarget(xmonisdn)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org