March 2009 - openSUSE Commits - openSUSE Mailing Lists

commit iprutils for openSUSE:Factory
by root＠Hilbert.suse.de 10 Mar '09

10 Mar '09

Hello community, here is the log from the commit of package iprutils for openSUSE:Factory checked in at Tue Mar 10 01:32:01 CET 2009. -------- --- iprutils/iprutils.changes 2008-11-18 17:27:28.000000000 +0100 +++ /mounts/work_users/ro/STABLE/iprutils/iprutils.changes 2009-03-10 01:31:50.559266000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 10 01:31:42 CET 2009 - ro(a)suse.de + +- do not try to include <linux/byteorder/swab.h> + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- iprutils-noswab.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iprutils.spec ++++++ --- /var/tmp/diff_new_pack.m17261/_old 2009-03-10 01:31:55.000000000 +0100 +++ /var/tmp/diff_new_pack.m17261/_new 2009-03-10 01:31:55.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package iprutils (Version 2.2.13) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,8 +22,8 @@ BuildRequires: ncurses-devel pciutils-devel sysfsutils Summary: Utilities for the IBM Power Linux RAID Adapters Version: 2.2.13 -Release: 1 -License: Other uncritical OpenSource License +Release: 2 +License: Common Public License v1.0 Url: http://sourceforge.net/projects/iprdd/ Group: Hardware/Other PreReq: %insserv_prereq %fillup_prereq @@ -33,6 +33,7 @@ Patch0: iprconfig.usr-sbin.patch Patch1: iprutils.install-man.patch Patch2: iprutils.runlevel.patch +Patch3: iprutils-noswab.patch %description Provides a suite of utilities to manage and configure SCSI devices @@ -49,6 +50,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 %build make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -I/usr/include/ncurses \$(IPR_DEFINES)" @@ -88,6 +90,8 @@ %attr(755,root,root) /etc/init.d/* %changelog +* Tue Mar 10 2009 ro(a)suse.de +- do not try to include <linux/byteorder/swab.h> * Tue Nov 18 2008 olh(a)suse.de - update iprutils to version 2.2.13 (bnc#443674 - LTC49827) Additional fixes for the active-active functionality. ++++++ iprutils-noswab.patch ++++++ --- iprlib.h +++ iprlib.h @@ -43,7 +43,7 @@ #include <stdbool.h> #include <netinet/in.h> #include <sysfs/libsysfs.h> -#include <linux/byteorder/swab.h> +/* #include <linux/byteorder/swab.h> */ #include <asm/byteorder.h> #include <sys/mman.h> #include <paths.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

commit gnet for openSUSE:Factory
by root＠Hilbert.suse.de 10 Mar '09

10 Mar '09

Hello community, here is the log from the commit of package gnet for openSUSE:Factory checked in at Tue Mar 10 01:31:16 CET 2009. -------- --- GNOME/gnet/gnet.changes 2009-02-13 10:13:17.000000000 +0100 +++ /mounts/work_users/ro/STABLE/gnet/gnet.changes 2009-03-10 01:23:28.199039000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 10 01:23:20 CET 2009 - ro(a)suse.de + +- drop eel-devel from buildrequires + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnet.spec ++++++ --- /var/tmp/diff_new_pack.L15790/_old 2009-03-10 01:31:11.000000000 +0100 +++ /var/tmp/diff_new_pack.L15790/_new 2009-03-10 01:31:11.000000000 +0100 @@ -19,9 +19,9 @@ Name: gnet -BuildRequires: eel-devel gtk-doc indent intltool libidl-devel librsvg-devel libwnck-devel libxml-devel libxslt-devel perl-XML-Parser python-devel python-xml scrollkeeper +BuildRequires: gtk-doc indent intltool libidl-devel librsvg-devel libwnck-devel libxml-devel libxslt-devel perl-XML-Parser python-devel python-xml scrollkeeper Version: 2.0.8 -Release: 1 +Release: 2 License: LGPL v2.1 or later Group: System/Libraries Url: http://www.gnetlibrary.org/ @@ -134,6 +134,8 @@ %doc README ChangeLog AUTHORS TODO COPYING %changelog +* Tue Mar 10 2009 ro(a)suse.de +- drop eel-devel from buildrequires * Fri Feb 13 2009 drahn(a)suse.de - update to new upstream release 2.0.8 - fixes bnc#434615 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bochs for openSUSE:Factory
by root＠Hilbert.suse.de 10 Mar '09

10 Mar '09

Hello community, here is the log from the commit of package bochs for openSUSE:Factory checked in at Tue Mar 10 01:22:23 CET 2009. -------- --- bochs/bochs.changes 2008-06-03 04:12:43.000000000 +0200 +++ /mounts/work_users/ro/STABLE/bochs/bochs.changes 2009-03-10 01:22:12.323417000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 10 01:22:02 CET 2009 - ro(a)suse.de + +- fix build by adding a missing include statement + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bochs-2.2.1-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bochs.spec ++++++ --- /var/tmp/diff_new_pack.Te3150/_old 2009-03-10 01:22:19.000000000 +0100 +++ /var/tmp/diff_new_pack.Te3150/_new 2009-03-10 01:22:19.000000000 +0100 @@ -1,10 +1,17 @@ # # spec file for package bochs (Version 2.2.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. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# 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,13 +23,14 @@ Group: System/Emulators/PC AutoReqProv: on Version: 2.2.1 -Release: 206 +Release: 256 Summary: Cross-Platform IA32 Emulator Source: bochs-%{version}.tar.bz2 Patch2: bochs-2.1.1-nonvoid.patch Patch3: fix-module-building.diff Patch4: bochs-2.2.1-ne2ksanity.patch Patch5: bochs-strncat.patch +Patch6: bochs-2.2.1-include.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,6 +53,7 @@ %patch3 %patch4 %patch5 +%patch6 %build %ifarch %ix86 @@ -122,6 +131,8 @@ %{_libdir}/bochs %changelog +* Tue Mar 10 2009 ro(a)suse.de +- fix build by adding a missing include statement * Tue Jun 03 2008 crrodriguez(a)suse.de - needs fno-strict-aliasing in CFLAGS * Wed May 07 2008 schwab(a)suse.de @@ -139,7 +150,7 @@ - fix BuildRequires * Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Wed Jan 18 2006 schwab(a)suse.de +* Tue Jan 17 2006 schwab(a)suse.de - Don't strip binaries. * Mon Jul 11 2005 sf(a)suse.de - update to version 2.2.1 ++++++ bochs-2.2.1-include.patch ++++++ --- iodev/eth.cc +++ iodev/eth.cc @@ -32,6 +32,8 @@ // Define BX_PLUGGABLE in files that can be compiled into plugins. For // platforms that require a special tag on exported symbols, BX_PLUGGABLE // is used to know when we are exporting symbols and when we are importing. +#include <cstring> + #define BX_PLUGGABLE #include "iodev.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

commit yast2-network for openSUSE:Factory
by root＠Hilbert.suse.de 09 Mar '09

