September 2008 - openSUSE Commits - openSUSE Mailing Lists

commit kdeaccessibility4
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package kdeaccessibility4 checked in at Mon Sep 1 14:59:33 CEST 2008. -------- --- KDE/kdeaccessibility4/kdeaccessibility4.changes 2008-07-23 12:49:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdeaccessibility4/kdeaccessibility4.changes 2008-08-28 14:18:23.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 28 14:18:15 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php + +------------------------------------------------------------------- kdeaccessibility4-icons.changes: same change Old: ---- kdeaccessibility-4.1.0.tar.bz2 New: ---- kdeaccessibility-4.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeaccessibility4-icons.spec ++++++ --- /var/tmp/diff_new_pack.E20241/_old 2008-09-01 14:59:23.000000000 +0200 +++ /var/tmp/diff_new_pack.E20241/_new 2008-09-01 14:59:23.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package kdeaccessibility4-icons (Version 4.1.0) +# spec file for package kdeaccessibility4-icons (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -19,7 +26,7 @@ Group: System/GUI/KDE Summary: Monochrome Icon Set for KDE Url: http://www.kde.org -Version: 4.1.0 +Version: 4.1.1 Release: 1 Source0: kdeaccessibility-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,6 +65,9 @@ /usr/share/icons/mono %changelog +* Thu Aug 28 2008 dmueller(a)suse.de +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php * Wed Jul 23 2008 dmueller(a)suse.de - update to 4.1.0 * Sun Jul 20 2008 stbinner(a)suse.de ++++++ kdeaccessibility4.spec ++++++ --- /var/tmp/diff_new_pack.E20241/_old 2008-09-01 14:59:23.000000000 +0200 +++ /var/tmp/diff_new_pack.E20241/_new 2008-09-01 14:59:23.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package kdeaccessibility4 (Version 4.1.0) +# spec file for package kdeaccessibility4 (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -16,7 +23,7 @@ Group: System/GUI/KDE Summary: kdeaccessibility Base Package Url: http://www.kde.org -Version: 4.1.0 +Version: 4.1.1 Release: 1 Source0: kdeaccessibility-%version.tar.bz2 Source1: _upstream @@ -173,6 +180,9 @@ /usr/share/kde4/apps/color-schemes %changelog +* Thu Aug 28 2008 dmueller(a)suse.de +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php * Wed Jul 23 2008 dmueller(a)suse.de - update to 4.1.0 * Sun Jul 20 2008 stbinner(a)suse.de ++++++ kdeaccessibility-4.1.0.tar.bz2 -> kdeaccessibility-4.1.1.tar.bz2 ++++++ KDE/kdeaccessibility4/kdeaccessibility-4.1.0.tar.bz2 /mounts/work_src_done/STABLE/kdeaccessibility4/kdeaccessibility-4.1.1.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit i4l-base
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

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(a)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(a)suse.de +- update to isdn4k-utils v3.13 + * includes all our patches +- fix loading for HFC USB * Tue Aug 26 2008 kkeil(a)suse.de - fix vbox to get correct CFLAGS * Fri Aug 22 2008 kkeil(a)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(a)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 <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#include <time.h> -#include <stdio.h> -#include <pwd.h> -#include <string.h> - - -#include <tdu_user.h> -#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 <stdio.h> -# include <syslog.h> - -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(a)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 <stdio.h> -+#include <asm/types.h> - - /**************************************************************************/ - /** 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(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package installation-images checked in at Mon Sep 1 14:59:13 CEST 2008. -------- --- installation-images/installation-images.changes 2008-08-29 16:31:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2008-09-01 14:15:08.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 1 14:15:05 CEST 2008 - snwint(a)suse.de + +- removed evms +- temporarily add alsa/sound to initrd (for blinux) +- added yast2-nfs-client +- new kernel modules +- remove unused InputDevices from xorg.conf, leave only /dev/input/mice +- remove unused ModulePath from xorg.conf, it breaks transition from 32 to 64 bit + +------------------------------------------------------------------- Old: ---- installation-images-11.0.tar.bz2 New: ---- installation-images-11.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.O16519/_old 2008-09-01 14:57:51.000000000 +0200 +++ /var/tmp/diff_new_pack.O16519/_new 2008-09-01 14:57:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 11.0) +# spec file for package installation-images (Version 11.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,12 +22,12 @@ %define has_sles 1 %define build_xen 1 BuildRequires: adaptec-firmware ash autoyast2-installation bc blueprint-cursor-theme cifs-mount cron cups-libs ddrescue dhcpcd dhcpv6 dmraid dump ed efont-unicode eject fbiterm finger fonts-config gdb glibc-i18ndata hex icmpinfo initviocons iputils joe kdelibs3 krb5-devel libidn libjpeg-devel libpng-devel links linuxrc lklug lvm2 mdadm mingetty mtools multipath-tools nasm netcat netpbm nfs-utils nscd ntfsprogs openslp-server openssh pcmciautils pcre-devel popt-devel pothana2000 qlogic-firmware recode rsh rsync sbl screen setserial sg3_utils smartmontools socat sysconfig syslogd tcpd-devel telnet telnet-server termcap terminfo usbutils wget xfsdump -BuildRequires: e2fsprogs ncurses-utils yast2-add-on yast2-kdump yast2-mouse yast2-ncurses-pkg yast2-network yast2-ntp-client yast2-qt yast2-qt-pkg yast2-repair yast2-runlevel yast2-slp yast2-trans-allpacks yast2-trans-stats yast2-tune yast2-update yast2-users +BuildRequires: e2fsprogs ncurses-utils yast2-add-on yast2-kdump yast2-mouse yast2-ncurses-pkg yast2-network yast2-nfs-client yast2-ntp-client yast2-qt yast2-qt-pkg yast2-repair yast2-runlevel yast2-slp yast2-trans-allpacks yast2-trans-stats yast2-tune yast2-update yast2-users BuildRequires: aaa_base audit-libs boost busybox checkmedia cryptsetup dejavu dmapi dosfstools ethtool fvwm2 gpm hfsutils icewm-lite kernel-binary-packages libelf0 libzypp open-iscsi openct pciutils pcsc-lite perl-HTML-Parser resmgr sqlite3 util-linux BuildRequires: gpg2 jfsutils kexec-tools limal limal-perl perl-XML-Bare suse-build-key yast2-iscsi-client yast2-ncurses BuildRequires: Mesa tightvnc xkeyboard-config xmset xorg-x11 xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-fonts xorg-x11-fonts-core xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXrender xorg-x11-libXt xorg-x11-libfontenc xorg-x11-libxcb xorg-x11-libxkbfile xorg-x11-server xterm BuildRequires: bzip2 cracklib cracklib-dict-full curl libcap libexpat1 libfuse2 libreiserfs libreiserfs-devel lzma module-init-tools nfs-client ntfs-3g parted procinfo procps psmisc satsolver-tools squashfs strace vim xntp yast2-devtools -BuildRequires: bind-libs bind-utils lsscsi openldap2-client python sdparm smp_utils uuid-runtime yast2-multipath +BuildRequires: alsa alsa-utils bind-libs bind-utils espeak lsscsi openldap2-client portaudio python sdparm smp_utils speechd uuid-runtime yast2-multipath # kmps %ifarch %ix86 x86_64 BuildRequires: atmel-firmware ipw-firmware iwl3945-ucode iwl4965-ucode ralink-firmware wireless-tools wpa_supplicant @@ -85,9 +85,9 @@ Obsoletes: y2image AutoReqProv: off Summary: Installation Image Files -Version: 11.0 -Release: 3 -Source: installation-images-11.0.tar.bz2 +Version: 11.1 +Release: 1 +Source: installation-images-11.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -103,7 +103,7 @@ AutoReqProv: off Summary: Create initrd for Installation Version: 1.0 -Release: 433 +Release: 434 %description -n install-initrd You can create an initrd for installation. Useful, for example, to set @@ -159,6 +159,13 @@ /usr/sbin/mkinstallinitrd %changelog +* Mon Sep 01 2008 snwint(a)suse.de +- removed evms +- temporarily add alsa/sound to initrd (for blinux) +- added yast2-nfs-client +- new kernel modules +- remove unused InputDevices from xorg.conf, leave only /dev/input/mice +- remove unused ModulePath from xorg.conf, it breaks transition from 32 to 64 bit * Fri Aug 29 2008 snwint(a)suse.de - always use SLE branding * Mon Aug 25 2008 snwint(a)suse.de ++++++ installation-images-11.0.tar.bz2 -> installation-images-11.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.0/bin/mk_ppc_installation-images_bootbinaries.sh new/installation-images-11.1/bin/mk_ppc_installation-images_bootbinaries.sh --- old/installation-images-11.0/bin/mk_ppc_installation-images_bootbinaries.sh 2008-08-20 13:13:15.000000000 +0200 +++ new/installation-images-11.1/bin/mk_ppc_installation-images_bootbinaries.sh 2008-08-20 15:16:46.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/bash -# $Id: mk_ppc_installation-images_bootbinaries.sh 2478 2008-07-17 11:03:24Z olh $ +# $Id: mk_ppc_installation-images_bootbinaries.sh 2538 2008-08-20 14:23:50Z snwint $ # usage: $0 [-32] [-64] <bdir> <targetdirectory> set -ex diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.0/Changelog new/installation-images-11.1/Changelog --- old/installation-images-11.0/Changelog 2008-08-19 11:52:48.000000000 +0200 +++ new/installation-images-11.1/Changelog 2008-09-01 14:14:18.000000000 +0200 @@ -1,4 +1,10 @@ -*** this is 11.1-BETA, *NOT* 11.1-STABLE *** +25/8/2008: v11.1 + - removed evms + - temporarily add alsa/sound to initrd (for blinux) + - added yast2-nfs-client + - new kernel modules + - remove unused InputDevices from xorg.conf, leave only /dev/input/mice + - remove unused ModulePath from xorg.conf, it breaks transition from 32 to 64 bit 18/8/2008: v11.0 - make /var/lock/libstorage writable (bnc #416276) @@ -6,6 +12,7 @@ - updated module config - added bind-utils to inst-sys - added yast2-multipath + - run postinstall for yast2-storage 25/7/2008: v10.51 - reworked instsys scripts diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.0/data/base/base.file_list new/installation-images-11.1/data/base/base.file_list --- old/installation-images-11.0/data/base/base.file_list 2008-07-31 14:09:33.000000000 +0200 +++ new/installation-images-11.1/data/base/base.file_list 2008-09-01 13:11:35.000000000 +0200 @@ -49,6 +49,9 @@ /usr/bin r /bin/su +libselinux1: + / + libexpat1: /lib*/libexpat.so.* @@ -293,6 +296,8 @@ / bootsplash-branding-SLES: / + bootsplash-branding-SLED: + / endif : diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.0/data/initrd/initrd.file_list new/installation-images-11.1/data/initrd/initrd.file_list --- old/installation-images-11.0/data/initrd/initrd.file_list 2008-08-19 11:51:41.000000000 +0200 +++ new/installation-images-11.1/data/initrd/initrd.file_list 2008-09-01 12:47:36.000000000 +0200 @@ -66,6 +66,12 @@ x etc/syslog.conf etc +libselinux1: + / + +libsepol1: + / + module-init-tools: /etc/modprobe.conf /etc/modprobe.conf.local @@ -546,13 +552,12 @@ b 9 15 /lib/udev/devices/md15 # our own rules file which loads only pnp subsystem mods -r /etc/udev/rules.d/*-drivers.rules -x etc/80-drivers.rules /etc/udev/rules.d +# r /etc/udev/rules.d/*-drivers.rules +# x etc/80-drivers.rules /etc/udev/rules.d sysconfig: # for ipw3945d /etc/udev/rules.d/*-network.rules - /sbin/modify_resolvconf e perl -ni -e "print if /^SUBSYSTEM.*ipw3945/" etc/udev/rules.d/*-network.rules ntfs-3g: @@ -624,6 +629,49 @@ libgcc43: /lib* + +if 1 + +# add alsa +alsa: + / + +alsa-utils: + / + +libasound2: + / + +espeak: + / + +portaudio: + / + +libjack0: + / + +speechd: + / + +libglib-2_0-0: + / + +libgthread-2_0-0: + / + +pcre: + /usr/lib*/libpcre.so.* + +dotconf-devel: + /usr/lib*/libdotconf-1.0.so.* + +libgmodule-2_0-0: + / + +endif + + # add hal & dbus if 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.0/data/initrd/modules.file_list new/installation-images-11.1/data/initrd/modules.file_list --- old/installation-images-11.0/data/initrd/modules.file_list 2008-08-01 16:54:21.000000000 +0200 +++ new/installation-images-11.1/data/initrd/modules.file_list 2008-09-01 12:04:10.000000000 +0200 @@ -53,6 +53,11 @@ endif +if 1 +# add alsa modules + lib/modules/<kernel_ver>/kernel/sound +endif + # add modules.alias, modules.dep L boot/System.map* System.map e /sbin/depmod -a -b . -F System.map <kernel_ver> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.0/data/rescue/rescue.file_list new/installation-images-11.1/data/rescue/rescue.file_list --- old/installation-images-11.0/data/rescue/rescue.file_list 2008-08-19 11:50:18.000000000 +0200 +++ new/installation-images-11.1/data/rescue/rescue.file_list 2008-09-01 12:50:51.000000000 +0200 @@ -158,6 +158,12 @@ r /usr/bin/{db*,glibcbug,localedef,rpcgen} /usr/lib*/pt_chown +libselinux1: + / + +libsepol1: + / + gpart: /usr/bin @@ -257,14 +263,6 @@ /lib/libunwind.so* endif -evms: - /etc/evms.conf - /lib* - /sbin - -evms-gui: - /usr/sbin/evmsn - glib: /usr/lib*/libglib-1.2.so* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.0/data/root/etc/xorg.conf.template new/installation-images-11.1/data/root/etc/xorg.conf.template --- old/installation-images-11.0/data/root/etc/xorg.conf.template 2007-07-06 12:14:33.000000000 +0200 +++ new/installation-images-11.1/data/root/etc/xorg.conf.template 2008-09-01 14:12:04.000000000 +0200 @@ -4,28 +4,7 @@ FontPath "/usr/share/fonts/truetype/" FontPath "/usr/share/fonts/uni/" FontPath "/usr/share/fonts/misc/" - ModulePath "/usr/lib/xorg/modules" - InputDevices "/dev/ttyS0" - InputDevices "/dev/ttyS1" - InputDevices "/dev/ttyS2" - InputDevices "/dev/ttyS3" - InputDevices "/dev/ttyS4" - InputDevices "/dev/ttyS5" - InputDevices "/dev/ttyS6" - InputDevices "/dev/ttyS7" - InputDevices "/dev/ttyS8" - InputDevices "/dev/psaux" - InputDevices "/dev/logibm" - InputDevices "/dev/sunmouse" - InputDevices "/dev/atibm" - InputDevices "/dev/amigamouse" - InputDevices "/dev/atarimouse" - InputDevices "/dev/inportbm" - InputDevices "/dev/gpmdata" - InputDevices "/dev/usbmouse" - InputDevices "/dev/adbmouse" InputDevices "/dev/input/mice" - InputDevices "/dev/input/event0" EndSection Section "ServerFlags" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.0/data/root/root.file_list new/installation-images-11.1/data/root/root.file_list --- old/installation-images-11.0/data/root/root.file_list 2008-08-20 11:10:45.000000000 +0200 +++ new/installation-images-11.1/data/root/root.file_list 2008-09-01 14:13:55.000000000 +0200 @@ -206,6 +206,12 @@ /lib*/libpthread{.,-}* /lib*/libthread_db{.,-}* +libselinux1: + / + +libsepol1: + / + if !(arch eq 's390' || arch eq 's390x') hdparm: /sbin/hdparm @@ -215,7 +221,7 @@ /etc /sbin -uuidgen: +uuid-runtime: /usr/bin/uuidgen libext2fs2: @@ -407,6 +413,8 @@ / yast2-network: / + yast2-nfs-client: + / yast2-ntp-client: / yast2-packager: @@ -425,12 +433,9 @@ endif yast2-slp: / - yast2-storage: - / -if 0 - yast2-storage-evms: + yast2-storage: postin / -endif + E postin yast2-storage-lib: / yast2-transfer: @@ -748,18 +753,11 @@ /usr/sbin/ntfsresize /usr/lib*/libntfs.so* -if 0 -evms: - /etc/evms.conf - /lib* - /sbin -endif - sysconfig: # for modify_resolvconf d etc/sysconfig/network e echo MODIFY_RESOLV_CONF_DYNAMICALLY=\"yes\" >etc/sysconfig/network/config - /sbin/modify_resolvconf + # /sbin/modify_resolvconf pciutils: /sbin/lspci @@ -796,6 +794,7 @@ /usr/lib/perl*/*/SelectSaver.pm /usr/lib/perl*/*/Symbol.pm /usr/lib/perl*/*/Text/ParseWords.pm + /usr/lib/perl*/*/Tie/Hash.pm /usr/lib/perl*/*/base.pm /usr/lib/perl*/*/bytes.pm /usr/lib/perl*/*/bytes_heavy.pl @@ -848,7 +847,6 @@ /usr/lib/perl*/*/Pod/Text.pm /usr/lib/perl*/*/Pod/Usage.pm /usr/lib/perl*/*/Term/Cap.pm - /usr/lib/perl*/*/Tie/Hash.pm /usr/lib/perl*/*/Time/Local.pm /usr/lib/perl*/*/Time/localtime.pm /usr/lib/perl*/*/Time/tm.pm diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.0/etc/module.config new/installation-images-11.1/etc/module.config --- old/installation-images-11.0/etc/module.config 2008-08-19 11:51:06.000000000 +0200 +++ new/installation-images-11.1/etc/module.config 2008-09-01 12:17:37.000000000 +0200 @@ -31,6 +31,7 @@ ; some extra modules that are not manually loadable in linuxrc [other] 8390,,-,,,,1 +8390p,,-,,,,1 appletouch,"Apple PowerBook Touchpad",- binfmt_misc cicada,-Cicadia PHY driver @@ -159,6 +160,8 @@ rtc-ds1511,-,- rtc-r9701,-,- rtc-s35390a,-,- +rtc-ds1305,-,- +rtc-m41t94,-,- virtio_balloon,-,- virtio_pci,-,-,,virtio_blk virtio_net virtio_balloon virtio_ring,-,- @@ -186,6 +189,7 @@ ibm_acpi lcd pcc_acpi +pci_slot processor sbs sony_acpi @@ -237,6 +241,8 @@ # load the next two for wlan (at least as long as we don't have modprobe) ecb arc4 +snd_seq +snd_pcm_oss [IDE/RAID/SCSI] MoreModules=scsi-modules @@ -467,6 +473,7 @@ atp,"AT-LAN-TEC/RealTek pocket adaptor" at1700,"AT1700","io=0x260" atl1,"Attansic 1000M Ethernet" +atl1e,"Atheros 1000M Ethernet" b44,"Broadcom 4400 10/100 Ethernet" bnx2,"Broadcom NetXtreme II BCM5706" bnx2x,"Broadcom NetXtreme II BCM57710" @@ -579,6 +586,7 @@ airo_cs,"Cisco/Aironet PC Card" airport,"Apple Airport" ath5k,"5xxx series of Atheros 802.11 WLAN" +ath9k,"Atheros 802.11n WLAN" at76_usb,"Atmel at76c50x USB" atmel,"Atmel at76c50x" atmel_cs,"Atmel at76c50x PC Card" @@ -595,6 +603,7 @@ ipw3945,"Intel PRO/Wireless 3945" iwl3945,"Intel PRO/Wireless 3945ABG/BG" iwl4965,"Intel Wireless 4965AGN" +iwlagn,"Intel(R) Wireless WiFi Link AGN" iwlcore libertas_sdio,"Libertas SDIO" libertas_cs,"Marvell 83xx compact flash" @@ -1124,3 +1133,9 @@ powernow-k7,"PowerNow! driver for CPU frequency scaling for Athlon",- sk98lin,"SysKonnect SK-98xx Gigabit Ethernet" moto_modem +mac80211_hwsim +; +ili9320 +mbp_nvidia_bl +platform_lcd +vgg2432a4 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.0/VERSION new/installation-images-11.1/VERSION --- old/installation-images-11.0/VERSION 2008-08-19 11:52:01.000000000 +0200 +++ new/installation-images-11.1/VERSION 2008-08-25 11:22:37.000000000 +0200 @@ -1 +1 @@ -11.0 +11.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-packagekit
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package gnome-packagekit checked in at Mon Sep 1 14:57:31 CEST 2008. -------- --- GNOME/gnome-packagekit/gnome-packagekit.changes 2008-08-18 07:47:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-packagekit/gnome-packagekit.changes 2008-09-01 00:35:42.300386000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 1 00:45:39 CEST 2008 - sreeves(a)suse.de + +- Match PackageKit version change to 0.3.1 + +------------------------------------------------------------------- Old: ---- gnome-packagekit-0.3.0.tar.bz2 New: ---- gnome-packagekit-0.3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-packagekit.spec ++++++ --- /var/tmp/diff_new_pack.d14590/_old 2008-09-01 14:57:11.000000000 +0200 +++ /var/tmp/diff_new_pack.d14590/_new 2008-09-01 14:57:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gnome-packagekit (Version 0.3.0) +# spec file for package gnome-packagekit (Version 0.3.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: gnome-packagekit Url: http://packagekit.org/ -Version: 0.3.0 +Version: 0.3.1 Release: 1 License: GPL v2 or later Source: %{name}-%{version}.tar.bz2 @@ -105,6 +105,8 @@ %files lang -f %{name}.lang %changelog +* Mon Sep 01 2008 sreeves(a)suse.de +- Match PackageKit version change to 0.3.1 * Mon Aug 18 2008 sreeves(a)suse.de - Match PackageKit version change to 0.3.0 * Fri Aug 01 2008 cthiel(a)suse.de ++++++ gnome-packagekit-0.3.0.tar.bz2 -> gnome-packagekit-0.3.1.tar.bz2 ++++++ ++++ 9548 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dhcpv6
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package dhcpv6 checked in at Mon Sep 1 14:48:24 CEST 2008. -------- --- dhcpv6/dhcpv6.changes 2008-08-18 00:46:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcpv6/dhcpv6.changes 2008-09-01 12:56:33.293336000 +0200 @@ -1,0 +2,11 @@ +Mon Sep 1 12:54:37 CEST 2008 - kkeil(a)suse.de + +- Add netconfig support + +------------------------------------------------------------------- +Fri Aug 30 18:00:57 CEST 2008 - kkeil(a)suse.de + +- Initialize variables in dhcp6_set_ia_options() +- Do not add an invalid IA Address option to an IA (bnc#418705) + +------------------------------------------------------------------- New: ---- dhcpv6-1.0.20-Do-not-add-an-invalid-IA-Address-option-to.patch dhcpv6-1.0.20-git_Initialize_variables_in_dhcp6_set_ia_options dhcpv6-1.0.20-netconfig.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcpv6.spec ++++++ --- /var/tmp/diff_new_pack.w32020/_old 2008-09-01 14:48:14.000000000 +0200 +++ /var/tmp/diff_new_pack.w32020/_new 2008-09-01 14:48:14.000000000 +0200 @@ -26,13 +26,16 @@ Group: Productivity/Networking/System Summary: DHCP Client and Server for IPv6 Version: 1.0.20 -Release: 1 +Release: 7 Source0: %{name}-%{version}.tar.bz2 Source1: dhcp6c_update.sh Source2: 60-dhcp6c.up Source3: 60-dhcp6c.down Patch1: %{name}-%{version}-destdir.patch Patch2: %{name}-%{version}-cmd.patch +Patch3: %{name}-%{version}-git_Initialize_variables_in_dhcp6_set_ia_options +Patch4: %{name}-%{version}-Do-not-add-an-invalid-IA-Address-option-to.patch +Patch5: %{name}-%{version}-netconfig.dif Provides: dhcp6 = 1.0.4 Obsoletes: dhcp6 <= 1.0.4 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -101,6 +104,9 @@ %setup -q -n %{name}-%{version} %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 %build touch NEWS @@ -111,7 +117,7 @@ autoheader automake --foreign --add-missing --copy autoconf -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DWITH_NETCONFIG" \ ./configure --prefix=/usr \ --libdir=%{_libdir} \ --mandir=%{_mandir} \ @@ -173,6 +179,11 @@ %{_libdir}/libdhcp6client-1.0.so.* %changelog +* Mon Sep 01 2008 kkeil(a)suse.de +- Add netconfig support +* Sat Aug 30 2008 kkeil(a)suse.de +- Initialize variables in dhcp6_set_ia_options() +- Do not add an invalid IA Address option to an IA (bnc#418705) * Mon Aug 18 2008 kkeil(a)suse.de - update update to 1.0.20 * include all our patches ++++++ dhcpv6-1.0.20-Do-not-add-an-invalid-IA-Address-option-to.patch ++++++ >From 4f3c9bc0768329152bb08020772dd61850657234 Mon Sep 17 00:00:00 2001 From: Mitsuru Chinen <mitch(a)linux.vnet.ibm.com> Date: Fri, 29 Aug 2008 22:12:47 +0900 Subject: [PATCH] [dhcp6s] Do not add an invalid IA Address option to an IA An invalid IA Address option was added to an IA when status code option is in a Solicit or a Request message by mistake Signed-off-by: Mitsuru Chinen <mitch(a)linux.vnet.ibm.com> --- src/common.c | 42 +++++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/common.c b/src/common.c index 9353f24..dd447b6 100644 --- a/src/common.c +++ b/src/common.c @@ -98,6 +98,7 @@ static int get_assigned_ipv6addrs __P((unsigned char *, unsigned char *, struct ia_listval *)); static int dhcp6_set_ia_options __P((unsigned char **, int *, struct ia_listval *)); +static int ia_add_address __P((struct ia_listval *, struct dhcp6_addr *)); struct dhcp6_if *find_ifconfbyname(const char *ifname) { struct dhcp6_if *ifp; @@ -1402,6 +1403,8 @@ static int get_assigned_ipv6addrs(unsigned char *p, unsigned char *ep, default: goto malformed; } + if (ia_add_address(ia, &addr6)) + goto fail; break; case DH6OPT_IAPREFIX: if (optlen < sizeof(pi) - sizeof(u_int32_t)) @@ -1448,27 +1451,12 @@ static int get_assigned_ipv6addrs(unsigned char *p, unsigned char *ep, default: goto malformed; } + if (ia_add_address(ia, &addr6)) + goto fail; break; default: goto malformed; } - - /* set up address type */ - addr6.type = ia->type; - if (dhcp6_find_listval(&ia->addr_list, - &addr6, DHCP6_LISTVAL_DHCP6ADDR)) { - dhcpv6_dprintf(LOG_INFO, "duplicated address (%s/%d)", - in6addr2str(&addr6.addr, 0), addr6.plen); - /* XXX: decline message */ - continue; - } - - if (dhcp6_add_listval(&ia->addr_list, &addr6, - DHCP6_LISTVAL_DHCP6ADDR) == NULL) { - dhcpv6_dprintf(LOG_ERR, "%s" "failed to copy an " - "address", FNAME); - goto fail; - } } return 0; @@ -1481,6 +1469,26 @@ fail: return -1; } +static int ia_add_address(struct ia_listval *ia, struct dhcp6_addr *addr6) { + /* set up address type */ + addr6->type = ia->type; + if (dhcp6_find_listval(&ia->addr_list, + addr6, DHCP6_LISTVAL_DHCP6ADDR)) { + dhcpv6_dprintf(LOG_INFO, "duplicated address (%s/%d)", + in6addr2str(&addr6->addr, 0), addr6->plen); + /* XXX: decline message */ + return 0; + } + + if (dhcp6_add_listval(&ia->addr_list, addr6, + DHCP6_LISTVAL_DHCP6ADDR) == NULL) { + dhcpv6_dprintf(LOG_ERR, "%s" "failed to copy an " + "address", FNAME); + return -1; + } + return 0; +} + #define COPY_OPTION(t, l, v, p) do { \ if ((void *)(ep) - (void *)(p) < (l) + sizeof(struct dhcp6opt)) { \ dhcpv6_dprintf(LOG_INFO, "%s" "option buffer short for %s", FNAME, dhcp6optstr((t))); \ -- 1.5.5.1 ++++++ dhcpv6-1.0.20-netconfig.dif ++++++ --- src/dhcp6c.c +++ src/dhcp6c.c 2008/08/26 11:51:53 @@ -91,6 +91,19 @@ #include "libdhcp_control.h" #endif +#ifdef WITH_NETCONFIG +#ifndef _GNU_SOURCE + #define _GNU_SOURCE + #include <getopt.h> + #undef _GNU_SOURCE +#else + #include <getopt.h> +#endif +#include "netconfig.h" + +static int use_netconfig = 0; +#endif + static int debug = 0; static u_long sig_flags = 0; @@ -195,6 +208,12 @@ int dhcpv6_client(LIBDHCP_Control *libdh char *progname, *conffile = DHCP6C_CONF; FILE *pidfp; char *addr; +#ifdef WITH_NETCONFIG + struct option long_options[] = { + {"netconfig", no_argument, NULL, 0x0100}, + { NULL, 0, NULL, 0 } + }; +#endif #ifdef LIBDHCP libdhcp_control = libdhcp_ctl; @@ -211,8 +230,17 @@ int dhcpv6_client(LIBDHCP_Control *libdh progname++; TAILQ_INIT(&request_list); +#ifdef WITH_NETCONFIG + while ((ch = getopt_long(argc, argv, "c:r:R:P:vfIp:", + long_options, NULL)) != -1) { + switch (ch) { + case 0x0100: + use_netconfig = 1; + break; +#else while ((ch = getopt(argc, argv, "c:r:R:P:vfIp:")) != -1) { switch (ch) { +#endif case 'p': if (strlen(optarg) >= MAXPATHLEN) { dhcpv6_dprintf(LOG_ERR, "pid file name is too long"); @@ -931,11 +959,25 @@ static void free_resources(struct dhcp6_ dhcp6_remove_event(ev); } - /* restore /etc/resolv.conf.dhcpv6.bak back to /etc/resolv.conf */ - if (!lstat(RESOLV_CONF_BAK_FILE, &buf)) { - if (rename(RESOLV_CONF_BAK_FILE, RESOLV_CONF_FILE)) - dhcpv6_dprintf(LOG_ERR, "%s" " failed to backup resolv.conf", - FNAME); +#ifdef WITH_NETCONFIG + if(use_netconfig) + { + int ret = netconfig_remove("dhcp6c", debug, ifp->ifname); + dhcpv6_dprintf(LOG_DEBUG, "netconfig remove(%s): status %d", + ifp->ifname, ret); + } + else +#endif +#ifdef LIBDHCP + if (libdhcp_control && (libdhcp_control->capability & DHCP_CONFIGURE_RESOLVER)) +#endif + { + /* restore /etc/resolv.conf.dhcpv6.bak back to /etc/resolv.conf */ + if (!lstat(RESOLV_CONF_BAK_FILE, &buf)) { + if (rename(RESOLV_CONF_BAK_FILE, RESOLV_CONF_FILE)) + dhcpv6_dprintf(LOG_ERR, "%s" " failed to backup resolv.conf", + FNAME); + } } free_servers(ifp); @@ -1837,6 +1879,15 @@ static int client6_recvreply(struct dhcp return -1; } +#ifdef WITH_NETCONFIG + if (use_netconfig) + { + int ret = netconfig_modify("dhcp6c", debug, ifp->ifname, optinfo, ifp); + dhcpv6_dprintf(LOG_DEBUG, "netconfig modify(%s): status %d", + ifp->ifname, ret); + } + else +#endif if (!TAILQ_EMPTY(&optinfo->dns_list.addrlist) || optinfo->dns_list.domainlist != NULL) { #ifdef LIBDHCP @@ -2401,3 +2452,8 @@ static void setup_interface(char *ifname return; } + +#ifdef WITH_NETCONFIG +#include "netconfig.c" +#endif + --- src/netconfig.c +++ src/netconfig.c 2008/08/19 20:36:54 @@ -0,0 +1,242 @@ +#ifdef WITH_NETCONFIG +#include <sys/types.h> +#include <sys/socket.h> +#include <sys/wait.h> +#include <unistd.h> +#include <stdio.h> +#include <stdlib.h> +#include "netconfig.h" + +static int do_netconfig_restore = 0; + +int netconfig_modify(const char *service, int verbose, const char *ifname, + struct dhcp6_optinfo *optinfo, struct dhcp6_if *ifp) +{ + if(getuid() != 0 || geteuid() != 0) + { + return -1; + } + + if( !service || !ifname || !optinfo || !ifp) + { + return -1; + } + + int rc; + int fd[2] = {-1, -1}; + rc = socketpair(AF_LOCAL, SOCK_STREAM, PF_LOCAL, fd); + if(rc == -1) + { + return -1; + } + + pid_t pid; + pid = fork(); + if(pid == 0) + { + char *argv[] = { + "/sbin/netconfig", + "modify", + "-s", (char *)service, + "-i", (char *)ifname, + (verbose ? "-v" : NULL), + NULL + }; + extern char **environ; + + close(fd[0]); + if(dup2(fd[1], fileno(stdin)) == fileno(stdin)) + { + close(fd[1]); + if(freopen("/dev/null", "w", stdout) && + freopen("/dev/null", "w", stderr)) + { + execve(argv[0], argv, environ); + } + } else { + close(fd[1]); + } + exit(127); + } + else + if(pid > 0) + { + close(fd[1]); + FILE *out = fdopen(fd[0], "w"); + if( out) + { + fprintf(out, "INTERFACE='%s'\n", ifname); +#if 0 + /* + ** FIXME: the optinfo struct changed between 1.0.11 and 1.0.20 + ** not a problem, since IPADDR is informational only + */ + struct ia_listval *ia = ia_find_listval(&optinfo->ia_list, ...); + + if(!TAILQ_EMPTY(&ia->addr_list)) + { + struct dhcp6_listval *lv; + size_t i = 0; + fprintf(out, "IPADDR='"); + for (lv = TAILQ_FIRST(&ia->addr_list); + lv; + lv = TAILQ_NEXT(lv, link), i++) + { + if (lv->val_dhcp6addr.type != IAPD) { + u_int8_t plen = lv->val_dhcp6addr.plen ? + lv->val_dhcp6addr.plen : + dhcp6_get_prefixlen(&lv->val_dhcp6addr.addr, ifp); + + dhcpv6_dprintf(LOG_DEBUG, + "netconfig modify(%s): " + "IPADDR+='%s/%u'", + ifname, + in6addr2str(&lv->val_dhcp6addr.addr, 0), + plen); + fprintf(out, "%s%s", + (i == 0 ? "" : " "), + in6addr2str(&lv->val_dhcp6addr.addr, 0)); + if( plen) + fprintf(out, "/%u", plen); + } + } + fprintf(out, "'\n"); + } +#endif + fprintf(out, "DNSSERVERS='"); + if (!TAILQ_EMPTY(&optinfo->dns_list.addrlist)) + { + struct dhcp6_listval *d; + size_t i = 0; + for (d = TAILQ_FIRST(&optinfo->dns_list.addrlist); + d; + d = TAILQ_NEXT(d, link), i++) + { + dhcpv6_dprintf(LOG_DEBUG, + "netconfig modify(%s): " + "DNSSERVERS+='%s'", + ifname, + in6addr2str(&d->val_addr6, 0)); + + fprintf(out, "%s%s", + (i == 0 ? "" : " "), + in6addr2str(&d->val_addr6, 0)); + } + } + else + { + dhcpv6_dprintf(LOG_DEBUG, "netconfig modify(%s): " + "no DNS server available", ifname); + } + fprintf(out, "'\n"); + + fprintf(out, "DNSSEARCH='"); + if (optinfo->dns_list.domainlist) + { + struct domain_list *dlist; + size_t i = 0; + for (dlist = optinfo->dns_list.domainlist; + dlist; + dlist = dlist->next, i++) + { + dhcpv6_dprintf(LOG_DEBUG, + "netconfig modify(%s): " + "DNSSEARCH+='%s'", + ifname, + dlist->name); + + fprintf(out, "%s%s", + (i == 0 ? "" : " "), + dlist->name); + } + } + else + { + dhcpv6_dprintf(LOG_DEBUG, "netconfig modify(%s): " + "no DNS search list available", ifname); + } + fprintf(out, "'\n"); + + fclose(out); + } + else + { + close(fd[0]); + } + + /* wait for child even unable to write */ + int err; + int ret = 0; + do + { + err = waitpid(pid, &ret, 0); + } while(err == -1 && errno == EINTR); + + do_netconfig_restore++; + + return (((ret & 0x7f)==0) ? + ((ret >> 8) & 0xff) : + -(ret & 0x7f)); + } + return -1; +} + +int netconfig_remove(const char *service, int verbose, const char *ifname) +{ + if(getuid() != 0 || geteuid() != 0) + { + return -1; + } + + if( !service || !ifname) + { + return -1; + } + + if( do_netconfig_restore == 0) + { + return 0; + } + + pid_t pid; + + pid = fork(); + if(pid == 0) + { + char *argv[] = { + "/sbin/netconfig", + "remove", + "-s", (char *)service, + "-i", (char *)ifname, + (verbose ? "-v" : NULL), + NULL + }; + extern char **environ; + + if(freopen("/dev/null", "r", stdin) && + freopen("/dev/null", "w", stdout) && + freopen("/dev/null", "w", stderr)) + { + execve(argv[0], argv, environ); + } + exit(127); + } + else + if(pid > 0) + { + int err; + int ret = 0; + do + { + err = waitpid(pid, &ret, 0); + } while(err == -1 && errno == EINTR); + + do_netconfig_restore = 0; + + return (((ret & 0x7f)==0) ? + ((ret >> 8) & 0xff) : + -(ret & 0x7f)); + } + return -1; +} +#endif --- src/netconfig.h +++ src/netconfig.h 2008/08/19 12:38:29 @@ -0,0 +1,12 @@ +#ifdef WITH_NETCONFIG +#ifndef NETCONFIG_H +#define NETCONFIG_H +#include "dhcp6.h" + +int netconfig_modify(const char *service, int verbose, const char *ifname, + struct dhcp6_optinfo *optinfo, struct dhcp6_if *ifp); + +int netconfig_remove(const char *service, int verbose, const char *ifname); + +#endif +#endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit deb
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package deb checked in at Mon Sep 1 14:48:03 CEST 2008. -------- --- deb/deb.changes 2008-08-12 11:30:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/deb/deb.changes 2008-09-01 14:04:18.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 1 14:02:20 CEST 2008 - puzel(a)suse.cz + +- update to 7.0.17 + * dh_auto_install: Fix man page, was referring to dh_auto_clean. + * dh_gencontrol: Drop the Homepage field from udebs. Closes debian bug #492719 + * Typo. Closes debian bug #493062 + * dh_auto_install: Improve check for MakeMaker, to avoid passing PREFIX + if the Makefile was generated by Module::Build::Compat. Closes debian bug #496157 + +------------------------------------------------------------------- Old: ---- debhelper_7.0.16.tar.bz2 New: ---- debhelper_7.0.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deb.spec ++++++ --- /var/tmp/diff_new_pack.I30843/_old 2008-09-01 14:47:47.000000000 +0200 +++ /var/tmp/diff_new_pack.I30843/_new 2008-09-01 14:47:47.000000000 +0200 @@ -29,10 +29,10 @@ Requires: cpio patch make html2text update-alternatives AutoReqProv: on Version: 1.14.19 -Release: 23 +Release: 34 Summary: Tools for Debian Packages Source: dpkg_%{version}.tar.bz2 -Source1: debhelper_7.0.16.tar.bz2 +Source1: debhelper_7.0.17.tar.bz2 Patch0: debhelper-no-localized-manpages.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,7 +70,7 @@ make %{?jobs:-j%jobs} # This makes debhelper man pages cd ../debhelper -make VERSION='7.0.16' +make VERSION='7.0.17' %install ## @@ -166,6 +166,13 @@ %{perl_vendorlib}/Dpkg.pm %changelog +* Mon Sep 01 2008 puzel(a)suse.cz +- update to 7.0.17 + * dh_auto_install: Fix man page, was referring to dh_auto_clean. + * dh_gencontrol: Drop the Homepage field from udebs. Closes debian bug #492719 + * Typo. Closes debian bug #493062 + * dh_auto_install: Improve check for MakeMaker, to avoid passing PREFIX + if the Makefile was generated by Module::Build::Compat. Closes debian bug #496157 * Tue Aug 12 2008 puzel(a)suse.cz - fix paths * install perl stuff to %%{perl_vendorlib}/Debian where it is ++++++ debhelper_7.0.16.tar.bz2 -> debhelper_7.0.17.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/debian/changelog new/debhelper/debian/changelog --- old/debhelper/debian/changelog 2008-07-19 21:34:15.000000000 +0200 +++ new/debhelper/debian/changelog 2008-08-23 04:30:21.000000000 +0200 @@ -1,3 +1,16 @@ +debhelper (7.0.17) unstable; urgency=low + + [ Per Olofsson ] + * dh_auto_install: Fix man page, was referring to dh_auto_clean. + + [ Joey Hess ] + * dh_gencontrol: Drop the Homepage field from udebs. Closes: #492719 + * Typo. Closes: #493062 + * dh_auto_install: Improve check for MakeMaker, to avoid passing PREFIX + if the Makefile was generated by Module::Build::Compat. Closes: #496157 + + -- Joey Hess <joeyh(a)debian.org> Fri, 22 Aug 2008 22:30:12 -0400 + debhelper (7.0.16) unstable; urgency=low * dh: Avoid passing --with on to subcommands. Closes: #490886 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh_auto_build new/debhelper/dh_auto_build --- old/debhelper/dh_auto_build 2008-05-19 18:40:23.000000000 +0200 +++ new/debhelper/dh_auto_build 2008-08-23 04:11:00.000000000 +0200 @@ -30,7 +30,7 @@ =item B<--> I<params> -Pass "params" to the program that is run. These can be used to suppliment +Pass "params" to the program that is run. These can be used to supplement or override any standard parameters that dh_auto_build passes. =back diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh_auto_clean new/debhelper/dh_auto_clean --- old/debhelper/dh_auto_clean 2008-06-04 20:38:54.000000000 +0200 +++ new/debhelper/dh_auto_clean 2008-08-23 04:11:00.000000000 +0200 @@ -31,7 +31,7 @@ =item B<--> I<params> -Pass "params" to the program that is run. These can be used to suppliment +Pass "params" to the program that is run. These can be used to supplement or override the any standard parameters that dh_auto_clean passes. =back diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh_auto_configure new/debhelper/dh_auto_configure --- old/debhelper/dh_auto_configure 2008-05-19 18:40:23.000000000 +0200 +++ new/debhelper/dh_auto_configure 2008-08-23 04:11:00.000000000 +0200 @@ -23,7 +23,7 @@ This is intended to work for about 90% of packages. If it doesn't work, you're encouraged to skip using dh_auto_configure at all, and just run -./configure or its equivilant manually. +./configure or its equivalent manually. =head1 OPTIONS @@ -31,7 +31,7 @@ =item B<--> I<params> -Pass "params" to the program that is run. These can be used to suppliment +Pass "params" to the program that is run. These can be used to supplement or override the standard parameters that dh_auto_configure passes. =back diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh_auto_install new/debhelper/dh_auto_install --- old/debhelper/dh_auto_install 2008-06-25 18:24:21.000000000 +0200 +++ new/debhelper/dh_auto_install 2008-08-23 04:17:55.000000000 +0200 @@ -32,7 +32,7 @@ automatically set PREFIX=/usr too, since such Makefiles need that. This is intended to work for about 90% of packages. If it doesn't work, or -tries to use the wrong clean target, you're encouraged to skip using +tries to use the wrong install target, you're encouraged to skip using dh_auto_install at all, and just run make install manually. =head1 OPTIONS @@ -41,8 +41,8 @@ =item B<--> I<params> -Pass "params" to the program that is run. These can be used to suppliment -or override the any standard parameters that dh_auto_clean passes. +Pass "params" to the program that is run. These can be used to supplement +or override the any standard parameters that dh_auto_install passes. =back @@ -63,10 +63,13 @@ if (-e "Makefile" || -e "makefile" || -e "GNUmakefile") { $ENV{MAKE}="make" unless exists $ENV{MAKE}; my @params="DESTDIR=$destdir"; - # Special case for MakeMaker. - if (-e "Makefile.PL") { + + # Special case for MakeMaker generated Makefiles. + if (-e "Makefile" && + system('grep -q "generated automatically by MakeMaker" Makefile') == 0) { push @params, "PREFIX=/usr"; } + foreach my $target (qw{install}) { # Use make -n to check to see if the target would do # anything. There's no good way to test if a target exists. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh_auto_test new/debhelper/dh_auto_test --- old/debhelper/dh_auto_test 2008-05-19 18:40:23.000000000 +0200 +++ new/debhelper/dh_auto_test 2008-08-23 04:11:00.000000000 +0200 @@ -32,7 +32,7 @@ =item B<--> I<params> -Pass "params" to the program that is run. These can be used to suppliment +Pass "params" to the program that is run. These can be used to supplement or override the any standard parameters that dh_auto_test passes. =back diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh_gencontrol new/debhelper/dh_gencontrol --- old/debhelper/dh_gencontrol 2008-05-19 18:40:23.000000000 +0200 +++ new/debhelper/dh_gencontrol 2008-07-31 19:33:14.000000000 +0200 @@ -58,6 +58,7 @@ push @command, "-p$package"; } if (is_udeb($package)) { + push @command, "-UHomepage"; push @command, "-n".udeb_filename($package); } doit(@command, "-l$changelog", "-Tdebian/${ext}substvars", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/man/po4a/po/fr.po new/debhelper/man/po4a/po/fr.po --- old/debhelper/man/po4a/po/fr.po 2008-07-09 22:16:22.000000000 +0200 +++ new/debhelper/man/po4a/po/fr.po 2008-07-31 19:33:14.000000000 +0200 @@ -2415,7 +2415,7 @@ "paquet. S<Nota :> Si le paquet n'est pas natif Debian, le fichier debian/" "TODO sera installé sous le nom TODO.Debian. Pour des raisons de cohérence, " "le fichier README.debian est installé sous le nom de README.Debian. Enfin, " -"des fichiers debian/paquet/README.Debian et debian/paquet.TODO peuvent être " +"des fichiers debian/paquet.README.Debian et debian/paquet.TODO peuvent être " "utilisés pour fournir des fichiers TODO et README aux sous-paquets." # type: textblock ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit at
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package at checked in at Mon Sep 1 14:45:29 CEST 2008. -------- --- at/at.changes 2008-04-08 17:35:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/at/at.changes 2008-09-01 13:53:06.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 1 13:52:04 CEST 2008 - puzel(a)suse.cz + +- enabled SELinux support [Fate#303662] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at.spec ++++++ --- /var/tmp/diff_new_pack.a19982/_old 2008-09-01 14:45:20.000000000 +0200 +++ /var/tmp/diff_new_pack.a19982/_new 2008-09-01 14:45:20.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package at (Version 3.1.8) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,12 +20,13 @@ Name: at BuildRequires: bison flex pam-devel +BuildRequires: libselinux-devel Url: ftp://ftp.debian.org/debian/pool/main/a/at License: GPL v2 or later Group: System/Daemons AutoReqProv: on Version: 3.1.8 -Release: 1031 +Release: 1061 Summary: A Job Manager Source: at_3.1.8-11.tar.gz Source1: atd.init @@ -70,7 +78,7 @@ autoconf export CFLAGS="$RPM_OPT_FLAGS" export SENDMAIL=/usr/sbin/sendmail -./configure --prefix=%{_prefix} --with-pam \ +./configure --prefix=%{_prefix} --with-pam --with-selinux \ --with-daemon_username=at --with-daemon_groupname=at \ --mandir=%{_mandir} make @@ -138,6 +146,8 @@ /var/adm/fillup-templates/sysconfig.atd %changelog +* Mon Sep 01 2008 puzel(a)suse.cz +- enabled SELinux support [Fate#303662] * Tue Apr 08 2008 mrueckert(a)suse.de - add at-3.1.8_massive_batch.patch: (bnc#347126) properly handle sighup when multiple jobs are submitted at the ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit amavisd-new
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package amavisd-new checked in at Mon Sep 1 14:07:35 CEST 2008. -------- --- amavisd-new/amavisd-new.changes 2008-08-12 23:37:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/amavisd-new/amavisd-new.changes 2008-09-01 11:59:37.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 1 11:59:23 CEST 2008 - kukuk(a)suse.de + +- Don't require unace, amavis does not know about it. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amavisd-new.spec ++++++ --- /var/tmp/diff_new_pack.l12762/_old 2008-09-01 14:07:27.000000000 +0200 +++ /var/tmp/diff_new_pack.l12762/_new 2008-09-01 14:07:27.000000000 +0200 @@ -19,17 +19,17 @@ Name: amavisd-new -BuildRequires: krb5 sendmail sendmail-devel +BuildRequires: sendmail sendmail-devel License: GPL v2 or later Group: Productivity/Networking/Security Url: http://www.ijs.si/software/amavisd/ Obsoletes: amavisd-postfix amavis-postfix amavis-sendmail amavisd-sendmail -Requires: gzip bzip2 lha unace unarj unrar zoo sharutils perl-Compress-Zlib perl-Convert-UUlib perl-IO-stringy perl-MIME-tools perl-MailTools perl-Archive-Tar perl-Unix-Syslog perl-Convert-TNEF perl-Archive-Zip perl-Net-Server perl-spamassassin file perl-BerkeleyDB +Requires: gzip bzip2 lha unarj unrar zoo sharutils perl-Compress-Zlib perl-Convert-UUlib perl-IO-stringy perl-MIME-tools perl-MailTools perl-Archive-Tar perl-Unix-Syslog perl-Convert-TNEF perl-Archive-Zip perl-Net-Server perl-spamassassin file perl-BerkeleyDB PreReq: /usr/sbin/useradd /bin/hostname /bin/sed /bin/cp /bin/mv %insserv_prereq AutoReqProv: on Summary: High-Performance E-Mail Virus Scanner Version: 2.6.1 -Release: 20 +Release: 31 Source0: amavisd-new-%{version}.tar.gz Source1: sysconfig.amavis Source2: rc.amavis @@ -59,7 +59,6 @@ # --------------------------------------------------------------------------- %install -rm -rf $RPM_BUILD_ROOT # create the vscan user in the build system /usr/sbin/groupadd -r %{avgroup} 2> /dev/null || : /usr/sbin/useradd -r -o -g %{avgroup} -u 65 -s /bin/false -c "Vscan account" -d %{avspool} %{avuser} 2> /dev/null || : @@ -176,6 +175,8 @@ Mark Martinec <mark.martinec(a)ijs.si> %changelog +* Mon Sep 01 2008 kukuk(a)suse.de +- Don't require unace, amavis does not know about it. * Wed Aug 13 2008 crrodriguez(a)suse.de - fix init scripts * Tue Jul 01 2008 varkoly(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-update
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package yast2-update checked in at Mon Sep 1 14:05:39 CEST 2008. -------- --- yast2-update/yast2-update.changes 2008-08-04 13:19:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2008-09-01 13:15:48.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Sep 1 13:15:22 CEST 2008 - locilka(a)suse.cz + +- Obsolete EVMS-related code disabled. +- 2.17.3 + +------------------------------------------------------------------- +Mon Sep 1 10:21:46 CEST 2008 - ug(a)suse.de + +- activation of EVMS removed since it does not exist anymore +- 2.17.2 + +------------------------------------------------------------------- Old: ---- yast2-update-2.17.1.tar.bz2 New: ---- yast2-update-2.17.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.nM8826/_old 2008-09-01 14:05:27.000000000 +0200 +++ /var/tmp/diff_new_pack.nM8826/_new 2008-09-01 14:05:27.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-update (Version 2.17.1) +# spec file for package yast2-update (Version 2.17.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-update -Version: 2.17.1 +Version: 2.17.3 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-update-2.17.1.tar.bz2 +Source0: yast2-update-2.17.3.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-storage yast2-testsuite # Wizard::OpenOKDialog @@ -73,7 +80,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-update-2.17.1 +%setup -n yast2-update-2.17.3 %build %{prefix}/bin/y2tool y2autoconf @@ -121,6 +128,12 @@ /usr/share/YaST2/clients/update.ycp /usr/share/YaST2/clients/run_update.ycp %changelog +* Mon Sep 01 2008 locilka(a)suse.cz +- Obsolete EVMS-related code disabled. +- 2.17.3 +* Mon Sep 01 2008 ug(a)suse.de +- activation of EVMS removed since it does not exist anymore +- 2.17.2 * Mon Aug 04 2008 locilka(a)suse.cz - Initializing target as soon as possible (updating running system) (bnc #394662). ++++++ yast2-update-2.17.1.tar.bz2 -> yast2-update-2.17.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.1/configure new/yast2-update-2.17.3/configure --- old/yast2-update-2.17.1/configure 2008-07-24 12:56:53.000000000 +0200 +++ new/yast2-update-2.17.3/configure 2008-09-01 13:17:11.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-update 2.17.0. +# Generated by GNU Autoconf 2.61 for yast2-update 2.17.3. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-update' PACKAGE_TARNAME='yast2-update' -PACKAGE_VERSION='2.17.0' -PACKAGE_STRING='yast2-update 2.17.0' +PACKAGE_VERSION='2.17.3' +PACKAGE_STRING='yast2-update 2.17.3' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-update 2.17.0 to adapt to many kinds of systems. +\`configure' configures yast2-update 2.17.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-update 2.17.0:";; + short | recursive ) echo "Configuration of yast2-update 2.17.3:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-update configure 2.17.0 +yast2-update configure 2.17.3 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-update $as_me 2.17.0, which was +It was created by yast2-update $as_me 2.17.3, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-update' - VERSION='2.17.0' + VERSION='2.17.3' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.0" +VERSION="2.17.3" RPMNAME="yast2-update" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3306,7 +3306,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-update $as_me 2.17.0, which was +This file was extended by yast2-update $as_me 2.17.3, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3349,7 +3349,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-update config.status 2.17.0 +yast2-update config.status 2.17.3 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.1/configure.in new/yast2-update-2.17.3/configure.in --- old/yast2-update-2.17.1/configure.in 2008-07-24 12:56:50.000000000 +0200 +++ new/yast2-update-2.17.3/configure.in 2008-09-01 13:17:08.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-update dnl -dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-update, 2.17.0, http://bugs.opensuse.org/, yast2-update) +AC_INIT(yast2-update, 2.17.3, http://bugs.opensuse.org/, yast2-update) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.0" +VERSION="2.17.3" RPMNAME="yast2-update" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.1/src/modules/RootPart.ycp new/yast2-update-2.17.3/src/modules/RootPart.ycp --- old/yast2-update-2.17.1/src/modules/RootPart.ycp 2008-04-29 15:38:39.000000000 +0200 +++ new/yast2-update-2.17.3/src/modules/RootPart.ycp 2008-09-01 13:16:52.000000000 +0200 @@ -6,7 +6,7 @@ * Purpose: Responsible for searching of root partitions and * mounting of target partitions. * - * $Id: RootPart.ycp 47161 2008-04-29 13:38:38Z locilka $ + * $Id: RootPart.ycp 50517 2008-09-01 11:16:51Z locilka $ */ { module "RootPart"; @@ -539,6 +539,8 @@ return true; } +/* + * No more EVMS // bugzilla #237139 // '/dev/evms/lvm2/system/root' is the same as '/dev/system/root' // the root from /etc/fstab must be used @@ -562,6 +564,7 @@ return true; } } +*/ return true; } @@ -1492,7 +1495,7 @@ Storage::SetTargetMap ((map<string,map>) SCR::Read (.target.yast2, "test_target_map.ycp")); } - Storage::ActivateEvms(); +// Storage::ActivateEvms(); map <string, map> target_map = (map <string, map>) Storage::GetOndiskTarget (); y2milestone ("target_map: %1", target_map); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.1/VERSION new/yast2-update-2.17.3/VERSION --- old/yast2-update-2.17.1/VERSION 2008-08-04 13:20:33.000000000 +0200 +++ new/yast2-update-2.17.3/VERSION 2008-09-01 13:15:16.000000000 +0200 @@ -1 +1 @@ -2.17.1 +2.17.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mono-debugger
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package mono-debugger checked in at Mon Sep 1 14:04:20 CEST 2008. -------- --- arch/i386/mono-debugger/mono-debugger.changes 2008-08-27 18:42:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/mono-debugger/mono-debugger.changes 2008-09-01 13:58:26.983832000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 1 11:51:18 CEST 2008 - ro(a)suse.de + +- respect CFLAGS setting (for RPM_OPT_FLAGS) + (patch present but disabled, too many errors) +- make term.c include ncurses/termcap.h to fix build + +------------------------------------------------------------------- New: ---- mono-debugger-cflags.patch mono-debugger-termcap.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mono-debugger.spec ++++++ --- /var/tmp/diff_new_pack.as1491/_old 2008-09-01 14:02:15.000000000 +0200 +++ /var/tmp/diff_new_pack.as1491/_new 2008-09-01 14:02:15.000000000 +0200 @@ -24,9 +24,11 @@ Summary: Mono Debugger Url: http://www.mono-project.com/Debugger Version: 2.0 -Release: 1 +Release: 2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 +Patch: mono-debugger-cflags.patch +Patch1: mono-debugger-termcap.patch Provides: mono-debugger = %{version}-%{release} ExclusiveArch: %ix86 x86_64 Requires: mono-core = %{version} @@ -83,10 +85,12 @@ %prep %setup -q -n mono-debugger-%{version} +%patch1 %build %{?env_options} %{?configure_options} +CFLAGS="$RPM_OPT_FLAGS `ncurses5-config --cflags`" %configure make @@ -111,13 +115,17 @@ %define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort | uniq' %changelog +* Mon Sep 01 2008 ro(a)suse.de +- respect CFLAGS setting (for RPM_OPT_FLAGS) + (patch present but disabled, too many errors) +- make term.c include ncurses/termcap.h to fix build * Tue Aug 26 2008 ajorgensen(a)novell.com - Update to 2.0 * Will be released with Mono going forward to ensure compatibility * Many bugfixes * Tue May 06 2008 aj(a)suse.de - Use <sys/users.h> to fix build. -* Mon Jan 14 2008 wberrier(a)novell.com +* Tue Jan 15 2008 wberrier(a)novell.com - Update to 0.60 -Updated to run with mono 1.2.6 runtime -Various bux fixes @@ -137,11 +145,11 @@ - add %%debug_package so debug packages get created * Wed Apr 11 2007 wberrier(a)novell.com - Add mono dep/req for older distros -* Wed Apr 04 2007 wberrier(a)novell.com +* Thu Apr 05 2007 wberrier(a)novell.com - Adapt for buildservice * Wed Dec 06 2006 dmueller(a)suse.de - don't build as root -* Tue Nov 14 2006 wberrier(a)suse.de +* Wed Nov 15 2006 wberrier(a)suse.de - Update to 0.31 - (contains a gpl friendly libedit) - Remove old patches @@ -179,12 +187,12 @@ and more reliable. * Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Wed Dec 21 2005 wberrier(a)suse.de +* Thu Dec 22 2005 wberrier(a)suse.de - Clean up spec, update to 0.11, add NULL patch for libedit, only build on x86 and x86_64 * Mon Aug 29 2005 aj(a)suse.de - Add check-build.sh. -* Mon Aug 01 2005 ro(a)suse.de +* Tue Aug 02 2005 ro(a)suse.de - make it build ... -* Tue Jul 19 2005 wberrier(a)suse.de +* Wed Jul 20 2005 wberrier(a)suse.de - Initial submission ++++++ mono-debugger-cflags.patch ++++++ --- configure +++ configure @@ -21519,7 +21519,7 @@ -CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings' +CFLAGS="$CFLAGS -g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings" # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -23417,7 +23417,7 @@ { echo "$as_me:$LINENO: checking Whether your Mono is working" >&5 echo $ECHO_N "checking Whether your Mono is working... $ECHO_C" >&6; } -old_CFLAGS=$cflags +old_CFLAGS=$CFLAGS CFLAGS=$WRAPPER_CFLAGS cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ --- configure.in +++ configure.in @@ -104,7 +104,7 @@ # not 64 bit clean in cross-compile AC_CHECK_SIZEOF(void *, 4) -CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings' +CFLAGS="$CFLAGS -g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings" AC_PATH_PROG(PKG_CONFIG, pkg-config, no) if test "x$PKG_CONFIG" = "xno"; then @@ -280,7 +280,7 @@ AM_CONDITIONAL(HAVE_XSP, test "x$xsp" = "xyes") AC_MSG_CHECKING([Whether your Mono is working]) -old_CFLAGS=$cflags +old_CFLAGS=$CFLAGS CFLAGS=$WRAPPER_CFLAGS AC_TRY_COMPILE([#include <mono/metadata/mono-debug.h> #include <mono/metadata/debug-mono-symfile.h> ++++++ mono-debugger-termcap.patch ++++++ --- frontend/libedit/term.c +++ frontend/libedit/term.c @@ -52,6 +52,14 @@ # include <ncurses.h> #endif +#ifdef HAVE_TERMCAP_H +# include <termcap.h> +#elif HAVE_TERMCAP_TERMCAP_H +# include <termcap/termcap.h> +#else +# include <ncurses/termcap.h> +#endif + /* Solaris's term.h does horrid things. */ #if (defined(HAVE_TERM_H) && !defined(_SUNOS)) # include <term.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0