09 Mar '09

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at Tue Mar 10 00:03:22 CET 2009. -------- --- yast2-network/yast2-network.changes 2009-03-05 14:36:39.000000000 +0100 +++ yast2-network/yast2-network.changes 2009-03-09 15:07:57.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Mar 9 14:58:10 CET 2009 - mzugec(a)suse.cz + +- improve address dialog for vlan (bnc#376063) +- allow all netcard devices except vlan, bridge and bond to be +etherdevice for vlan +- 2.18.17 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-network-2.18.16.tar.bz2 New: ---- yast2-network-2.18.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.t25430/_old 2009-03-10 00:01:58.000000000 +0100 +++ /var/tmp/diff_new_pack.t25430/_new 2009-03-10 00:01:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.18.16) +# spec file for package yast2-network (Version 2.18.17) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-network -Version: 2.18.16 +Version: 2.18.17 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.18.16.tar.bz2 +Source0: yast2-network-2.18.17.tar.bz2 Prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm @@ -78,7 +78,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-network-2.18.16 +%setup -n yast2-network-2.18.17 %build %{prefix}/bin/y2tool y2autoconf @@ -142,6 +142,11 @@ %exclude %{prefix}/share/doc/packages/yast2-network/COPYING %exclude %{prefix}/share/doc/packages/yast2-network/README %changelog +* Mon Mar 09 2009 mzugec(a)suse.cz +- improve address dialog for vlan (bnc#376063) +- allow all netcard devices except vlan, bridge and bond to be + etherdevice for vlan +- 2.18.17 * Thu Mar 05 2009 mzugec(a)suse.cz - in DSL module list also pppoe devices (bnc#449982) - 2.18.16 ++++++ yast2-network-2.18.16.tar.bz2 -> yast2-network-2.18.17.tar.bz2 ++++++ ++++ 2326 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.16/configure.in new/yast2-network-2.18.17/configure.in --- old/yast2-network-2.18.16/configure.in 2009-03-05 14:23:43.000000000 +0100 +++ new/yast2-network-2.18.17/configure.in 2009-03-09 14:52:33.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.18.15, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.18.16, http://bugs.opensuse.org/, yast2-network) 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.18.15" +VERSION="2.18.16" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.16/doc/autodocs/Makefile.am new/yast2-network-2.18.17/doc/autodocs/Makefile.am --- old/yast2-network-2.18.16/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-2.18.17/doc/autodocs/Makefile.am 2008-01-24 14:41:26.000000000 +0100 @@ -0,0 +1,11 @@ +# +# Makefile.am for YCP module .../doc/autodocs +# + +htmldir = @docdir@/autodocs + +html_DATA = index.html $(wildcard *.html) +CLEANFILES = $(html_DATA) + +index.html: $(srcdir)/../../src/*/*.ycp + ${YCPDOC} -d. -s$(srcdir)/../../src/ $(srcdir)/../../src/*/*.ycp diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.16/doc/autoinst new/yast2-network-2.18.17/doc/autoinst --- old/yast2-network-2.18.16/doc/autoinst 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-2.18.17/doc/autoinst 2008-01-24 14:41:26.000000000 +0100 @@ -0,0 +1,132 @@ +How Autoyast networking works in SLES9-SP2 +========================================== + +$Revision: 1.1.2.3 $ $Date: 2006/03/06 12:26:49 $ - work in progress! +Martin Vidner <mvidner(a)suse.cz> + +Use case 1 - One ethernet card with DHCP +---------------------------------------- + +Probably the simplest case. Here is what one gets when configuring it +using the GUI: + + <networking> + <dns> + <dhcp_hostname config:type="boolean">false</dhcp_hostname> + <dhcp_resolv config:type="boolean">true</dhcp_resolv> + <domain>SuSE.Cz</domain> + <hostname>Medusa</hostname> + </dns> + <interfaces config:type="list"> + <interface> + <bootproto>dhcp</bootproto> + <device>eth0</device> + <startmode>onboot</startmode> + </interface> + </interfaces> + <modules config:type="list"> + <module_entry> + <device>static-0</device> + <module></module> + <options></options> + </module_entry> + </modules> + <routing> + <ip_forward config:type="boolean">true</ip_forward> + </routing> + </networking> + +Here the contents of <device> entries do not matter - the resulting +configuration files are named using the MAC address and PCI bus +location (ifcfg-eth-id-00:00:1c:b5:70:7e, hwcfg-bus-pci-0000:00:0b.0). + +(Note: I installed from a network installation source. So install.inf +was used. CD installation may behave differently) + +Ideas from code reading +----------------------- + +Autoinstall checks Hardware!=[] && interfaces != []. That will not +create config for a card that is not currently plugged in. + + +How it Works +------------ + +SP2: If <interfaces> is not empty (and Hardware is not empty, possible +bug), do autoinstallation configuration, otherwise do the installation +proposal, including routing and resolver. + +SP3 (since 2.9.84): If <interfaces> is not empty, use it for +autoinstallation configuration, otherwise propose only the +interfaces. Routing and resolver will be taken from the profile in +both cases (see also bug #117484). + +2.9.89: For each of <interfaces>, <routing><routes>, <dns><hostname>, +and <dns><nameservers>, if it is not empty, use it for +autoinstallation configuration, otherwise use the values from install.inf +(bug #153426). + + Autoinstallation + ---------------- + +For each <interface>: +Find a device which matches it (complex rules, see below). +If we found a matching device, get the corresponding <module_entry> +(having equal <device>). If found, it overrides the detected settings, +else use the detected driver. +If we did not find a matching device, use driver settings from +install.inf. If there are none, don't set up the interface. +Set interface properties. + + Proposal + -------- + + Finding a Matching Device + ------------------------- + +Let D be <interface/device>. +Look for the first match: +- (0) matching MAC for D being *-id-MAC +- (0) matching bus id for D being *-bus-BUS-ID (PCI and in SP3 VIO) +- (0) matching module (of first driver) for corresponding + <module_entry/module> [a] + +Then, when configuring the first interface: +- (1) matching MAC with install.inf +- (1) matching module (1st driver) with install.inf +- (1) first that has an active module +- (1) first that has a module + +For subsequent interfaces, instead: +- (2) take the first device that does not have a configuration yet + (checking only the default name, eg *-id-MAC, BTW how are the + resulting configs named???) and has the same type (eth...) as + <interface/device>. + + +[a]: If there are two devices with the same module, the first will be +picked, even if it has already been configured. That is why (2) exists +to overrule it. Unfortunately in SLES9 SP2, (2) also overrules the +other, unique, (0) selections (bug #119592#c9). +It has been "fixed" in SP3 in a broken way, to apply (2) only if (0) +did not match. This means that specifying two devices by bus ID will +work but specifying two devices with the same module can break (bug +#146965). + +Why not just take what is written in the profile? +------------------------------------------------- + +Currently YaST relies on some data that is obtained from hardware +detection, like the Unique ID from hwinfo. In the future it should be +possible to avoid that. + +Notes +----- + +<foo/bar> denotes the XML element bar that is under foo. Think of +XPath. + +/etc/install.inf contains the parameters passed to YaST by linuxrc, +the text mode bootstrap program. linuxrc gets them from the kernel +command line or by asking the user. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.16/doc/avm.html new/yast2-network-2.18.17/doc/avm.html --- old/yast2-network-2.18.16/doc/avm.html 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-2.18.17/doc/avm.html 2008-01-24 14:41:26.000000000 +0100 @@ -0,0 +1,192 @@ +This is the desctiption of hardware sent to Prague by AVM in November 2004. The +numbers (avm-2000-xxxx) refer to Artikel-Nr. near the barcode on the boxes. + +<h3>dsl-isdn-avm-2000-1619</h3> + +Hwinfo and YaST detect it as ISDN. + +<pre>16: PCI 09.0: 10300 ISDN Adapter + [Created at pci.243] + Unique ID: WL76.sPKw5MDkHpA + SysFS ID: /devices/pci0000:00/0000:00:09.0 + SysFS BusID: 0000:00:09.0 + Hardware Class: isdn adapter + Model: "AVM FRITZ!Card DSL v2.0" + Vendor: pci 0x1244 "AVM Audiovisuelles MKTG & Computer System GmbH" + Device: pci 0x2900 + SubVendor: pci 0x1244 "AVM Audiovisuelles MKTG & Computer System GmbH" + SubDevice: pci 0x2900 + Revision: 0x02 + Driver: "fcdsl2" + Memory Range: 0xf2800000-0xf2bfffff (rw,prefetchable) + Memory Range: 0xf2000000-0xf27fffff (rw,non-prefetchable) + I/O Ports: 0x6c00-0x6c0f (rw) + IRQ: 9 (no events) + Requires: kernel-nongpl, avm_fcdsl, capi4linux, i4l-base, i4l-isdnlog + Driver Info #0: + I4L Type: 8004/3 [AVM FRITZ!Card DSL v2.0] + Config Status: cfg=yes, avail=yes, need=no, active=unknown +</pre> + +<h3>dsl-sl-avm-2000-1611</h3> + +New in YaST: detected as DSL. + +<pre>07: PCI 09.0: 11402 Network controller + [Created at pci.243] + Unique ID: WL76.IDXtufUoD50 + SysFS ID: /devices/pci0000:00/0000:00:09.0 + SysFS BusID: 0000:00:09.0 + Hardware Class: DSL adapter + Model: "AVM FRITZ!Card DSL SL" + Vendor: pci 0x1244 "AVM Audiovisuelles MKTG & Computer System GmbH" + Device: pci 0x2700 "Fritz!Card DSL SL" + SubVendor: pci 0x1244 "AVM Audiovisuelles MKTG & Computer System GmbH" + SubDevice: pci 0x2700 + Revision: 0x02 + Memory Range: 0xf2800000-0xf2bfffff (rw,prefetchable) + Memory Range: 0xf2000000-0xf27fffff (rw,non-prefetchable) + I/O Ports: 0x6c00-0x6c0f (rw) + IRQ: 9 (no events) + Requires: kernel-nongpl, avm_fcdsl, capi4linux, i4l-base + Driver Info #0: + DSL Mode: capiadsl + Driver: fcdslsl + Config Status: cfg=new, avail=yes, need=no, active=unknown +</pre> + +<h3>dsl-usb-avm-2000-1627</h3> +<pre>05: USB 00.0: 0000 Unclassified device + [Created at usb.118] + Unique ID: ADDn.FGWFNUuF0w8 + Parent ID: k4bc.1Z2mRNfvkDF + SysFS ID: /devices/pci0000:00/0000:00:07.2/usb1/1-1/1-1:1.0 + SysFS BusID: 1-1:1.0 + Hardware Class: unknown + Model: "AVM USB DSL Device" + Hotplug: USB + Vendor: usb 0x057c "AVM GmbH" + Device: usb 0x3000 "USB DSL Device" + Revision: "1.04" + Serial ID: "00783501" + Speed: 1.5 Mbps + Config Status: cfg=new, avail=yes, need=no, active=unknown + Attached to: #4 (Hub) +</pre> + +<h3>dsl-usb-avm-2000-1655</h3> +<pre>05: USB 00.0: 11401 DSL Card + [Created at usb.118] + Unique ID: ADDn.Btypm3ougH1 + Parent ID: k4bc.1Z2mRNfvkDF + SysFS ID: /devices/pci0000:00/0000:00:07.2/usb1/1-1/1-1:1.0 + SysFS BusID: 1-1:1.0 + Hardware Class: DSL adapter + Model: "AVM FRITZ!Box" + Hotplug: USB + Vendor: usb 0x057c "AVM GmbH" + Device: usb 0x3702 "USB DSL Device" + Revision: "1.00" + Driver: "usbnet" + Device File: /dev/ttyACM0 + Speed: 1.5 Mbps + Requires: ppp, smpppd + Driver Info #0: + DSL Mode: pppoe + Driver: usbnet + Config Status: cfg=new, avail=yes, need=no, active=unknown + Attached to: #4 (Hub) +</pre> + +<h3>isdn-avm-2000-1332</h3> +<pre>16: PCI 09.0: 10300 ISDN Adapter + [Created at pci.243] + Unique ID: WL76.8twkxmoMQ3C + SysFS ID: /devices/pci0000:00/0000:00:09.0 + SysFS BusID: 0000:00:09.0 + Hardware Class: isdn adapter + Model: "AVM FRITZ!Card PCI" + Vendor: pci 0x1244 "AVM Audiovisuelles MKTG & Computer System GmbH" + Device: pci 0x0a00 "A1 ISDN [Fritz]" + SubVendor: pci 0x1244 "AVM Audiovisuelles MKTG & Computer System GmbH" + SubDevice: pci 0x0a00 "FRITZ!Card ISDN Controller" + Revision: 0x02 + Driver: "fcpci" + Memory Range: 0xf2008000-0xf200801f (rw,non-prefetchable) + I/O Ports: 0x6c00-0x6c1f (rw) + IRQ: 9 (8573 events) + Requires: kernel-nongpl, capi4linux, i4l-base, i4l-isdnlog + Driver Info #0: + I4L Type: 8002/1 [AVM FRITZ!Card PCI] + Driver Info #1: + I4L Type: 27/1 [AVM FRITZ!Card PCI] + Config Status: cfg=yes, avail=yes, need=no, active=unknown +</pre> + +<h3>isdn-avm-2000-1700</h3> +<pre>16: PCI 0a.0: 10300 ISDN Adapter + [Created at pci.243] + Unique ID: bSAa.GGXqL9GEYV1 + SysFS ID: /devices/pci0000:00/0000:00:0a.0 + SysFS BusID: 0000:00:0a.0 + Hardware Class: isdn adapter + Model: "AVM FRITZ!Card PCI v2.0" + Vendor: pci 0x1244 "AVM Audiovisuelles MKTG & Computer System GmbH" + Device: pci 0x0e00 "Fritz!PCI v2.0 ISDN" + SubVendor: pci 0x1244 "AVM Audiovisuelles MKTG & Computer System GmbH" + SubDevice: pci 0x0e00 + Revision: 0x02 + Driver: "fcpci" + Memory Range: 0xf2008000-0xf200801f (rw,non-prefetchable) + I/O Ports: 0x6c00-0x6c1f (rw) + IRQ: 9 (14 events) + Requires: kernel-nongpl, capi4linux, i4l-base, i4l-isdnlog + Driver Info #0: + I4L Type: 8002/2 [AVM FRITZ!Card PCI v2.0] + Driver Info #1: + I4L Type: 1000/0 [AVM FRITZ!Card PCI v2.0] + Config Status: cfg=no, avail=yes, need=no, active=unknown +</pre> + +<h3>isdn-b1-avm-2000-1445</h3> +<pre>16: PCI 09.0: 10300 ISDN Adapter + [Created at pci.243] + Unique ID: WL76.gaD24FG1U99 + SysFS ID: /devices/pci0000:00/0000:00:09.0 + SysFS BusID: 0000:00:09.0 + Hardware Class: isdn adapter + Model: "AVM B1 PCI" + Vendor: pci 0x1244 "AVM Audiovisuelles MKTG & Computer System GmbH" + Device: pci 0x0700 "B1 ISDN" + Revision: 0x01 + Memory Range: 0xf2008000-0xf200803f (rw,non-prefetchable) + I/O Ports: 0x6c00-0x6c3f (rw) + I/O Ports: 0x7000-0x701f (rw) + IRQ: 9 (no events) + Requires: capi4linux, i4l-base, i4l-isdnlog, i4lfirm + Driver Info #0: + I4L Type: 8001/1 [AVM B1 PCI] + Config Status: cfg=no, avail=yes, need=no, active=unknown +</pre> + +<h3>isdn-usb-avm-2000-1590</h3> +<pre>05: USB 00.0: 10300 ISDN Adapter + [Created at usb.118] + Unique ID: ADDn.FC71YnSrDeA + Parent ID: k4bc.1Z2mRNfvkDF + SysFS ID: /devices/pci0000:00/0000:00:07.2/usb1/1-1/1-1:1.0 + SysFS BusID: 1-1:1.0 + Hardware Class: isdn adapter + Model: "AVM FRITZ!X USB v3.0" + Hotplug: USB + Vendor: usb 0x057c "AVM GmbH" + Device: usb 0x2000 "USB ISDN-Connector" + Revision: "3.02" + Speed: 1.5 Mbps + Requires: kernel-nongpl, capi4linux, i4l-base, i4l-isdnlog + Driver Info #0: + I4L Type: 8003/8 [AVM FRITZ!X USB v3.0] + Config Status: cfg=yes, avail=yes, need=no, active=unknown + Attached to: #4 (Hub) +</pre> + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.16/doc/devices.html new/yast2-network-2.18.17/doc/devices.html --- old/yast2-network-2.18.16/doc/devices.html 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-2.18.17/doc/devices.html 2008-01-24 14:41:26.000000000 +0100 @@ -0,0 +1,287 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html><head> +<title>Network Configuration: Devices Overview</title> +</head><body bgcolor=#ffffff> + + + +<a name="top"></a> +<h1>Network Configuration: Devices Overview</h1> +<hr> + +<table border="1" summary="overview"> + <tbody> + + <tr> + <th>Type</th> + <th>Subtype</th> + <th>Device</th> + + <th>PTP</th> + + <th>ISA</th> + <th>PCI</th> + <th>PCMCIA</th> + <th>CardBus</th> + <th>USB</th> + <th>Serial</th> + + <th>Other</th> + </tr> + + <tr> + <td rowspan=13>Network Card</td> + <td><a href="#arc">ARCnet</a></td> + <td>arc</td> + <td></td> + <td>ISA</td> + <td><a href="">#</a></td> + </tr> + <tr> + <td><a href="#dummy">Dummy</a></td> + <td>dummy</td> + </tr> + <tr> + <td><a href="#ci">CLAW</a></td> + <td>ci</td> + </tr> + <tr> + <td><a href="#ctc">CTC</a></td> + <td>ctc</td> + <td>PTP</td> + </tr> + <tr> + <td><a href="#escon">Escon</a></td> + <td>escon</td> + <td>PTP</td> + </tr> + <tr> + <td><a href="#eth">Ethernet</a></td> + <td>eth</td> + <td></td> + <td>ISA</td> + <td><a href="hwinfo/bSAa.+xOL8ZCSAQC">PCI</a></td> + <td><a href="hwinfo/K1pk.IbtCQ++Y3l4">PCMCIA</a></td> + <td><a href="hwinfo/vTuk.IQxIdIhhuH7">CardBus</a></td> + <td><a href="">#</a></td> + </tr> + <tr> + <td><a href="#fddi">FDDI</a></td> + <td>fddi</td> + <td></td> + <td>ISA</td> + <td><a href="">#</a></td> + </tr> + <tr> + <td><a href="#hsi">Hipersockets</a></td> + <td>hsi</td> + </tr> + <tr> + <td><a href="#iucv">IUCV</a></td> + <td>iucv</td> + <td>PTP</td> + </tr> + <tr> + <td><a href="#myri">Myrinet</a></td> + <td>myri</td> + <td></td> + <td></td> + <td><a href="hwinfo/bSAa.wZUhdK_A1p5">PCI</a></td> + </tr> + <tr> + <td><a href="#qeth">QETH</a></td> + <td>qeth</td> + </tr> + <tr> + <td><a href="#tr">Token-Ring</a></td> + <td>tr</td> + <td></td> + <td>ISA</td> + <td><a href="hwinfo/H9CO.Oa5XQ+zHPiE">PCI</a></td> + <td><a href="">#</a></td> + <td><a href="">#</a></td> + <td><a href="">#</a></td> + </tr> + <tr> + <td><a href="#wlan">Wireless</a></td> + <td>wlan</td> + <td></td> + <td></td> + <td><a href="hwinfo/jqQS.CA1y3f8FAiF">PCI</a></td> + <td><a href="">#</a></td> + <td><a href="hwinfo/08s.2pQPFZ9qjED">CardBus</a></td> + <td><a href="">#</a></td> + </tr> + + <tr> + <td rowspan=3><a href="#dialup">Dialup</a></td> + <td>Modem</td> + <td>ppp</td> + <td>PTP</td> + <td>ISA</td> + <td><a href="">#</a></td> + <td><a href="hwinfo/i7s0.gdm40Ifamk7">PCMCIA</a></td> + <td><a href="">#</a></td> + <td><a href="hwinfo/ZLwt.gGqXKNqGK+7">USB</a></td> + <td><a href="hwinfo/i7s0.stlz_5b5o73">Serial</a></td> + </tr> + + <tr> + <td>ISDN Card</td> + <td>ippp</td> + <td>PTP</td> + <td><a href="hwinfo/QQNm.4JPVYg4a1y4">ISA</a></td> + <td><a href="hwinfo/gZD2.gV8_U5wZ+LB">PCI</a></td> + <td><a href="">#</a></td> + <td><a href="">#</a></td> + <td><a href="hwinfo/B3Fu.FC71YnSrDeA">USB</a></td> + <td></td> + <td><a href="hwinfo/WL76.NfNR2ssSbN5">DSL - combo</a></td> + </tr> + + <tr> + <td>DSL</td> + <td>ppp</td> + <td>PTP</td> + <td></td> + <td><a href="hwinfo/WL76.NfNR2ssSbN5">PCI</a></td> + <td></td> + <td></td> + <td><a href="hwinfo/B3Fu.Z4Y2LKD9B2B">USB</a></td> + <td></td> + <td><a href="hwinfo/Phe5.ndpeucax6V12">PPPOE</a></td> + </tr> + + <tr> + <td rowspan=3><a href="#tunnel">Tunnel</a></td> + <td>6-in-4</td> + <td>sit</td> + <td>PTP</td> + </tr> + <tr> + <td>GRE</td> + <td>gre</td> + <td>PTP</td> + </tr> + <tr> + <td>IPIP</td> + <td>ipip</td> + <td>PTP</td> + </tr> + + <tr> + <td rowspan=2><a href="#special">Special</a></td> + <td>Loopback</td> + <td>lo</td> + </tr> + <tr> + <td>VMWare</td> + <td>vmnet</td> + </tr> + + <tr> + <td rowspan=4><a href="#cable">Cable</a></td> + <td rowspan=2>Serial Line</td> + <td>slip</td> + </tr> + <tr> + <td>ppp</td> + </tr> + <tr> + <td>Parallel Line</td> + <td>plip</td> + </tr> + <tr> + <td>USB Network</td> + <td>usb?</td> + </tr> + + <tr> + <td rowspan=7><a href="#wireless">Wireless</a></td> + <td rowspan=3>Infra-Red</td> + <td>irda</td> + </tr> + <tr> + <td>irlan</td> + </tr> + <tr> + <td>ppp</td> + </tr> + <tr> + <td>Bluetooth</td> + <td>bt</td> + <td></td> + <td></td> + <td></td> + <td></td> + <td></td> + <td><a href="hwinfo/B3Fu.FC71YnSrDeA">USB</a></td> + </tr> + + </tbody> +</table> + + + +<h3>Notes:</h3> +<ol> +<li><b>PTP</b> means a <b>Point-to-Point</b> network link +<li>Regular <b>ISA</b> cards can't be detected by hwinfo, so there's no way + to download the hwinfo log. It's only possible for some ISA PnP cards. +<li># means missing hwinfo log +</ol> + + + +<h3>Description:</h3> + +<ul> +<li><a name="arc">ARCnet</a> +/usr/src/linux/Documentation/networking/arcnet.txt +/usr/src/linux/Documentation/networking/arcnet-hardware.txt + +<li><a name="ci">CLAW</a> +<li><a name="ctc">CTC</a> +Channel-To-Channel + +<li><a name="dummy">dummy</a> +/usr/src/linux/drivers/net/dummy.c + +<li><a name="decnet">DecNet</a> +/usr/src/linux/Documentation/networking/decnet.txt + +<li><a name="escon">Escon</a> +Enteprise System CONnector (something like a mixture of SCSI and +Ethernet - its a channel, but can carry network traffic) + +<li><a name="eth">Ethernet</a> +<li><a name="fddi">FDDI</a> +<li><a name="hsi">HSI</a> +Hipersockets + +<li><a name="iucv">IUCV</a> +Inter User Communication Vehicle (means: DMA based network pipe +between Virtual Machine instances (like vmware) on an s390) + +<li><a name="myri">Myrinet</a> +<a href="http://www.myri.com">http://www.myri.com</a> + +<li><a name="plip">PLIP</a> +Parallel Line IP +/usr/src/linux/Documentation/networking/PLIP.txt + +<li><a name="qeth">QETH</a> + +<li><a name="sci">SCI</a> +<a href="http://www.scizzl.com/WhatIsSCI.html">http://www.scizzl.com/WhatIsSCI.html</a> +<a href="http://www.dolphinics.com/sci/index.html">http://www.dolphinics.com/sci/index.html</a> + +<li><a name="tr">Token-Ring</a> +<li><a name="wlan">Wireless</a> +</ul> + + + +</body> +</html> + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.16/doc/Makefile.am new/yast2-network-2.18.17/doc/Makefile.am --- old/yast2-network-2.18.16/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-2.18.17/doc/Makefile.am 2008-01-24 14:41:26.000000000 +0100 @@ -0,0 +1,28 @@ +# +# Makefile.am for y2c_network/doc +# + +SUBDIRS = autodocs # files hwinfo + +htmldir = $(docdir) + +doc_DATA = autoinst +html_DATA = todo.html $(wildcard *.html) + +todo.html: Todo.txt + @( \ + grep -B100 '##BODY##' skel.html; \ + echo -e "\n<pre>\n"; \ + cat Todo.txt; \ + echo -e "\n</pre>\n"; \ + grep -A100 '##BODY##' skel.html; \ + ) \ + | sed 's|##TITLE##|Things To Do|g' \ + | sed 's|^#\+$$|<hr>|g' \ + | sed 's|^#\+ $[[:alnum:],:)( -]*$#\+$$||g' \ + | sed 's|^$[[:alnum:],:)( -]*:$$$|<h2>\1</h2>|g' \ + | sed 's|#$[0-9]\{4,5\}$|<a href="http://bugzilla.suse.de/show_bug.cgi?id=\1">#\1</a>|g' \ + > todo.html + +CLEANFILES = todo.html +EXTRA_DIST = Todo.txt $(doc_DATA) $(html_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.16/doc/skel.html new/yast2-network-2.18.17/doc/skel.html --- old/yast2-network-2.18.16/doc/skel.html 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-2.18.17/doc/skel.html 2008-01-24 14:41:26.000000000 +0100 @@ -0,0 +1,14 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html><head> +<title>Network Configuration: ##TITLE##</title> +</head><body bgcolor=#ffffff> + + + +<a name="top"><p> +<h1>Network Configuration: ##TITLE##</h1> +<hr> + + + +</body></html> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.16/doc/todo.html new/yast2-network-2.18.17/doc/todo.html --- old/yast2-network-2.18.16/doc/todo.html 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-2.18.17/doc/todo.html 2008-06-02 09:16:08.000000000 +0200 @@ -0,0 +1,254 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html><head> +<title>Network Configuration: Things To Do</title> +</head><body bgcolor=#ffffff> + + + +<a name="top"><p> +<h1>Network Configuration: Things To Do</h1> +<hr> + + + +<pre> + +# $Id: Todo.txt 18259 2004-07-28 09:54:08Z msvec $ + +<hr> + + +<h2>Bugs:</h2> +- KInternet: better helptext (configured + kinternet, cinternet) +- ISDN cleanup (adapt to new sources, better sysconfig) [ISDN] + +<a href="http://bugzilla.suse.de/show_bug.cgi?id=35935">#35935</a> nor yast2 asks for internet test although network config skipped +<a href="http://bugzilla.suse.de/show_bug.cgi?id=37864">#37864</a> nor kinternet not started after dsl config + +- name resolving doesn't work without /etc/resolv.conf (ResolveIP, ag_hostnames) + +- cleanup ifcfg and hwcfg naming +- cleanup NetworkModules +- fix (or delete) all FIXMEs + +<h2>in-progress:</h2> +- [snwint] ifcfg-usb-usb: detected devices (manual adding done, detected missing) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=22739">#22739</a>) +- [zoz] routing: restart only routing (<a href="http://bugzilla.suse.de/show_bug.cgi?id=33025">#33025</a>) + +<hr> + + +<h2>Small Features:</h2> +- host: add (update) all hosts in the local network +- host: scan for hosts on the local network [Add] +- host: show system hosts checkbox (like users have) +- modem: check existence of the modem device in ModemDialog +- routing: summary: print other routes in nice form +- package: include all agents (ag_xauth, ag_resolver, ag_hostnames, ...) +- routing: DHCLIENT_SET_DEFAULT_ROUTE (similar to RESOLV_CONF, HOSTNAME) + +<h2>Large Features:</h2> +- lan: new UI (<a href="http://bugzilla.suse.de/show_bug.cgi?id=29721">#29721</a>, see also <a href="http://bugzilla.suse.de/show_bug.cgi?id=33801">#33801</a>) [sigi] +- proxy: use immediately (<a href="http://bugzilla.suse.de/show_bug.cgi?id=23728">#23728</a>), enhance other programs +- new: IPv6 support (tunnels) +- lan: check IPv6 support is really functional (all fields) +- new: cable connection (slip, plip, ppp, usb) +- hardware: wireless connection (irda, bluetooth) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=35747">#35747</a>) +- support custom provider from INS file (<a href="http://bugzilla.suse.de/show_bug.cgi?id=25774">#25774</a>) +- lan: install required packages: dhcpcd|sysconfig|hotplug|wireless-tools (only if needed, before Write?) +- dialup: don't always ask for the mail config (<a href="http://bugzilla.suse.de/show_bug.cgi?id=31472">#31472</a>) +- lan: ask for the mail config? +- lan: allow configuring a net interface without an IP address (<a href="http://bugzilla.suse.de/show_bug.cgi?id=33801">#33801</a>) +- routing: other fields (see routes(5)) +- modem: speaker volume as combo (or better as slider) +- not only lan: temporary interface disable (<a href="http://bugzilla.suse.de/show_bug.cgi?id=24926">#24926</a>) +- lan: myrinet: check for driver presence [warning + info] + +<hr> + + +- lan: netcards without a driver (what to do on s390?, warn?) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=29296">#29296</a>) +- lan: compiled in kernel drivers (#???) + offer them besides modularized drivers? src/lan/cards.ycp? + +<h2>Improvements:</h2> +- dns: two resolv.conf scrconfs (resolv.conf.saved.by.dhcpcd, <a href="http://bugzilla.suse.de/show_bug.cgi?id=38834">#38834</a>) XXX? +- lan: check link presence (see sysconfig.rpm how is it done, or was it RH?) +- routing: check already present default route (partially <a href="http://bugzilla.suse.de/show_bug.cgi?id=11132">#11132</a>c26) +- routines: check for yast2-mail presence +- provider: offer to delete provider after device delete if not used (<a href="http://bugzilla.suse.de/show_bug.cgi?id=16094">#16094</a>) +- provider: delete default route if removed (<a href="http://bugzilla.suse.de/show_bug.cgi?id=10739">#10739</a>) +- lan: warn before the network restart (<a href="http://bugzilla.suse.de/show_bug.cgi?id=27137">#27137</a>, <a href="http://bugzilla.suse.de/show_bug.cgi?id=19851">#19851</a>) [WARN] +- lan: yp configuration failed (<a href="http://bugzilla.suse.de/show_bug.cgi?id=25506">#25506</a>) + ask if network should be restarted +- dns: better "DNS and Hostname" and "Hosts" titles (<a href="http://bugzilla.suse.de/show_bug.cgi?id=29722">#29722</a>) +- dns: better message for broken fields (eg. domain) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=22802">#22802</a>) +- lan: ssh installation (install.inf format) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=24836">#24836</a>) + duplicate Alias lines; maybe not necessary, review <a href="http://bugzilla.suse.de/show_bug.cgi?id=22444">#22444</a> +- dialup: mail question only if new device was added + yast ui config XXX? + +<h2>Enhancements:</h2> +- detection (netprobe, dhcpcd) <a href="http://bugzilla.suse.de/show_bug.cgi?id=15489">#15489</a> (see also <a href="http://bugzilla.suse.de/show_bug.cgi?id=7287">#7287</a>, <a href="http://bugzilla.suse.de/show_bug.cgi?id=13200">#13200</a>, <a href="http://bugzilla.suse.de/show_bug.cgi?id=9951">#9951</a>) + <a href="http://bugzilla.suse.de/show_bug.cgi?id=7287">#7287</a>, <a href="http://bugzilla.suse.de/show_bug.cgi?id=13200">#13200</a> are dups of <a href="http://bugzilla.suse.de/show_bug.cgi?id=16471">#16471</a>: take info from linuxrc +- modem: pap|chap secrets writing (isdn may do it already), not sure if it's useful +- providers: no-global-values (ini-agent parameter, ease of use: flat(<a href="http://bugzilla.suse.de/show_bug.cgi?id=21867">#21867</a>)?) +- providers: -> HWDB-NG +- all: edit without restart (reload) +- device: use map instead of variables (-> fill all variables) +- package: require yast2-language, yast2-mail, ... (maybe do that at runtime) +- feature: IP-masquerading (<a href="http://bugzilla.suse.de/show_bug.cgi?id=16131">#16131</a>), is already in the firewall +- routing: default route without GW (<a href="http://bugzilla.suse.de/show_bug.cgi?id=23977">#23977</a>) +- dsl: flat rate (<a href="http://bugzilla.suse.de/show_bug.cgi?id=27840">#27840</a>) +- improve modules.conf options merging (maybe obsolete with 2.6) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=29995">#29995</a>) +- make DHCP options iface-local (questionable) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=30476">#30476</a>) +- edit dsl HW goes through provider again (default provider?) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=24000">#24000</a>) +- allow to change the netcard type (for a broken detection) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=30890">#30890</a>) +- skip detect check box (general yast2 feature) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=31478">#31478</a>) +- installation: better network configuration (inst_netcfg, create_interfaces) +- host: drop oldhostentry file +- host: better deleted hostnames handling + +<hr> + + +<h2>New in Bugzilla:</h2> + +<a href="http://bugzilla.suse.de/show_bug.cgi?id=33071">#33071</a> enh provide a per interface routing configuration +<a href="http://bugzilla.suse.de/show_bug.cgi?id=33649">#33649</a> cri yast2 ISDN module always activates personal firewall +<a href="http://bugzilla.suse.de/show_bug.cgi?id=34626">#34626</a> enh Allow giving a net interface an arbitrary name +<a href="http://bugzilla.suse.de/show_bug.cgi?id=35221">#35221</a> nor LATER Better behavior with multiple dhcp clients +<a href="http://bugzilla.suse.de/show_bug.cgi?id=35638">#35638</a> min On Abort, ask only if there have been any changes +<a href="http://bugzilla.suse.de/show_bug.cgi?id=35671">#35671</a> min Yast2 deletes hostname aliases, if more than one are present +<a href="http://bugzilla.suse.de/show_bug.cgi?id=35955">#35955</a> min LATER Obsolete NETWORK, BROADCAST, NETMASK, UNIQUE in ifcfg +<a href="http://bugzilla.suse.de/show_bug.cgi?id=37520">#37520</a> enh LATER Let user identify ifcfg by MAC, bus id, vpid... +<a href="http://bugzilla.suse.de/show_bug.cgi?id=38213">#38213</a> min YaST network forgets configuration name proposal +<a href="http://bugzilla.suse.de/show_bug.cgi?id=38031">#38031</a> nor Changing network environment causes resolver problems +<a href="http://bugzilla.suse.de/show_bug.cgi?id=38135">#38135</a> min after deleting the only configured modem, yast2-mail is run +<a href="http://bugzilla.suse.de/show_bug.cgi?id=38746">#38746</a> nor dsl config is not working with two network cards +<a href="http://bugzilla.suse.de/show_bug.cgi?id=39027">#39027</a> min LATER "Back" button is interpreted as "Abort" +<a href="http://bugzilla.suse.de/show_bug.cgi?id=40012">#40012</a> enh LATER Allow editing the whole resolver search list +<a href="http://bugzilla.suse.de/show_bug.cgi?id=40254">#40254</a> nor LATER Allow choosing the encoding for passwords +<a href="http://bugzilla.suse.de/show_bug.cgi?id=40458">#40458</a> nor LATER Improve VNC Remote Administration +<a href="http://bugzilla.suse.de/show_bug.cgi?id=40861">#40861</a> enh LATER Add "Test connection" button to proxy etc. config +<a href="http://bugzilla.suse.de/show_bug.cgi?id=41204">#41204</a> enh LATER unconnected network card is assumed to be connected + +<hr> + + +<h2>Documentation:</h2> +- example dhcpcd-eth0.info +- example intstall.inf's +- Net-HOWTO link +- s390 devices (see bellow, also from mails) +- overall device overview (see bellow, also required data like IP, RI, NM) +- UIMODE: link to autodocs +- doc: adding network device mini-howto: grep for "escon" for example +- doc: include public_html/network, dia, ... + +<h2>New device type:</h2> +- lan/cards.ycp add type cards (at least one entry) +- lan/hardware.ycp update "device_types" list +- modules/NetworkDevices.ycp update "netcard" list +- routines/complex.ycp add "device_name" to CheckEmptyName +- routines/hardware.ycp update ControllerType (detection) +- routines/summary.ycp add "device_type" to DeviceType + +<h2>Debug (bugzilla):</h2> +- 'hwinfo --all --log hwinfo.log' +- /etc/sysconfig/hardware/hwcfg-* +- /etc/sysconfig/network/ifcfg-* +- /etc/sysconfig/network/ifroute-* +- /var/lib/YaST2/install.inf +- /var/log/YaST2/y2log* + +- /etc/sysconfig/network/providers/* [dialup problems] + +- /etc/sysconfig/network/config +- /etc/sysconfig/network/dhcp +- /etc/sysconfig/network/routes + +- /etc/resolv.conf [DNS problems] + +- /etc/modprobe.conf +- /etc/modprobe.conf.local +- /etc/modprobe.d/* + +- 'ip a' +- /var/log/messages + +<hr> + + +<h2>ISDN:</h2> +- code cleanup (use yast2-network structure: Provider, devices, ...) +- UI cleanup (http://w3.suse.de/~sigi/yast2/modules/isdn/81isdn/isdn81_improvement_it01.h…) +- isdn: start mail after config (<a href="http://bugzilla.suse.de/show_bug.cgi?id=18256">#18256</a>) + +<h2>WARN:</h2> +- <a href="http://bugzilla.suse.de/show_bug.cgi?id=19851">#19851</a>, <a href="http://bugzilla.suse.de/show_bug.cgi?id=27137">#27137</a> +- warn before rcnetwork restart -> RestartNetwork() || StopNetwork(); +- see routines/runtime.ycp:RunningLocal() + +<hr> + + +<h2>TO-SORT:</h2> + +- all: use rcnetwork reload (but probably only in some cases, things like + remove 2 eth cards and add them in a different order won't work due to + the kernel modules not being unloaded) + * "rcnetwork reload" (if DeletedModules\!=[] "restart") + +- routines: -> FIREWALL=yes|no to each ifcfg-XXX <a href="http://bugzilla.suse.de/show_bug.cgi?id=18840">#18840</a> (support for modems) + +<hr> + + +<h2>DOC:</h2> +- doc: dummy: IP/NM/BC +- doc: irlan: IP/NM/BC (eth?) +- doc: irnet: IP/RI (?) +- doc: plip: IP/RI (Parallel Line IP) +- doc: slip: IP/RI (Serial Line IP, obsoleted by PPP) +- doc: ppp: IP/RI (Serial Point-To-Point protocol) + +<h2>UI proposal:</h2> +- detected +- choose your card (current list) +- hw params only (current manual) + +<h2>Hardware:</h2> +- usb: network cabel, ethernet card, TR card, ISDN card, modem +- pcmcia: ethernet card, TR card, ISDN card, modem +- wireless network cards +- fddi card + +- make device optional in routes agent +- DefaultDevice(ip) + check all PPP connections (REMOTEIP) + other devices + - take IP + - if(network(IP) == network(ip)) return x; +- compare with old lan +- where is this used? + +<h2>Modules:</h2> +- see the "*ISDN*" paper + +MODULES=$[]; -> Lan.ycp +DELETED=[]; -> Lan.ycp +ReadModules(); -> M +WriteModules(); <- D,M +Select: C,M -> global vars +AddEdit: global vars -> C,M +Delete: global vars -> C,M,D + +<hr> + + +</pre> + + + +</body></html> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.16/doc/Todo.txt new/yast2-network-2.18.17/doc/Todo.txt --- old/yast2-network-2.18.16/doc/Todo.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-2.18.17/doc/Todo.txt 2008-01-24 14:41:26.000000000 +0100 @@ -0,0 +1,233 @@ +# $Id: Todo.txt 18259 2004-07-28 09:54:08Z msvec $ + +############################################################################## +##### Bugs ##### + +Bugs: +- KInternet: better helptext (configured + kinternet, cinternet) +- ISDN cleanup (adapt to new sources, better sysconfig) [ISDN] + +#35935 nor yast2 asks for internet test although network config skipped +#37864 nor kinternet not started after dsl config + +- name resolving doesn't work without /etc/resolv.conf (ResolveIP, ag_hostnames) + +- cleanup ifcfg and hwcfg naming +- cleanup NetworkModules +- fix (or delete) all FIXMEs + +in-progress: +- [snwint] ifcfg-usb-usb: detected devices (manual adding done, detected missing) (#22739) +- [zoz] routing: restart only routing (#33025) + +############################################################################## +##### Features ##### + +Small Features: +- host: add (update) all hosts in the local network +- host: scan for hosts on the local network [Add] +- host: show system hosts checkbox (like users have) +- modem: check existence of the modem device in ModemDialog +- routing: summary: print other routes in nice form +- package: include all agents (ag_xauth, ag_resolver, ag_hostnames, ...) +- routing: DHCLIENT_SET_DEFAULT_ROUTE (similar to RESOLV_CONF, HOSTNAME) + +Large Features: +- lan: new UI (#29721, see also #33801) [sigi] +- proxy: use immediately (#23728), enhance other programs +- new: IPv6 support (tunnels) +- lan: check IPv6 support is really functional (all fields) +- new: cable connection (slip, plip, ppp, usb) +- hardware: wireless connection (irda, bluetooth) (#35747) +- support custom provider from INS file (#25774) +- lan: install required packages: dhcpcd|sysconfig|hotplug|wireless-tools (only if needed, before Write?) +- dialup: don't always ask for the mail config (#31472) +- lan: ask for the mail config? +- lan: allow configuring a net interface without an IP address (#33801) +- routing: other fields (see routes(5)) +- modem: speaker volume as combo (or better as slider) +- not only lan: temporary interface disable (#24926) +- lan: myrinet: check for driver presence [warning + info] + +############################################################################## +##### Old Stuff ##### + +- lan: netcards without a driver (what to do on s390?, warn?) (#29296) +- lan: compiled in kernel drivers (#???) + offer them besides modularized drivers? src/lan/cards.ycp? + +Improvements: +- dns: two resolv.conf scrconfs (resolv.conf.saved.by.dhcpcd, #38834) XXX? +- lan: check link presence (see sysconfig.rpm how is it done, or was it RH?) +- routing: check already present default route (partially #11132c26) +- routines: check for yast2-mail presence +- provider: offer to delete provider after device delete if not used (#16094) +- provider: delete default route if removed (#10739) +- lan: warn before the network restart (#27137, #19851) [WARN] +- lan: yp configuration failed (#25506) + ask if network should be restarted +- dns: better "DNS and Hostname" and "Hosts" titles (#29722) +- dns: better message for broken fields (eg. domain) (#22802) +- lan: ssh installation (install.inf format) (#24836) + duplicate Alias lines; maybe not necessary, review #22444 +- dialup: mail question only if new device was added + yast ui config XXX? + +Enhancements: +- detection (netprobe, dhcpcd) #15489 (see also #7287, #13200, #9951) + #7287, #13200 are dups of #16471: take info from linuxrc +- modem: pap|chap secrets writing (isdn may do it already), not sure if it's useful +- providers: no-global-values (ini-agent parameter, ease of use: flat(#21867)?) +- providers: -> HWDB-NG +- all: edit without restart (reload) +- device: use map instead of variables (-> fill all variables) +- package: require yast2-language, yast2-mail, ... (maybe do that at runtime) +- feature: IP-masquerading (#16131), is already in the firewall +- routing: default route without GW (#23977) +- dsl: flat rate (#27840) +- improve modules.conf options merging (maybe obsolete with 2.6) (#29995) +- make DHCP options iface-local (questionable) (#30476) +- edit dsl HW goes through provider again (default provider?) (#24000) +- allow to change the netcard type (for a broken detection) (#30890) +- skip detect check box (general yast2 feature) (#31478) +- installation: better network configuration (inst_netcfg, create_interfaces) +- host: drop oldhostentry file +- host: better deleted hostnames handling + +############################################################################## +##### New Bugs ##### + +New in Bugzilla: + +#33071 enh provide a per interface routing configuration +#33649 cri yast2 ISDN module always activates personal firewall +#34626 enh Allow giving a net interface an arbitrary name +#35221 nor LATER Better behavior with multiple dhcp clients +#35638 min On Abort, ask only if there have been any changes +#35671 min Yast2 deletes hostname aliases, if more than one are present +#35955 min LATER Obsolete NETWORK, BROADCAST, NETMASK, UNIQUE in ifcfg +#37520 enh LATER Let user identify ifcfg by MAC, bus id, vpid... +#38213 min YaST network forgets configuration name proposal +#38031 nor Changing network environment causes resolver problems +#38135 min after deleting the only configured modem, yast2-mail is run +#38746 nor dsl config is not working with two network cards +#39027 min LATER "Back" button is interpreted as "Abort" +#40012 enh LATER Allow editing the whole resolver search list +#40254 nor LATER Allow choosing the encoding for passwords +#40458 nor LATER Improve VNC Remote Administration +#40861 enh LATER Add "Test connection" button to proxy etc. config +#41204 enh LATER unconnected network card is assumed to be connected + +############################################################################## +##### Documentation ##### + +Documentation: +- example dhcpcd-eth0.info +- example intstall.inf's +- Net-HOWTO link +- s390 devices (see bellow, also from mails) +- overall device overview (see bellow, also required data like IP, RI, NM) +- UIMODE: link to autodocs +- doc: adding network device mini-howto: grep for "escon" for example +- doc: include public_html/network, dia, ... + +New device type: +- lan/cards.ycp add type cards (at least one entry) +- lan/hardware.ycp update "device_types" list +- modules/NetworkDevices.ycp update "netcard" list +- routines/complex.ycp add "device_name" to CheckEmptyName +- routines/hardware.ycp update ControllerType (detection) +- routines/summary.ycp add "device_type" to DeviceType + +Debug (bugzilla): +- 'hwinfo --all --log hwinfo.log' +- /etc/sysconfig/hardware/hwcfg-* +- /etc/sysconfig/network/ifcfg-* +- /etc/sysconfig/network/ifroute-* +- /var/lib/YaST2/install.inf +- /var/log/YaST2/y2log* + +- /etc/sysconfig/network/providers/* [dialup problems] + +- /etc/sysconfig/network/config +- /etc/sysconfig/network/dhcp +- /etc/sysconfig/network/routes + +- /etc/resolv.conf [DNS problems] + +- /etc/modprobe.conf +- /etc/modprobe.conf.local +- /etc/modprobe.d/* + +- 'ip a' +- /var/log/messages + +############################################################################## +##### Details for some of the above ##### + +ISDN: +- code cleanup (use yast2-network structure: Provider, devices, ...) +- UI cleanup (http://w3.suse.de/~sigi/yast2/modules/isdn/81isdn/isdn81_improvement_it01.h…) +- isdn: start mail after config (#18256) + +WARN: +- #19851, #27137 +- warn before rcnetwork restart -> RestartNetwork() || StopNetwork(); +- see routines/runtime.ycp:RunningLocal() + +############################################################################## +##### Ancient Stuff ##### + +TO-SORT: + +- all: use rcnetwork reload (but probably only in some cases, things like + remove 2 eth cards and add them in a different order won't work due to + the kernel modules not being unloaded) + * "rcnetwork reload" (if DeletedModules\!=[] "restart") + +- routines: -> FIREWALL=yes|no to each ifcfg-XXX #18840 (support for modems) + +############################################################################## +##### Some details, other stuff, old ##### + +DOC: +- doc: dummy: IP/NM/BC +- doc: irlan: IP/NM/BC (eth?) +- doc: irnet: IP/RI (?) +- doc: plip: IP/RI (Parallel Line IP) +- doc: slip: IP/RI (Serial Line IP, obsoleted by PPP) +- doc: ppp: IP/RI (Serial Point-To-Point protocol) + +UI proposal: +- detected +- choose your card (current list) +- hw params only (current manual) + +Hardware: +- usb: network cabel, ethernet card, TR card, ISDN card, modem +- pcmcia: ethernet card, TR card, ISDN card, modem +- wireless network cards +- fddi card + +- make device optional in routes agent +- DefaultDevice(ip) + check all PPP connections (REMOTEIP) + other devices + - take IP + - if(network(IP) == network(ip)) return x; +- compare with old lan +- where is this used? + +Modules: +- see the "*ISDN*" paper + +MODULES=$[]; -> Lan.ycp +DELETED=[]; -> Lan.ycp +ReadModules(); -> M +WriteModules(); <- D,M +Select: C,M -> global vars +AddEdit: global vars -> C,M +Delete: global vars -> C,M,D + +############################################################################## +##### EOF :-) #### diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.16/src/lan/address.ycp new/yast2-network-2.18.17/src/lan/address.ycp --- old/yast2-network-2.18.16/src/lan/address.ycp 2009-02-20 15:11:11.000000000 +0100 +++ new/yast2-network-2.18.17/src/lan/address.ycp 2009-03-09 15:00:38.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Network card adresss configuration dialogs * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: address.ycp 55603 2009-02-18 17:08:21Z mzugec $ + * $Id: address.ycp 56016 2009-03-09 14:00:37Z mzugec $ */ { @@ -122,14 +122,16 @@ */ void InitVLANSlave(string key) { - settings["ETHERDEVICE"] = NetworkInterfaces::Current["ETHERDEVICE"]:""; + settings["ETHERDEVICE"] = NetworkInterfaces::Current["ETHERDEVICE"]:""; - list items = createUnconfigured([settings["ETHERDEVICE"]:""]); - - foreach (string dev_name, NetworkInterfaces::List("br|bond"), { - items = add(items, `item(`id(dev_name), dev_name, - (dev_name==settings["ETHERDEVICE"]:"")?true:false)); - }); + list items = []; + map <string, any> configurations = NetworkInterfaces::FilterDevices("netcard"); + foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { + foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), { + if (contains(["vlan", "bond", "br"], NetworkInterfaces::GetType(devname))) continue; + items = add (items, `item(`id(devname), sformat("%1 - %2", devname, configurations[devtype, devname, "NAME"]:""), settings["ETHERDEVICE"]:""==devname) ); + }); + }); UI::ChangeWidget(`id(key), `Items, items); } @@ -205,7 +207,7 @@ * @param key id of the widget */ void initBootProto (string key) { - if (contains(["vlan", "br"], LanItems::type)) UI::ReplaceWidget(`rp, `Empty()); + if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty()); switch(settings["BOOTPROTO"]:""){ case "static": UI::ChangeWidget(`id(`bootproto), `CurrentButton, `static); UI::ChangeWidget(`id(`ipaddr), `Value, settings["IPADDR"]:""); @@ -818,29 +820,19 @@ "IFCFGTYPE", `HSpacing(1.5), `MinWidth(30, "IFCFGID"), - `HSpacing(0.5) + `HSpacing(0.5), + LanItems::type=="vlan" ? `VBox("ETHERDEVICE") : `Empty() ); if(LanItems::operation != `add) { if(LanItems::alias == "") { settings["IFCFG"] = LanItems::device; } else { -// settings["IFCFG"] = NetworkInterfaces::alias_name(NetworkInterfaces::RealType(LanItems::type, LanItems::hotplug), LanItems::device, LanItems::alias); settings["IFCFG"] = LanItems::device; } } list<string> mb_items = []; -// if (!NetworkService::IsManaged()) mb_items = add(mb_items, "ADDITIONAL_ADDRESSES"); - - // Allow changing s390 options, except for iucv, where the option - // is in the name of the hwcfg file. Haven't figured it out yet. -/* - if (Arch::s390 () && drvtype != "iucv") - { - mb_items = add(mb_items, "S390"); - } -*/ wd["ADVANCED_MB", "items"] = maplist (string btn, mb_items, { // TODO helps return [btn, wd[btn, "label"]:btn]; @@ -913,17 +905,6 @@ frame2 ); } - else if (LanItems::type == "vlan") - { - settings["STARTMODE"] = "onboot"; - address_contents = `VBox( - `Left(label), - `Left( `VBox("ETHERDEVICE")), - just_address_contents, - "AD_ADDRESSES", - frame2 - ); - } else if (LanItems::type == "br") { address_contents = `VBox( diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.18.16/VERSION new/yast2-network-2.18.17/VERSION --- old/yast2-network-2.18.16/VERSION 2009-03-05 14:27:17.000000000 +0100 +++ new/yast2-network-2.18.17/VERSION 2009-03-09 14:58:07.000000000 +0100 @@ -1 +1 @@ -2.18.16 +2.18.17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-mail for openSUSE:Factory
by root＠Hilbert.suse.de 09 Mar '09

09 Mar '09

Hello community, here is the log from the commit of package yast2-mail for openSUSE:Factory checked in at Tue Mar 10 00:01:50 CET 2009. -------- --- yast2-mail/yast2-mail.changes 2009-01-25 19:22:36.000000000 +0100 +++ yast2-mail/yast2-mail.changes 2009-03-09 22:22:32.105710000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 9 22:15:36 CET 2009 - varkoly(a)suse.de + +- bnc#483639 - yast2 mail server's master.cf parser do not writes some lines + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-mail.spec ++++++ --- /var/tmp/diff_new_pack.l17814/_old 2009-03-09 23:57:31.000000000 +0100 +++ /var/tmp/diff_new_pack.l17814/_new 2009-03-09 23:57:31.000000000 +0100 @@ -20,7 +20,7 @@ Name: yast2-mail Version: 2.17.4 -Release: 7 +Release: 9 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -171,6 +171,8 @@ %dir /usr/share/YaST2/clients /usr/share/YaST2/clients/users* %changelog +* Mon Mar 09 2009 varkoly(a)suse.de +- bnc#483639 - yast2 mail server's master.cf parser do not writes some lines * Sun Jan 25 2009 varkoly(a)suse.de - saslauthd and cyrus must be started and enabled by YaPI - Serial of SOA Record must not be greater then 4294967295 ++++++ yast2-mail-2.17.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.17.4/agents/MasterCFParser.pm new/yast2-mail-2.17.4/agents/MasterCFParser.pm --- old/yast2-mail-2.17.4/agents/MasterCFParser.pm 2009-01-08 13:15:58.000000000 +0100 +++ new/yast2-mail-2.17.4/agents/MasterCFParser.pm 2009-03-09 22:02:41.000000000 +0100 @@ -425,7 +425,9 @@ if( defined $srv->{comment} ) { $line = $srv->{comment}; } - elsif( defined $srv->{service} && $srv->{type} && $srv->{private} && $srv->{unpriv} && $srv->{chroot} && $srv->{wakeup} && $srv->{maxproc} && $srv->{command} ) + elsif( defined $srv->{service} && defined $srv->{type} && defined $srv->{private} && + defined $srv->{unpriv} && defined $srv->{chroot} && defined $srv->{wakeup} && + defined $srv->{maxproc} && defined $srv->{command} ) { $line = sprintf("%-8s %-5s %-6s %-7s %-7s %-8s %-7s %s", ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-iscsi-server for openSUSE:Factory
by root＠Hilbert.suse.de 09 Mar '09

09 Mar '09

Hello community, here is the log from the commit of package yast2-iscsi-server for openSUSE:Factory checked in at Mon Mar 9 23:57:24 CET 2009. -------- --- yast2-iscsi-server/yast2-iscsi-server.changes 2009-01-26 14:58:29.000000000 +0100 +++ yast2-iscsi-server/yast2-iscsi-server.changes 2009-03-09 15:53:47.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Mar 9 15:42:14 CET 2009 - mzugec(a)suse.cz + +- correctly work with firewall (bnc#462006) +- 2.18.2 + +------------------------------------------------------------------- +Tue Mar 3 13:18:40 CET 2009 - mzugec(a)suse.cz + +- handle exceptions - thanks to ajohansson(a)novell.com (bnc#481379) +- 2.18.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-iscsi-server-2.18.0.tar.bz2 New: ---- yast2-iscsi-server-2.18.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-server.spec ++++++ --- /var/tmp/diff_new_pack.SC7688/_old 2009-03-09 23:56:15.000000000 +0100 +++ /var/tmp/diff_new_pack.SC7688/_new 2009-03-09 23:56:15.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-iscsi-server (Version 2.18.0) +# spec file for package yast2-iscsi-server (Version 2.18.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-iscsi-server -Version: 2.18.0 +Version: 2.18.2 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-server-2.18.0.tar.bz2 +Source0: yast2-iscsi-server-2.18.2.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite # network needs Wizard::OpenCancelOKDialog() @@ -39,7 +39,7 @@ %prep -%setup -n yast2-iscsi-server-2.18.0 +%setup -n yast2-iscsi-server-2.18.2 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +73,12 @@ /usr/share/YaST2/scrconf/ietd.scr %doc %{prefix}/share/doc/packages/yast2-iscsi-server %changelog +* Mon Mar 09 2009 mzugec(a)suse.cz +- correctly work with firewall (bnc#462006) +- 2.18.2 +* Tue Mar 03 2009 mzugec(a)suse.cz +- handle exceptions - thanks to ajohansson(a)novell.com (bnc#481379) +- 2.18.1 * Mon Jan 26 2009 mzugec(a)suse.cz - button labeling (bnc#440542) - 2.18.0 ++++++ yast2-iscsi-server-2.18.0.tar.bz2 -> yast2-iscsi-server-2.18.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.18.0/configure new/yast2-iscsi-server-2.18.2/configure --- old/yast2-iscsi-server-2.18.0/configure 2009-01-26 14:49:46.000000000 +0100 +++ new/yast2-iscsi-server-2.18.2/configure 2009-03-09 15:34:38.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-iscsi-server 2.17.4. +# Generated by GNU Autoconf 2.63 for yast2-iscsi-server 2.18.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-iscsi-server' PACKAGE_TARNAME='yast2-iscsi-server' -PACKAGE_VERSION='2.17.4' -PACKAGE_STRING='yast2-iscsi-server 2.17.4' +PACKAGE_VERSION='2.18.1' +PACKAGE_STRING='yast2-iscsi-server 2.18.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,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-iscsi-server 2.17.4 to adapt to many kinds of systems. +\`configure' configures yast2-iscsi-server 2.18.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1346,7 +1346,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-iscsi-server 2.17.4:";; + short | recursive ) echo "Configuration of yast2-iscsi-server 2.18.1:";; esac cat <<\_ACEOF @@ -1426,7 +1426,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-iscsi-server configure 2.17.4 +yast2-iscsi-server configure 2.18.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1440,7 +1440,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-iscsi-server $as_me 2.17.4, which was +It was created by yast2-iscsi-server $as_me 2.18.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2287,7 +2287,7 @@ # Define the identity of the package. PACKAGE='yast2-iscsi-server' - VERSION='2.17.4' + VERSION='2.18.1' cat >>confdefs.h <<_ACEOF @@ -2511,7 +2511,7 @@ -VERSION="2.17.4" +VERSION="2.18.1" RPMNAME="yast2-iscsi-server" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -3452,7 +3452,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-iscsi-server $as_me 2.17.4, which was +This file was extended by yast2-iscsi-server $as_me 2.18.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3502,7 +3502,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-iscsi-server config.status 2.17.4 +yast2-iscsi-server config.status 2.18.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.18.0/configure.in new/yast2-iscsi-server-2.18.2/configure.in --- old/yast2-iscsi-server-2.18.0/configure.in 2009-01-26 14:49:38.000000000 +0100 +++ new/yast2-iscsi-server-2.18.2/configure.in 2009-03-09 15:34:30.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-iscsi-server, 2.17.4, http://bugs.opensuse.org/, yast2-iscsi-server) +AC_INIT(yast2-iscsi-server, 2.18.1, http://bugs.opensuse.org/, yast2-iscsi-server) 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.4" +VERSION="2.18.1" RPMNAME="yast2-iscsi-server" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.18.0/src/dialogs.ycp new/yast2-iscsi-server-2.18.2/src/dialogs.ycp --- old/yast2-iscsi-server-2.18.0/src/dialogs.ycp 2009-01-26 14:53:10.000000000 +0100 +++ new/yast2-iscsi-server-2.18.2/src/dialogs.ycp 2009-03-09 15:43:10.000000000 +0100 @@ -11,7 +11,7 @@ * Summary: Dialogs definitions * Authors: Michal Zugec <mzugec(a)suse.cz> * - * $Id: dialogs.ycp 55023 2009-01-26 13:53:10Z mzugec $ + * $Id: dialogs.ycp 56021 2009-03-09 14:43:09Z mzugec $ */ { @@ -171,7 +171,7 @@ // firewall "firewall" : CWMFirewallInterfaces::CreateOpenFirewallWidget ($[ - "services" : [ "iscsi-server" ], + "services" : [ "service:iscsitarget" ], "display_details" : true, ]), "isns" : $[ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.18.0/src/IscsiServerFunctions.pm new/yast2-iscsi-server-2.18.2/src/IscsiServerFunctions.pm --- old/yast2-iscsi-server-2.18.0/src/IscsiServerFunctions.pm 2008-12-05 10:35:59.000000000 +0100 +++ new/yast2-iscsi-server-2.18.2/src/IscsiServerFunctions.pm 2009-03-03 13:13:14.000000000 +0100 @@ -307,10 +307,14 @@ } } # write 'iSNS' and 'auth' into %new_config - $config_file{'value'} = $new_config{'iSNS'}; + if (defined $new_config{'iSNS'}){ + $config_file{'value'} = $new_config{'iSNS'}; delete ($new_config{'iSNS'}); - if (exists $new_config{'auth'}) { @{$config_file{'value'}} = (@{$config_file{'value'}}, @{$new_config{'auth'}}) } + } + if (defined $new_config{'auth'}){ + @{$config_file{'value'}} = (@{$config_file{'value'}}, @{$new_config{'auth'}}) ; delete ($new_config{'auth'}); + } #write all targets into %new_config foreach my $key (reverse(keys %new_config )){ if (not ref($new_config{$key})){ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.18.0/VERSION new/yast2-iscsi-server-2.18.2/VERSION --- old/yast2-iscsi-server-2.18.0/VERSION 2009-01-26 14:51:52.000000000 +0100 +++ new/yast2-iscsi-server-2.18.2/VERSION 2009-03-09 15:42:12.000000000 +0100 @@ -1 +1 @@ -2.18.0 +2.18.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-http-server for openSUSE:Factory
by root＠Hilbert.suse.de 09 Mar '09

09 Mar '09

Hello community, here is the log from the commit of package yast2-http-server for openSUSE:Factory checked in at Mon Mar 9 23:56:09 CET 2009. -------- --- yast2-http-server/yast2-http-server.changes 2009-03-06 16:56:56.000000000 +0100 +++ yast2-http-server/yast2-http-server.changes 2009-03-09 12:31:50.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 9 09:28:02 CET 2009 - mzugec(a)suse.cz + +- handling of custom modules (see bnc#482424) +- 2.18.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-http-server-2.18.2.tar.bz2 New: ---- yast2-http-server-2.18.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.L20076/_old 2009-03-09 23:52:36.000000000 +0100 +++ /var/tmp/diff_new_pack.L20076/_new 2009-03-09 23:52:36.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-http-server (Version 2.18.2) +# spec file for package yast2-http-server (Version 2.18.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-http-server -Version: 2.18.2 +Version: 2.18.3 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-http-server-2.18.2.tar.bz2 +Source0: yast2-http-server-2.18.3.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt libzio perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-network yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite Requires: yast2-network yast2-perl-bindings libzio @@ -44,7 +44,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-http-server-2.18.2 +%setup -n yast2-http-server-2.18.3 %build %{prefix}/bin/y2tool y2autoconf @@ -80,6 +80,9 @@ /usr/lib/YaST2/servers_non_y2/* %doc %{prefix}/share/doc/packages/yast2-http-server %changelog +* Mon Mar 09 2009 mzugec(a)suse.cz +- handling of custom modules (see bnc#482424) +- 2.18.3 * Fri Mar 06 2009 mzugec(a)suse.cz - modules ordering problem (bnc#350590) - validation of modules dependency ++++++ yast2-http-server-2.18.2.tar.bz2 -> yast2-http-server-2.18.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.18.2/configure new/yast2-http-server-2.18.3/configure --- old/yast2-http-server-2.18.2/configure 2009-03-03 10:23:15.000000000 +0100 +++ new/yast2-http-server-2.18.3/configure 2009-03-09 09:27:10.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-http-server 2.18.0. +# Generated by GNU Autoconf 2.63 for yast2-http-server 2.18.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-http-server' PACKAGE_TARNAME='yast2-http-server' -PACKAGE_VERSION='2.18.0' -PACKAGE_STRING='yast2-http-server 2.18.0' +PACKAGE_VERSION='2.18.2' +PACKAGE_STRING='yast2-http-server 2.18.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,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-http-server 2.18.0 to adapt to many kinds of systems. +\`configure' configures yast2-http-server 2.18.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1346,7 +1346,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-http-server 2.18.0:";; + short | recursive ) echo "Configuration of yast2-http-server 2.18.2:";; esac cat <<\_ACEOF @@ -1426,7 +1426,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-http-server configure 2.18.0 +yast2-http-server configure 2.18.2 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1440,7 +1440,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-http-server $as_me 2.18.0, which was +It was created by yast2-http-server $as_me 2.18.2, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2287,7 +2287,7 @@ # Define the identity of the package. PACKAGE='yast2-http-server' - VERSION='2.18.0' + VERSION='2.18.2' cat >>confdefs.h <<_ACEOF @@ -2511,7 +2511,7 @@ -VERSION="2.18.0" +VERSION="2.18.2" RPMNAME="yast2-http-server" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -3452,7 +3452,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-http-server $as_me 2.18.0, which was +This file was extended by yast2-http-server $as_me 2.18.2, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3502,7 +3502,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-http-server config.status 2.18.0 +yast2-http-server config.status 2.18.2 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.18.2/configure.in new/yast2-http-server-2.18.3/configure.in --- old/yast2-http-server-2.18.2/configure.in 2009-03-03 10:23:08.000000000 +0100 +++ new/yast2-http-server-2.18.3/configure.in 2009-03-09 09:27:04.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-http-server, 2.18.0, http://bugs.opensuse.org/, yast2-http-server) +AC_INIT(yast2-http-server, 2.18.2, http://bugs.opensuse.org/, yast2-http-server) 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.18.0" +VERSION="2.18.2" RPMNAME="yast2-http-server" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.18.2/doc/autodocs/Makefile.am new/yast2-http-server-2.18.3/doc/autodocs/Makefile.am --- old/yast2-http-server-2.18.2/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-http-server-2.18.3/doc/autodocs/Makefile.am 2008-01-24 14:40:00.000000000 +0100 @@ -0,0 +1,12 @@ +# +# Makefile.am for devtools/devtools/skeletons/config/doc/autodocs +# + +htmldir = $(docdir)/autodocs + +index.html: $(srcdir)/../../src/*.ycp + $(ybindir)/ycpdoc -d. $(srcdir)/../../src/*.ycp + +html_DATA = index.html $(wildcard *.html) + +CLEANFILES = $(html_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.18.2/doc/autodocs/Makefile.in new/yast2-http-server-2.18.3/doc/autodocs/Makefile.in --- old/yast2-http-server-2.18.2/doc/autodocs/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-http-server-2.18.3/doc/autodocs/Makefile.in 2009-03-09 09:27:11.000000000 +0100 @@ -0,0 +1,364 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 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. + +@SET_MAKE@ + +# +# Makefile.am for devtools/devtools/skeletons/config/doc/autodocs +# + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = doc/autodocs +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(htmldir)" +htmlDATA_INSTALL = $(INSTALL_DATA) +DATA = $(html_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINTAINER = @MAINTAINER@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RPMNAME = @RPMNAME@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +STYLESHEET_CSS = @STYLESHEET_CSS@ +STYLESHEET_HTML = @STYLESHEET_HTML@ +STYLESHEET_PDF = @STYLESHEET_PDF@ +STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@ +STYLESHEET_YDOC = @STYLESHEET_YDOC@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ +YCPC = @YCPC@ +YCPDOC = @YCPDOC@ +YCPMAKEDEP = @YCPMAKEDEP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +agentdir = @agentdir@ +am__leading_dot = @am__leading_dot@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +clientdir = @clientdir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +desktopdir = @desktopdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +execcompdir = @execcompdir@ +fillupdir = @fillupdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = $(docdir)/autodocs +imagedir = @imagedir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moduledir = @moduledir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgconfigdatadir = @pkgconfigdatadir@ +pkgconfigdir = @pkgconfigdir@ +plugindir = @plugindir@ +potdir = @potdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +schemadir = @schemadir@ +scrconfdir = @scrconfdir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +themedir = @themedir@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +yast2dir = @yast2dir@ +ybindir = @ybindir@ +ydatadir = @ydatadir@ +yncludedir = @yncludedir@ +ystartupdir = @ystartupdir@ +html_DATA = index.html $(wildcard *.html) +CLEANFILES = $(html_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/autodocs/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/autodocs/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-htmlDATA: $(html_DATA) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" + @list='$(html_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ + $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ + done + +uninstall-htmlDATA: + @$(NORMAL_UNINSTALL) + @list='$(html_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \ + rm -f "$(DESTDIR)$(htmldir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(htmldir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-htmlDATA + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-htmlDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-htmlDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ + uninstall-am uninstall-htmlDATA + + +index.html: $(srcdir)/../../src/*.ycp + $(ybindir)/ycpdoc -d. $(srcdir)/../../src/*.ycp +# 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/yast2-http-server-2.18.2/doc/Makefile.am new/yast2-http-server-2.18.3/doc/Makefile.am --- old/yast2-http-server-2.18.2/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-http-server-2.18.3/doc/Makefile.am 2008-01-24 14:40:00.000000000 +0100 @@ -0,0 +1,12 @@ +# +# Makefile.am for devtools/devtools/skeletons/config/doc +# + +SUBDIRS = autodocs + +htmldir = $(docdir) + +doc_DATA = +html_DATA = + +EXTRA_DIST = $(doc_DATA) $(html_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.18.2/doc/Makefile.in new/yast2-http-server-2.18.3/doc/Makefile.in --- old/yast2-http-server-2.18.2/doc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-http-server-2.18.3/doc/Makefile.in 2009-03-09 09:27:11.000000000 +0100 @@ -0,0 +1,538 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 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. + +@SET_MAKE@ + +# +# Makefile.am for devtools/devtools/skeletons/config/doc +# + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = doc +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(htmldir)" +docDATA_INSTALL = $(INSTALL_DATA) +htmlDATA_INSTALL = $(INSTALL_DATA) +DATA = $(doc_DATA) $(html_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINTAINER = @MAINTAINER@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RPMNAME = @RPMNAME@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +STYLESHEET_CSS = @STYLESHEET_CSS@ +STYLESHEET_HTML = @STYLESHEET_HTML@ +STYLESHEET_PDF = @STYLESHEET_PDF@ +STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@ +STYLESHEET_YDOC = @STYLESHEET_YDOC@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ +YCPC = @YCPC@ +YCPDOC = @YCPDOC@ +YCPMAKEDEP = @YCPMAKEDEP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +agentdir = @agentdir@ +am__leading_dot = @am__leading_dot@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +clientdir = @clientdir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +desktopdir = @desktopdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +execcompdir = @execcompdir@ +fillupdir = @fillupdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = $(docdir) +imagedir = @imagedir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moduledir = @moduledir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgconfigdatadir = @pkgconfigdatadir@ +pkgconfigdir = @pkgconfigdir@ +plugindir = @plugindir@ +potdir = @potdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +schemadir = @schemadir@ +scrconfdir = @scrconfdir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +themedir = @themedir@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +yast2dir = @yast2dir@ +ybindir = @ybindir@ +ydatadir = @ydatadir@ +yncludedir = @yncludedir@ +ystartupdir = @ystartupdir@ +SUBDIRS = autodocs +doc_DATA = +html_DATA = +EXTRA_DIST = $(doc_DATA) $(html_DATA) +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-docDATA: $(doc_DATA) + @$(NORMAL_INSTALL) + test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" + @list='$(doc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ + $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ + done + +uninstall-docDATA: + @$(NORMAL_UNINSTALL) + @list='$(doc_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \ + rm -f "$(DESTDIR)$(docdir)/$$f"; \ + done +install-htmlDATA: $(html_DATA) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" + @list='$(html_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ + $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ + done + +uninstall-htmlDATA: + @$(NORMAL_UNINSTALL) + @list='$(html_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \ + rm -f "$(DESTDIR)$(htmldir)/$$f"; \ + done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile $(DATA) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(htmldir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: install-docDATA install-htmlDATA + +install-dvi: install-dvi-recursive + +install-exec-am: + +install-html: install-html-recursive + +install-info: install-info-recursive + +install-man: + +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-docDATA uninstall-htmlDATA + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-docDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-htmlDATA install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-docDATA uninstall-htmlDATA + +# 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/yast2-http-server-2.18.2/src/HttpServerWidgets.ycp new/yast2-http-server-2.18.3/src/HttpServerWidgets.ycp --- old/yast2-http-server-2.18.2/src/HttpServerWidgets.ycp 2009-03-06 16:50:30.000000000 +0100 +++ new/yast2-http-server-2.18.3/src/HttpServerWidgets.ycp 2009-03-09 12:25:28.000000000 +0100 @@ -6,7 +6,7 @@ * Stanislav Visnovsky <visnov(a)suse.cz> * Internal * - * $Id: HttpServerWidgets.ycp 55984 2009-03-06 15:50:29Z mzugec $ + * $Id: HttpServerWidgets.ycp 56009 2009-03-09 11:25:28Z mzugec $ */ { @@ -2563,10 +2563,10 @@ else if (event["ID"]:nil == `add_user) { - string modules_dir=sformat("/usr/%1/apache2-%2/", (Arch::ia64()||Arch::mips64()||Arch::ppc64()||Arch::s390_64()||Arch::sparc64()||Arch::x86_64())?"lib64":"lib", (PackageSystem::Installed("apache2-prefork"))?"prefork":"worker"); + string module_dirs=sformat("/usr/lib*/apache2/ /usr/lib*/apache2-%1/", (PackageSystem::Installed("apache2-prefork"))?"prefork":"worker"); // list of all installed modules list <string> all_modules = splitstring(((map<string, any>) SCR::Execute(.target.bash_output, - sformat("ls %1|grep so|cut -d. -f1|cut -d_ -f2-", modules_dir)))["stdout"]:"", "\n"); + sformat("ls %1|grep \".so$\"|cut -d. -f1|cut -d_ -f2-", module_dirs)))["stdout"]:"", "\n"); list<string> existing = maplist (map<string,any> mod, YaST::HTTPDData::GetKnownModules(), ``( mod["name"]:_("unknown"))); // extract unknown modules from all installed diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.18.2/VERSION new/yast2-http-server-2.18.3/VERSION --- old/yast2-http-server-2.18.2/VERSION 2009-03-06 16:49:02.000000000 +0100 +++ new/yast2-http-server-2.18.3/VERSION 2009-03-09 09:28:00.000000000 +0100 @@ -1 +1 @@ -2.18.2 +2.18.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 xorg-x11-driver-video for openSUSE:Factory
by root＠Hilbert.suse.de 09 Mar '09

09 Mar '09

Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Mon Mar 9 23:52:29 CET 2009. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-03-08 06:25:29.000000000 +0100 +++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-03-09 14:38:15.267262831 +0100 @@ -1,0 +2,6 @@ +Mon Mar 9 14:36:32 CET 2009 - sndirsch(a)suse.de + +- removed xf86-video-intel-sdvo_detect.diff due to a severe + regression in G45 startup (bnc #480374) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-video-intel-sdvo_detect.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.D12001/_old 2009-03-09 23:50:07.000000000 +0100 +++ /var/tmp/diff_new_pack.D12001/_new 2009-03-09 23:50:07.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 46 +Release: 47 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -94,7 +94,6 @@ Patch61: xf86-video-intel-bug18462.diff Patch62: xf86-video-intel-NoFBC-945GME.diff Patch64: xf86-video-vesa_DefaultRefresh.diff -Patch66: xf86-video-intel-sdvo_detect.diff Patch67: xf86-video-intel-bfo17988.diff Patch68: xf86-video-ati-bug474071-fix2.diff Patch69: xf86-video-ati-ia64_screen_blank.diff @@ -130,9 +129,6 @@ %patch57 -p1 %patch61 -p1 %patch62 -p1 -%if %suse_version > 1110 -%patch66 -p1 -%endif %patch67 -p1 ### FIXME #%patch72 -p1 @@ -280,6 +276,9 @@ /var/lib/hardware/ids/20.%{name} %changelog +* Mon Mar 09 2009 sndirsch(a)suse.de +- removed xf86-video-intel-sdvo_detect.diff due to a severe + regression in G45 startup (bnc #480374) * Sun Mar 08 2009 sndirsch(a)suse.de - disable xf86-video-intel-commit-73aa23d.diff due to a Sig11 during Xserver start for now ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-driver-input for openSUSE:Factory
by root＠Hilbert.suse.de 09 Mar '09

09 Mar '09

Hello community, here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory checked in at Mon Mar 9 23:49:59 CET 2009. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-03-08 21:24:30.000000000 +0100 +++ xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-03-09 04:26:57.851701551 +0100 @@ -1,0 +2,16 @@ +Mon Mar 9 04:03:02 CET 2009 - sndirsch(a)suse.de + +- xf86-input-synaptics 1.1.0 + * man: device properties are now supported, should be stated as + such. This includes listing supported properties and + de-emphasizing the need for SHM. + * man: remove some pointless ( and ) around "float" options. +- xf86-input-evdev 2.2.0 + * Fix duplicate wheel button up mapping. + * Check button label before fetching the Atom from the server + (bfo #20524) + * Define MAX_VALUATORS if it's missing to allow for builds + against 1.5. +- no longer exclude vmmmouse HAL files + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-input-evdev-2.1.99.1.tar.bz2 xf86-input-synaptics-1.0.99.4.tar.bz2 New: ---- xf86-input-evdev-2.2.0.tar.bz2 xf86-input-synaptics-1.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.KL2463/_old 2009-03-09 23:48:20.000000000 +0100 +++ /var/tmp/diff_new_pack.KL2463/_new 2009-03-09 23:48:20.000000000 +0100 @@ -24,7 +24,7 @@ BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 23 +Release: 24 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -62,8 +62,8 @@ Source26: xf86-input-vmmouse-12.6.3.tar.bz2 Source27: xf86-input-void-1.2.0.tar.bz2 Source28: xf86-input-diamondtouch-0.3.0.tar.bz2 -Source29: xf86-input-synaptics-1.0.99.4.tar.bz2 -Source30: xf86-input-evdev-2.1.99.1.tar.bz2 +Source29: xf86-input-synaptics-1.1.0.tar.bz2 +Source30: xf86-input-evdev-2.2.0.tar.bz2 Source31: 11-x11-synaptics.fdi Patch2: xf86-input-jamstudio.diff Patch3: p_mouse_misc.diff @@ -227,14 +227,29 @@ %{_mandir}/man4/* /usr/bin/syn* %ifarch %ix86 x86_64 -%exclude /usr/bin/vmmouse_detect -%exclude /usr/%{_lib}/hal/hal-probe-vmmouse -%exclude /usr/share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi -%exclude /usr/share/man/man1/vmmouse_detect.1.gz +%dir /usr/%{_lib}/hal +%dir /usr/share/hal/fdi/policy/20thirdparty +/usr/bin/vmmouse_detect +/usr/%{_lib}/hal/hal-probe-vmmouse +/usr/share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi +/usr/share/man/man1/vmmouse_detect.1.gz %endif /usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi %changelog +* Mon Mar 09 2009 sndirsch(a)suse.de +- xf86-input-synaptics 1.1.0 + * man: device properties are now supported, should be stated as + such. This includes listing supported properties and + de-emphasizing the need for SHM. + * man: remove some pointless ( and ) around "float" options. +- xf86-input-evdev 2.2.0 + * Fix duplicate wheel button up mapping. + * Check button label before fetching the Atom from the server + (bfo #20524) + * Define MAX_VALUATORS if it's missing to allow for builds + against 1.5. +- no longer exclude vmmmouse HAL files * Sun Mar 08 2009 sndirsch(a)suse.de - added synaptics .fdi file for HAL configuration support * Thu Mar 05 2009 sndirsch(a)suse.de ++++++ xf86-input-evdev-2.1.99.1.tar.bz2 -> xf86-input-evdev-2.2.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-evdev-2.1.99.1/ChangeLog new/xf86-input-evdev-2.2.0/ChangeLog --- old/xf86-input-evdev-2.1.99.1/ChangeLog 2009-02-17 07:18:22.000000000 +0100 +++ new/xf86-input-evdev-2.2.0/ChangeLog 2009-03-09 01:04:18.000000000 +0100 @@ -1,39 +1,333 @@ -commit f48abf89e4095fd1218b930035cee7e4c7265e13 +commit 73e5eba8cd9ef885542c94b72b783366228ce0df Author: Peter Hutterer <peter.hutterer(a)who-t.net> -Date: Tue Feb 17 16:17:25 2009 +1000 +Date: Mon Mar 9 09:27:19 2009 +1000 - evdev 2.1.3 + evdev 2.2.0 Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> -commit 87819fe86bebb1d0fa6eee515976f1cd0c4340b1 +commit 31853c39bfae7bb1035485407fd245cd11337d4f +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Mar 9 09:29:48 2009 +1000 + + Define MAX_VALUATORS if it's missing to allow for builds against 1.5. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 2c49e21a815632fc1addd04dde96592237757a2e +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Mar 9 09:05:10 2009 +1000 + + Check button label before fetching the Atom from the server. (#20524) + + The server doesn't like NULL names, so don't call XIGetKnownProperty for + labels that don't exist. + + X.Org Bug 20524 <http://bugs.freedesktop.org/show_bug.cgi?id=20524> + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Tested-by: Peter Henriksson + +commit 4361b3efa0da5e85da7f0506c81dba31e59dc897 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Fri Mar 6 08:13:36 2009 +1000 + + Fix duplicate wheel button up mapping. + + Reported by Simon Thum. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Signed-off-by: Simon Thum <simon.thum(a)gmx.de> + +commit 281a7b4b88015c768639b7ae960b62f3539f012b +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Mar 2 16:27:47 2009 +1000 + + evdev 2.1.99.1 + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 051cb8b528f6eddddccee44842bcb2152ed0e418 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Feb 26 12:14:20 2009 +1000 + + Add support for button labelling. + + Buttons 4/5 and 6/7 are hardcoded for wheel buttons. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 1abcc881715327614e248e9047c5fbd29a945c03 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Feb 26 10:48:06 2009 +1000 + + Rename prop_label to prop_axis_label. + +commit c89bbf80be65eb9d0d20871761d22c6d6d76708b +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Feb 26 12:14:03 2009 +1000 + + Don't double-assign the UKNOWN axis label. + + All labels default to unknown anyway. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 178435832f5f6988e58fddc4ffe82ddc032d9dce +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Feb 26 12:09:33 2009 +1000 + + If scrollwheels are found, bump the button number by 4 (or up to 7). + + Scrollwheel data is always posted as buttons, so we need to advertise at least + enough buttons to accommodate for 6/7 (horizontal wheel). + + Note that this may mean that if you have a device that has scroll wheels and + axes, but no buttons, it may be interpreted as a mouse. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit c9cab83bac32275f6851d2616bb749b3b2621ed6 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue Feb 24 11:32:40 2009 +1000 + + Ignore REL_WHEEL, REL_HWHEEL and REL_DIAL during axis initialisation. + + We don't post the events for them anyway, so lets ignore them completely. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 43dd2a959243877c1628a08b4fc6c07c9ae6bac0 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue Feb 24 10:36:41 2009 +1000 + + Pass on all relative events, not just x/y. + + 9620fe776 added generic axes support for relativ values, but values from such + axes didn't get passed on to the server. Fix this. + + Note that wheel events are not posted as motion events. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 7977947e0df6ea6379dab76805b06be6bdd71947 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Tue Feb 24 10:08:22 2009 +1000 + + Reduce the number of read calls in ReadInput. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Signed-off-by: Adam Jackson <ajax(a)redhat.com> + +commit 11a56d4a176a2c5b2f8794147d4bafd88477b80b +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue Feb 24 09:39:01 2009 +1000 + + Split ReadInput into ReadInput and ProcessEvent. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 7b0f613c7f1462fc36f1e13968d96e8b8a559be6 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Tue Feb 24 09:34:26 2009 +1000 + + Move relative motion and other magic up to EV_SYN processing. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Signed-off-by: Adam Jackson <ajax(a)redhat.com> + +commit 75af278861dcd96124544d3c2889028578708317 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Mon Feb 23 16:01:14 2009 -0500 + + Open with O_NONBLOCK, and simplify EvdevReadInput to match. + + xf86WaitForInput() would call select() with zero timeout to discover if + more input was ready. But we know that's always true at least once, + since we're only ever called from the sigio handler (if silken is + active) or from the main loop (if it's not and we selected readable). + With nonblocking IO we can just spin around until we hit EAGAIN, which + gets us down to n+1 syscalls per event instead of 2n. + +commit 4fd9cd2ea81607c17eb39baaad24f09dd55995f2 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Feb 19 10:02:49 2009 +1000 + + Revert "Remove useless include directive." + + Necessary for builds against 1.6, but let's at least get rid of XKB defines. + + This reverts commit aa5dfa1d6ae374479d39f1394b85660e6b6bb881. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 12c287df894c88a1b2badf105ef625c7c67f334d +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Feb 18 09:30:17 2009 +1000 + + Label axes conditional on actual support. + + Server 1.6 has device properties, but not axis labels. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 9f1b9aa6eb81087b3df12184eafb104c0e745f41 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Feb 18 09:04:12 2009 +1000 + + Accommodate for holes in the ABS label defines. + + abs_labels[] has to be aligned with the defines in linux/input.h, but the + latter does not have continuous range. Pad the holes with + AXIS_LABEL_PROP_ABS_MISC. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit acb1d557e216d7fa58ef8dbf3182e6604888ae2a +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue Feb 17 15:08:03 2009 +1000 + + Add support for arbitrary relative axis labels. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 6a1f8f463d28c263a73b81b92d9d52a6cd3873cb +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue Feb 17 14:54:49 2009 +1000 + + Remove superfluous (and duplicate) call to xf86MotionHistoryAllocate. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 9620fe7765b340213a552b5656d9d10bbbefd4cb +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue Feb 17 14:53:51 2009 +1000 + + Add generic axis support for relative axes. + + Just query the kernel what axes we actually have, rather than hard-coding x/y. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit a1714cac5242e5f8320ed7212efca481351355a2 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue Feb 17 14:42:19 2009 +1000 + + Add dynamic axis labelling for absolute devices. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 5a99ef7ed21ff879b6c55027590733bc7a9c6742 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Feb 16 15:11:20 2009 +1000 + + remove duplicate (code > 255) check. + +commit 3b22e4703fa712ddb6d14d3a847ecfeac27520b4 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Feb 16 14:48:04 2009 +1000 + + man: list the options and properties in alphabetical order. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 0de20a8f1b9f80b33081cea20444a05a745cb95e Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Mon Feb 16 14:40:45 2009 +1000 man: Fix two minor typos in man page. Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> - (cherry picked from commit 0de20a8f1b9f80b33081cea20444a05a745cb95e) -commit ffa1fbc770a5b862f0768690c198cc819ce14621 +commit 978384ede7b0832fef8a399efbc3050bb2f212f7 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Feb 16 14:07:30 2009 +1000 + + Swap axes after scaling, not before. + + If we swap before scaling, we scale with the wrong coordinate range. + + Reported by Matt Helsley. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit df7ff12ed230009de895107c40de8f457879d66b +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Feb 16 12:00:52 2009 +1000 + + CacheCompare before probing the device. + + Saves a few duplicate ioctls. + + Suggested by Matt Helsley. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit dd2c89ac93535b833ee79e459410f4679c060774 +Author: Matt Helsley <matt.helsley(a)gmail.com> +Date: Mon Feb 16 11:18:50 2009 +1000 + + General axis valuator support. + + Instead of x/y and pressure, support any absolute axis that is reported on the + device. Note that there are still locations that special-case X and Y. + + Minor modifications by Peter Hutterer. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 4616c79f6cc6d81c1d9d27efa05ffaf51d521d2b +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Feb 16 11:15:25 2009 +1000 + + Change cached bitmasks from long to unsigned long. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit a31170718d098fd7ce42cf4f6e457a713e39a0c1 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Feb 16 10:48:58 2009 +1000 + + Remove unused 'screen' variable from the EvdevRec. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 95099cb0368d76ee139f1442253f26f68d493df9 Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Mon Feb 16 10:43:36 2009 +1000 Log which EVIOCGABS ioctl failed. Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> - (cherry picked from commit 95099cb0368d76ee139f1442253f26f68d493df9) -commit 40bb3c69ce80c1dd7c903e2a381b9fe064c98bc4 +commit c58bae0b77b9e39ab341af994648ca22867271a2 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Feb 16 12:05:45 2009 +1000 + + Remove superfluous motion history allocation. + + The motion history buffer is allocated during InitValuatorClassDeviceStruct + anyway. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 32242871f7001e7e995d501a32f350120bad2fd6 Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Mon Feb 16 08:51:22 2009 +1000 Remove duplicate MB emu finalization. Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> - (cherry picked from commit 32242871f7001e7e995d501a32f350120bad2fd6) -commit 675218cbf5513b7e8836ba63d93dfe87aa21084a +commit aa5dfa1d6ae374479d39f1394b85660e6b6bb881 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Fri Feb 13 16:24:36 2009 +1000 + + Remove useless include directive. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 2a6c1d7a605e11189e4539db84b1c4da5707dbc6 Author: Bryce Harrington <bryce(a)bryceharrington.org> Date: Thu Feb 12 17:52:43 2009 -0800 @@ -45,9 +339,33 @@ exactly was seen to have changed. Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> - (cherry picked from commit 2a6c1d7a605e11189e4539db84b1c4da5707dbc6) -commit ad834abd570be893aa14b83eb10b635947b5a141 +commit 0f0743e3cfc2f7d288dfec3fba9bc093cbedf537 +Author: Dan Nicholson <dbn.lists(a)gmail.com> +Date: Mon Feb 2 22:35:20 2009 -0800 + + Really fix distcheck + + distcheck has an annoying feature where it checks that all files install + under $prefix. Unfortunately, this conflicts with the desire to install + headers to the SDK directory. Workaround by passing --with-sdkdir during + distcheck. + + Signed-off-by: Dan Nicholson <dbn.lists(a)gmail.com> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 095766ebb3afafc4906cb29e22d996dbcd773ad8 +Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br> +Date: Mon Feb 2 19:47:50 2009 -0200 + + Janitor: make distcheck, .gitignore. + + Remove non toplevel .gitignore and .cvsignore files. + The "make distcheck correction" for $(sdkdir) probably has a better + approach using a "*-hook:" target, or possibly making $sdkdir a + configure time option that could be set with DISTCHECK_CONFIGURE_FLAGS. + +commit 0dbb88c52b057cfdff6116060060841e4fc4abb5 Author: Julien Plissonneau Duquene <julien.plissonneau.duquene(a)savoirfairelinux.com> Date: Mon Feb 2 10:46:52 2009 -0500 @@ -63,26 +381,16 @@ Signed-off-by: Julien Cristau <jcristau(a)debian.org> Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> - (cherry picked from commit 0dbb88c52b057cfdff6116060060841e4fc4abb5) -commit 3549c3e5f0b0fffe6f2ee12a31a447494dfdce1b +commit c9281567024ef1e94f2da42f0d701ed69728c355 Author: Peter Breitenlohner <peb(a)mppmu.mpg.de> Date: Fri Nov 21 21:57:41 2008 +0100 fix manpage formatting Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> - (cherry picked from commit c9281567024ef1e94f2da42f0d701ed69728c355) - -commit 5def56d2f4c2d65a09db844bbb8d4aad53cde3a8 -Author: Peter Hutterer <peter.hutterer(a)who-t.net> -Date: Mon Feb 2 11:13:03 2009 +1000 - - evdev 2.1.2 - - Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> -commit b907c23d00feae0e361f02c80570ec490e44ad6f +commit 07f40a04df28e9ee6318411beb71eedc7cd6e288 Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Mon Feb 2 11:00:30 2009 +1000 @@ -91,18 +399,28 @@ X.Org Bug 19882 <http://bugs.freedesktop.org/show_bug.cgi?id=19882> Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> - (cherry picked from commit 07f40a04df28e9ee6318411beb71eedc7cd6e288) -commit 6c975917f8adbae6799b59675fc258ed9541ef86 +commit e260993b6af0c463bd593a3192d2ba4ee6912fc9 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Fri Jan 30 20:18:50 2009 -0800 Add README with pointers to mailing list, bugzilla & git repos - (cherry picked from commit e260993b6af0c463bd593a3192d2ba4ee6912fc9) -commit ac421e536cdc08e24cc651a0806871df0dc589b0 +commit dc72e6d8aecbc60900bb3b72978d63495f3f6954 +Author: Dan Nicholson <dbn.lists(a)gmail.com> +Date: Thu Jan 22 10:15:15 2009 -0800 + + Stop hammering XKB defaults + + With the new InitKeyboardDeviceStruct, we can just pass the RMLVO we + want without setting the defaults first. + + Signed-off-by: Dan Nicholson <dbn.lists(a)gmail.com> + Signed-off-by: Daniel Stone <daniel(a)fooishbar.org> + +commit 1906e4d5c112c25c9d7a736d4924d1005267aba7 Author: Peter Hutterer <peter.hutterer(a)who-t.net> -Date: Thu Jan 22 15:20:05 2009 +1100 +Date: Thu Jan 22 09:44:15 2009 +1100 Reshuffle property initialization. @@ -112,13 +430,41 @@ Reported by Simon Thum. Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> - (cherry picked from commit 1906e4d5c112c25c9d7a736d4924d1005267aba7) + +commit 3047c25db24becf475b45d13e03a8badd58dcde6 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Jan 22 09:19:16 2009 +1100 + + Deal with XINPUT ABI 5. - Conflicts: + Some XKB stuff has been removed, so let's deal with it. + +commit c158cf2b64034a49e1c95549603b684e21e7511a +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Jan 21 16:32:27 2009 +1100 + + Require XKB. - src/evdev.c + Welcome to the future. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit dae1a78a521fa2e9fe7d058a66ae9ef7ea5d9471 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue Jan 20 09:45:44 2009 +1100 + + Add automatic axis labeling. + + Since we don't support anything but REL/ABS x/y and sometimes pressure this is + bordering on pointlessness, but once the year of the Linux desktop comes + around this will be really handy. Or so. + + Also, we don't allow changing axis labels, but should eventually rearrange + them if swapaxis is on. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> -commit bd55c2f02127e17dfe246fef1821e422b2757972 +commit 263bf04a9d350dddd796f3a21c7b1749647be91c Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Tue Jan 20 11:46:05 2009 +1100 @@ -127,26 +473,36 @@ xf86SetStrOption already prints with X_CONFIG anyway, no need to do it again. Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> - (cherry picked from commit 263bf04a9d350dddd796f3a21c7b1749647be91c) -commit 11d506dce6363525e80eda219aee8af429fb302e +commit c035f3d0f58698d0f1dbeb1be7ad00f0787d3292 Author: Peter Hutterer <peter.hutterer(a)who-t.net> -Date: Tue Jan 13 11:32:05 2009 +1000 +Date: Tue Jan 20 09:44:49 2009 +1100 - evdev 2.1.1 + Register the property handler AFTER setting all the properties. + + Otherwise, we add a new property based on a setting in pEvdev, which triggers + the update handler to change the setting in pEvdev based on the property. + Truly pointless. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit a7e8af65fca9c38a8c0c24ffc660c06c8d4a0b9b +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Jan 19 21:23:34 2009 +1100 + + Test for pressure BEFORE using has_pressure. -commit a34a2cd3476441f29c9faa79ffa9289dbf2eebf4 +commit 0592d97fbb5a1241ee79397ce9203346d050a9f9 Author: Michael Chapman <mike(a)very.puzzling.org> Date: Fri Jan 9 19:07:10 2009 +1100 Disable middle mouse button emulation when a middle mouse button event is registered Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> - (cherry picked from commit 0592d97fbb5a1241ee79397ce9203346d050a9f9) -commit 78c00bd77f983aa22611c9966fbcb7e22453b588 +commit 4dfd86b2201b2b19761a1abb3c580cecf0060224 Author: Matt Helsley <matt.helsley(a)gmail.com> -Date: Tue Jan 13 11:03:04 2009 +1000 +Date: Sun Jan 11 18:36:59 2009 -0800 Fix FOO_MAX off-by-one @@ -164,13 +520,8 @@ Signed-off-by: Matt Helsley <matt.helsley(a)gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> - (cherry picked from commit 4dfd86b2201b2b19761a1abb3c580cecf0060224) - - Conflicts: - - src/evdev.c -commit 760f1c6bb184e3b48ca6a6bfe8942d306f378148 +commit d3fd42d8644310abcae23bbf534f8c445296bcb7 Author: Matt Helsley <matt.helsley(a)gmail.com> Date: Sun Jan 11 18:04:40 2009 -0800 @@ -182,19 +533,26 @@ Signed-off-by: Matt Helsley <matt.helsley(a)gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit dd1752ce3ffe9bdfa3e13dc075b7f22750e77fea +Author: Matt Helsley <matt.helsley(a)gmail.com> +Date: Sat Jan 10 23:51:22 2009 -0800 + + Add pressure valuator - (cherry-picked from commit d3fd42d8644310abcae23bbf534f8c445296bcb7) - Not really required, but it makes cherry-picking - 4dfd86b2201b2b19761a1abb3c580cecf0060224 easier. + If it's available report pressure as third valuator. + (Use xf86PostMotionEventP instead of the varargs wrapper.) + + Signed-off-by: Matt Helsley <matt.helsley(a)gmail.com> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> -commit 2db04ba3c35e4976b34d92f8f7c6c2c9ec09f3ab +commit 0f0a149067abdd1ed89717de43febe89b2a3490b Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Fri Jan 9 16:13:09 2009 -0800 Remove xorgconfig & xorgcfg from See Also list in man page - (cherry picked from commit 0f0a149067abdd1ed89717de43febe89b2a3490b) -commit 363d0bdb9fcae7f57f53c50667429ac9b37d41cc +commit d170cba0cdd8f7a2e500e094f5b21fc33aefb52a Author: Yan Li <yan.i.li(a)intel.com> Date: Mon Jan 5 16:35:09 2009 +0800 @@ -202,24 +560,72 @@ Signed-off-by: Yan Li <yan.i.li(a)intel.com> Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> - (cherry picked from commit d170cba0cdd8f7a2e500e094f5b21fc33aefb52a) -commit 16a26a1eca6395284fcb8e62be7b2bc30becb0d3 +commit 268038270593aae45e2740ad2151243383743c1d +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Fri Dec 19 08:27:47 2008 +1000 + + Add dummy test device - simple device that doesn't move at all. + + Good for filling up the device list without getting distracted by spurious + events all the time. + +commit 0f36384d0636d6a8d3a8f182be69c72cccd1ff5c +Author: Sascha Hlusiak <saschahlusiak(a)arcor.de> +Date: Mon Dec 8 12:32:31 2008 +0100 + + Revert "Keyboard: Disable kernel autorepeat" + + This reverts commit 6867652c2c8ad563d5655302d94134592b10265b. + Functionally replaced by commit ece72ce9e97adae23b1932dc1334f63669196d56 + + Signed-off-by: Daniel Stone <daniel(a)fooishbar.org> + +commit ece72ce9e97adae23b1932dc1334f63669196d56 +Author: Sascha Hlusiak <saschahlusiak(a)arcor.de> +Date: Mon Dec 8 12:27:34 2008 +0100 + + Filter all repeated keys from kernel, because we do softrepeat in server + + Discard all repeated events that come from the device. The server will handle + per-key autorepeat in software. + + Signed-off-by: Daniel Stone <daniel(a)fooishbar.org> + +commit 2bf6e29b40f0da2bc417964fd2bd819306e5d3ed Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Wed Nov 26 15:01:57 2008 +1000 Finalize MB emu (and wakeup handlers) before closing the fd. Signed-off-by: Peter Hutterer <peter.hutterer(a)redhat.com> - (cherry picked from commit 2bf6e29b40f0da2bc417964fd2bd819306e5d3ed) -commit b879ae73510ad733c266fba80e0ec4b0f903e71b -Author: Peter Hutterer <peter.hutterer(a)redhat.com> -Date: Mon Nov 17 09:27:25 2008 +1000 +commit 2bd24649ecbae08b7bd4dacd67d141ae665f8db7 +Author: Tibi Nagy <nltibi(a)gmail.com> +Date: Mon Nov 24 22:28:44 2008 +0200 + + Support keyboards with scroll wheels. + + For keyboards, scroll events are reported by the kernel as EV_REL class events + of REL_WHEEL type. If, during probing, the device is found to support wheel + events, make sure it is set up as a pointing device, even if it doesn't have + buttons or doesn't report motion along the X and Y axis so that the scroll + events can be mapped to mouse wheel buttons (usually buttons 4 and 5). + + Signed-off-by: Peter Hutterer <peter.hutterer(a)redhat.com> - evdev 2.1 +commit 6867652c2c8ad563d5655302d94134592b10265b +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Thu Nov 27 13:24:08 2008 +1100 + + Keyboard: Disable kernel autorepeat + + We handle autorepeat in software due to per-key repeat and whatnot, so + disable the kernel's, which just interferes with ours. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> -commit 53566b7d4d7e641df4db5720ae9132eb4c812c84 +commit 63af314368cec47b6b8266db331f2c820e7a071f Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Mon Nov 17 10:03:11 2008 +1000 @@ -230,24 +636,14 @@ /dev/input/by-id/blahblah and not get the same device added by HAL. Signed-off-by: Peter Hutterer <peter.hutterer(a)redhat.com> - (cherry picked from commit 63af314368cec47b6b8266db331f2c820e7a071f) -commit 29c2765fc30c74171e51ba694ea4810916803c31 +commit 4c5c9c111d406e5590429377262b86e91868ef76 Author: Fernando Carrijo <fcarrijo(a)yahoo.com.br> Date: Thu Nov 6 13:20:16 2008 -0500 Fix error message - (cherry picked from commit 4c5c9c111d406e5590429377262b86e91868ef76) - -commit 7ef4e2c5e14e558f41fb7f411e2976f517b6b526 -Author: Peter Hutterer <peter.hutterer(a)redhat.com> -Date: Mon Nov 3 13:47:15 2008 +1030 - - evdev 2.1 RC 3 - - That's it, no more new features. Now it's down to bugfixing only. -commit dd0eeacc24a80893209f24d9ad028a6bc7e3a390 +commit 4826969f23a0b298da2750c2e23a92b9d91819dd Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Mon Nov 3 13:25:06 2008 +1030 @@ -259,9 +655,8 @@ Actual swapping code written by Donnie Berkholz. Signed-off-by: Peter Hutterer <peter.hutterer(a)redhat.com> - (cherry picked from commit 4826969f23a0b298da2750c2e23a92b9d91819dd) -commit 67c0ea6c9421a5226c1b8bc3a198b1cb01f6b355 +commit 33eb36f26663c09c873acede1b35e91ef4c64479 Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Thu Oct 30 16:55:29 2008 +1030 @@ -274,9 +669,22 @@ If the property is set, the driver scales from the calibrated range to the values reported to the X server (which then may scale to screen coordinates). If the property is not set (i.e. zero items) no scaling is performed. - (cherry picked from commit 33eb36f26663c09c873acede1b35e91ef4c64479) -commit 6bcbbc0411cf3466edeb1fcbb393290cadfd3082 +commit d5cf24d3f0075a467e026592bfbb76b207dea8eb +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Wed Oct 29 16:54:16 2008 +1030 + + Add test/ directory for uinput-based test devices. + + Three test devices provided: + btn0 .... Provides BTN_0, BTN_1, BTN_2 instead of BTN_LEFT, BTN_MIDDLE, + BTN_RIGHT. + abs ..... Provdes x/y absolute axes, jumps between 100/100 and 120/120. + absrel .. Provides relative x/y axes and absolute x/y axes at the same time. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)redhat.com> + +commit 64554e4799a697d37dfd8be480f8eee636b9bea1 Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Wed Oct 29 13:50:07 2008 +1030 @@ -292,9 +700,8 @@ trying to map BTN_0. Signed-off-by: Peter Hutterer <peter.hutterer(a)redhat.com> - (cherry picked from commit 64554e4799a697d37dfd8be480f8eee636b9bea1) -commit 534a3734d088ff0155ebc7fca7ab246635cd725a +commit b77f9398570fb8eae1fcf50bc3c10c9c390c6bac Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Wed Oct 29 13:28:19 2008 +1030 @@ -303,9 +710,8 @@ xkeyboard-config's maps are perfectly able to cope with evdev now. Signed-off-by: Peter Hutterer <peter.hutterer(a)redhat.com> - (cherry picked from commit b77f9398570fb8eae1fcf50bc3c10c9c390c6bac) -commit 215c230d5c036e7d5c8e2621cf272a078149d969 +commit a43ab4999b9cad10f77aa6c703d3c61b754f1fd4 Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Tue Oct 28 12:09:26 2008 +1030 @@ -314,9 +720,8 @@ Suggested by Julien Cristau. Signed-off-by: Peter Hutterer <peter.hutterer(a)redhat.com> - (cherry picked from commit a43ab4999b9cad10f77aa6c703d3c61b754f1fd4) -commit 8f96530449b264e7f1f21ab1d030c5b361937774 +commit af096e8c5d8b425f725a37bf4a98e205e70716e9 Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Mon Oct 27 15:54:49 2008 +1030 @@ -326,9 +731,8 @@ EmuMBPreInit call was removed from EvdevOn. As a result, VT switching away and back wouldn't restore the wakeup handlers and mouse button presses disappeared. - (cherry picked from commit af096e8c5d8b425f725a37bf4a98e205e70716e9) -commit 4fb97edcd4e3de23a8476ca4d0267f55293cccad +commit 12498042fcc08e34aef0117ce84192f59542fd56 Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Fri Oct 24 13:09:46 2008 +1030 @@ -336,9 +740,8 @@ If min_x/y was not equal to 0, the inverted calculated range was off and leads to inaccessible or out-of-range areas. - (cherry picked from commit 12498042fcc08e34aef0117ce84192f59542fd56) -commit 4e86393bc0873235c1381faee5559b1aeba63be5 +commit 0f8fcfccb3251ee3df80d90ae5d7df638722d24e Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Fri Oct 24 09:21:36 2008 +1030 @@ -348,36 +751,26 @@ whether we're forcing it off or on. Found by Michel Dänzer. - (cherry picked from commit 0f8fcfccb3251ee3df80d90ae5d7df638722d24e) - -commit a64a78791f8350a01193ae216341fbb3d3d66567 -Author: Peter Hutterer <peter.hutterer(a)redhat.com> -Date: Thu Oct 23 17:16:36 2008 +1030 - - evdev 2.1 RC 2 -commit 09b2a5e87b9f05cb2cb7e794e49ba9650dd94eab +commit 0ab4c09e504ba3822c5e030732b770140165e725 Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Thu Oct 23 14:05:41 2008 +1030 Silence compiler warning by memsetting the struct properly. - (cherry picked from commit 0ab4c09e504ba3822c5e030732b770140165e725) -commit fa18a4a38d3cdf9ab94dcc5586cade3016a97616 +commit d348eb8ce78640363c159e1a4fdbfa9b596fa5bb Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Thu Oct 23 13:22:17 2008 +1030 MB emulation timeout is stored as Time, make the property 32-bit too. - (cherry picked from commit d348eb8ce78640363c159e1a4fdbfa9b596fa5bb) -commit 172523d74557f4c82209f9dd4869d7735944c9e7 +commit 2c1698fa615a083de7dd647622a302d5de77dc0c Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Wed Oct 22 18:01:58 2008 +1030 Init ioctl bitmasks to 0, shuts up valgrind too. - (cherry picked from commit 2c1698fa615a083de7dd647622a302d5de77dc0c) -commit 8fb820ffafdc8962ed747f918c6ecc1c4f451b0e +commit 8c39302594445ba774ea3fec66417492cc5643e0 Author: Søren Hauberg <hauberg(a)gmail.com> Date: Wed Oct 1 11:06:31 2008 +0930 @@ -387,9 +780,8 @@ BTN_TOUCH. Add a new flag to note the device type. If BTN_TOUCH is detected, change it to BTN_LEFT and process it normally. - (cherry picked from commit 8c39302594445ba774ea3fec66417492cc5643e0) -commit c7893b212d4d633c3229901bace6571d67ec1315 +commit f57e8face94c9e6986b35ca2ec231e284b9f58cf Author: Julien Cristau <jcristau(a)debian.org> Date: Tue Oct 21 19:21:21 2008 +0200 @@ -397,9 +789,8 @@ Reported by Albert Damen <albrt(a)gmx.net> X.Org Bug#18150 <http://bugs.freedesktop.org/show_bug.cgi?id=18150> - (cherry picked from commit f57e8face94c9e6986b35ca2ec231e284b9f58cf) -commit e9dd721e2dd24e9bdc5092bcc0bbe94a2ac065ff +commit 4912e2aa7f867a86d383010023b8426c881fb3b0 Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Thu Oct 16 15:23:06 2008 +1030 @@ -410,9 +801,8 @@ This is an updated version of e8534d47c8524ac081c2e3e6ebaabe4c6b274a18, which was reverted in 6dc41991557fa55a9e2f5aaf0fe40c70a08d41fd. - (cherry picked from commit 4912e2aa7f867a86d383010023b8426c881fb3b0) -commit cab104fd9e508030db623bae2eb70bd5dd1bf450 +commit 7243116f55609a2a5f73bb88cf6ad6386c9bbc0b Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Thu Oct 16 22:35:42 2008 +1030 @@ -422,43 +812,32 @@ them. It makes the server unhappy. Signed-off-by: Julien Cristau <jcristau(a)debian.org> - (cherry picked from commit 7243116f55609a2a5f73bb88cf6ad6386c9bbc0b) - -commit 708eb345997336f2df58b1d8c5ef36572e8f420c -Author: Peter Hutterer <peter.hutterer(a)redhat.com> -Date: Tue Oct 14 17:19:58 2008 +1030 - evdev 2.1 RC 1. - -commit 36a687796f3a810812bc7e22791fe21f2be618d6 +commit 0089d931ac5fb290c82908da652b28c8b515d449 Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Tue Oct 14 17:02:43 2008 +1030 Fix "Device reopened after N attempts" message. - (cherry picked from commit 0089d931ac5fb290c82908da652b28c8b515d449) -commit 26229df106f604ffad9a602e128108e93678c403 +commit 0f5a5ac09ebc89e984b72d395475bb9f412e240c Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Tue Oct 14 16:45:44 2008 +1030 Don't init draglock, etc. if we don't have the required capabilities. - (cherry picked from commit 0f5a5ac09ebc89e984b72d395475bb9f412e240c) -commit f4616d87fc6e5a111ec1ad67281c93a2c8bc1011 +commit 36d68b006d6bb3d41c93888acead73043ca304a1 Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Tue Oct 14 16:41:54 2008 +1030 8-bit properties should use 8-bit storage types... - (cherry picked from commit 36d68b006d6bb3d41c93888acead73043ca304a1) -commit 2aa5ca8cdd7f0c00983cab86829a6c668fc0fe80 +commit bb1f42168761b928478a9cb066457b525c41ddd9 Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Tue Oct 14 16:25:27 2008 +1030 Don't include the client-side header anymore. xkbstr.h is server SDK. - (cherry picked from commit bb1f42168761b928478a9cb066457b525c41ddd9) -commit 39263dc65d5240f74fd5f1b0ec5bdf53a007d5e9 +commit 0405f7b17fb0ce5cadcc6c5aa6eeb61bdacdf9cd Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Tue Oct 14 16:21:00 2008 +1030 @@ -466,23 +845,20 @@ This includes shuffling some functions around so we don't need the prototypes in evdev.h. - (cherry picked from commit 0405f7b17fb0ce5cadcc6c5aa6eeb61bdacdf9cd) -commit 57521e4e60c47b4683910d7f3cec42d1fa276810 +commit 088e0a175a4913bf827c1f7e19de09fdf987d347 Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Tue Oct 14 16:14:13 2008 +1030 Rename DragLockInit to DragLockPreInit, remove superfluous "return". - (cherry picked from commit 088e0a175a4913bf827c1f7e19de09fdf987d347) -commit 7da15223097a13fc8dac68a18a40342d5070bfa3 +commit cefedeb205291001e7e47b7516de261dbccce059 Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Tue Oct 14 16:12:13 2008 +1030 Register property handler from within the modules, not the main evdev file. - (cherry picked from commit cefedeb205291001e7e47b7516de261dbccce059) -commit b4fcb825fc989131c399e3473576f539a81f3aac +commit b0737bdbd1f6e601eb4984b6f4cb49279190984c Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Tue Oct 14 16:09:20 2008 +1030 @@ -491,35 +867,36 @@ Call the PreInit functions for MB Emulation, wheel emu, and draglock during PreInit, not on DEVICE_INIT. This way, we only parse the options once and don't overwrite with defaults when coming back from a VT switch. - (cherry picked from commit b0737bdbd1f6e601eb4984b6f4cb49279190984c) -commit 7c955ad050e6f7011e513af823d3229686ee982e +commit 5f2c8a2dcdf98b39997ee5e7c9a9ace3b640bfa3 Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Tue Oct 14 16:01:17 2008 +1030 Janitor: clean up xf86Msg use, might as well use X_CONFIG directly. - (cherry picked from commit 5f2c8a2dcdf98b39997ee5e7c9a9ace3b640bfa3) -commit 4f80c0f2cb77b9a51ab27577c318469f7eaf1e15 +commit ff783fce65a63707555098759692b22147646263 Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Tue Oct 14 15:30:20 2008 +1030 Add property support for ReopenAttempts option. - (cherry picked from commit ff783fce65a63707555098759692b22147646263) -commit 5070d64aa85f9bf137836ad46b3da9581e139a1a +commit c638aa4a88116a1219cf4941aacd630e070db099 Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Tue Oct 14 15:06:40 2008 +1030 Document properties in man page. - (cherry picked from commit c638aa4a88116a1219cf4941aacd630e070db099) -commit caacacf0576fe3a4c63593ecd2085a82fa0b406c +commit b46677e346c33379cac814895641349cbd3b37f2 Author: Peter Hutterer <peter.hutterer(a)redhat.com> Date: Tue Oct 14 15:06:17 2008 +1030 Document InvertX/Y options. - (cherry picked from commit b46677e346c33379cac814895641349cbd3b37f2) + +commit 680b41dc7681cd611ed385af8009489be6071a41 +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Mon Oct 13 17:08:22 2008 +1030 + + Bump to 2.1.99. commit 9065d0ccb26d013f26570d29c332bf1c93fabb2d Author: Peter Hutterer <peter.hutterer(a)redhat.com> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-evdev-2.1.99.1/configure new/xf86-input-evdev-2.2.0/configure --- old/xf86-input-evdev-2.1.99.1/configure 2009-03-02 07:18:01.000000000 +0100 +++ new/xf86-input-evdev-2.2.0/configure 2009-03-09 01:04:11.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for xf86-input-evdev 2.1.99.1. +# Generated by GNU Autoconf 2.63 for xf86-input-evdev 2.2.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -750,8 +750,8 @@ # Identity of this package. PACKAGE_NAME='xf86-input-evdev' PACKAGE_TARNAME='xf86-input-evdev' -PACKAGE_VERSION='2.1.99.1' -PACKAGE_STRING='xf86-input-evdev 2.1.99.1' +PACKAGE_VERSION='2.2.0' +PACKAGE_STRING='xf86-input-evdev 2.2.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1512,7 +1512,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 xf86-input-evdev 2.1.99.1 to adapt to many kinds of systems. +\`configure' configures xf86-input-evdev 2.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1583,7 +1583,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-input-evdev 2.1.99.1:";; + short | recursive ) echo "Configuration of xf86-input-evdev 2.2.0:";; esac cat <<\_ACEOF @@ -1700,7 +1700,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-input-evdev configure 2.1.99.1 +xf86-input-evdev configure 2.2.0 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1714,7 +1714,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-input-evdev $as_me 2.1.99.1, which was +It was created by xf86-input-evdev $as_me 2.2.0, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2432,7 +2432,7 @@ # Define the identity of the package. PACKAGE='xf86-input-evdev' - VERSION='2.1.99.1' + VERSION='2.2.0' cat >>confdefs.h <<_ACEOF @@ -22123,7 +22123,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-input-evdev $as_me 2.1.99.1, which was +This file was extended by xf86-input-evdev $as_me 2.2.0, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22186,7 +22186,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -xf86-input-evdev config.status 2.1.99.1 +xf86-input-evdev config.status 2.2.0 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-evdev-2.1.99.1/configure.ac new/xf86-input-evdev-2.2.0/configure.ac --- old/xf86-input-evdev-2.1.99.1/configure.ac 2009-03-02 07:17:50.000000000 +0100 +++ new/xf86-input-evdev-2.2.0/configure.ac 2009-03-09 01:02:14.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-evdev], - 2.1.99.1, + 2.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xf86-input-evdev) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-evdev-2.1.99.1/include/Makefile.in new/xf86-input-evdev-2.2.0/include/Makefile.in --- old/xf86-input-evdev-2.1.99.1/include/Makefile.in 2009-03-02 07:18:44.000000000 +0100 +++ new/xf86-input-evdev-2.2.0/include/Makefile.in 2009-03-09 01:04:12.000000000 +0100 @@ -202,9 +202,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/Makefile + $(AUTOMAKE) --foreign include/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-evdev-2.1.99.1/man/Makefile.in new/xf86-input-evdev-2.2.0/man/Makefile.in --- old/xf86-input-evdev-2.1.99.1/man/Makefile.in 2009-03-02 07:18:44.000000000 +0100 +++ new/xf86-input-evdev-2.2.0/man/Makefile.in 2009-03-09 01:04:12.000000000 +0100 @@ -245,9 +245,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/Makefile + $(AUTOMAKE) --foreign man/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-evdev-2.1.99.1/src/evdev.c new/xf86-input-evdev-2.2.0/src/evdev.c --- old/xf86-input-evdev-2.1.99.1/src/evdev.c 2009-03-02 07:16:59.000000000 +0100 +++ new/xf86-input-evdev-2.2.0/src/evdev.c 2009-03-09 00:11:15.000000000 +0100 @@ -2002,6 +2002,9 @@ int group = (button % 0x100)/16; int idx = button - ((button/16) * 16); + if (!btn_labels[group][idx]) + continue; + atom = XIGetKnownProperty(btn_labels[group][idx]); if (!atom) continue; @@ -2014,7 +2017,7 @@ /* wheel buttons, hardcoded anyway */ atoms[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP); - atoms[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP); + atoms[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN); atoms[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT); atoms[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-evdev-2.1.99.1/src/evdev.h new/xf86-input-evdev-2.2.0/src/evdev.h --- old/xf86-input-evdev-2.1.99.1/src/evdev.h 2009-02-19 01:03:22.000000000 +0100 +++ new/xf86-input-evdev-2.2.0/src/evdev.h 2009-03-09 01:00:05.000000000 +0100 @@ -59,6 +59,11 @@ #define HAVE_PROPERTIES 1 #endif +#ifndef MAX_VALUATORS +#define MAX_VALUATORS 36 +#endif + + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5 typedef struct { char *rules; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-evdev-2.1.99.1/src/Makefile.in new/xf86-input-evdev-2.2.0/src/Makefile.in --- old/xf86-input-evdev-2.1.99.1/src/Makefile.in 2009-03-02 07:18:44.000000000 +0100 +++ new/xf86-input-evdev-2.2.0/src/Makefile.in 2009-03-09 01:04:12.000000000 +0100 @@ -256,9 +256,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + $(AUTOMAKE) --foreign src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-evdev-2.1.99.1/test/Makefile.in new/xf86-input-evdev-2.2.0/test/Makefile.in --- old/xf86-input-evdev-2.1.99.1/test/Makefile.in 2009-03-02 07:18:44.000000000 +0100 +++ new/xf86-input-evdev-2.2.0/test/Makefile.in 2009-03-09 01:04:12.000000000 +0100 @@ -270,9 +270,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu test/Makefile + $(AUTOMAKE) --foreign test/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ ++++++ xf86-input-synaptics-1.0.99.4.tar.bz2 -> xf86-input-synaptics-1.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.4/configure new/xf86-input-synaptics-1.1.0/configure --- old/xf86-input-synaptics-1.0.99.4/configure 2009-03-05 02:57:09.000000000 +0100 +++ new/xf86-input-synaptics-1.1.0/configure 2009-03-09 03:00:15.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for xf86-input-synaptics 1.0.99.4. +# Generated by GNU Autoconf 2.63 for xf86-input-synaptics 1.1.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -750,8 +750,8 @@ # Identity of this package. PACKAGE_NAME='xf86-input-synaptics' PACKAGE_TARNAME='xf86-input-synaptics' -PACKAGE_VERSION='1.0.99.4' -PACKAGE_STRING='xf86-input-synaptics 1.0.99.4' +PACKAGE_VERSION='1.1.0' +PACKAGE_STRING='xf86-input-synaptics 1.1.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1520,7 +1520,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 xf86-input-synaptics 1.0.99.4 to adapt to many kinds of systems. +\`configure' configures xf86-input-synaptics 1.1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1591,7 +1591,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-input-synaptics 1.0.99.4:";; + short | recursive ) echo "Configuration of xf86-input-synaptics 1.1.0:";; esac cat <<\_ACEOF @@ -1714,7 +1714,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-input-synaptics configure 1.0.99.4 +xf86-input-synaptics configure 1.1.0 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1728,7 +1728,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-input-synaptics $as_me 1.0.99.4, which was +It was created by xf86-input-synaptics $as_me 1.1.0, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2446,7 +2446,7 @@ # Define the identity of the package. PACKAGE='xf86-input-synaptics' - VERSION='1.0.99.4' + VERSION='1.1.0' cat >>confdefs.h <<_ACEOF @@ -22186,7 +22186,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-input-synaptics $as_me 1.0.99.4, which was +This file was extended by xf86-input-synaptics $as_me 1.1.0, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22249,7 +22249,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -xf86-input-synaptics config.status 1.0.99.4 +xf86-input-synaptics config.status 1.1.0 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.4/configure.ac new/xf86-input-synaptics-1.1.0/configure.ac --- old/xf86-input-synaptics-1.0.99.4/configure.ac 2009-03-05 02:54:56.000000000 +0100 +++ new/xf86-input-synaptics-1.1.0/configure.ac 2009-03-09 02:59:54.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-synaptics], - 1.0.99.4, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xf86-input-synaptics) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.4/man/synaptics.man new/xf86-input-synaptics-1.1.0/man/synaptics.man --- old/xf86-input-synaptics-1.0.99.4/man/synaptics.man 2009-02-26 05:20:07.000000000 +0100 +++ new/xf86-input-synaptics-1.1.0/man/synaptics.man 2009-03-09 02:37:31.000000000 +0100 @@ -68,9 +68,6 @@ Please refer to __xconfigfile__(__filemansuffix__) for general configuration details and for options that can be used with all input drivers. This section only covers configuration details specific to this driver. -. -If you have the SHMConfig parameter enabled, these parameters can also -be changed at runtime with the synclient(1) program. .PP The following driver .B Options @@ -93,23 +90,24 @@ .TE .TP 7 .BI "Option \*qSHMConfig\*q \*q" boolean \*q -Switch on/off shared memory for configuration. This enables the driver to be -configured at runtime. Note that this is considered a security risk since any -user can access the configuration. +Switch on/off shared memory for run-time configuration. Note that this is +considered a security risk since any user can access the configuration. This +option is not needed with synaptics 1.0 or later. See section +.B Device Properties. .TP 7 .BI "Option \*qLeftEdge\*q \*q" integer \*q -X coordinate for left edge. +X coordinate for left edge. Property: "Synaptics Edges" .TP 7 .BI "Option \*qRightEdge\*q \*q" integer \*q X coordinate for right edge. If this option is set, .BI SpecialScrollAreaRight -is ignored. +is ignored. Property: "Synaptics Edges" .TP 7 .BI "Option \*qTopEdge\*q \*q" integer \*q -Y coordinate for top edge. +Y coordinate for top edge. Property: "Synaptics Edges" .TP 7 .BI "Option \*qBottomEdge\*q \*q" integer \*q -Y coordinate for bottom edge. +Y coordinate for bottom edge. Property: "Synaptics Edges" .TP 7 .BI "Option \*qSpecialScrollAreaRight\*q \*q" boolean \*q Some touchpads have a scroll region on the right edge. Disable this option if @@ -117,135 +115,157 @@ .TP 7 .BI "Option \*qFingerLow\*q \*q" integer \*q When finger pressure drops below this value, the driver counts it as a -release. +release. Property: "Synaptics Finger" .TP 7 .BI "Option \*qFingerHigh\*q \*q" integer \*q When finger pressure goes above this value, the driver counts it as a -touch. +touch. Property: "Synaptics Finger" .TP 7 .BI "Option \*qFingerPress\*q \*q" integer \*q When finger pressure goes above this value, the driver counts it as a press. . Currently a press is equivalent to putting the touchpad in trackstick -emulation mode. +emulation mode. Property: "Synaptics Finger" .TP 7 .BI "Option \*qMaxTapTime\*q \*q" integer \*q -Maximum time (in milliseconds) for detecting a tap. +Maximum time (in milliseconds) for detecting a tap. Property: "Synaptics Tap +Durations" .TP 7 .BI "Option \*qBMaxTapMove\*q \*q" integer \*q -Maximum movement of the finger for detecting a tap. +Maximum movement of the finger for detecting a tap. Property: "Synaptics Tap +Move" .TP 7 .BI "Option \*qMaxDoubleTapTime\*q \*q" integer \*q -Maximum time (in milliseconds) for detecting a double tap. +Maximum time (in milliseconds) for detecting a double tap. Property: +"Synaptics Tap Durations" .TP 7 .BI "Option \*qClickTime\*q \*q" integer \*q -The duration of the mouse click generated by tapping. +The duration of the mouse click generated by tapping. Property: "Synaptics Tap +Durations" .TP 7 .BI "Option \*qFastTaps\*q \*q" boolean \*q Makes the driver react faster to a single tap, but also makes double -clicks caused by double tapping slower. +clicks caused by double tapping slower. Property: "Synaptics Tap FastTap" .TP 7 .BI "Option \*qVertEdgeScroll\*q \*q" boolean \*q -Enable vertical scrolling when dragging along the right edge. +Enable vertical scrolling when dragging along the right edge. Property: +"Synaptics Edge Scrolling" .TP 7 .BI "Option \*qHorizEdgeScroll\*q \*q" boolean \*q -Enable horizontal scrolling when dragging along the bottom edge. +Enable horizontal scrolling when dragging along the bottom edge. Property: +"Synaptics Edge Scrolling" .TP 7 .BI "Option \*qCornerCoasting\*q \*q" boolean \*q Enable edge scrolling to continue while the finger stays in an edge corner. +Property: "Synaptics Edge Scrolling" .TP 7 .BI "Option \*qVertTwoFingerScroll\*q \*q" boolean \*q Enable vertical scrolling when dragging with two fingers anywhere on -the touchpad. +the touchpad. Property: "Synaptics Two-Finger Scrolling" .TP 7 .BI "Option \*qHorizTwoFingerScroll\*q \*q" boolean \*q Enable horizontal scrolling when dragging with two fingers anywhere on -the touchpad. +the touchpad. Property: "Synaptics Two-Finger Scrolling" .TP 7 .BI "Option \*qVertScrollDelta\*q \*q" integer \*q -Move distance of the finger for a scroll event. +Move distance of the finger for a scroll event. Property: "Synaptics Scrolling +Distance" .TP 7 .BI "Option \*qHorizScrollDelta\*q \*q" integer \*q -Move distance of the finger for a scroll event. +Move distance of the finger for a scroll event. Property: "Synaptics Scrolling +Distance" .TP 7 .BI "Option \*qEdgeMotionMinZ\*q \*q" integer \*q -Finger pressure at which minimum edge motion speed is set. +Finger pressure at which minimum edge motion speed is set. Property: +"Synaptics Edge Motion Pressure" .TP .BI "Option \*qEdgeMotionMaxZ\*q \*q" integer \*q -Finger pressure at which maximum edge motion speed is set. +Finger pressure at which maximum edge motion speed is set. Property: +"Synaptics Edge Motion Pressure" .TP .BI "Option \*qEdgeMotionMinSpeed\*q \*q" integer \*q -Slowest setting for edge motion speed. +Slowest setting for edge motion speed. Property: "Synaptics Edge Motion Speed" .TP .BI "Option \*qEdgeMotionMaxSpeed\*q \*q" integer \*q -Fastest setting for edge motion speed. +Fastest setting for edge motion speed. Property: "Synaptics Edge Motion Speed" .TP .BI "Option \*qEdgeMotionUseAlways\*q \*q" boolean \*q If on, edge motion is also used for normal movements. . -If off, egde motion is used only when dragging. +If off, egde motion is used only when dragging. Property: "Synaptics Edge +Motion Always" .TP .BI "Option \*qMinSpeed\*q \*q" float \*q -Minimum speed factor. +Minimum speed factor. Property: "Synaptics Move Speed" .TP -.BI "Option \*qMaxSpeed\fR (\*q \*q" float \*q) -Maximum speed factor. +.BI "Option \*qMaxSpeed\*q \*q" float \*q +Maximum speed factor. Property: "Synaptics Move Speed" .TP -.BI "Option \*qAccelFactor\fR (\*q \*q" float \*q) -Acceleration factor for normal pointer movements. +.BI "Option \*qAccelFactor\*q \*q" float \*q +Acceleration factor for normal pointer movements. Property: "Synaptics Move +Speed" .TP -.BI "Option \*qTrackstickSpeed\fR (\*q \*q" float \*q) -Speed scale when in trackstick emulation mode. +.BI "Option \*qTrackstickSpeed\*q \*q" float \*q +Speed scale when in trackstick emulation mode. Property: "Synaptics Move Speed" .TP .BI "Option \*qPressureMotionMinZ\*q \*q" integer \*q -Finger pressure at which minimum pressure motion factor is applied. +Finger pressure at which minimum pressure motion factor is applied. Property: +"Synaptics Pressure Motion" .TP .BI "Option \*qPressureMotionMaxZ\*q \*q" integer \*q -Finger pressure at which maximum pressure motion factor is applied. +Finger pressure at which maximum pressure motion factor is applied. Property: +"Synaptics Pressure Motion" .TP .BI "Option \*qPressureMotionMinFactor\*q \*q" integer \*q -Lowest setting for pressure motion factor. +Lowest setting for pressure motion factor. Property: "Synaptics Pressure +Motion Factor" .TP .BI "Option \*qPressureMotionMaxFactor\*q \*q" integer \*q -Greatest setting for pressure motion factor. +Greatest setting for pressure motion factor. Property: "Synaptics Pressure +Motion Factor" .TP .BI "Option \*qUpDownScrolling\*q \*q" boolean \*q If on, the up/down buttons generate button 4/5 events. . If off, the up button generates a double click and the down button -generates a button 2 event. +generates a button 2 event. Property: "Synaptics Button Scrolling" .TP .BI "Option \*qLeftRightScrolling\*q \*q" boolean \*q If on, the left/right buttons generate button 6/7 events. . -If off, the left/right buttons both generate button 2 events. +If off, the left/right buttons both generate button 2 events. Property: +"Synaptics Button Scrolling" .TP .BI "Option \*qUpDownScrollRepeat\*q \*q" boolean \*q If on, and the up/down buttons are used for scrolling (\fBUpDownScrolling\fR), these buttons will send auto-repeating 4/5 events, with the delay between repeats determined by \fBScrollButtonRepeat\fR. +Property: "Synaptics Button Scrolling Repeat" .TP .BI "Option \*qLeftRightScrollRepeat\*q \*q" boolean \*q If on, and the left/right buttons are used for scrolling (\fBLeftRightScrolling\fR), these buttons will send auto-repeating 6/7 events, with the delay between repeats determined by \fBScrollButtonRepeat\fR. +Property: "Synaptics Button Scrolling Repeat" .TP .BI "Option \*qScrollButtonRepeat\*q \*q" integer \*q The number of milliseconds between repeats of button events 4-7 from the -up/down/left/right scroll buttons. +up/down/left/right scroll buttons. Property: "Synaptics Button Scrolling Time" .TP .BI "Option \*qEmulateMidButtonTime\*q \*q" integer \*q -Maximum time (in milliseconds) for middle button emulation. +Maximum time (in milliseconds) for middle button emulation. Property: +"Synaptics Middle Button Timeout" .TP .BI "Option \*qEmulateTwoFingerMinZ\*q \*q" integer \*q For touchpads not capable of detecting multiple fingers (Alps), this sets the -Z pressure threshold to emulate a two finger press. +Z pressure threshold to emulate a two finger press. Property: "Synaptics +Two-Finger Pressure" .TP .BI "Option \*qEmulateTwoFingerMinW\*q \*q" integer \*q Some touchpads report a two-finger touch as wide finger. This sets the finger width threshold to emulate a two finger press. This feature works best with -(\fBPalmDetect\fR) off. +(\fBPalmDetect\fR) off. Property: "Synaptics Two-Finger Width" .TP .BI "Option \*qTouchpadOff\*q \*q" integer \*q Switch off the touchpad. @@ -257,77 +277,80 @@ 1 Touchpad is switched off 2 Only tapping and scrolling is switched off .TE +Property: "Synaptics Off" .TP .BI "Option \*qGuestMouseOff\*q \*q" boolean \*q -Switch on/off guest mouse (often a stick). +Switch on/off guest mouse (often a stick). Property: "Synaptics Guestmouse +Off" .TP .BI "Option \*qLockedDrags\*q \*q" boolean \*q If off, a tap and drag gesture ends when you release the finger. . If on, the gesture is active until you tap a second time, or until -LockedDragTimeout expires. +LockedDragTimeout expires. Property: "Synaptics Locked Drags" .TP .BI "Option \*qLockedDragTimeout\*q \*q" integer \*q This parameter specifies how long it takes (in milliseconds) for the LockedDrags mode to be automatically turned off after the finger is -released from the touchpad. +released from the touchpad. Property: "Synaptics Locked Drags Timeout" .TP .BI "Option \*qRTCornerButton\*q \*q" integer \*q . Which mouse button is reported on a right top corner tap. . -Set to 0 to disable. +Set to 0 to disable. Property: "Synaptics Tap Action" .TP .BI "Option \*qRBCornerButton\*q \*q" integer \*q Which mouse button is reported on a right bottom corner tap. . -Set to 0 to disable. +Set to 0 to disable. Property: "Synaptics Tap Action" .TP .BI "Option \*qLTCornerButton\*q \*q" integer \*q Which mouse button is reported on a left top corner tap. . -Set to 0 to disable. +Set to 0 to disable. Property: "Synaptics Tap Action" .TP .BI "Option \*qLBCornerButton\*q \*q" integer \*q Which mouse button is reported on a left bottom corner tap. . -Set to 0 to disable. +Set to 0 to disable. Property: "Synaptics Tap Action" .TP .BI "Option \*qTapButton1\*q \*q" integer \*q Which mouse button is reported on a non-corner one-finger tap. . -Set to 0 to disable. +Set to 0 to disable. Property: "Synaptics Tap Action" .TP .BI "Option \*qTapButton2\*q \*q" integer \*q Which mouse button is reported on a non-corner two-finger tap. . -Set to 0 to disable. +Set to 0 to disable. Property: "Synaptics Tap Action" .TP .BI "Option \*qTapButton3\*q \*q" integer \*q Which mouse button is reported on a non-corner three-finger tap. . -Set to 0 to disable. +Set to 0 to disable. Property: "Synaptics Tap Action" .TP .BI "Option \*qClickFinger1\*q \*q" integer \*q Which mouse button is reported when left-clicking with one finger. . -Set to 0 to disable. +Set to 0 to disable. Property: "Synaptics Click Action" .TP .BI "Option \*qClickFinger2\*q \*q" integer \*q Which mouse button is reported when left-clicking with two fingers. . -Set to 0 to disable. +Set to 0 to disable. Property: "Synaptics Click Action" .TP .BI "Option \*qClickFinger3\*q \*q" integer \*q Which mouse button is reported when left-clicking with three fingers. . -Set to 0 to disable. +Set to 0 to disable. Property: "Synaptics Click Action" .TP .BI "Option \*qCircularScrolling\*q \*q" boolean \*q -If on, circular scrolling is used. +If on, circular scrolling is used. Property: "Synaptics Circular Scrolling" .TP -.BI "Option \*qCircScrollDelta\fR (\*q \*q" float \*q) -Move angle (radians) of finger to generate a scroll event. +.BI "Option \*qCircScrollDelta\*q \*q" float \*q +Move angle (radians) of finger to generate a scroll event. Property: "Synaptics +Circular Scrolling Distance" .TP .BI "Option \*qCircScrollTrigger\*q \*q" integer \*q Trigger region on the touchpad to start circular scrolling @@ -343,33 +366,37 @@ 7 Left Edge 8 Top Left Corner .TE +Property: "Synaptics Circular Scrolling Trigger" .TP .BI "Option \*qCircularPad\*q \*q" boolean \*q . Instead of being a rectangle, the edge is the ellipse enclosed by the Left/Right/Top/BottomEdge parameters. . -For circular touchpads. +For circular touchpads. Property: "Synaptics Circular Pad" .TP .BI "Option \*qPalmDetect\*q \*q" boolean \*q If palm detection should be enabled. . Note that this also requires hardware/firmware support from the -touchpad. +touchpad. Property: "Synaptics Palm Detection" .TP .BI "Option \*qPalmMinWidth\*q \*q" integer \*q -Minimum finger width at which touch is considered a palm. +Minimum finger width at which touch is considered a palm. Property: "Synaptics +Palm Dimensions" .TP .BI "Option \*qPalmMinZ\*q \*q" integer \*q -Minimum finger pressure at which touch is considered a palm. +Minimum finger pressure at which touch is considered a palm. Property: +"Synaptics Palm Dimensions" .TP -.BI "Option \*qCoastingSpeed\fR (\*q \*q" float \*q) +.BI "Option \*qCoastingSpeed\*q \*q" float \*q Coasting threshold scrolling speed. . -0 disables coasting. +0 disables coasting. Property: "Synaptics Coasting Speed" .TP .BI "Option \*qSingleTapTimeout\*q \*q" integer \*q -Timeout after a tap to recognize it as a single tap. +Timeout after a tap to recognize it as a single tap. Property: "Synaptics Tap +Durations" .TP .BI "Option \*qGrabEventDevice\*q \*q" boolean \*q If GrabEventDevice is true, the driver will grab the event device for @@ -614,6 +641,158 @@ Trackstick mode is exited when the finger pressure drops below FingerLow or when the finger is moved further than MaxTapMove away from the initial position. + +.SH "DEVICE PROPERTIES" +Synaptics 1.0 and higher support input device properties if the driver is +running on X server 1.6 or higher. On these driver versions, Option +"SHMConfig" is not needed to enable run-time configuration. The synclient tool +shipped with synaptics version 1.1 uses input device properties by default. +. +Properties supported: +.TP 7 +.BI "Synaptics Edges" +32 bit, 4 values, left, right, top, bottom. + +.TP 7 +.BI "Synaptics Finger" +32 bit, 3 values, low, high, press. + +.TP 7 +.BI "Synaptics Tap Time" +32 bit. + +.TP 7 +.BI "Synaptics Tap Move" +32 bit. + +.TP 7 +.BI "Synaptics Tap Durations" +32 bit, 3 values, single touch timeout, max tapping time for double taps, +duration of a single click. + +.TP 7 +.BI "Synaptics Tap FastTap" +8 bit (BOOL). + +.TP 7 +.BI "Synaptics Middle Button Timeout" +32 bit. + +.TP 7 +.BI "Synaptics Two-Finger Pressure" +32 bit. + +.TP 7 +.BI "Synaptics Two-Finger Width" +32 bit. + +.TP 7 +.BI "Synaptics Scrolling Distance" +32 bit, 2 values, vert, horiz. + +.TP 7 +.BI "Synaptics Edge Scrolling" +8 bit (BOOL), 3 values, vertical, horizontal, corner. + +.TP 7 +.BI "Synaptics Two-Finger Scrolling" +8 bit (BOOL), 2 values, vertical, horizontal. + +.TP 7 +.BI "Synaptics Move Speed" +FLOAT, 4 values, min, max, accel, trackstick. + +.TP 7 +.BI "Synaptics Edge Motion Pressure" +32 bit, 2 values, min, max. + +.TP 7 +.BI "Synaptics Edge Motion Speed" +32 bit, 2 values, min, max. + +.TP 7 +.BI "Synaptics Edge Motion Always" +8 bit (BOOL). + +.TP 7 +.BI "Synaptics Button Scrolling" +8 bit (BOOL), 2 values, updown, leftright. + +.TP 7 +.BI "Synaptics Button Scrolling Repeat" +8 bit (BOOL), 2 values, updown, leftright. + +.TP 7 +.BI "Synaptics Button Scrolling Time" +32 bit. + +.TP 7 +.BI "Synaptics Off" +8 bit, valid values (0, 1, 2). + +.TP 7 +.BI "Synaptics Guestmouse Off" +8 bit (BOOL). + +.TP 7 +.BI "Synaptics Locked Drags" +8 bit (BOOL). + +.TP 7 +.BI "Synaptics Locked Drags Timeout" +32 bit. + +.TP 7 +.BI "Synaptics Tap Action" +8 bit, up to MAX_TAP values (see synaptics.h), 0 disables an element. order: +RT, RB, LT, LB, F1, F2, F3. + +.TP 7 +.BI "Synaptics Click Action" +8 bit, up to MAX_CLICK values (see synaptics.h), 0 disables an element. +order: Finger 1, 2, 3. + +.TP 7 +.BI "Synaptics Circular Scrolling" +8 bit (BOOL). + +.TP 7 +.BI "Synaptics Circular Scrolling Distance" +FLOAT. + +.TP 7 +.BI "Synaptics Circular Scrolling Trigger" +8 bit, valid values 0..8 (inclusive) order: any edge, top, top + right, +right, right + bottom, bottom, bottom + left, left, left + top. + +.TP 7 +.BI "Synaptics Circular Pad" +8 bit (BOOL). + +.TP 7 +.BI "Synaptics Palm Detection" +8 bit (BOOL). + +.TP 7 +.BI "Synaptics Palm Dimensions" +32 bit, 2 values, width, z. + +.TP 7 +.BI "Synaptics Coasting Speed" +FLOAT. + +.TP 7 +.BI "Synaptics Pressure Motion" +32 bit, 2 values, min, max. + +.TP 7 +.BI "Synaptics Pressure Motion Factor" +FLOAT, 2 values, min, max. + +.TP 7 +.BI "Synaptics Grab Event Device" +8 bit (BOOL). + .SH "NOTES" There is an example hal policy file in .I ${sourcecode}/fdi/11-x11-synaptics.fdi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 webalizer for openSUSE:Factory
by root＠Hilbert.suse.de 09 Mar '09

09 Mar '09

Hello community, here is the log from the commit of package webalizer for openSUSE:Factory checked in at Mon Mar 9 23:42:49 CET 2009. -------- --- webalizer/webalizer.changes 2008-07-28 19:09:26.000000000 +0200 +++ webalizer/webalizer.changes 2009-03-09 17:19:24.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Mar 9 17:18:28 CET 2009 - anicka(a)suse.cz + +- update to 2.20 + * Added missing memory deallocation call in DNS lookup code. + * Minor fixes to configure script + * Added "YearTotals" config option for main index page totals + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- webalizer-2.20-01-configuration.diff webalizer-2.20-01.diff webalizer-2.20-01-ia64.diff webalizer-2.20-01-maxagent.diff webalizer-2.20-01-src.tar.bz2 New: ---- webalizer-2.21-02-configuration.diff webalizer-2.21-02.diff webalizer-2.21-02-ia64.diff webalizer-2.21-02-maxagent.diff webalizer-2.21-02-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webalizer.spec ++++++ --- /var/tmp/diff_new_pack.I10449/_old 2009-03-09 23:36:12.000000000 +0100 +++ /var/tmp/diff_new_pack.I10449/_new 2009-03-09 23:36:12.000000000 +0100 @@ -1,10 +1,17 @@ # -# spec file for package webalizer (Version 2.20) +# spec file for package webalizer (Version 2.21) # -# 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. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# 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,13 +20,13 @@ Name: webalizer BuildRequires: apache2-devel db-devel db1-devel gd-devel libapr-util1-devel libjpeg-devel libpng-devel mm pcre-devel xorg-x11 xorg-x11-devel -%define editlvl 01 +%define editlvl 02 License: LGPL v2.1 or later Group: Productivity/Networking/Web/Utilities Provides: webalize Obsoletes: webalize AutoReqProv: on -Version: 2.20 +Version: 2.21 Release: 1 Url: http://www.mrunix.net/webalizer/ Summary: A Web Server Log File Analysis Program @@ -95,6 +102,11 @@ /var/lib/webalizer %changelog +* Mon Mar 09 2009 anicka(a)suse.cz +- update to 2.20 + * Added missing memory deallocation call in DNS lookup code. + * Minor fixes to configure script + * Added "YearTotals" config option for main index page totals * Mon Jul 28 2008 anicka(a)suse.cz - update to 2.20 * Fixed problem with timing totals. @@ -232,7 +244,7 @@ - Remove stupid casts. * Wed May 23 2001 cihlar(a)suse.cz - fixed cast warnings on ia64 -* Thu Mar 22 2001 ro(a)suse.de +* Wed Mar 21 2001 ro(a)suse.de - added freetype2 to neededforbuild * Fri Feb 23 2001 ro(a)suse.de - changed neededforbuild <apache> to <apache apache-devel> ++++++ webalizer-2.20-01-configuration.diff -> webalizer-2.21-02-configuration.diff ++++++ --- webalizer/webalizer-2.20-01-configuration.diff 2006-03-16 14:47:29.000000000 +0100 +++ webalizer/webalizer-2.21-02-configuration.diff 2009-03-09 17:16:43.000000000 +0100 @@ -1,15 +1,15 @@ --- sample.conf +++ sample.conf -@@ -25,7 +25,7 @@ - # the log filename ends in '.gz' (ie: a gzip compressed file), it will - # be decompressed on the fly as it is being read. +@@ -26,7 +26,7 @@ + # (bzip2 compressed file), it will be decompressed on the fly as it + # is being read. -#LogFile /var/lib/httpd/logs/access_log +LogFile /var/log/apache2/access_log # LogType defines the log type being processed. Normally, the Webalizer # expects a CLF or Combined web server log as input. Using this option, -@@ -39,7 +39,7 @@ +@@ -40,7 +40,7 @@ # should be a full path name, however relative ones might work as well. # If no output directory is specified, the current directory will be used. @@ -17,8 +17,8 @@ +OutputDir /srv/www/htdocs/webalizer # HistoryName allows you to specify the name of the history file produced - # by the Webalizer. The history file keeps the data for up to 12 months -@@ -126,7 +126,7 @@ + # by the Webalizer. The history file keeps the data for previous months, +@@ -168,7 +168,7 @@ # relative to the default output directory. See the DNS.README file for # additional information. @@ -27,12 +27,12 @@ # DNSChildren allows you to specify how many "children" processes are # run to perform DNS lookups to create or update the DNS cache file. -@@ -140,7 +140,7 @@ +@@ -182,7 +182,7 @@ # normal system operations. Reasonable values should be between 5 and # 20. See the DNS.README file for additional information. -#DNSChildren 0 +DNSChildren 10 - # HTMLPre defines HTML code to insert at the very beginning of the - # file. Default is the DOCTYPE line shown below. Max line length + # CacheIPs allows unresolved IP addresses to be cached in the DNS + # database. Normally, only resolved addresses are saved. At some ++++++ webalizer-2.20-01-configuration.diff -> webalizer-2.21-02.diff ++++++ --- webalizer/webalizer-2.20-01-configuration.diff 2006-03-16 14:47:29.000000000 +0100 +++ webalizer/webalizer-2.21-02.diff 2009-03-09 17:16:43.000000000 +0100 @@ -1,38 +1,23 @@ ---- sample.conf -+++ sample.conf -@@ -25,7 +25,7 @@ - # the log filename ends in '.gz' (ie: a gzip compressed file), it will - # be decompressed on the fly as it is being read. - --#LogFile /var/lib/httpd/logs/access_log -+LogFile /var/log/apache2/access_log - - # LogType defines the log type being processed. Normally, the Webalizer - # expects a CLF or Combined web server log as input. Using this option, -@@ -39,7 +39,7 @@ - # should be a full path name, however relative ones might work as well. - # If no output directory is specified, the current directory will be used. - --#OutputDir /var/lib/httpd/htdocs/usage -+OutputDir /srv/www/htdocs/webalizer - - # HistoryName allows you to specify the name of the history file produced - # by the Webalizer. The history file keeps the data for up to 12 months -@@ -126,7 +126,7 @@ - # relative to the default output directory. See the DNS.README file for - # additional information. - --#DNSCache dns_cache.db -+DNSCache dns_cache.db - - # DNSChildren allows you to specify how many "children" processes are - # run to perform DNS lookups to create or update the DNS cache file. -@@ -140,7 +140,7 @@ - # normal system operations. Reasonable values should be between 5 and - # 20. See the DNS.README file for additional information. - --#DNSChildren 0 -+DNSChildren 10 - - # HTMLPre defines HTML code to insert at the very beginning of the - # file. Default is the DOCTYPE line shown below. Max line length +--- Makefile.in ++++ Makefile.in +@@ -26,7 +26,7 @@ + GEODB = @GEODB_LOC@ + CC = @CC@ + CFLAGS = @CFLAGS@ @CPPFLAGS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -ljpeg -ldb -L/usr/X11R6/$(LIBNAME) -lX11 -lXpm + WCMGR_LIBS = @WCMGR_LIBS@ + DEFS = -DETCDIR=\"${ETCDIR}\" -DGEODB_LOC=\"${GEODB}\" @DEFS@ @OPTS@ + LDFLAGS = @LDFLAGS@ +--- configure.in ++++ configure.in +@@ -48,9 +48,6 @@ + [ --enable-static Build as static executable [[default=no]]], + LDFLAGS="--static ${LDFLAGS}") + +- if test "$IN_CFLAGS" = ""; then +- CFLAGS="-Wall -O2" +- fi + if test "$ac_cv_c_char_unsigned" = "yes"; then + CFLAGS="-fsigned-char ${CFLAGS}" + fi ++++++ webalizer-2.20-01-ia64.diff -> webalizer-2.21-02-ia64.diff ++++++ ++++++ webalizer-2.20-01-maxagent.diff -> webalizer-2.21-02-maxagent.diff ++++++ ++++++ webalizer-2.20-01-src.tar.bz2 -> webalizer-2.21-02-src.tar.bz2 ++++++ ++++ 3609 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/CHANGES new/webalizer-2.21-02/CHANGES --- old/webalizer-2.20-01/CHANGES 2008-07-01 22:35:37.000000000 +0200 +++ new/webalizer-2.21-02/CHANGES 2009-01-08 06:38:59.000000000 +0100 @@ -1,4 +1,16 @@ -------------------------------------------------------------------- +2.21-xx changes from 2.20-xx (brad(a)mrunix.net) +-------------------------------------------------------------------- + +Fixes: + o Added missing memory deallocation call in DNS lookup code. + + o Minor fixes to configure script + +Changes/Additions: + o Added "YearTotals" config option for main index page totals + +-------------------------------------------------------------------- 2.20-xx changes from 2.01-xx (brad(a)mrunix.net) -------------------------------------------------------------------- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/configure.in new/webalizer-2.21-02/configure.in --- old/webalizer-2.20-01/configure.in 2008-07-05 20:43:19.000000000 +0200 +++ new/webalizer-2.21-02/configure.in 2009-01-13 05:45:04.000000000 +0100 @@ -1,6 +1,6 @@ dnl dnl The Webalizer - A web server log file analysis program -dnl Copyright (C) 1997-2008 by Bradford L. Barrett +dnl Copyright (C) 1997-2009 by Bradford L. Barrett dnl dnl configure.in template for The Webalizer Version 2.20 dnl Process this file with autoconf to produce a configure script. @@ -197,7 +197,7 @@ AC_ARG_ENABLE(bz2, [ --enable-bz2 Enable BZip2 decompression code [[default=no]]], - USE_BZIP="yes", USE_BZIP="no") + USE_BZIP="${enableval}", USE_BZIP="no") AC_ARG_WITH(bz2, [ --with-bz2=DIR Alternate location for bz2 header files], @@ -233,7 +233,7 @@ AC_ARG_ENABLE(geoip, [ --enable-geoip Enable GeoIP geolocation code [[default=no]]], - USE_GEOIP="yes", USE_GEOIP="no") + USE_GEOIP="${enableval}", USE_GEOIP="no") AC_ARG_WITH(geoip, [ --with-geoip=DIR Alternate location for libGeoIP header files], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/Copyright new/webalizer-2.21-02/Copyright --- old/webalizer-2.20-01/Copyright 2008-06-08 03:49:30.000000000 +0200 +++ new/webalizer-2.21-02/Copyright 2009-01-13 05:47:39.000000000 +0100 @@ -1,6 +1,6 @@ webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/dns_resolv.c new/webalizer-2.21-02/dns_resolv.c --- old/webalizer-2.20-01/dns_resolv.c 2008-07-01 07:51:40.000000000 +0200 +++ new/webalizer-2.21-02/dns_resolv.c 2009-01-13 05:42:46.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -277,6 +277,7 @@ put_dnode(log_rec.hostname, ares->ai_addr, ares->ai_addrlen, host_table); } + freeaddrinfo(ares); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/graphs.c new/webalizer-2.21-02/graphs.c --- old/webalizer-2.20-01/graphs.c 2008-06-16 08:27:11.000000000 +0200 +++ new/webalizer-2.21-02/graphs.c 2009-01-13 05:42:53.000000000 +0100 @@ -1,7 +1,7 @@ /* graphs.c - produces graphs used by the Webalizer - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/hashtab.c new/webalizer-2.21-02/hashtab.c --- old/webalizer-2.20-01/hashtab.c 2008-05-26 19:13:41.000000000 +0200 +++ new/webalizer-2.21-02/hashtab.c 2009-01-13 05:42:57.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/lang/webalizer_lang.swedish new/webalizer-2.21-02/lang/webalizer_lang.swedish --- old/webalizer-2.20-01/lang/webalizer_lang.swedish 2008-07-02 00:24:12.000000000 +0200 +++ new/webalizer-2.21-02/lang/webalizer_lang.swedish 2008-12-15 08:34:02.000000000 +0100 @@ -16,6 +16,7 @@ 01-Jun-2000 Modified/corrected by Joaquim Homrighausen (joho(a)webbplatsen.se) 26-Mar-2008 Updated to current IANA TLDs (brad(a)mrunix.net) 26-May-2008 Modified for level 2.2 support (brad(a)mrunix.net) + 14-nov-2008 Modifed for HTML-special chars (bengt(a)sm7jqb.se) Please fix all typos, or drop me a note and i will fix it and submit patches upstream. /daniel @@ -186,7 +187,7 @@ #endif #ifdef USE_GEOIP "-w = Enable GeoIP lookups" , - "-W namn = Use GeoIP database 'namn'" , + "-W namn = Anv�nd GeoIP databas 'namn'" , #endif NULL}; @@ -200,106 +201,121 @@ /* Webalizer. */ /* */ /***********************************************************************/ +/* Changed by Bengt Samuelsson <bengt(a)sm7jqb.se> */ +/* � = Å � = Ä � = Ö */ +/* � = å � = ä � = ö */ +/***********************************************************************/ /* header strings */ -char *msg_hhdr_sp = "Period f�r summering"; +char *msg_hhdr_sp = "Period för summering"; char *msg_hhdr_gt = "Skapad"; /* main index strings */ +/* For libgd is no HTML letters */ char *msg_main_us = "Summering f�r"; -/* char *msg_main_per= "Senaste 12 m�naderna"; */ -char *msg_main_per= "Summering m�nad f�r m�nad"; -char *msg_main_sum= "Summering m�nad f�r m�nad"; -char *msg_main_da = "Medel �ver dagen"; -char *msg_main_mt = "M�natliga summor"; + +/* char *msg_main_per= "Senaste 12 månaderna"; */ +char *msg_main_per= "Summering månad för månad"; +char *msg_main_sum= "Summering månad för månad"; +char *msg_main_da = "Medel över dagen"; +char *msg_main_mt = "Månatliga summor"; /* month HTML page strings */ +/* For libgd is no HTML letters */ char *msg_hmth_du = "Daglig anv�ndning f�r"; char *msg_hmth_hu = "Anv�ndning timme f�r timme f�r"; /* table header strings */ -char *msg_h_by = "By"; +/* For libgd is no HTML letters */ +char *msg_h_by = "av"; char *msg_h_avg = "Medel"; char *msg_h_max = "Max"; char *msg_h_total = "Summa"; char *msg_h_totals= "Summor"; char *msg_h_day = "Dag"; -char *msg_h_mth = "M�nad"; +// char *msg_h_mth = "Månad"; // HTML +char *msg_h_mth = "M�nad"; // GD char *msg_h_hour = "Timme"; -char *msg_h_hits = "Tr�ffar"; +// char *msg_h_hits = "Träffar"; // HTML +char *msg_h_hits = "Tr�ffar"; // GD char *msg_h_pages = "Sidor"; -char *msg_h_visits= "Bes�kare"; +// char *msg_h_visits= "Besö."; // HTML +char *msg_h_visits= "Bes�k."; // GD char *msg_h_files = "Filer"; -char *msg_h_sites = "Klientadresser"; +char *msg_h_sites = "Klient."; char *msg_h_xfer = "kilobyte"; -char *msg_h_hname = "V�rdnamn"; +// char *msg_h_hname = "Värdnamn"; // HTML +char *msg_h_hname = "V�rdnamn"; // GD char *msg_h_url = "URL"; char *msg_h_agent = "Klienttyp"; -char *msg_h_ref = "Refererare"; +char *msg_h_ref = "Referens"; char *msg_h_ctry = "Land"; -char *msg_h_search= "S�kstr�ng"; -char *msg_h_uname = "Username"; +// char *msg_h_search= "Söksträng"; // HTML +char *msg_h_search= "S�kstr�ng"; // GD +// char *msg_h_uname = "Användarnamn"; // HTML +char *msg_h_uname = "Anv�ndarnamn"; // GD /* links along top of page */ char *msg_hlnk_ds = "Daglig statistik"; -char *msg_hlnk_hs = "Statistik timme f�r timme"; +char *msg_hlnk_hs = "Statistik timme för timme"; char *msg_hlnk_u = "URLer"; char *msg_hlnk_s = "Klientadresser"; char *msg_hlnk_a = "Klienttyper"; -char *msg_hlnk_c = "L�nder"; -char *msg_hlnk_r = "H�nvisare"; -char *msg_hlnk_en = "Ing�ng"; -char *msg_hlnk_ex = "Utg�ng"; -char *msg_hlnk_sr = "S�k"; -char *msg_hlnk_i = "Users"; +char *msg_hlnk_c = "Länder"; +char *msg_hlnk_r = "Hänvisare"; +char *msg_hlnk_en = "Ingång"; +char *msg_hlnk_ex = "Utgång"; +char *msg_hlnk_sr = "Sök"; +char *msg_hlnk_i = "Användare"; /* monthly total table */ -char *msg_mtot_ms = "M�natlig statistik f�r"; -char *msg_mtot_th = "Totalt antal tr�ffar"; +char *msg_mtot_ms = "Månatlig statistik för"; +char *msg_mtot_th = "Totalt antal träffar"; char *msg_mtot_tf = "Totalt antal filer"; char *msg_mtot_tx = "Totalt antal kilobytes"; char *msg_mtot_us = "Totalt antal unika klientadresser"; -char *msg_mtot_ur = "Totalt antal unika h�nvisningar"; +char *msg_mtot_ur = "Totalt antal unika hänvisningar"; char *msg_mtot_ua = "Totalt antal unika klienttyper"; char *msg_mtot_uu = "Totalt antal unika URLer"; -char *msg_mtot_ui = "Totalt antal unika anv�ndarnamn"; -char *msg_mtot_mhd= "Tr�ffar per dag"; -char *msg_mtot_mhh= "Tr�ffar per timme"; +char *msg_mtot_ui = "Totalt antal unika användarnamn"; +char *msg_mtot_mhd= "Träffar per dag"; +char *msg_mtot_mhh= "Träffar per timme"; char *msg_mtot_mfd= "Filer per dag"; char *msg_mtot_mpd= "Sidor per dag"; char *msg_mtot_msd= "Klientadresser per dag"; -char *msg_mtot_mvd= "Bes�k per dag"; +char *msg_mtot_mvd= "Besök per dag"; char *msg_mtot_mkd= "Kilobytes per dag"; -char *msg_mtot_rc = "Tr�ffar sorterade efter svarskod"; +char *msg_mtot_rc = "Träffar sorterade efter svarskod"; /* daily total table */ -char *msg_dtot_ds = "Daglig statistik f�r"; +char *msg_dtot_ds = "Daglig statistik för"; /* hourly total table */ -char *msg_htot_hs = "Statistik timme f�r timme f�r"; +char *msg_htot_hs = "Statistik timme för timme för"; /* country pie chart */ +/* For libgd is no HTML letters */ char *msg_ctry_use= "Statsistik sorterat efter land f�r"; /* top tables */ /* Formatted as "Top xxx of xxx Total something" */ char *msg_top_top = "Vanligaste"; -char *msg_top_of = "utav totalt"; +char *msg_top_of = "av totalt"; char *msg_top_s = "klientursprung"; char *msg_top_u = "URLer"; -char *msg_top_r = "h�nvisnigar"; +char *msg_top_r = "hänvisnigar"; char *msg_top_a = "klienttyper"; -char *msg_top_c = "l�nder"; -char *msg_top_en = "totalt ing�ngssidor"; -char *msg_top_ex = "totalt utg�ngssidor"; -char *msg_top_sr = "totalt s�kstr�ngar"; -char *msg_top_i = "totalt anv�ndarnamn"; -char *msg_v_sites = "View All Sites"; -char *msg_v_urls = "View All URLs"; -char *msg_v_refs = "View All Referrers"; -char *msg_v_agents= "View All User Agents"; -char *msg_v_search= "View All Search Strings"; -char *msg_v_users = "View All Usernames"; +char *msg_top_c = "länder"; +char *msg_top_en = "totalt ingångssidor"; +char *msg_top_ex = "totalt utgångssidor"; +char *msg_top_sr = "totalt söksträngar"; +char *msg_top_i = "totalt användarnamn"; +char *msg_v_sites = "Visa Alla Sidor"; +char *msg_v_urls = "Visa Alla URLer"; +char *msg_v_refs = "Visa Alla Referenser"; +char *msg_v_agents= "Visa Alla Användar Agenter"; +char *msg_v_search= "Visa Alla Sök Strängar"; +char *msg_v_users = "Visa Alla Användarnamn"; /* short month names MUST BE 3 CHARS in size... pad if needed*/ char *s_month[12]={ "Jan", "Feb", "Mar", @@ -315,331 +331,333 @@ /* response code descriptions... order IS important! */ struct response_code response[] = { { "Oidentifierad svarskod", 0 }, - { "Kod 100 - Forts�tt", 0 }, + { "Kod 100 - Fortsätt", 0 }, { "Kod 101 - Byter protokoll", 0 }, { "Kod 200 - OK", 0 }, { "Kod 201 - Skapad", 0 }, { "Kod 202 - Accepterad", 0 }, { "Kod 203 - Icke auktoritativ information", 0 }, - { "Kod 204 - Inget inneh�ll", 0 }, - { "Kod 205 - �terst�ll inneh�ll", 0 }, - { "Kod 206 - Partiellt inneh�ll", 0 }, + { "Kod 204 - Inget innehåll", 0 }, + { "Kod 205 - återställ innehåll", 0 }, + { "Kod 206 - Partiellt innehåll", 0 }, { "Kod 300 - Multipla val", 0 }, { "Kod 301 - Permanent flyttad", 0 }, - { "Kod 302 - Hittad", 0 }, + { "Kod 302 - Funnen", 0 }, { "Kod 303 - Se annan", 0 }, - { "Kod 304 - Of�r�ndrad", 0 }, - { "Kod 305 - Anv�nd proxy", 0 }, - { "Kod 307 - Tillf�lligt flyttad", 0 }, - { "Kod 400 - Felaktig f�rfr�gan", 0 }, + { "Kod 304 - Inte ändrad", 0 }, + { "Kod 305 - Använd proxy", 0 }, + { "Kod 307 - Tillfälligt flyttad", 0 }, + { "Kod 400 - Felaktig förfrågan", 0 }, { "Kod 401 - Icke auktoriserad", 0 }, - { "Kod 402 - Betalning kr�vs", 0 }, - { "Kod 403 - F�rbjuden", 0 }, + { "Kod 402 - Betalning krävs", 0 }, + { "Kod 403 - Förbjuden", 0 }, { "Kod 404 - Hittades ej", 0 }, - { "Kod 405 - Otill�ten metod", 0 }, + { "Kod 405 - Otillåten metod", 0 }, { "Kod 406 - Icke accepterbar", 0 }, - { "Kod 407 - Verifiering fr�n proxy kr�vs", 0 }, - { "Kod 408 - F�rfr�gan gick �ver tiden", 0 }, + { "Kod 407 - Verifiering från proxy krävs", 0 }, + { "Kod 408 - Förfrågan gick över tiden", 0 }, { "Kod 409 - Konflikt", 0 }, { "Kod 410 - Borta", 0 }, - { "Kod 411 - Beh�ver l�ngd", 0 }, + { "Kod 411 - Behöver längd", 0 }, { "Kod 412 - Misslyckades med villkor", 0 }, - { "Kod 413 - F�rfr�geenhet f�r stor", 0 }, - { "Kod 414 - F�rfr�ge-URI f�r l�ng", 0 }, - { "Kod 415 - Ej st�dd medietyp", 0 }, - { "Kod 416 - Efterfr�gat intervall ej m�jligt",0 }, + { "Kod 413 - Förfrågeenhet för stor", 0 }, + { "Kod 414 - Förfråge-URI för lång", 0 }, + { "Kod 415 - Ej stödd medietyp", 0 }, + { "Kod 416 - Efterfrågat intervall ej möjligt",0 }, { "Kod 417 - Expectation Failed", 0 }, { "Kod 500 - Internt serverfel", 0 }, { "Kod 501 - Ej implementerad", 0 }, { "Kod 502 - Felaktig gateway", 0 }, - { "Kod 503 - Tj�nsten otillg�nglig", 0 }, - { "Kod 504 - Gateway gick �ver tiden", 0 }, - { "Kod 505 - denna HTTP-version st�ds icke", 0 } }; + { "Kod 503 - Tjänsten otillgänglig", 0 }, + { "Kod 504 - Gateway gick över tiden", 0 }, + { "Kod 505 - denna HTTP-version stöds icke",0 } +}; -char *msg_title = "Statistik �ver anv�ndning f�r"; +char *msg_title = "Statistik över användning för"; char *msg_h_other = "Annan"; /* Country codes (previously in ctry.h header file) */ - +/* For libgd is no HTML letters */ struct country_code ctry[] = { -{ 0, "Ej uppslagen/ok�nd", 0,0,0 }, -{ IDX_3C('c','o','m'), "Kommersiell (com)", 0,0,0 }, -{ IDX_3C('e','d','u'), "Utbildning (edu)", 0,0,0 }, -{ IDX_3C('g','o','v'), "USA, staten (gov)", 0,0,0 }, -{ IDX_3C('i','n','t'), "Interationell (int)", 0,0,0 }, -{ IDX_3C('m','i','l'), "USA, milit�r (mil)", 0,0,0 }, -{ IDX_3C('n','e','t'), "N�tverk (net)", 0,0,0 }, -{ IDX_3C('o','r','g'), "Ideell organisation (org)", 0,0,0 }, -{ IDX_3C('b','i','z'), "Generic Business (biz)", 0,0,0 }, -{ IDX_3C('c','a','t'), "Catalan Community (cat)", 0,0,0 }, -{ IDX_3C('p','r','o'), "Professional (pro)", 0,0,0 }, -{ IDX_3C('t','e','l'), "Ind. Contact Data (tel)", 0,0,0 }, -{ IDX_4C('a','e','r','o'),"Air Transport Industry (aero)", 0,0,0 }, -{ IDX_4C('a','s','i','a'),"Asia Pacific Community (asia)", 0,0,0 }, -{ IDX_4C('c','o','o','p'),"Cooperative Association (coop)", 0,0,0 }, -{ IDX_4C('i','n','f','o'),"Generic TLD (info)", 0,0,0 }, -{ IDX_4C('j','o','b','s'),"Human Resources (jobs)", 0,0,0 }, -{ IDX_4C('m','o','b','i'),"Generic Mobile TLD (mobi)", 0,0,0 }, -{ IDX_4C('n','a','m','e'),"Individual (name)", 0,0,0 }, -{ IDX_4C('a','r','p','a'),"Address Routing (arpa)", 0,0,0 }, -{ IDX_4C('n','a','t','o'),"Nato (nato)", 0,0,0 }, -{ IDX_6C('m','u','s','e','u','m'), "Museums (museum)", 0,0,0 }, -{ IDX_6C('t','r','a','v','e','l'), "Travel Ind. (travel)", 0,0,0 }, -{ IDX_2C('a','c'), "Ascension Island", 0,0,0 }, -{ IDX_2C('a','d'), "Andorra", 0,0,0 }, -{ IDX_2C('a','e'), "F�renade arabemiraten", 0,0,0 }, -{ IDX_2C('a','f'), "Afganistan", 0,0,0 }, -{ IDX_2C('a','g'), "Antigua and Barbuda", 0,0,0 }, -{ IDX_2C('a','i'), "Anguilla", 0,0,0 }, -{ IDX_2C('a','l'), "Albanien", 0,0,0 }, -{ IDX_2C('a','m'), "Armenien", 0,0,0 }, -{ IDX_2C('a','n'), "Nederl�nderna", 0,0,0 }, -{ IDX_2C('a','o'), "Angola", 0,0,0 }, -{ IDX_2C('a','q'), "Antarktis", 0,0,0 }, -{ IDX_2C('a','r'), "Argentina", 0,0,0 }, -{ IDX_2C('a','s'), "Amerikanska Samoa", 0,0,0 }, -{ IDX_2C('a','t'), "�sterrike", 0,0,0 }, -{ IDX_2C('a','u'), "Australien", 0,0,0 }, -{ IDX_2C('a','w'), "Aruba", 0,0,0 }, -{ IDX_2C('a','x'), "Aland Islands", 0,0,0 }, -{ IDX_2C('a','z'), "Azerbadjan", 0,0,0 }, -{ IDX_2C('b','a'), "Bosnien Herzegovina", 0,0,0 }, -{ IDX_2C('b','b'), "Barbados", 0,0,0 }, -{ IDX_2C('b','d'), "Bangladesh", 0,0,0 }, -{ IDX_2C('b','e'), "Belgien", 0,0,0 }, -{ IDX_2C('b','f'), "Burkina Faso", 0,0,0 }, -{ IDX_2C('b','g'), "Bulgarien", 0,0,0 }, -{ IDX_2C('b','h'), "Bahrain", 0,0,0 }, -{ IDX_2C('b','i'), "Burundi", 0,0,0 }, -{ IDX_2C('b','j'), "Benin", 0,0,0 }, -{ IDX_2C('b','l'), "Saint Barthelemy", 0,0,0 }, -{ IDX_2C('b','m'), "Bermuda", 0,0,0 }, -{ IDX_2C('b','n'), "Brunei Darussalam", 0,0,0 }, -{ IDX_2C('b','o'), "Bolivia", 0,0,0 }, -{ IDX_2C('b','r'), "Brazilien", 0,0,0 }, -{ IDX_2C('b','s'), "Bahamas", 0,0,0 }, -{ IDX_2C('b','t'), "Bhutan", 0,0,0 }, -{ IDX_2C('b','v'), "Bouvet Island", 0,0,0 }, -{ IDX_2C('b','w'), "Botswana", 0,0,0 }, -{ IDX_2C('b','y'), "Belarus", 0,0,0 }, -{ IDX_2C('b','z'), "Belize", 0,0,0 }, -{ IDX_2C('c','a'), "Canada", 0,0,0 }, -{ IDX_2C('c','c'), "Cocos�arna", 0,0,0 }, -{ IDX_2C('c','d'), "Congo, Democratic Republic", 0,0,0 }, -{ IDX_2C('c','f'), "Centralafrikanska republiken", 0,0,0 }, -{ IDX_2C('c','g'), "Congo", 0,0,0 }, -{ IDX_2C('c','h'), "Schweiz", 0,0,0 }, -{ IDX_2C('c','i'), "Elfenbenskusten", 0,0,0 }, -{ IDX_2C('c','k'), "Cook Islands", 0,0,0 }, -{ IDX_2C('c','l'), "Chile", 0,0,0 }, -{ IDX_2C('c','m'), "Kamerun", 0,0,0 }, -{ IDX_2C('c','n'), "Kina", 0,0,0 }, -{ IDX_2C('c','o'), "Colombia", 0,0,0 }, -{ IDX_2C('c','r'), "Costa Rica", 0,0,0 }, -{ IDX_2C('c','u'), "Kuba", 0,0,0 }, -{ IDX_2C('c','v'), "Cape Verde", 0,0,0 }, -{ IDX_2C('c','x'), "Jul�n", 0,0,0 }, -{ IDX_2C('c','y'), "Cypern", 0,0,0 }, -{ IDX_2C('c','z'), "Tjeckien", 0,0,0 }, -{ IDX_2C('d','e'), "Tyskland", 0,0,0 }, -{ IDX_2C('d','j'), "Djibouti", 0,0,0 }, -{ IDX_2C('d','k'), "Danmark", 0,0,0 }, -{ IDX_2C('d','m'), "Dominica", 0,0,0 }, -{ IDX_2C('d','o'), "Dominikanska Republiken", 0,0,0 }, -{ IDX_2C('d','z'), "Algeriet", 0,0,0 }, -{ IDX_2C('e','c'), "Ekvador", 0,0,0 }, -{ IDX_2C('e','e'), "Estland", 0,0,0 }, -{ IDX_2C('e','g'), "Egypten", 0,0,0 }, -{ IDX_2C('e','h'), "V�stsahara", 0,0,0 }, -{ IDX_2C('e','r'), "Eritrea", 0,0,0 }, -{ IDX_2C('e','s'), "Spanien", 0,0,0 }, -{ IDX_2C('e','t'), "Etiopien", 0,0,0 }, -{ IDX_2C('e','u'), "European Union", 0,0,0 }, -{ IDX_2C('f','i'), "Finland", 0,0,0 }, -{ IDX_2C('f','j'), "Fiji", 0,0,0 }, -{ IDX_2C('f','k'), "Falklands�arna", 0,0,0 }, -{ IDX_2C('f','m'), "Mikronesien", 0,0,0 }, -{ IDX_2C('f','o'), "Farao�arna", 0,0,0 }, -{ IDX_2C('f','r'), "Frankrike", 0,0,0 }, -{ IDX_2C('g','a'), "Gabon", 0,0,0 }, -{ IDX_2C('g','b'), "England", 0,0,0 }, -{ IDX_2C('g','d'), "Grenada", 0,0,0 }, -{ IDX_2C('g','e'), "Georgien", 0,0,0 }, -{ IDX_2C('g','f'), "Franska Guiana", 0,0,0 }, -{ IDX_2C('g','g'), "Guernsey", 0,0,0 }, -{ IDX_2C('g','h'), "Ghana", 0,0,0 }, -{ IDX_2C('g','i'), "Gibraltar", 0,0,0 }, -{ IDX_2C('g','l'), "Gr�nland", 0,0,0 }, -{ IDX_2C('g','m'), "Gambia", 0,0,0 }, -{ IDX_2C('g','n'), "Guinea", 0,0,0 }, -{ IDX_2C('g','p'), "Guadeloupe", 0,0,0 }, -{ IDX_2C('g','q'), "Ekvatorialguinea", 0,0,0 }, -{ IDX_2C('g','r'), "Grekland", 0,0,0 }, -{ IDX_2C('g','s'), "S. Georgia och S. Sandwich�arna", 0,0,0 }, -{ IDX_2C('g','t'), "Guatemala", 0,0,0 }, -{ IDX_2C('g','u'), "Guam", 0,0,0 }, -{ IDX_2C('g','w'), "Guinea-Bissau", 0,0,0 }, -{ IDX_2C('g','y'), "Guyana", 0,0,0 }, -{ IDX_2C('h','k'), "Hong Kong", 0,0,0 }, -{ IDX_2C('h','m'), "Heard- och McDonald�arna", 0,0,0 }, -{ IDX_2C('h','n'), "Honduras", 0,0,0 }, -{ IDX_2C('h','r'), "Kroatien", 0,0,0 }, -{ IDX_2C('h','t'), "Haiti", 0,0,0 }, -{ IDX_2C('h','u'), "Ungern" , 0,0,0 }, -{ IDX_2C('i','d'), "Indonesien", 0,0,0 }, -{ IDX_2C('i','e'), "Irland", 0,0,0 }, -{ IDX_2C('i','l'), "Israel", 0,0,0 }, -{ IDX_2C('i','m'), "Isle of Man", 0,0,0 }, -{ IDX_2C('i','n'), "Indien", 0,0,0 }, -{ IDX_2C('i','o'), "British Indian Ocean Territory", 0,0,0 }, -{ IDX_2C('i','q'), "Irak", 0,0,0 }, -{ IDX_2C('i','r'), "Iran", 0,0,0 }, -{ IDX_2C('i','s'), "Island", 0,0,0 }, -{ IDX_2C('i','t'), "Italien", 0,0,0 }, -{ IDX_2C('j','e'), "Jersey", 0,0,0 }, -{ IDX_2C('j','m'), "Jamaica", 0,0,0 }, -{ IDX_2C('j','o'), "Jordanien", 0,0,0 }, -{ IDX_2C('j','p'), "Japan", 0,0,0 }, -{ IDX_2C('k','e'), "Kenya", 0,0,0 }, -{ IDX_2C('k','g'), "Kirgistan", 0,0,0 }, -{ IDX_2C('k','h'), "Kambodja", 0,0,0 }, -{ IDX_2C('k','i'), "Kiribati", 0,0,0 }, -{ IDX_2C('k','m'), "Comoros", 0,0,0 }, -{ IDX_2C('k','n'), "Saint Kitts och Nevis", 0,0,0 }, -{ IDX_2C('k','p'), "Nordkorea", 0,0,0 }, -{ IDX_2C('k','r'), "Sydkorea", 0,0,0 }, -{ IDX_2C('k','w'), "Kuwait", 0,0,0 }, -{ IDX_2C('k','y'), "Cayman�arna", 0,0,0 }, -{ IDX_2C('k','z'), "Kazachstan", 0,0,0 }, -{ IDX_2C('l','a'), "Laos", 0,0,0 }, -{ IDX_2C('l','b'), "Libanon", 0,0,0 }, -{ IDX_2C('l','c'), "Saint Lucia", 0,0,0 }, -{ IDX_2C('l','i'), "Liechtenstein", 0,0,0 }, -{ IDX_2C('l','k'), "Sri Lanka", 0,0,0 }, -{ IDX_2C('l','r'), "Liberia", 0,0,0 }, -{ IDX_2C('l','s'), "Lesotho", 0,0,0 }, -{ IDX_2C('l','t'), "Litauen", 0,0,0 }, -{ IDX_2C('l','u'), "Luxembourg", 0,0,0 }, -{ IDX_2C('l','v'), "Lettland", 0,0,0 }, -{ IDX_2C('l','y'), "Libyen", 0,0,0 }, -{ IDX_2C('m','a'), "Marocco", 0,0,0 }, -{ IDX_2C('m','c'), "Monaco", 0,0,0 }, -{ IDX_2C('m','d'), "Moldavien", 0,0,0 }, -{ IDX_2C('m','e'), "Montenegro", 0,0,0 }, -{ IDX_2C('m','f'), "Saint Martin (French part)", 0,0,0 }, -{ IDX_2C('m','g'), "Malagasy", 0,0,0 }, -{ IDX_2C('m','h'), "Marshall�arna", 0,0,0 }, -{ IDX_2C('m','k'), "Makedonien", 0,0,0 }, -{ IDX_2C('m','l'), "Mali", 0,0,0 }, -{ IDX_2C('m','m'), "Myanmar", 0,0,0 }, -{ IDX_2C('m','n'), "Mongoliet", 0,0,0 }, -{ IDX_2C('m','o'), "Macau", 0,0,0 }, -{ IDX_2C('m','p'), "Norra Mariana�arna", 0,0,0 }, -{ IDX_2C('m','q'), "Martinique", 0,0,0 }, -{ IDX_2C('m','r'), "Mauritania", 0,0,0 }, -{ IDX_2C('m','s'), "Montserrat", 0,0,0 }, -{ IDX_2C('m','t'), "Malta", 0,0,0 }, -{ IDX_2C('m','u'), "Mauritius", 0,0,0 }, -{ IDX_2C('m','v'), "Maldiverna", 0,0,0 }, -{ IDX_2C('m','w'), "Malawi", 0,0,0 }, -{ IDX_2C('m','x'), "Mexico", 0,0,0 }, -{ IDX_2C('m','y'), "Malaysia", 0,0,0 }, -{ IDX_2C('m','z'), "Mo�ambique", 0,0,0 }, -{ IDX_2C('n','a'), "Namibia", 0,0,0 }, -{ IDX_2C('n','c'), "Nya Caledonien", 0,0,0 }, -{ IDX_2C('n','e'), "Niger", 0,0,0 }, -{ IDX_2C('n','f'), "Norfolk Island", 0,0,0 }, -{ IDX_2C('n','g'), "Nigeria", 0,0,0 }, -{ IDX_2C('n','i'), "Nicaragua", 0,0,0 }, -{ IDX_2C('n','l'), "Nederl�nderna", 0,0,0 }, -{ IDX_2C('n','o'), "Norge", 0,0,0 }, -{ IDX_2C('n','p'), "Nepal", 0,0,0 }, -{ IDX_2C('n','r'), "Nauru", 0,0,0 }, -{ IDX_2C('n','u'), "Niue", 0,0,0 }, -{ IDX_2C('n','z'), "Nya Zeeland", 0,0,0 }, -{ IDX_2C('o','m'), "Oman", 0,0,0 }, -{ IDX_2C('p','a'), "Panama", 0,0,0 }, -{ IDX_2C('p','e'), "Peru", 0,0,0 }, -{ IDX_2C('p','f'), "Franska Polynesien", 0,0,0 }, -{ IDX_2C('p','g'), "Papua Nya Guinea", 0,0,0 }, -{ IDX_2C('p','h'), "Filippinerna", 0,0,0 }, -{ IDX_2C('p','k'), "Pakistan", 0,0,0 }, -{ IDX_2C('p','l'), "Polen", 0,0,0 }, -{ IDX_2C('p','m'), "St. Pierre och Miquelon", 0,0,0 }, -{ IDX_2C('p','n'), "Pitcairn", 0,0,0 }, -{ IDX_2C('p','r'), "Puerto Rico", 0,0,0 }, -{ IDX_2C('p','s'), "Palestinian Territory, Occupied", 0,0,0 }, -{ IDX_2C('p','t'), "Portugal", 0,0,0 }, -{ IDX_2C('p','w'), "Palau", 0,0,0 }, -{ IDX_2C('p','y'), "Paraguay", 0,0,0 }, -{ IDX_2C('q','a'), "Qatar", 0,0,0 }, -{ IDX_2C('r','e'), "Reunion", 0,0,0 }, -{ IDX_2C('r','o'), "Rum�nien", 0,0,0 }, -{ IDX_2C('r','s'), "Serbia", 0,0,0 }, -{ IDX_2C('r','u'), "Ryssland", 0,0,0 }, -{ IDX_2C('r','w'), "Rwanda", 0,0,0 }, -{ IDX_2C('s','a'), "Saudiarabien", 0,0,0 }, -{ IDX_2C('s','b'), "Solomon�arna", 0,0,0 }, -{ IDX_2C('s','c'), "Seychelles", 0,0,0 }, -{ IDX_2C('s','d'), "Sudan", 0,0,0 }, -{ IDX_2C('s','e'), "Sverige", 0,0,0 }, -{ IDX_2C('s','g'), "Singapore", 0,0,0 }, -{ IDX_2C('s','h'), "St. Helena", 0,0,0 }, -{ IDX_2C('s','i'), "Slovenien", 0,0,0 }, -{ IDX_2C('s','j'), "Svalbard och Jan Mayen-�arna", 0,0,0 }, -{ IDX_2C('s','k'), "Slovakien", 0,0,0 }, -{ IDX_2C('s','l'), "Sierra Leone", 0,0,0 }, -{ IDX_2C('s','m'), "San Marino", 0,0,0 }, -{ IDX_2C('s','n'), "Senegal", 0,0,0 }, -{ IDX_2C('s','o'), "Somalia", 0,0,0 }, -{ IDX_2C('s','r'), "Surinam", 0,0,0 }, -{ IDX_2C('s','t'), "Sao Tome och Principe", 0,0,0 }, -{ IDX_2C('s','u'), "Sovjet (f�re detta)", 0,0,0 }, -{ IDX_2C('s','v'), "El Salvador", 0,0,0 }, -{ IDX_2C('s','y'), "Syrien", 0,0,0 }, -{ IDX_2C('s','z'), "Swaziland", 0,0,0 }, -{ IDX_2C('t','c'), "Turks och Caicos�arna", 0,0,0 }, -{ IDX_2C('t','d'), "Chad", 0,0,0 }, -{ IDX_2C('t','f'), "S�dra Franska territorierna", 0,0,0 }, -{ IDX_2C('t','g'), "Togo", 0,0,0 }, -{ IDX_2C('t','h'), "Thailand", 0,0,0 }, -{ IDX_2C('t','j'), "Tajikistan", 0,0,0 }, -{ IDX_2C('t','k'), "Tokelau", 0,0,0 }, -{ IDX_2C('t','l'), "Timor-Leste", 0,0,0 }, -{ IDX_2C('t','m'), "Turkmenistan", 0,0,0 }, -{ IDX_2C('t','n'), "Tunisien", 0,0,0 }, -{ IDX_2C('t','o'), "Tonga", 0,0,0 }, -{ IDX_2C('t','p'), "�sttimor", 0,0,0 }, -{ IDX_2C('t','r'), "Turkiet", 0,0,0 }, -{ IDX_2C('t','t'), "Trinidad och Tobago", 0,0,0 }, -{ IDX_2C('t','v'), "Tuvalu", 0,0,0 }, -{ IDX_2C('t','w'), "Taiwan", 0,0,0 }, -{ IDX_2C('t','z'), "Tanzania", 0,0,0 }, -{ IDX_2C('u','a'), "Ukraina", 0,0,0 }, -{ IDX_2C('u','g'), "Uganda", 0,0,0 }, -{ IDX_2C('u','k'), "Storbritanien", 0,0,0 }, -{ IDX_2C('u','m'), "US Minor Outlying Islands", 0,0,0 }, -{ IDX_2C('u','s'), "USA", 0,0,0 }, -{ IDX_2C('u','y'), "Uruguay", 0,0,0 }, -{ IDX_2C('u','z'), "Uzbekistan", 0,0,0 }, -{ IDX_2C('v','a'), "Vatikanstaten", 0,0,0 }, -{ IDX_2C('v','c'), "Saint Vincent och Grenadinerna", 0,0,0 }, -{ IDX_2C('v','e'), "Venezuela", 0,0,0 }, -{ IDX_2C('v','g'), "Virgin-�arna (Brittiska)", 0,0,0 }, -{ IDX_2C('v','i'), "Virgin-�arna (Amerikanska)", 0,0,0 }, -{ IDX_2C('v','n'), "Vietnam", 0,0,0 }, -{ IDX_2C('v','u'), "Vanuatu", 0,0,0 }, -{ IDX_2C('w','f'), "Wallis och Futuna�arna", 0,0,0 }, -{ IDX_2C('w','s'), "Samoa", 0,0,0 }, -{ IDX_2C('y','e'), "Yemen", 0,0,0 }, -{ IDX_2C('y','t'), "Mayotte", 0,0,0 }, -{ IDX_2C('y','u'), "Jugoslavien", 0,0,0 }, -{ IDX_2C('z','a'), "Sydafrika", 0,0,0 }, -{ IDX_2C('z','m'), "Zambia", 0,0,0 }, -{ IDX_2C('z','w'), "Zimbabwe", 0,0,0 }, -{ IDX_2C('a','1'), "Anonymous Proxy", 0,0,0 }, -{ IDX_2C('a','2'), "Satellite Provider", 0,0,0 }, -{ IDX_2C('o','1'), "Other", 0,0,0 }, -{ IDX_2C('a','p'), "Asia/Pacific Region", 0,0,0 }, -{ IDX_3C('l','a','n'), "Local Network (lan)", 0,0,0 }, -{ 0, NULL, 0,0,0 }}; +{ 0, "Ej uppslagen/ok�nd",0,0,0 }, +{ IDX_3C('c','o','m'), "Kommersiell (com)",0,0,0 }, +{ IDX_3C('e','d','u'), "Utbildning (edu)",0,0,0 }, +{ IDX_3C('g','o','v'), "USA, staten (gov)",0,0,0 }, +{ IDX_3C('i','n','t'), "Interationell (int)",0,0,0 }, +{ IDX_3C('m','i','l'), "USA, milit�r (mil)",0,0,0 }, +{ IDX_3C('n','e','t'), "N�tverk (net)",0,0,0 }, +{ IDX_3C('o','r','g'), "Ideell organisation (org)",0,0,0 }, +{ IDX_3C('b','i','z'), "Generic Business (biz)",0,0,0 }, +{ IDX_3C('c','a','t'), "Catalan Community (cat)",0,0,0 }, +{ IDX_3C('p','r','o'), "Professional (pro)",0,0,0 }, +{ IDX_3C('t','e','l'), "Ind. Contact Data (tel)",0,0,0 }, +{ IDX_4C('a','e','r','o'), "Air Transport Industry (aero)",0,0,0 }, +{ IDX_4C('a','s','i','a'), "Asia Pacific Community (asia)",0,0,0 }, +{ IDX_4C('c','o','o','p'), "Cooperative Association (coop)",0,0,0 }, +{ IDX_4C('i','n','f','o'), "Generic TLD (info)",0,0,0 }, +{ IDX_4C('j','o','b','s'), "Human Resources (jobs)",0,0,0 }, +{ IDX_4C('m','o','b','i'), "Generic Mobile TLD (mobi)",0,0,0 }, +{ IDX_4C('n','a','m','e'), "Individual (name)",0,0,0 }, +{ IDX_4C('a','r','p','a'), "Address Routing (arpa)",0,0,0 }, +{ IDX_4C('n','a','t','o'), "Nato (nato)", 0,0,0 }, +{ IDX_6C('m','u','s','e','u','m'),"Museums (museum)", 0,0,0 }, +{ IDX_6C('t','r','a','v','e','l'),"Travel Ind. (travel)",0,0,0 }, +{ IDX_2C('a','c'), "Ascension Island",0,0,0 }, +{ IDX_2C('a','d'), "Andorra",0,0,0 }, +{ IDX_2C('a','e'), "F�renade arabemiraten",0,0,0 }, +{ IDX_2C('a','f'), "Afganistan", 0,0,0 }, +{ IDX_2C('a','g'), "Antigua and Barbuda",0,0,0 }, +{ IDX_2C('a','i'), "Anguilla",0,0,0 }, +{ IDX_2C('a','l'), "Albanien",0,0,0 }, +{ IDX_2C('a','m'), "Armenien",0,0,0 }, +{ IDX_2C('a','n'), "Nederl�nderna",0,0,0 }, +{ IDX_2C('a','o'), "Angola",0,0,0 }, +{ IDX_2C('a','q'), "Antarktis",0,0,0 }, +{ IDX_2C('a','r'), "Argentina",0,0,0 }, +{ IDX_2C('a','s'), "Amerikanska Samoa",0,0,0 }, +{ IDX_2C('a','t'), "�sterrike",0,0,0 }, +{ IDX_2C('a','u'), "Australien",0,0,0 }, +{ IDX_2C('a','w'), "Aruba",0,0,0 }, +{ IDX_2C('a','x'), "Aland Islands",0,0,0 }, +{ IDX_2C('a','z'), "Azerbadjan",0,0,0 }, +{ IDX_2C('b','a'), "Bosnien Herzegovina",0,0,0 }, +{ IDX_2C('b','b'), "Barbados",0,0,0 }, +{ IDX_2C('b','d'), "Bangladesh",0,0,0 }, +{ IDX_2C('b','e'), "Belgien",0,0,0 }, +{ IDX_2C('b','f'), "Burkina Faso",0,0,0 }, +{ IDX_2C('b','g'), "Bulgarien",0,0,0 }, +{ IDX_2C('b','h'), "Bahrain",0,0,0 }, +{ IDX_2C('b','i'), "Burundi",0,0,0 }, +{ IDX_2C('b','j'), "Benin",0,0,0 }, +{ IDX_2C('b','l'), "Saint Barthelemy",0,0,0 }, +{ IDX_2C('b','m'), "Bermuda",0,0,0 }, +{ IDX_2C('b','n'), "Brunei Darussalam",0,0,0 }, +{ IDX_2C('b','o'), "Bolivia",0,0,0 }, +{ IDX_2C('b','r'), "Brazilien",0,0,0 }, +{ IDX_2C('b','s'), "Bahamas",0,0,0 }, +{ IDX_2C('b','t'), "Bhutan",0,0,0 }, +{ IDX_2C('b','v'), "Bouvet Island",0,0,0 }, +{ IDX_2C('b','w'), "Botswana",0,0,0 }, +{ IDX_2C('b','y'), "Vitryssland",0,0,0 }, +{ IDX_2C('b','z'), "Belize",0,0,0 }, +{ IDX_2C('c','a'), "Kanada",0,0,0 }, +{ IDX_2C('c','c'), "Cocos�arna",0,0,0 }, +{ IDX_2C('c','d'), "Kongo, Democratic Republic",0,0,0 }, +{ IDX_2C('c','f'), "Centralafrikanska republiken",0,0,0 }, +{ IDX_2C('c','g'), "Kongo",0,0,0 }, +{ IDX_2C('c','h'), "Schweiz",0,0,0 }, +{ IDX_2C('c','i'), "Elfenbenskusten",0,0,0 }, +{ IDX_2C('c','k'), "Cook �arna",0,0,0 }, +{ IDX_2C('c','l'), "Chile",0,0,0 }, +{ IDX_2C('c','m'), "Kamerun",0,0,0 }, +{ IDX_2C('c','n'), "Kina",0,0,0 }, +{ IDX_2C('c','o'), "Colombia",0,0,0 }, +{ IDX_2C('c','r'), "Costa Rica",0,0,0 }, +{ IDX_2C('c','u'), "Kuba",0,0,0 }, +{ IDX_2C('c','v'), "Cape Verde",0,0,0 }, +{ IDX_2C('c','x'), "Jul�n",0,0,0 }, +{ IDX_2C('c','y'), "Cypern",0,0,0 }, +{ IDX_2C('c','z'), "Tjeckien",0,0,0 }, +{ IDX_2C('d','e'), "Tyskland",0,0,0 }, +{ IDX_2C('d','j'), "Djibouti",0,0,0 }, +{ IDX_2C('d','k'), "Danmark",0,0,0 }, +{ IDX_2C('d','m'), "Dominica",0,0,0 }, +{ IDX_2C('d','o'), "Dominikanska Republiken",0,0,0 }, +{ IDX_2C('d','z'), "Algeriet",0,0,0 }, +{ IDX_2C('e','c'), "Ekvador",0,0,0 }, +{ IDX_2C('e','e'), "Estland",0,0,0 }, +{ IDX_2C('e','g'), "Egypten",0,0,0 }, +{ IDX_2C('e','h'), "V�stsahara",0,0,0 }, +{ IDX_2C('e','r'), "Eritrea",0,0,0 }, +{ IDX_2C('e','s'), "Spanien",0,0,0 }, +{ IDX_2C('e','t'), "Etiopien",0,0,0 }, +{ IDX_2C('e','u'), "European Union",0,0,0 }, +{ IDX_2C('f','i'), "Finland",0,0,0 }, +{ IDX_2C('f','j'), "Fiji",0,0,0 }, +{ IDX_2C('f','k'), "Falklands�arna",0,0,0 }, +{ IDX_2C('f','m'), "Mikronesien",0,0,0 }, +{ IDX_2C('f','o'), "Farao�arna",0,0,0 }, +{ IDX_2C('f','r'), "Frankrike",0,0,0 }, +{ IDX_2C('g','a'), "Gabon",0,0,0 }, +{ IDX_2C('g','b'), "England",0,0,0 }, +{ IDX_2C('g','d'), "Grenada",0,0,0 }, +{ IDX_2C('g','e'), "Georgien",0,0,0 }, +{ IDX_2C('g','f'), "Franska Guiana",0,0,0 }, +{ IDX_2C('g','g'), "Guernsey",0,0,0 }, +{ IDX_2C('g','h'), "Ghana",0,0,0 }, +{ IDX_2C('g','i'), "Gibraltar",0,0,0 }, +{ IDX_2C('g','l'), "Gr�nland",0,0,0 }, +{ IDX_2C('g','m'), "Gambia",0,0,0 }, +{ IDX_2C('g','n'), "Guinea",0,0,0 }, +{ IDX_2C('g','p'), "Guadeloupe",0,0,0 }, +{ IDX_2C('g','q'), "Ekvatorialguinea",0,0,0 }, +{ IDX_2C('g','r'), "Grekland",0,0,0 }, +{ IDX_2C('g','s'), "S. Georgia och S. Sandwich�arna",0,0,0 }, +{ IDX_2C('g','t'), "Guatemala",0,0,0 }, +{ IDX_2C('g','u'), "Guam",0,0,0 }, +{ IDX_2C('g','w'), "Guinea-Bissau",0,0,0 }, +{ IDX_2C('g','y'), "Guyana",0,0,0 }, +{ IDX_2C('h','k'), "Hong Kong",0,0,0 }, +{ IDX_2C('h','m'), "Heard- och McDonald�arna",0,0,0 }, +{ IDX_2C('h','n'), "Honduras",0,0,0 }, +{ IDX_2C('h','r'), "Kroatien",0,0,0 }, +{ IDX_2C('h','t'), "Haiti",0,0,0 }, +{ IDX_2C('h','u'), "Ungern" ,0,0,0 }, +{ IDX_2C('i','d'), "Indonesien",0,0,0 }, +{ IDX_2C('i','e'), "Irland",0,0,0 }, +{ IDX_2C('i','l'), "Israel",0,0,0 }, +{ IDX_2C('i','m'), "Isle of Man",0,0,0 }, +{ IDX_2C('i','n'), "Indien",0,0,0 }, +{ IDX_2C('i','o'), "Brittiska Indiska Osianien",0,0,0 }, +{ IDX_2C('i','q'), "Irak",0,0,0 }, +{ IDX_2C('i','r'), "Iran",0,0,0 }, +{ IDX_2C('i','s'), "Island",0,0,0 }, +{ IDX_2C('i','t'), "Italien",0,0,0 }, +{ IDX_2C('j','e'), "Jersey",0,0,0 }, +{ IDX_2C('j','m'), "Jamaica",0,0,0 }, +{ IDX_2C('j','o'), "Jordanien",0,0,0 }, +{ IDX_2C('j','p'), "Japan",0,0,0 }, +{ IDX_2C('k','e'), "Kenya",0,0,0 }, +{ IDX_2C('k','g'), "Kirgistan",0,0,0 }, +{ IDX_2C('k','h'), "Kambodja",0,0,0 }, +{ IDX_2C('k','i'), "Kiribati",0,0,0 }, +{ IDX_2C('k','m'), "Comoros",0,0,0 }, +{ IDX_2C('k','n'), "Saint Kitts och Nevis",0,0,0 }, +{ IDX_2C('k','p'), "Nord Korea",0,0,0 }, +{ IDX_2C('k','r'), "Syd Korea",0,0,0 }, +{ IDX_2C('k','w'), "Kuwait",0,0,0 }, +{ IDX_2C('k','y'), "Cayman�arna",0,0,0 }, +{ IDX_2C('k','z'), "Kazachstan",0,0,0 }, +{ IDX_2C('l','a'), "Laos",0,0,0 }, +{ IDX_2C('l','b'), "Libanon",0,0,0 }, +{ IDX_2C('l','c'), "Saint Lucia",0,0,0 }, +{ IDX_2C('l','i'), "Liechtenstein",0,0,0 }, +{ IDX_2C('l','k'), "Sri Lanka",0,0,0 }, +{ IDX_2C('l','r'), "Liberia",0,0,0 }, +{ IDX_2C('l','s'), "Lesotho",0,0,0 }, +{ IDX_2C('l','t'), "Litauen",0,0,0 }, +{ IDX_2C('l','u'), "Luxembourg",0,0,0 }, +{ IDX_2C('l','v'), "Lettland",0,0,0 }, +{ IDX_2C('l','y'), "Libyen",0,0,0 }, +{ IDX_2C('m','a'), "Marocco",0,0,0 }, +{ IDX_2C('m','c'), "Monaco",0,0,0 }, +{ IDX_2C('m','d'), "Moldavien",0,0,0 }, +{ IDX_2C('m','e'), "Montenegro",0,0,0 }, +{ IDX_2C('m','f'), "Saint Martin (Franska delen)",0,0,0 }, +{ IDX_2C('m','g'), "Malagasy",0,0,0 }, +{ IDX_2C('m','h'), "Marshall�arna",0,0,0 }, +{ IDX_2C('m','k'), "Makedonien",0,0,0 }, +{ IDX_2C('m','l'), "Mali",0,0,0 }, +{ IDX_2C('m','m'), "Myanmar",0,0,0 }, +{ IDX_2C('m','n'), "Mongoliet",0,0,0 }, +{ IDX_2C('m','o'), "Macau",0,0,0 }, +{ IDX_2C('m','p'), "Norra Mariana�arna",0,0,0 }, +{ IDX_2C('m','q'), "Martinique",0,0,0 }, +{ IDX_2C('m','r'), "Mauritania",0,0,0 }, +{ IDX_2C('m','s'), "Montserrat",0,0,0 }, +{ IDX_2C('m','t'), "Malta",0,0,0 }, +{ IDX_2C('m','u'), "Mauritius",0,0,0 }, +{ IDX_2C('m','v'), "Maldiverna",0,0,0 }, +{ IDX_2C('m','w'), "Malawi",0,0,0 }, +{ IDX_2C('m','x'), "Mexico",0,0,0 }, +{ IDX_2C('m','y'), "Malaysia",0,0,0 }, +{ IDX_2C('m','z'), "Mozambique",0,0,0 }, +{ IDX_2C('n','a'), "Namibia",0,0,0 }, +{ IDX_2C('n','c'), "Nya Caledonien",0,0,0 }, +{ IDX_2C('n','e'), "Niger",0,0,0 }, +{ IDX_2C('n','f'), "Norfolk Island",0,0,0 }, +{ IDX_2C('n','g'), "Nigeria",0,0,0 }, +{ IDX_2C('n','i'), "Nicaragua",0,0,0 }, +{ IDX_2C('n','l'), "Nederl�nderna",0,0,0 }, +{ IDX_2C('n','o'), "Norge",0,0,0 }, +{ IDX_2C('n','p'), "Nepal",0,0,0 }, +{ IDX_2C('n','r'), "Nauru",0,0,0 }, +{ IDX_2C('n','u'), "Niue",0,0,0 }, +{ IDX_2C('n','z'), "Nya Zeland",0,0,0 }, +{ IDX_2C('o','m'), "Oman",0,0,0 }, +{ IDX_2C('p','a'), "Panama",0,0,0 }, +{ IDX_2C('p','e'), "Peru",0,0,0 }, +{ IDX_2C('p','f'), "Franska Polynesien",0,0,0 }, +{ IDX_2C('p','g'), "Papua Nya Guinea",0,0,0 }, +{ IDX_2C('p','h'), "Filippinerna",0,0,0 }, +{ IDX_2C('p','k'), "Pakistan",0,0,0 }, +{ IDX_2C('p','l'), "Polen",0,0,0 }, +{ IDX_2C('p','m'), "St. Pierre och Miquelon",0,0,0 }, +{ IDX_2C('p','n'), "Pitcairn",0,0,0 }, +{ IDX_2C('p','r'), "Puerto Rico",0,0,0 }, +{ IDX_2C('p','s'), "Palestinian Territory, Occupied",0,0,0 }, +{ IDX_2C('p','t'), "Portugal",0,0,0 }, +{ IDX_2C('p','w'), "Palau",0,0,0 }, +{ IDX_2C('p','y'), "Paraguay",0,0,0 }, +{ IDX_2C('q','a'), "Qatar",0,0,0 }, +{ IDX_2C('r','e'), "Reunion",0,0,0 }, +{ IDX_2C('r','o'), "Rum�nien",0,0,0 }, +{ IDX_2C('r','s'), "Serbien",0,0,0 }, +{ IDX_2C('r','u'), "Ryssland",0,0,0 }, +{ IDX_2C('r','w'), "Rwanda",0,0,0 }, +{ IDX_2C('s','a'), "Saudiarabien",0,0,0 }, +{ IDX_2C('s','b'), "Solomon�arna",0,0,0 }, +{ IDX_2C('s','c'), "Seychellerna",0,0,0 }, +{ IDX_2C('s','d'), "Sudan",0,0,0 }, +{ IDX_2C('s','e'), "Sverige",0,0,0 }, +{ IDX_2C('s','g'), "Singapor",0,0,0 }, +{ IDX_2C('s','h'), "St. Helena",0,0,0 }, +{ IDX_2C('s','i'), "Slovenien",0,0,0 }, +{ IDX_2C('s','j'), "Svalbard och Jan Mayen-�arna",0,0,0 }, +{ IDX_2C('s','k'), "Slovakien",0,0,0 }, +{ IDX_2C('s','l'), "Sierra Leone",0,0,0 }, +{ IDX_2C('s','m'), "San Marino",0,0,0 }, +{ IDX_2C('s','n'), "Senegal",0,0,0 }, +{ IDX_2C('s','o'), "Somalia",0,0,0 }, +{ IDX_2C('s','r'), "Surinam",0,0,0 }, +{ IDX_2C('s','t'), "Sao Tome och Principe",0,0,0 }, +{ IDX_2C('s','u'), "Sovjet",0,0,0 }, +{ IDX_2C('s','v'), "El Salvador",0,0,0 }, +{ IDX_2C('s','y'), "Syrien",0,0,0 }, +{ IDX_2C('s','z'), "Swaziland",0,0,0 }, +{ IDX_2C('t','c'), "Turks och Caicos�arna",0,0,0 }, +{ IDX_2C('t','d'), "Chad",0,0,0 }, +{ IDX_2C('t','f'), "S�dra Franska territorierna",0,0,0 }, +{ IDX_2C('t','g'), "Togo",0,0,0 }, +{ IDX_2C('t','h'), "Thailand",0,0,0 }, +{ IDX_2C('t','j'), "Tajikistan",0,0,0 }, +{ IDX_2C('t','k'), "Tokelau",0,0,0 }, +{ IDX_2C('t','l'), "Timor-Leste",0,0,0 }, +{ IDX_2C('t','m'), "Turkmenistan",0,0,0 }, +{ IDX_2C('t','n'), "Tunisien",0,0,0 }, +{ IDX_2C('t','o'), "Tonga",0,0,0 }, +{ IDX_2C('t','p'), "�sttimor",0,0,0 }, +{ IDX_2C('t','r'), "Turkiet",0,0,0 }, +{ IDX_2C('t','t'), "Trinidad och Tobago",0,0,0 }, +{ IDX_2C('t','v'), "Tuvalu",0,0,0 }, +{ IDX_2C('t','w'), "Taiwan",0,0,0 }, +{ IDX_2C('t','z'), "Tanzania",0,0,0 }, +{ IDX_2C('u','a'), "Ukraina",0,0,0 }, +{ IDX_2C('u','g'), "Uganda",0,0,0 }, +{ IDX_2C('u','k'), "Storbritanien",0,0,0 }, +{ IDX_2C('u','m'), "US Minor Outlying Islands",0,0,0 }, +{ IDX_2C('u','s'), "USA",0,0,0 }, +{ IDX_2C('u','y'), "Uruguay",0,0,0 }, +{ IDX_2C('u','z'), "Uzbekistan",0,0,0 }, +{ IDX_2C('v','a'), "Vatikanstaten",0,0,0 }, +{ IDX_2C('v','c'), "Saint Vincent och Grenadinerna",0,0,0 }, +{ IDX_2C('v','e'), "Venezuela",0,0,0 }, +{ IDX_2C('v','g'), "Jungfru-�arna (Brittiska)",0,0,0 }, +{ IDX_2C('v','i'), "Jungfru-�arna (Amerikanska)",0,0,0 }, +{ IDX_2C('v','n'), "Vietnam",0,0,0 }, +{ IDX_2C('v','u'), "Vanuatu",0,0,0 }, +{ IDX_2C('w','f'), "Wallis och Futuna�arna",0,0,0 }, +{ IDX_2C('w','s'), "Samoa",0,0,0 }, +{ IDX_2C('y','e'), "Yemen",0,0,0 }, +{ IDX_2C('y','t'), "Mayotte",0,0,0 }, +{ IDX_2C('y','u'), "Jugoslavien",0,0,0 }, +{ IDX_2C('z','a'), "Sydafrika",0,0,0 }, +{ IDX_2C('z','m'), "Zambia",0,0,0 }, +{ IDX_2C('z','w'), "Zimbabwe",0,0,0 }, +{ IDX_2C('a','1'), "Anonymous Proxy",0,0,0 }, +{ IDX_2C('a','2'), "Satellite Provider",0,0,0 }, +{ IDX_2C('o','1'), "Other",0,0,0 }, +{ IDX_2C('a','p'), "Asia/Pacific Region",0,0,0 }, +{ IDX_3C('l','a','n'), "Local Network (lan)",0,0,0 }, +{ 0, NULL,0,0,0 } +}; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/linklist.c new/webalizer-2.21-02/linklist.c --- old/webalizer-2.20-01/linklist.c 2008-07-01 06:12:13.000000000 +0200 +++ new/webalizer-2.21-02/linklist.c 2009-01-13 05:43:00.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/Makefile.std new/webalizer-2.21-02/Makefile.std --- old/webalizer-2.20-01/Makefile.std 2008-07-02 00:28:24.000000000 +0200 +++ new/webalizer-2.21-02/Makefile.std 2009-01-13 05:46:50.000000000 +0100 @@ -1,7 +1,7 @@ # # Makefile for webalizer - a web server logfile analysis thingie # -# (c)1997-2008 by Bradford L. Barrett +# (c)1997-2009 by Bradford L. Barrett # Distributed under the GNU GPL. See "README" and "Copyright" # files supplied with this distribution for more information. # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/output.c new/webalizer-2.21-02/output.c --- old/webalizer-2.20-01/output.c 2008-07-01 00:04:39.000000000 +0200 +++ new/webalizer-2.21-02/output.c 2009-01-13 06:34:04.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -175,7 +175,7 @@ fprintf(out_fp,"\n", version,editlvl); fprintf(out_fp,"\n"); - fprintf(out_fp,"\n"); + fprintf(out_fp,"\n"); fprintf(out_fp,"\n"); fprintf(out_fp,"\n"); fprintf(out_fp,"\n"); @@ -2386,6 +2386,11 @@ int s_year=hist[HISTSIZE-1].year; char index_fname[256]; char buffer[BUFSIZE]; + u_int64_t m_hit=0; + u_int64_t m_files=0; + u_int64_t m_pages=0; + u_int64_t m_visits=0; + double m_xfer=0.0; double gt_hit=0.0; double gt_files=0.0; double gt_pages=0.0; @@ -2473,6 +2478,26 @@ /* Check for year change */ if (s_year!=hist[i].year) { + /* Year Totals */ + if (index_mths>16 && year_totals) + { + fprintf(out_fp,"<TR><TH COLSPAN=6 BGCOLOR=\"%s\" " \ + "ALIGN=left><FONT SIZE=\"-1\"><STRONG>%04d</TH>\n", + GRPCOLOR,s_year); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%.0f</TH>", GRPCOLOR, m_xfer); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%0llu</TH>", GRPCOLOR, m_visits); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%0llu</TH>", GRPCOLOR, m_pages); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%0llu</TH>", GRPCOLOR, m_files); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%0llu</TH>", GRPCOLOR, m_hit); + m_xfer=0; m_visits=0; m_pages=0; m_files=0; m_hit=0; + } + + /* Year Header */ s_year=hist[i].year; if (index_mths>16 && year_hdrs) fprintf(out_fp,"<TR><TH COLSPAN=11 BGCOLOR=\"%s\" " \ @@ -2515,6 +2540,28 @@ gt_pages += hist[i].page; gt_xfer += hist[i].xfer; gt_visits+= hist[i].visit; + m_hit += hist[i].hit; + m_files += hist[i].files; + m_pages += hist[i].page; + m_visits+= hist[i].visit; + m_xfer += hist[i].xfer; + } + + if (index_mths>16 && year_totals) + { + fprintf(out_fp,"<TR><TH COLSPAN=6 BGCOLOR=\"%s\" " \ + "ALIGN=left><FONT SIZE=\"-1\"><STRONG>%04d</TH>\n", + GRPCOLOR,s_year); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%.0f</TH>", GRPCOLOR, m_xfer); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%0llu</TH>", GRPCOLOR, m_visits); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%0llu</TH>", GRPCOLOR, m_pages); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%0llu</TH>", GRPCOLOR, m_files); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%0llu</TH>", GRPCOLOR, m_hit); } fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n"); fprintf(out_fp,"<TR><TH BGCOLOR=\"%s\" COLSPAN=6 ALIGN=left>" \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/parser.c new/webalizer-2.21-02/parser.c --- old/webalizer-2.20-01/parser.c 2008-05-29 18:25:55.000000000 +0200 +++ new/webalizer-2.21-02/parser.c 2009-01-13 05:43:08.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/preserve.c new/webalizer-2.21-02/preserve.c --- old/webalizer-2.20-01/preserve.c 2008-07-03 08:13:16.000000000 +0200 +++ new/webalizer-2.21-02/preserve.c 2009-01-13 05:43:12.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/README new/webalizer-2.21-02/README --- old/webalizer-2.20-01/README 2008-07-10 21:16:58.000000000 +0200 +++ new/webalizer-2.21-02/README 2009-01-13 05:44:49.000000000 +0100 @@ -1,5 +1,5 @@ The Webalizer - A web server log file analysis tool -Copyright 1997-2008 by Bradford L. Barrett +Copyright 1997-2009 by Bradford L. Barrett Distributed under the GNU GPL. See the files "COPYING" and "Copyright" supplied with the distribution for additional info. @@ -43,7 +43,7 @@ cache files used and produced by the webalizer. See the file DNS.README for additional information regarding DNS support. -This documentation applies to The Webalizer Version 2.20 +This documentation applies to The Webalizer Version 2.21 Running the Webalizer --------------------- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/sample.conf new/webalizer-2.21-02/sample.conf --- old/webalizer-2.20-01/sample.conf 2008-07-10 09:09:33.000000000 +0200 +++ new/webalizer-2.21-02/sample.conf 2009-01-13 05:46:19.000000000 +0100 @@ -1,6 +1,6 @@ # # Sample Webalizer configuration file -# Copyright 1997-2008 by Bradford L. Barrett +# Copyright 1997-2009 by Bradford L. Barrett # # Distributed under the GNU General Public License. See the # files "Copyright" and "COPYING" provided with the webalizer @@ -431,6 +431,13 @@ #YearHeaders yes +# YearTotals enables/disables the display of yearly totals in the main +# index (yearly summary) table. If enabled, year totals will be shown +# when the table is displaying more than 16 months worth of data. Values +# can be 'yes' or 'no', with 'yes' being the default. + +#YearTotals yes + # GraphMonths defines the number of months to display in the main index # (yearly summary) graph. Value can be between 12 and 72 months, with # the default being 12 months. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/wcmgr.1 new/webalizer-2.21-02/wcmgr.1 --- old/webalizer-2.20-01/wcmgr.1 2008-07-13 00:07:20.000000000 +0200 +++ new/webalizer-2.21-02/wcmgr.1 2009-01-13 05:45:27.000000000 +0100 @@ -103,7 +103,7 @@ .SH BUGS Please report bugs to the author. .SH COPYRIGHT -Copyright (C) 1997-2008 by Bradford L. Barrett. Distributed under +Copyright (C) 1997-2009 by Bradford L. Barrett. Distributed under the GNU GPL. See the files "\fICOPYING\fP" and "\fICopyright\fP", supplied with all distributions for additional information. .SH AUTHOR diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/wcmgr.c new/webalizer-2.21-02/wcmgr.c --- old/webalizer-2.20-01/wcmgr.c 2008-07-13 00:07:46.000000000 +0200 +++ new/webalizer-2.21-02/wcmgr.c 2009-01-13 05:45:49.000000000 +0100 @@ -3,7 +3,7 @@ webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -96,7 +96,7 @@ char *version = "1.00"; /* program version */ char *editlvl = "03"; /* edit level */ char *moddate = "12-Jul-2008"; /* modification date */ -char *copyright = "Copyright 2007-2008 by Bradford L. Barrett"; +char *copyright = "Copyright 2007-2009 by Bradford L. Barrett"; int action = 'l'; /* action flag (default=list) */ int create = 0; /* cache creation flag */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/webalizer.1 new/webalizer-2.21-02/webalizer.1 --- old/webalizer-2.20-01/webalizer.1 2008-07-13 00:07:09.000000000 +0200 +++ new/webalizer-2.21-02/webalizer.1 2009-01-13 05:51:37.000000000 +0100 @@ -535,6 +535,12 @@ is displaying more than 16 months worth of data. Values can be 'yes' or 'no'. Default is 'yes'. .TP 8 +.B YearTotals \fP( \fByes\fP | no ) +Enable/disable the display of year totals in the main index (yearly +summary) table. If enabled, year totals will be shown when the table +is displaying more than 16 months worth of data. Values can be 'yes' +or 'no'. Default is 'yes'. +.TP 8 .B GraphMonths \fInum\fP Specify the number of months to display in the main index (yearly summary) graph. Default is 12 months. Can be set to anything between @@ -892,7 +898,7 @@ .SH BUGS Please report bugs to the author. .SH COPYRIGHT -Copyright (C) 1997-2008 by Bradford L. Barrett. Distributed under +Copyright (C) 1997-2009 by Bradford L. Barrett. Distributed under the GNU GPL. See the files "\fICOPYING\fP" and "\fICopyright\fP", supplied with all distributions for additional information. .SH AUTHOR diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/webalizer.c new/webalizer-2.21-02/webalizer.c --- old/webalizer-2.20-01/webalizer.c 2008-07-13 00:07:34.000000000 +0200 +++ new/webalizer-2.21-02/webalizer.c 2009-01-13 06:35:54.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,6 +25,13 @@ /* STANDARD INCLUDES */ /*********************************************/ +/* Fix broken Zlib 64 bitness */ +#if _FILE_OFFSET_BITS == 64 +#ifndef _LARGEFILE64_SOURCE +#define _LARGEFILE64_SOURCE = 1 +#endif +#endif + #include <time.h> #include <stdio.h> #include <stdlib.h> @@ -104,10 +111,10 @@ /* GLOBAL VARIABLES */ /*********************************************/ -char *version = "2.20"; /* program version */ -char *editlvl = "01"; /* edit level */ -char *moddate = "12-Jul-2008"; /* modification date */ -char *copyright = "Copyright 1997-2008 by Bradford L. Barrett"; +char *version = "2.21"; /* program version */ +char *editlvl = "02"; /* edit level */ +char *moddate = "13-Jan-2009"; /* modification date */ +char *copyright = "Copyright 1997-2009 by Bradford L. Barrett"; int verbose = 2; /* 2=verbose,1=err, 0=none */ int debug_mode = 0; /* debug mode flag */ @@ -158,6 +165,7 @@ int graph_mths = 12; /* # months in index graph */ int index_mths = 12; /* # months in index table */ int year_hdrs = 1; /* index year seperators */ +int year_totals = 1; /* index year subtotals */ int use_flags = 0; /* Show flags in ctry table */ char *flag_dir = "flags"; /* location of flag icons */ @@ -1617,9 +1625,10 @@ "IndexMonths", /* # months for main page 114 */ "GraphMonths", /* # months for yearly graph 115 */ "YearHeaders", /* use year headers? (1=yes) 116 */ - "CountryFlags", /* show country flags? (0-no) 117 */ - "FlagDir", /* directory w/flag images 118 */ - "SearchCaseI" /* srch str case insensitive 119 */ + "YearTotals", /* show year subtotals (0=no) 117 */ + "CountryFlags", /* show country flags? (0-no) 118 */ + "FlagDir", /* directory w/flag images 119 */ + "SearchCaseI" /* srch str case insensitive 120 */ }; FILE *fp; @@ -1847,10 +1856,12 @@ case 115: graph_mths=atoi(value); break; /* GraphMonths */ case 116: year_hdrs= (tolower(value[0])=='n')?0:1; break; /* YearHeaders */ - case 117: use_flags= + case 117: year_totals= + (tolower(value[0])=='n')?0:1; break; /* YearTotals */ + case 118: use_flags= (tolower(value[0])=='y')?1:0; break; /* CountryFlags */ - case 118: use_flags=1; flag_dir=save_opt(value); break; /* FlagDir */ - case 119: searchcasei= + case 119: use_flags=1; flag_dir=save_opt(value); break; /* FlagDir */ + case 120: searchcasei= (tolower(value[0])=='n')?0:1; break; /* SearchCaseI */ } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/webalizer.h new/webalizer-2.21-02/webalizer.h --- old/webalizer-2.20-01/webalizer.h 2008-07-01 07:19:17.000000000 +0200 +++ new/webalizer-2.21-02/webalizer.h 2009-01-08 06:10:27.000000000 +0100 @@ -194,6 +194,7 @@ extern int graph_mths ; /* # months in index graph */ extern int index_mths ; /* # months in index table */ extern int year_hdrs ; /* Show year headers (0=no) */ +extern int year_totals ; /* Show year totals (0=no) */ extern int use_flags ; /* Show flags in ctry table */ extern char *flag_dir ; /* flag directory */ extern char *hname ; /* hostname for reports */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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