November 2009 - openSUSE Commits - openSUSE Mailing Lists

commit kdemultimedia4 for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package kdemultimedia4 for openSUSE:Factory checked in at Fri Nov 27 15:18:35 CET 2009. -------- --- KDE/kdemultimedia4/kdemultimedia4.changes 2009-11-02 22:03:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2009-11-16 21:46:27.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 16 21:45:40 CET 2009 - llunak(a)novell.com + +- obsolete only old versions of kdemultimedia3-kmix (bnc#542094) + +------------------------------------------------------------------- @@ -5,0 +11,5 @@ + +------------------------------------------------------------------- +Thu Oct 22 14:25:11 UTC 2009 - crrodriguez(a)opensuse.org + +- fix Provides/Obsoletes of kmix calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.j2VGYN/_old 2009-11-27 15:17:15.000000000 +0100 +++ /var/tmp/diff_new_pack.j2VGYN/_new 2009-11-27 15:17:15.000000000 +0100 @@ -27,12 +27,12 @@ BuildRequires: libtheora-devel libtunepimp-devel libvorbis-devel speex-devel taglib-devel xine-devel xine-lib BuildRequires: alsa-devel gstreamer010-devel gstreamer010-plugins-base-devel libakode-devel libogg-devel BuildRequires: libknotificationitem-devel -License: GPL v2 or later +License: GPLv2+ Group: System/GUI/KDE Summary: kdemultimedia base package Url: http://www.kde.org Version: 4.3.3 -Release: 1 +Release: 2 Source0: kdemultimedia-%version.tar.bz2 Patch0: 4_3_BRANCH.diff Patch1: kmix-autostart.diff @@ -103,7 +103,7 @@ rm -rf filelists %package -n dragonplayer -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Multimedia/Video/Players Summary: Multimedia Player Url: http://dragonplayer.org/ @@ -127,7 +127,7 @@ %doc COPYING COPYING.DOC README %package -n juk -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Multimedia/Sound/Players Summary: Jukebox Provides: kde4-juk = 4.3.0 @@ -152,12 +152,12 @@ %doc COPYING COPYING.DOC README %package -n kmix -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Multimedia/Sound/Mixers Summary: Sound Mixer %kde4_runtime_requires -Provides: kdemultimedia3-mixer = 3.5.1 -Obsoletes: kdemultimedia3-mixer <= 3.5.1 +Provides: kdemultimedia3-mixer = 3.5.10 +Obsoletes: kdemultimedia3-mixer <= 3.5.10 Provides: kde4-kmix = 4.3.0 Obsoletes: kde4-kmix < 4.3.0 @@ -179,7 +179,7 @@ %doc COPYING COPYING.DOC README %package -n kscd -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Multimedia/CD/Players Summary: CD Player %kde4_runtime_requires @@ -211,7 +211,7 @@ %dir %_kde4_appsdir/profiles %package -n kio_audiocd -License: GPL v2 or later +License: GPLv2+ Group: System/GUI/KDE Summary: KDE I/O Slave for Audio CDs %kde4_runtime_requires @@ -240,7 +240,7 @@ %doc COPYING COPYING.DOC README %package -n libkcddb4 -License: GPL v2 or later +License: GPLv2+ Group: System/GUI/KDE Summary: KDE CDDB Library @@ -262,7 +262,7 @@ %doc COPYING COPYING.DOC README %package -n libkcddb4-devel -License: GPL v2 or later +License: GPLv2+ Group: System/GUI/KDE Summary: KDE CDDB Library: Build Environment Requires: libkcddb4 = %version @@ -282,7 +282,7 @@ %dir /usr/include/libkcddb %package -n libkcompactdisc4 -License: GPL v2 or later +License: GPLv2+ Group: System/GUI/KDE Summary: KDE CD Library %requires_ge libqt4-x11 @@ -306,7 +306,7 @@ %doc COPYING COPYING.DOC %package -n libkcompactdisc4-devel -License: GPL v2 or later +License: GPLv2+ Group: System/GUI/KDE Summary: KDE CD Library: Build Environment Requires: libkcompactdisc4 = %version ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 plotutils for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package plotutils for openSUSE:Factory checked in at Fri Nov 27 15:14:17 CET 2009. -------- --- plotutils/plotutils.changes 2009-01-20 18:54:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/plotutils/plotutils.changes 2009-11-26 09:56:25.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 26 09:54:41 CET 2009 - werner(a)suse.de + +- Update to version 2.6 as this fix a copyright problem of mixing + GPL and non-commercial code (bnc#465378) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- plotutils-2.5.1.tar.bz2 New: ---- plotutils-2.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plotutils.spec ++++++ --- /var/tmp/diff_new_pack.ZATdVX/_old 2009-11-27 15:11:01.000000000 +0100 +++ /var/tmp/diff_new_pack.ZATdVX/_new 2009-11-27 15:11:01.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package plotutils (Version 2.5.1) +# spec file for package plotutils (Version 2.6) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: plotutils BuildRequires: bison flex gcc-c++ libpng-devel xorg-x11-devel zlib-devel -License: GPL v2 or later; GPL v3 or later +License: GPLv2+ ; GPLv3+ Url: http://www.gnu.org/software/plotutils/plotutils.html Group: Productivity/Graphics/Visualization/Graph PreReq: %install_info_prereq %suseconfig_fonts_prereq -Version: 2.5.1 -Release: 2 +Version: 2.6 +Release: 1 Summary: GNU Plotting Utilities Source: %{name}-%{version}.tar.bz2 Patch: plotutils-man.patch @@ -54,7 +54,7 @@ James J. Clark <jjc(a)jclark.com> %package devel -License: GPL v2 or later; GPL v3 or later +License: GPLv2+ ; GPLv3+ Summary: GNU Plotting Utilities Group: Development/Libraries/C and C++ Requires: %{name} = %{version} libstdc++-devel xorg-x11-libX11-devel @@ -80,7 +80,7 @@ James J. Clark <jjc(a)jclark.com> %package -n libplot2 -License: GPL v2 or later; GPL v3 or later +License: GPLv2+ ; GPLv3+ Summary: GNU Plotting Utilities Group: System/Libraries @@ -104,7 +104,7 @@ James J. Clark <jjc(a)jclark.com> %package -n libplotter2 -License: GPL v2 or later; GPL v3 or later +License: GPLv2+ ; GPLv3+ Summary: GNU Plotting Utilities Group: System/Libraries @@ -128,7 +128,7 @@ James J. Clark <jjc(a)jclark.com> %package -n libxmi0 -License: GPL v2 or later; GPL v3 or later +License: GPLv2+ ; GPLv3+ Summary: GNU Plotting Utilities Group: System/Libraries @@ -160,7 +160,7 @@ %patch2 %patch3 # Force update lex and bison code: -rm $(fgrep -rl "made by GNU Bison" . ; fgrep -rl "A Bison parser, made from" . ; fgrep -rl '"lex.yy.c"' .) +grep -rslE '(made by GNU Bison|A Bison parser, made from|"lex.yy.c")' . | xargs -r rm -f %build autoreconf -f -i ++++++ plotutils-2.5.1.tar.bz2 -> plotutils-2.6.tar.bz2 ++++++ ++++ 15099 lines of diff (skipped) ++++++ plotutils-dasharray-format.patch ++++++ --- /var/tmp/diff_new_pack.ZATdVX/_old 2009-11-27 15:11:02.000000000 +0100 +++ /var/tmp/diff_new_pack.ZATdVX/_new 2009-11-27 15:11:02.000000000 +0100 @@ -4,8 +4,8 @@ { sprintf (page->point, "%.5g%s", dashbuf[i], -- i < num_dashes - 1 ? " " : "\""); -+ i < num_dashes - 1 ? " " : "\" "); +- i < num_dashes - 1 ? ", " : "\""); ++ i < num_dashes - 1 ? ", " : "\" "); _update_buffer (page); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yasm for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package yasm for openSUSE:Factory checked in at Fri Nov 27 14:58:43 CET 2009. -------- --- yasm/yasm.changes 2007-10-31 11:28:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/yasm/yasm.changes 2009-02-11 14:33:25.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 11 14:32:57 CET 2009 - dmueller(a)suse.de + +- update to 0.7.2: + * http://www.tortall.net/projects/yasm/wiki/Release0.7.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yasm-0.6.2.tar.bz2 New: ---- yasm-0.7.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yasm.spec ++++++ --- /var/tmp/diff_new_pack.sZveTS/_old 2009-11-27 14:56:48.000000000 +0100 +++ /var/tmp/diff_new_pack.sZveTS/_new 2009-11-27 14:56:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yasm (Version 0.6.2) +# spec file for package yasm (Version 0.7.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,11 +20,11 @@ Name: yasm Url: http://www.tortall.net/projects/yasm/ -License: BSD 3-Clause +License: BSD3c Group: Development/Languages/Other AutoReqProv: on -Version: 0.6.2 -Release: 85 +Version: 0.7.2 +Release: 1 Summary: YASM is a complete rewrite of the NASM assembler Source: yasm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,7 +44,7 @@ Peter Johnson <peter(a)tortall.net> %package devel -License: BSD 3-Clause +License: BSD3c Summary: YASM development package Group: Development/Languages/Other AutoReqProv: on @@ -74,11 +74,9 @@ %clean rm -rf %buildroot -%post -%run_ldconfig +%post -p /sbin/ldconfig -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root) ++++++ yasm-0.6.2.tar.bz2 -> yasm-0.7.2.tar.bz2 ++++++ ++++ 83156 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Bootloader for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at Fri Nov 27 14:56:37 CET 2009. -------- --- perl-Bootloader/perl-Bootloader.changes 2009-10-09 13:43:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2009-11-25 14:59:57.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Nov 25 13:50:16 UTC 2009 - jreidinger(a)novell.com + +- don't translate during kernel-update mdraid over whole disc + (FATE#305883) +- fix problems with MD Raid (bnc#533866,bnc#547580) +- pass vga mode to xen kernel (FATE#305310); fix mdraid test to + check proper directory +- 0.5.7 + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- perl-Bootloader-0.5.6.tar.bz2 New: ---- perl-Bootloader-0.5.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.xFLGDv/_old 2009-11-27 14:54:54.000000000 +0100 +++ /var/tmp/diff_new_pack.xFLGDv/_new 2009-11-27 14:54:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.5.6) +# spec file for package perl-Bootloader (Version 0.5.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: perl-Bootloader -Version: 0.5.6 +Version: 0.5.7 Release: 1 Requires: perl-base = %{perl_version} Requires: e2fsprogs ++++++ perl-Bootloader-0.5.6.tar.bz2 -> perl-Bootloader-0.5.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.6/lib/Bootloader/Core/ELILO.pm new/perl-Bootloader-0.5.7/lib/Bootloader/Core/ELILO.pm --- old/perl-Bootloader-0.5.6/lib/Bootloader/Core/ELILO.pm 2009-06-02 13:00:30.000000000 +0200 +++ new/perl-Bootloader-0.5.7/lib/Bootloader/Core/ELILO.pm 2009-10-27 19:53:27.000000000 +0100 @@ -463,6 +463,7 @@ elsif ($key eq "append") { my $first = $sectinfo{"xen_append"} || ""; + $first = "vga=mode-".(delete $sectinfo{"vgamode"})." $first" if ($sectinfo{"vgamode"} ne ""); my $second = $sectinfo{"append"} || ""; my $console = $sectinfo{"console"} || ""; $console = "console=$console" if ($console ne ""); @@ -505,7 +506,7 @@ $line_ref->{"key"} = "label"; push @lines, $line_ref; } - elsif ( $key eq "append" || $key eq "console" || $key eq "xen_append" ) + elsif ( $key eq "append" || $key eq "console" || $key eq "xen_append" || $key eq "vgamode") { if (defined($create_append)) { @@ -516,10 +517,10 @@ if ($type eq "xen") { my $xen_append = $sectinfo{"xen_append"} || ""; - $val = "$xen_append -- $val"; + my $vga = ""; + $vga="vga=mode-".$sectinfo{"vgamode"}." " if ($sectinfo{"vgamode"} ne ""); + $val = "$vga$xen_append -- $val"; } - - push @lines, { "key" => "append", "value" => $val, @@ -613,7 +614,12 @@ { $val =~ m/(.*)--(.*)/; my $xen_app = $1; - my $host_app = $2; + my $host_app = $2; + if ($xen_app =~ m/(.*)vga=mode-(\S+)\s*(.*)/) + { + $ret{"vgamode"} = $2; + $xen_app = $self->MergeIfDefined($1,$3) + } $ret{"xen_append"} = $self->trim($xen_app); $ret{"append"} = $self->trim($host_app); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.6/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.5.7/lib/Bootloader/Core/GRUB.pm --- old/perl-Bootloader-0.5.6/lib/Bootloader/Core/GRUB.pm 2009-08-04 14:16:20.000000000 +0200 +++ new/perl-Bootloader-0.5.7/lib/Bootloader/Core/GRUB.pm 2009-10-27 19:53:27.000000000 +0100 @@ -1069,13 +1069,13 @@ if (exists $ret{"xen_append"}) { my $xen_append = $ret{"xen_append"}; while ($xen_append =~ - s/(.*)console=(\S+)\s*(.*)$/$1$3/o) { - my $del_console = $2; - $xen_append =~ - s/(.*)${del_console}=\w+\s*(.*)$/$1$2/g; - } - $xen_append =~ s/\s*(\S*)\s*$/$1/; - $ret{"xen_append"} = "console=$console $speed $xen_append"; + s/(.*)console=(\S+)\s*(.*)$/$1$3/o) { + my $del_console = $2; + $xen_append =~ + s/(.*)${del_console}=\w+\s*(.*)$/$1$2/g; + } + $xen_append =~ s/\s*(\S*)\s*$/$1/; + $ret{"xen_append"} = "console=$console $speed $xen_append"; } else { $ret{"xen_append"} = "console=$console $speed"; } @@ -1085,6 +1085,11 @@ } elsif ($key eq "xen") { + if ($val =~ /^(?:(.*)\s+)?vga=mode-(\S+)(?:\s+(.*))?$/) + { + $ret{"vgamode"} = $2 if $2 ne ""; + $val = $self->MergeIfDefined ($1, $3); + } # split into loader and parameter, note that the regex does # always match $val =~ /^\s*(\S+)(?:\s+(.*))?$/; @@ -1447,9 +1452,11 @@ } elsif ($key eq "kernel") { if ($type eq "xen") { - $line_ref->{"value"} = - $self->UnixPath2GrubPath (delete($sectinfo{"xen"}), $grub_root) - . " " . (delete($sectinfo{"xen_append"}) || ""); + my $xen = $self->UnixPath2GrubPath (delete($sectinfo{"xen"}), $grub_root); + my $append = (delete($sectinfo{"xen_append"}) || ""); + my $vga = delete ($sectinfo{"vgamode"}) || ""; + $vga = "vga=mode-$vga " if $vga ne ""; + $line_ref->{"value"} = "$xen $vga$append"; } elsif ($type eq "image") { $line_ref->{"value"} = $self->CreateKernelLine (\%sectinfo, $grub_root); @@ -1530,8 +1537,11 @@ # keep a hard order for the following three entries if (exists $sectinfo{"xen"} && $type eq "xen") { - my $value = $self->UnixPath2GrubPath ($sectinfo{"xen"}, $grub_root) - . " " . ($sectinfo{"xen_append"} || ""); + my $xen = $self->UnixPath2GrubPath (delete($sectinfo{"xen"}), $grub_root); + my $append = (delete($sectinfo{"xen_append"}) || ""); + my $vga = $sectinfo{"vgamode"} || ""; + $vga = "vgamode=$vga " if $vga ne ""; + my $value = "$xen $vga$append"; push @lines, { "key" => "kernel", "value" => $value, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.6/lib/Bootloader/Core.pm new/perl-Bootloader-0.5.7/lib/Bootloader/Core.pm --- old/perl-Bootloader-0.5.6/lib/Bootloader/Core.pm 2009-08-11 11:00:15.000000000 +0200 +++ new/perl-Bootloader-0.5.7/lib/Bootloader/Core.pm 2009-10-27 19:53:27.000000000 +0100 @@ -1779,6 +1779,7 @@ my $output = `cat $log`; $self->l_milestone("run $command - ret $ret + output: $output"); + $self->l_error("Command '$command' failed with code $ret and output: $output") unless $ret == 0; return $ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.6/lib/Bootloader/Library.pm new/perl-Bootloader-0.5.7/lib/Bootloader/Library.pm --- old/perl-Bootloader-0.5.6/lib/Bootloader/Library.pm 2009-08-04 16:27:25.000000000 +0200 +++ new/perl-Bootloader-0.5.7/lib/Bootloader/Library.pm 2009-11-19 17:44:42.000000000 +0100 @@ -361,7 +361,7 @@ while ((my $phys, my $mp) = each (%{$map_ref})) { - Bootloader::Logger::instance()->milestone ("Library::DefineUdevMapping: Udev device: ".$phys||""." ; kernel: ".$mp||"".""); + Bootloader::Logger::instance()->milestone ("Library::DefineUdevMapping: Udev device: ".($phys||"")." ; kernel: ".($mp||"").""); } $loader->{"udevmap"} = $map_ref; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.6/lib/Bootloader/Tools.pm new/perl-Bootloader-0.5.7/lib/Bootloader/Tools.pm --- old/perl-Bootloader-0.5.6/lib/Bootloader/Tools.pm 2009-10-09 13:38:39.000000000 +0200 +++ new/perl-Bootloader-0.5.7/lib/Bootloader/Tools.pm 2009-11-25 14:56:34.000000000 +0100 @@ -427,7 +427,7 @@ } while (my ($k,$v) = each (%mapping)){ - $logger->milestone ("UDEV MAPPING: ".$k||""." -> ".$v||""." \n"); + $logger->milestone ("UDEV MAPPING: ".($k||"")." -> ".($v||"")); } @@ -643,6 +643,7 @@ # FIXME: this has to be read through yast::storage sub ReadRAID1Arrays { + my $udevmapping = shift; my $logger = Bootloader::Logger::instance(); my %mapping = (); # use '/sbin/mdadm --detail --verbose --scan' @@ -679,14 +680,19 @@ if ($line =~ /ARRAY (\S+) level=(\w+) num-devices=(\d+)/) { ($array, $level, $num_devices) = ($1, $2, $3); - $logger->milestone("Tools::ReadRAID1Arrays: set array $array level $level and device count to $num_devices"); + #udevadm sometime return udev symlink instead of physical device, bnc#547580 + $array = $udevmapping->{$array} if $udevmapping->{$array}; + $logger->milestone("Tools::ReadRAID1Arrays: set array $array level $level and device count to $num_devices"); } elsif ($level eq "raid1" and $line =~ /devices=(\S+)/) { # we could test $num_device against number of found devices to # detect degradedmode but that does not matter here (really?) $logger->milestone("Tools::ReadRAID1Arrays: set to array $array values $1"); - $mapping{$array} = [ split(/,/, $1) ]; + my @devices = split(/,/,$1); + if ($devices[0]=~ m/^.*\d+$/){ #add only non-disc arrays + $mapping{$array} = [ @devices ]; + } } } $logger->milestone("Tools::ReadRAID1Arrays: finish parsing mdadm --detail --verbose --scan:"); @@ -744,7 +750,7 @@ my $um = GetUdevMapping(); my $mp = ReadMountPoints ($um); my $part = ReadPartitions ($um); - my $md = ReadRAID1Arrays (); + my $md = ReadRAID1Arrays ($um); my $mpath = GetMultipath (); $lib_ref->SetLoaderType (GetBootloader ()); @@ -859,7 +865,9 @@ sub UpdateBootloader { - $lib_ref->UpdateBootloader (); + my $ret = $lib_ref->UpdateBootloader (); + DumpLog ($lib_ref->{"loader"}); + return $ret; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 syslogd for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package syslogd for openSUSE:Factory checked in at Fri Nov 27 14:54:40 CET 2009. -------- --- syslogd/syslogd.changes 2009-09-09 22:16:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/syslogd/syslogd.changes 2009-11-24 18:17:50.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Nov 24 17:16:07 UTC 2009 - crrodriguez(a)opensuse.org + +- refresh patches again + +------------------------------------------------------------------- +Tue Nov 3 19:09:47 UTC 2009 - coolo(a)novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslogd.spec ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -21,13 +21,13 @@ Name: syslogd %define omc_prefix /usr/share/omc %define omc_svcdir %{omc_prefix}/svcinfo.d -License: GPL v2 or later +License: GPLv2+ Group: System/Daemons PreReq: coreutils %fillup_prereq klogd sed Provides: syslog AutoReqProv: on Version: 1.4.1 -Release: 710 +Release: 711 Summary: The Syslog daemon Source: sysklogd-1.4.1.tar.bz2 Source1: logrotate.syslog @@ -78,7 +78,7 @@ Shane Alderton <shane(a)scs.apana.org.au> %package -n klogd -License: GPL v2 or later +License: GPLv2+ PreReq: %insserv_prereq %fillup_prereq Provides: sysklogd Provides: syslogd:/sbin/klogd @@ -111,21 +111,21 @@ %patch5 -p0 -b .ipv6 %patch6 -p0 -b .klogd24 %patch7 -p0 -b .large -%patch8 -p1 -b .dns +%patch8 -p0 -b .dns %patch9 -p0 -b .reopen %patch10 -p0 -b .sobsd -%patch11 -p1 -b .owlcr -%patch12 -p1 -b .klsize +%patch11 -p0 -b .owlcr +%patch12 -p0 -b .klsize %patch13 -p0 -b .usock %patch14 -p0 -b .shprio -%patch15 -p1 -b .presperc -%patch16 -p1 -b .utf8 -%patch17 -p1 -b .ksym -%patch18 -p1 -b .sleep +%patch15 -p0 -b .presperc +%patch16 -p0 -b .utf8 +%patch17 -p0 -b .ksym +%patch18 -p0 -b .sleep %patch19 -p0 -b .signal %patch20 -p0 -b .clear %patch21 -p0 -b .nofortify -%patch22 -p1 -b .sysmap +%patch22 -p0 -b .sysmap %patch0 -p0 %build ++++++ sysklogd-1.4.1-clearing.patch ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -2,8 +2,10 @@ ! Be able to write errors on creating of pid file on ! the current terminal (bug #394787) ! ---- klogd.c -+++ klogd.c 2008-05-28 12:01:46.000000000 +0200 +Index: klogd.c +=================================================================== +--- klogd.c.orig 2009-11-24 18:12:56.247123000 +0100 ++++ klogd.c 2009-11-24 18:12:56.685124000 +0100 @@ -1098,6 +1098,10 @@ int main(argc, argv) auto int fl; int num_fds = getdtablesize(); @@ -46,8 +48,10 @@ } #endif ---- pidfile.c -+++ pidfile.c 2008-05-29 23:43:35.280028303 +0200 +Index: pidfile.c +=================================================================== +--- pidfile.c.orig 1998-02-10 23:37:12.000000000 +0100 ++++ pidfile.c 2009-11-24 18:12:56.689116000 +0100 @@ -23,6 +23,7 @@ * Sat Aug 19 13:24:33 MET DST 1995: Martin Schulze * First version (v0.2) released @@ -128,8 +132,10 @@ close(fd); return 0; } ---- syslogd.c -+++ syslogd.c 2008-05-28 12:12:25.000000000 +0200 +Index: syslogd.c +=================================================================== +--- syslogd.c.orig 2009-11-24 18:12:56.480126000 +0100 ++++ syslogd.c 2009-11-24 18:12:56.694123000 +0100 @@ -22,7 +22,7 @@ char copyright2[] = #endif /* not lint */ ++++++ sysklogd-1.4.1-dgram.patch ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -1,6 +1,8 @@ ---- syslog.c -+++ syslog.c Wed May 23 18:48:13 2001 -@@ -211,8 +211,9 @@ +Index: syslog.c +=================================================================== +--- syslog.c.orig 2001-03-11 20:35:51.000000000 +0100 ++++ syslog.c 2009-11-24 18:12:52.145473000 +0100 +@@ -211,8 +211,9 @@ openlog(ident, logstat, logfac) strncpy(SyslogAddr.sa_data, _PATH_LOGNAME, sizeof(SyslogAddr.sa_data)); if (LogStat & LOG_NDELAY) { ++++++ sysklogd-1.4.1.dif ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -1,5 +1,7 @@ ---- .pkgextract -+++ .pkgextract 2006-02-08 17:29:50.000000000 +0100 +Index: .pkgextract +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ .pkgextract 2009-11-24 18:12:57.386029000 +0100 @@ -0,0 +1,20 @@ +patch -p0 -b --suffix=.dgram -s < ../sysklogd-1.4.1-dgram.patch +patch -p0 -b --suffix=.sparc -s < ../sysklogd-1.4.1-sparc.patch @@ -21,8 +23,10 @@ +patch -p1 -b --suffix=.sleep -s < ../sysklogd-1.4.1-dontsleep.patch +patch -p0 -b --suffix=.signal -s < ../sysklogd-1.4.1-signal.dif +patch -p0 -b --suffix=.clear -s < ../sysklogd-1.4.1-clearing.patch ---- Makefile -+++ Makefile 2006-02-08 17:29:50.000000000 +0100 +Index: Makefile +=================================================================== +--- Makefile.orig 2009-11-24 18:12:53.916293000 +0100 ++++ Makefile 2009-11-24 18:12:57.389032000 +0100 @@ -1,14 +1,17 @@ # Makefile for syslogd and klogd daemons. @@ -73,11 +77,13 @@ + ${INSTALL} -m 644 syslogd.8 ${DESTDIR}${MANDIR}/man8/syslogd.8 + ${INSTALL} -m 644 syslog.conf.5 ${DESTDIR}${MANDIR}/man5/syslog.conf.5 + ${INSTALL} -m 644 klogd.8 ${DESTDIR}${MANDIR}/man8/klogd.8 ---- klogd.c -+++ klogd.c 2008-05-30 12:23:07.616318420 +0200 -@@ -275,15 +275,21 @@ _syscall3(int,ksyslog,int, type, char *, - #define ksyslog klogctl - #endif +Index: klogd.c +=================================================================== +--- klogd.c.orig 2009-11-24 18:12:57.166028000 +0100 ++++ klogd.c 2009-11-24 18:12:57.393037000 +0100 +@@ -277,15 +277,21 @@ _syscall3(int,ksyslog,int, type, char *, + + #include <sys/utsname.h> -#define LOG_BUFFER_SIZE 4096 +#ifndef _PATH_KLOG @@ -101,7 +107,7 @@ #endif #include "fortify.h" -@@ -297,6 +303,8 @@ static int kmsg, +@@ -299,6 +305,8 @@ static int kmsg, static int use_syscall = 0, one_shot = 0, @@ -110,7 +116,7 @@ symbol_lookup = 1, no_fork = 0; /* don't fork - don't run in daemon mode */ -@@ -872,8 +880,7 @@ static void LogLine(char *ptr, int len) +@@ -874,8 +882,7 @@ static void LogLine(char *ptr, int len) value = strtoul(sym_start+1, (char **) 0, 16); *(line-1) = '>'; /* put back delim */ @@ -120,7 +126,7 @@ { parse_state = PARSING_TEXT; break; -@@ -914,7 +921,7 @@ static void LogLine(char *ptr, int len) +@@ -916,7 +923,7 @@ static void LogLine(char *ptr, int len) static void LogKernelLine(void) { @@ -129,7 +135,7 @@ /* * Zero-fill the log buffer. This should cure a multitude of -@@ -923,6 +930,11 @@ static void LogKernelLine(void) +@@ -925,6 +932,11 @@ static void LogKernelLine(void) * messages into this fresh buffer. */ memset(log_buffer, '\0', log_buf_size); @@ -141,7 +147,7 @@ if ( (rdcnt = ksyslog(2, log_buffer, log_buf_size-1)) < 0 ) { if ( errno == EINTR ) -@@ -1014,10 +1026,15 @@ int main(argc, argv) +@@ -1033,10 +1045,15 @@ int main(argc, argv) *output = (char *) 0; #ifndef TESTING @@ -159,7 +165,7 @@ switch((char)ch) { case '2': /* Print lines with symbols twice. */ -@@ -1048,6 +1065,14 @@ int main(argc, argv) +@@ -1067,6 +1084,14 @@ int main(argc, argv) case 'o': /* One-shot mode. */ one_shot = 1; break; @@ -174,7 +180,7 @@ case 'p': SetParanoiaLevel(1); /* Load symbols on oops. */ break; -@@ -1171,8 +1196,11 @@ int main(argc, argv) +@@ -1193,8 +1218,11 @@ int main(argc, argv) if ( one_shot ) { if (symbol_lookup) { @@ -188,7 +194,7 @@ } if ( (logsrc = GetKernelLogSrc()) == kernel ) LogKernelLine(); -@@ -1187,8 +1215,11 @@ int main(argc, argv) +@@ -1209,8 +1237,11 @@ int main(argc, argv) #endif logsrc = GetKernelLogSrc(); if (symbol_lookup) { @@ -202,8 +208,10 @@ } /* The main loop. */ ---- pidfile.c -+++ pidfile.c 2008-05-30 00:04:24.000000000 +0200 +Index: pidfile.c +=================================================================== +--- pidfile.c.orig 2009-11-24 18:12:56.689116000 +0100 ++++ pidfile.c 2009-11-24 18:12:57.397029000 +0100 @@ -46,11 +46,11 @@ int read_pid (char *pidfile) { @@ -244,8 +252,10 @@ if (!fprintf(f,"%d\n", pid)) { fprintf(stderr, "Can't write pid , %s.\n", strerror(errno)); close(fd); ---- resolve.c -+++ resolve.c 2006-02-08 17:29:50.000000000 +0100 +Index: resolve.c +=================================================================== +--- resolve.c.orig 2009-11-24 18:12:53.920294000 +0100 ++++ resolve.c 2009-11-24 18:12:57.400034000 +0100 @@ -13,6 +13,7 @@ #include <stdlib.h> #include <signal.h> @@ -254,7 +264,7 @@ #if defined(__GLIBC__) #define dprintf mydprintf -@@ -208,7 +209,7 @@ do_query(int fd, int family, const char +@@ -208,7 +209,7 @@ do_query(int fd, int family, const char { struct sockaddr_storage ss; struct addrinfo hints, *res; @@ -263,7 +273,7 @@ memset(&hints, 0, sizeof(hints)); hints.ai_socktype = SOCK_DGRAM; -@@ -244,6 +245,20 @@ do_query(int fd, int family, const char +@@ -244,6 +245,20 @@ do_query(int fd, int family, const char } else { memcpy(&ss, res->ai_addr, res->ai_addrlen); } @@ -286,8 +296,10 @@ + dprintf("failed to write: %s\n", strerror(errno)); + exit(1); } ---- sample-s390.conf -+++ sample-s390.conf 2006-02-08 17:29:50.000000000 +0100 +Index: sample-s390.conf +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ sample-s390.conf 2009-11-24 18:12:57.417029000 +0100 @@ -0,0 +1,60 @@ +# /etc/syslog.conf - Configuration file for syslogd(8) +# @@ -349,8 +361,10 @@ +local2,local3.* -/var/log/localmessages +local4,local5.* -/var/log/localmessages +local6,local7.* -/var/log/localmessages ---- sample.conf -+++ sample.conf 2006-02-08 17:29:50.000000000 +0100 +Index: sample.conf +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ sample.conf 2009-11-24 18:12:57.420029000 +0100 @@ -0,0 +1,60 @@ +# /etc/syslog.conf - Configuration file for syslogd(8) +# @@ -412,8 +426,10 @@ +local2,local3.* -/var/log/localmessages +local4,local5.* -/var/log/localmessages +local6,local7.* -/var/log/localmessages ---- syslog.c -+++ syslog.c 2006-02-08 17:29:50.000000000 +0100 +Index: syslog.c +=================================================================== +--- syslog.c.orig 2009-11-24 18:12:56.940031000 +0100 ++++ syslog.c 2009-11-24 18:12:57.423029000 +0100 @@ -70,7 +70,13 @@ static char sccsid[] = "@(#)syslog.c 5.2 #include <paths.h> #include <stdio.h> @@ -429,8 +445,10 @@ #include "fortify.h" ---- syslogd.c -+++ syslogd.c 2008-05-28 12:14:25.000000000 +0200 +Index: syslogd.c +=================================================================== +--- syslogd.c.orig 2009-11-24 18:12:56.694123000 +0100 ++++ syslogd.c 2009-11-24 18:12:57.428040000 +0100 @@ -466,6 +466,7 @@ static char sccsid[] __attribute__ ((un #include <sys/types.h> #endif ++++++ sysklogd-1.4.1-dns.patch ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -1,6 +1,8 @@ ---- sysklogd-1.4.1/Makefile.resolve 2003-06-02 14:30:18.000000000 +0200 -+++ sysklogd-1.4.1/Makefile 2003-06-02 14:30:18.000000000 +0200 -@@ -62,8 +62,8 @@ +Index: Makefile +=================================================================== +--- Makefile.orig 2009-11-24 18:12:53.675378000 +0100 ++++ Makefile 2009-11-24 18:12:53.916293000 +0100 +@@ -59,8 +59,8 @@ test: syslog_tst ksym oops_test tsyslogd install: install_man install_exec @@ -11,8 +13,10 @@ klogd: klogd.o syslog.o pidfile.o ksym.o ksym_mod.o ${CC} ${LDFLAGS} -o klogd klogd.o syslog.o pidfile.o ksym.o \ ---- sysklogd-1.4.1/resolve.c.resolve 2003-06-02 14:30:18.000000000 +0200 -+++ sysklogd-1.4.1/resolve.c 2003-06-02 14:30:33.000000000 +0200 +Index: resolve.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ resolve.c 2009-11-24 18:12:53.920294000 +0100 @@ -0,0 +1,249 @@ +/* + * Resolve a hostname @@ -263,9 +267,11 @@ + write(fd, &ss, sizeof(ss)); + exit(0); +} ---- sysklogd-1.4.1/syslogd.c.resolve 2003-06-02 14:30:18.000000000 +0200 -+++ sysklogd-1.4.1/syslogd.c 2003-06-02 14:30:26.000000000 +0200 -@@ -633,14 +633,7 @@ +Index: syslogd.c +=================================================================== +--- syslogd.c.orig 2009-11-24 18:12:53.679395000 +0100 ++++ syslogd.c 2009-11-24 18:12:53.926309000 +0100 +@@ -628,14 +628,7 @@ struct filed { struct { char f_hname[MAXHOSTNAMELEN+1]; #ifdef INET6 @@ -281,7 +287,7 @@ #else struct sockaddr_in f_addr; #endif -@@ -795,7 +788,7 @@ +@@ -790,7 +783,7 @@ int decode(char *name, struct code *code #if defined(__GLIBC__) #define dprintf mydprintf #endif /* __GLIBC__ */ @@ -290,7 +296,7 @@ static void allocate_log(void); void sighup_handler(); -@@ -804,10 +797,8 @@ +@@ -799,10 +792,8 @@ static int create_unix_socket(const char #endif #ifdef SYSLOG_INET static int create_inet_socket(); @@ -303,7 +309,7 @@ #endif int main(argc, argv) -@@ -1342,63 +1333,6 @@ +@@ -1337,63 +1328,6 @@ static int create_inet_socket() return fd; } @@ -367,7 +373,7 @@ #endif char ** -@@ -1821,7 +1755,7 @@ +@@ -1814,7 +1748,7 @@ void fprintlog(f, from, flags, msg) char line[MAXLINE + 1]; time_t fwd_suspend; #ifdef INET6 @@ -376,7 +382,7 @@ #else struct hostent *hp; #endif -@@ -1890,38 +1824,21 @@ +@@ -1883,38 +1817,21 @@ void fprintlog(f, from, flags, msg) */ case F_FORW_UNKN: dprintf(" %s\n", f->f_un.f_forw.f_hname); @@ -429,7 +435,7 @@ case F_FORW: /* -@@ -2553,6 +2470,7 @@ +@@ -2544,6 +2461,7 @@ void init() #endif #ifdef SYSLOG_INET @@ -437,7 +443,7 @@ if (Forwarding || AcceptRemote) { if (finet < 0) { finet = create_inet_socket(); -@@ -2569,10 +2487,6 @@ +@@ -2560,10 +2478,6 @@ void init() InetInuse = 0; } inetm = finet; @@ -448,7 +454,7 @@ #endif Initialized = 1; -@@ -2932,7 +2846,7 @@ +@@ -2923,7 +2837,7 @@ int decode(name, codetab) return (-1); } ++++++ sysklogd-1.4.1-dontsleep.patch ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -1,7 +1,8 @@ -diff -ru sysklogd-1.4.1.orig/klogd.c sysklogd-1.4.1/klogd.c ---- sysklogd-1.4.1.orig/klogd.c 2001-03-11 20:40:10.000000000 +0100 -+++ sysklogd-1.4.1/klogd.c 2007-06-18 13:22:06.978362000 +0200 -@@ -414,9 +414,11 @@ +Index: klogd.c +=================================================================== +--- klogd.c.orig 2009-11-24 18:12:55.564210000 +0100 ++++ klogd.c 2009-11-24 18:12:56.247123000 +0100 +@@ -416,9 +416,11 @@ static void Terminate() { CloseLogSrc(); Syslog(LOG_INFO, "Kernel log daemon terminating."); ++++++ sysklogd-1.4.1-fileleak.patch ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -1,6 +1,8 @@ ---- ksym.c -+++ ksym.c Wed May 23 18:54:18 2001 -@@ -344,6 +344,7 @@ +Index: ksym.c +=================================================================== +--- ksym.c.orig 2009-11-24 18:12:52.424467000 +0100 ++++ ksym.c 2009-11-24 18:12:52.901406000 +0100 +@@ -345,6 +345,7 @@ static char * FindSymbolFile() if ( (sym_file = fopen(symfile, "r")) != (FILE *) 0 ) { if (CheckMapVersion(symfile) == 1) file = symfile; @@ -8,7 +10,7 @@ } if (sym_file == (FILE *) 0 || file == (char *) 0) { sprintf (symfile, "%s", *mf); -@@ -352,6 +353,7 @@ +@@ -353,6 +354,7 @@ static char * FindSymbolFile() if ( (sym_file = fopen(symfile, "r")) != (FILE *) 0 ) { if (CheckMapVersion(symfile) == 1) file = symfile; ++++++ sysklogd-1.4.1-forw.patch ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -1,6 +1,8 @@ ---- sysklogd.8 -+++ sysklogd.8 Wed May 23 18:59:26 2001 -@@ -29,6 +29,7 @@ +Index: sysklogd.8 +=================================================================== +--- sysklogd.8.orig 2001-03-11 20:35:51.000000000 +0100 ++++ sysklogd.8 2009-11-24 18:12:52.655464000 +0100 +@@ -29,6 +29,7 @@ sysklogd \- Linux system logging utiliti .RB [ " \-s " .I domainlist ] @@ -8,21 +10,23 @@ .RB [ " \-v " ] .LP .SH DESCRIPTION -@@ -149,6 +150,11 @@ - is specified and the host logging resolves to satu.infodrom.north.de +@@ -150,6 +151,11 @@ is specified and the host logging resolv no domain would be cut, you will have to specify two domains like: .BR "\-s north.de:infodrom.north.de" . -+.TP + .TP +.B "\-t" +Tag forwarded messages with the sending hosts name as seen by the forwarder. +Useful for relaying syslog from DMZs through the firwall to an internal +loghost. - .TP ++.TP .B "\-v" Print version and exit. ---- syslogd.c -+++ syslogd.c Wed May 23 19:01:21 2001 -@@ -417,6 +417,13 @@ + .LP +Index: syslogd.c +=================================================================== +--- syslogd.c.orig 2001-03-11 20:40:10.000000000 +0100 ++++ syslogd.c 2009-11-24 18:12:52.661468000 +0100 +@@ -417,6 +417,13 @@ static char sccsid[] = "@(#)syslogd.c 5. * file is defined in the used libc and should not be hardcoded * into the syslogd binary referring the system it was compiled on. * @@ -36,7 +40,7 @@ * Sun Sep 17 20:45:33 CEST 2000: Martin Schulze <joey(a)infodrom.ffis.de> * Fixed some bugs in printline() code that did not escape * control characters '\177' through '\237' and contained a -@@ -731,6 +738,7 @@ +@@ -731,6 +738,7 @@ int MarkInterval = 20 * 60; /* interval int MarkSeq = 0; /* mark sequence number */ int NoFork = 0; /* don't fork - don't run in daemon mode */ int AcceptRemote = 0; /* receive messages that come via UDP */ @@ -44,7 +48,7 @@ char **StripDomains = NULL; /* these domains may be stripped before writing logs */ char **LocalHosts = NULL; /* these hosts are logged with their hostname */ int NoHops = 1; /* Can we bounce syslog messages through an -@@ -829,7 +837,7 @@ +@@ -829,7 +837,7 @@ int main(argc, argv) funix[i] = -1; } @@ -53,7 +57,7 @@ switch((char)ch) { case 'a': if (nfunix < MAXFUNIX) -@@ -874,6 +882,10 @@ +@@ -874,6 +882,10 @@ int main(argc, argv) } StripDomains = crunch_list(optarg); break; @@ -64,7 +68,7 @@ case 'v': printf("syslogd %s.%s\n", VERSION, PATCHLEVEL); exit (0); -@@ -1771,8 +1783,19 @@ +@@ -1771,8 +1783,19 @@ void fprintlog(f, from, flags, msg) dprintf("Not sending message to remote.\n"); else { f->f_time = now; ++++++ sysklogd-1.4.1-klogd24.dif ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -1,6 +1,8 @@ ---- klogd.c -+++ klogd.c Tue Sep 9 14:15:47 2003 -@@ -879,7 +879,7 @@ +Index: klogd.c +=================================================================== +--- klogd.c.orig 2001-03-11 20:40:10.000000000 +0100 ++++ klogd.c 2009-11-24 18:12:53.393383000 +0100 +@@ -879,7 +879,7 @@ static void LogLine(char *ptr, int len) { auto int sym_space; @@ -9,7 +11,7 @@ auto struct symbol sym; auto char *symbol; -@@ -904,7 +904,7 @@ +@@ -904,7 +904,7 @@ static void LogLine(char *ptr, int len) break; } @@ -18,8 +20,10 @@ symbol, sym.offset, sym.size ); space = sym_space + delta; ---- ksym.c -+++ ksym.c Tue Sep 9 14:15:47 2003 +Index: ksym.c +=================================================================== +--- ksym.c.orig 2009-11-24 18:12:52.901406000 +0100 ++++ ksym.c 2009-11-24 18:12:53.397383000 +0100 @@ -122,7 +122,7 @@ /* Variables static to this module. */ struct sym_table @@ -29,7 +33,7 @@ char *name; }; -@@ -151,7 +151,7 @@ +@@ -151,7 +151,7 @@ extern int debugging; /* Function prototypes. */ static char * FindSymbolFile(void); @@ -38,7 +42,7 @@ static void FreeSymbols(void); static int CheckVersion(char *); static int CheckMapVersion(char *); -@@ -185,7 +185,7 @@ +@@ -185,7 +185,7 @@ extern int InitKsyms(mapfile) auto int version = 0; @@ -47,7 +51,7 @@ auto FILE *sym_file; -@@ -237,16 +237,24 @@ +@@ -237,16 +237,24 @@ extern int InitKsyms(mapfile) */ while ( !feof(sym_file) ) { @@ -74,7 +78,7 @@ if ( AddSymbol(address, sym) == 0 ) { -@@ -521,7 +529,7 @@ +@@ -521,7 +529,7 @@ static int CheckMapVersion(fname) { int version; FILE *sym_file; @@ -83,7 +87,7 @@ auto char type, sym[512]; -@@ -536,16 +544,24 @@ +@@ -536,16 +544,24 @@ static int CheckMapVersion(fname) version = 0; while ( !feof(sym_file) && (version == 0) ) { @@ -110,7 +114,7 @@ version = CheckVersion(sym); } -@@ -583,7 +599,7 @@ +@@ -583,7 +599,7 @@ static int CheckMapVersion(fname) * Purpose: This function is responsible for adding a symbol name * and its address to the symbol table. * @@ -119,7 +123,7 @@ * * Return: int * -@@ -593,7 +609,7 @@ +@@ -593,7 +609,7 @@ static int CheckMapVersion(fname) static int AddSymbol(address, symbol) @@ -128,7 +132,7 @@ char *symbol; -@@ -639,7 +655,7 @@ +@@ -639,7 +655,7 @@ static int AddSymbol(address, symbol) char * LookupSymbol(value, sym) @@ -137,7 +141,7 @@ struct symbol *sym; -@@ -739,7 +755,7 @@ +@@ -739,7 +755,7 @@ extern char * ExpandKadds(line, el) *symbol; char num[15]; @@ -146,7 +150,7 @@ auto struct symbol sym; -@@ -821,7 +837,7 @@ +@@ -821,7 +837,7 @@ extern char * ExpandKadds(line, el) value = strtol(kp2, (char **) 0, 16); if ( (symbol = LookupSymbol(value, &sym)) ) { if (sym.size) @@ -155,7 +159,7 @@ else elp += sprintf(elp, " (%s)", symbol); } -@@ -830,7 +846,7 @@ +@@ -830,7 +846,7 @@ extern char * ExpandKadds(line, el) value = strtol(kp3, (char **) 0, 16); if ( (symbol = LookupSymbol(value, &sym)) ) { if (sym.size) @@ -164,7 +168,7 @@ else elp += sprintf(elp, " (%s)", symbol); } -@@ -841,7 +857,7 @@ +@@ -841,7 +857,7 @@ extern char * ExpandKadds(line, el) value = strtol(kp2, (char **) 0, 16); if ( (symbol = LookupSymbol(value, &sym)) ) { if (sym.size) @@ -173,7 +177,7 @@ else elp += sprintf(elp, " (%s)", symbol); } -@@ -877,17 +893,24 @@ +@@ -877,17 +893,24 @@ extern char * ExpandKadds(line, el) strcat(elp, symbol); elp += strlen(symbol); if ( debugging ) @@ -200,8 +204,10 @@ } strncat(elp, kp, value); elp += value; ---- ksym_mod.c -+++ ksym_mod.c Tue Sep 9 16:51:08 2003 +Index: ksym_mod.c +=================================================================== +--- ksym_mod.c.orig 2000-09-12 23:15:28.000000000 +0200 ++++ ksym_mod.c 2009-11-24 18:12:53.402379000 +0100 @@ -89,43 +89,101 @@ #include <errno.h> #include <sys/fcntl.h> @@ -329,7 +335,7 @@ char *name; }; -@@ -136,9 +194,7 @@ +@@ -136,9 +194,7 @@ struct Module char *name; struct module module; @@ -339,7 +345,7 @@ }; static int num_modules = 0; -@@ -155,8 +211,8 @@ +@@ -155,8 +211,8 @@ extern int debugging; /* Function prototypes. */ static void FreeModules(void); @@ -350,7 +356,7 @@ static int symsort(const void *, const void *); -@@ -344,7 +400,7 @@ +@@ -344,7 +400,7 @@ static void FreeModules() * Purpose: This function is responsible for adding a module to * the list of currently loaded modules. * @@ -359,7 +365,7 @@ * * address:-> The address of the module. * -@@ -355,7 +411,7 @@ +@@ -355,7 +411,7 @@ static void FreeModules() static int AddModule(address, symbol) @@ -368,7 +374,7 @@ char *symbol; -@@ -403,10 +459,14 @@ +@@ -403,10 +459,14 @@ static int AddModule(address, symbol) Syslog(LOG_WARNING, "Error opening /dev/kmem\n"); return(0); } @@ -384,7 +390,7 @@ return(0); } if ( read(memfd, \ -@@ -450,7 +510,7 @@ +@@ -450,7 +510,7 @@ static int AddModule(address, symbol) * Purpose: This function is responsible for adding a symbol name * and its address to the symbol table. * @@ -393,7 +399,7 @@ * * mp:-> A pointer to the module which the symbol is * to be added to. -@@ -469,7 +529,7 @@ +@@ -469,7 +529,7 @@ static int AddSymbol(mp, address, symbol struct Module *mp; @@ -402,7 +408,7 @@ char *symbol; -@@ -508,7 +568,7 @@ +@@ -508,7 +568,7 @@ static int AddSymbol(mp, address, symbol * Purpose: Find the symbol which is related to the given address from * a kernel module. * @@ -411,7 +417,7 @@ * * value:-> The address to be located. * -@@ -524,7 +584,7 @@ +@@ -524,7 +584,7 @@ static int AddSymbol(mp, address, symbol extern char * LookupModuleSymbol(value, sym) @@ -420,7 +426,7 @@ struct symbol *sym; -@@ -574,15 +634,9 @@ +@@ -574,15 +634,9 @@ extern char * LookupModuleSymbol(value, * If it is in this range we can at least return the * name of the module. */ @@ -437,7 +443,7 @@ { /* * A special case needs to be checked for. The above -@@ -601,13 +655,8 @@ +@@ -601,13 +655,8 @@ extern char * LookupModuleSymbol(value, if ( mp->num_syms > 0 ) { last = &mp->sym_array[mp->num_syms - 1]; @@ -452,7 +458,7 @@ sym->offset = value - last->value; return(last->name); } -@@ -617,12 +666,8 @@ +@@ -617,12 +666,8 @@ extern char * LookupModuleSymbol(value, * Return the module name and the offset of the * faulting address in the module. */ @@ -466,8 +472,10 @@ return(mp->name); } } ---- ksyms.h -+++ ksyms.h Tue Sep 9 14:15:47 2003 +Index: ksyms.h +=================================================================== +--- ksyms.h.orig 1997-06-13 11:35:55.000000000 +0200 ++++ ksyms.h 2009-11-24 18:12:53.406377000 +0100 @@ -20,16 +20,19 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ ++++++ sysklogd-1.4.1-ksym.patch ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -2,8 +2,10 @@ ksym_mod.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---- a/ksym_mod.c -+++ b/ksym_mod.c +Index: ksym_mod.c +=================================================================== +--- ksym_mod.c.orig 2009-11-24 18:12:53.402379000 +0100 ++++ ksym_mod.c 2009-11-24 18:12:56.016116000 +0100 @@ -91,7 +91,6 @@ #include <sys/stat.h> #include <stdarg.h> ++++++ sysklogd-1.4.1-ksyslogsize.diff ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -1,6 +1,8 @@ ---- sysklogd-1.4.1/klogd.c 2004-07-27 13:45:33.000000000 +0200 -+++ sysklogd-1.4.1/klogd.c 2004-07-27 13:53:48.985727118 +0200 -@@ -299,8 +299,10 @@ +Index: klogd.c +=================================================================== +--- klogd.c.orig 2009-11-24 18:12:53.393383000 +0100 ++++ klogd.c 2009-11-24 18:12:54.840288000 +0100 +@@ -299,8 +299,10 @@ static int use_syscall = 0, no_fork = 0; /* don't fork - don't run in daemon mode */ static char *symfile = (char *) 0, @@ -12,7 +14,7 @@ static FILE *output_file = (FILE *) 0; static enum LOGSRC {none, proc, kernel} logsrc; -@@ -937,8 +939,8 @@ +@@ -937,8 +939,8 @@ static void LogKernelLine(void) * which will contain old messages. Then read the kernel log * messages into this fresh buffer. */ @@ -23,7 +25,7 @@ { if ( errno == EINTR ) return; -@@ -962,8 +964,8 @@ +@@ -962,8 +964,8 @@ static void LogProcLine(void) * which will contain old messages. Then read the kernel messages * from the message pseudo-file into this fresh buffer. */ @@ -34,7 +36,7 @@ { if ( errno == EINTR ) return; -@@ -976,6 +978,44 @@ +@@ -976,6 +978,44 @@ static void LogProcLine(void) return; } @@ -79,7 +81,7 @@ int main(argc, argv) -@@ -1053,6 +1093,8 @@ +@@ -1053,6 +1093,8 @@ int main(argc, argv) console_log_level = *log_level - '0'; } ++++++ sysklogd-1.4.1-large.patch ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -1,6 +1,8 @@ ---- Makefile -+++ Makefile Tue May 20 13:15:53 2003 -@@ -29,7 +29,7 @@ +Index: Makefile +=================================================================== +--- Makefile.orig 2009-11-24 18:12:53.137377000 +0100 ++++ Makefile 2009-11-24 18:12:53.675378000 +0100 +@@ -29,7 +29,7 @@ MANDIR = /usr/man # The following define determines whether the package adheres to the # file system standard. @@ -9,9 +11,11 @@ # The following define establishes ownership for the man pages. # Avery tells me that there is a difference between Debian and ---- syslogd.c -+++ syslogd.c Tue May 20 13:12:35 2003 -@@ -992,6 +992,7 @@ +Index: syslogd.c +=================================================================== +--- syslogd.c.orig 2009-11-24 18:12:53.143385000 +0100 ++++ syslogd.c 2009-11-24 18:12:53.679395000 +0100 +@@ -1030,6 +1030,7 @@ int main(argc, argv) (void) signal(SIGCHLD, reapchild); (void) signal(SIGALRM, domark); (void) signal(SIGUSR1, Debug ? debug_switch : SIG_IGN); @@ -19,7 +23,7 @@ (void) alarm(TIMERINTVL); /* Create a partial message table for all file descriptors. */ -@@ -1852,7 +1853,7 @@ +@@ -2023,7 +2024,7 @@ void fprintlog(f, from, flags, msg) errno = e; logerror(f->f_un.f_fname); } ++++++ sysklogd-1.4.1-nofortify.patch ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -1,5 +1,7 @@ ---- fortify.h -+++ fortify.h 2008-05-30 12:18:14.874490898 +0200 +Index: fortify.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ fortify.h 2009-11-24 18:12:56.934029000 +0100 @@ -0,0 +1,17 @@ +#if defined(__USE_FORTIFY_LEVEL) +# undef syslog @@ -18,8 +20,10 @@ +# define closelog priv_closelog +# define setlogmask priv_setlogmask +#endif ---- klogd.c -+++ klogd.c 2008-05-30 12:19:59.501151202 +0200 +Index: klogd.c +=================================================================== +--- klogd.c.orig 2009-11-24 18:12:56.685124000 +0100 ++++ klogd.c 2009-11-24 18:12:56.937035000 +0100 @@ -286,6 +286,8 @@ static char *PidFile = "/etc/klogd.pid"; #endif #endif @@ -29,8 +33,10 @@ static int kmsg, change_state = 0, terminate = 0, ---- syslog.c -+++ syslog.c 2008-05-30 12:20:24.799728870 +0200 +Index: syslog.c +=================================================================== +--- syslog.c.orig 2009-11-24 18:12:54.173290000 +0100 ++++ syslog.c 2009-11-24 18:12:56.940031000 +0100 @@ -72,6 +72,8 @@ static char sccsid[] = "@(#)syslog.c 5.2 #define _PATH_LOGNAME "/dev/log" ++++++ sysklogd-1.4.1-no_SO_BSDCOMPAT.diff ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -1,6 +1,8 @@ ---- syslogd.c 2003/09/29 08:49:24 1.1 -+++ syslogd.c 2003/09/29 08:50:05 -@@ -1311,6 +1311,7 @@ +Index: syslogd.c +=================================================================== +--- syslogd.c.orig 2009-11-24 18:12:53.926309000 +0100 ++++ syslogd.c 2009-11-24 18:12:54.408310000 +0100 +@@ -1305,6 +1305,7 @@ static int create_inet_socket() close(fd); return -1; } @@ -8,7 +10,7 @@ /* We need to enable BSD compatibility. Otherwise an attacker * could flood our log files by sending us tons of ICMP errors. */ -@@ -1320,6 +1321,7 @@ +@@ -1314,6 +1315,7 @@ static int create_inet_socket() close(fd); return -1; } ++++++ sysklogd-1.4.1-owl-crunch_list.diff ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -1,7 +1,8 @@ -diff -ur sysklogd-1.4.1.orig/syslogd.c sysklogd-1.4.1/syslogd.c ---- sysklogd-1.4.1.orig/syslogd.c Sun Mar 11 19:40:10 2001 -+++ sysklogd-1.4.1/syslogd.c Sun Apr 18 01:42:21 2004 -@@ -1254,30 +1254,26 @@ +Index: syslogd.c +=================================================================== +--- syslogd.c.orig 2009-11-24 18:12:54.408310000 +0100 ++++ syslogd.c 2009-11-24 18:12:54.611301000 +0100 +@@ -1336,30 +1336,26 @@ char ** crunch_list(list) char *list; { @@ -40,7 +41,7 @@ } /* -@@ -1285,30 +1281,28 @@ +@@ -1367,30 +1363,28 @@ crunch_list(list) * characters are different from any delimiters, * so we don't have to care about this. */ ++++++ sysklogd-1.4.1-preserve_percents.patch ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -1,6 +1,8 @@ ---- sysklogd-1.4.1rh/klogd.c.preserve_percents 2002-04-17 10:49:34.000000000 -0400 -+++ sysklogd-1.4.1rh/klogd.c 2004-12-02 15:58:17.026614000 -0500 -@@ -741,7 +741,7 @@ +Index: klogd.c +=================================================================== +--- klogd.c.orig 2009-11-24 18:12:54.840288000 +0100 ++++ klogd.c 2009-11-24 18:12:55.564210000 +0100 +@@ -740,7 +740,7 @@ static void LogLine(char *ptr, int len) switch( parse_state ) { case PARSING_TEXT: @@ -9,7 +11,7 @@ line += delta; ptr += delta; space -= delta; -@@ -797,30 +797,9 @@ +@@ -796,30 +796,9 @@ static void LogLine(char *ptr, int len) parse_state = PARSING_SYMSTART; /* at < */ break; } ++++++ sysklogd-1.4.1-reopen.patch ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -9,9 +9,11 @@ # # Author: mt(a)suse.de # ---- syslog.c -+++ syslog.c 2003/08/26 11:34:34 -@@ -102,7 +102,7 @@ +Index: syslog.c +=================================================================== +--- syslog.c.orig 2009-11-24 18:12:52.145473000 +0100 ++++ syslog.c 2009-11-24 18:12:54.173290000 +0100 +@@ -97,7 +97,7 @@ vsyslog(pri, fmt, ap) register int cnt; register char *p; time_t now; @@ -20,7 +22,7 @@ char tbuf[2048], fmt_cpy[1024], *stdp = (char *) 0; saved_errno = errno; -@@ -172,7 +172,16 @@ +@@ -167,7 +167,16 @@ vsyslog(pri, fmt, ap) } /* output the message to the local logger */ ++++++ sysklogd-1.4.1-showpri.patch ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -1,5 +1,7 @@ ---- sysklogd.8.orig 2005-05-23 09:48:29.030220794 -0500 -+++ sysklogd.8 2005-05-23 09:48:34.564338699 -0500 +Index: sysklogd.8 +=================================================================== +--- sysklogd.8.orig 2009-11-24 18:12:52.655464000 +0100 ++++ sysklogd.8 2009-11-24 18:12:55.314207000 +0100 @@ -31,6 +31,7 @@ sysklogd \- Linux system logging utiliti ] .RB [ " \-t " ] @@ -37,8 +39,10 @@ .LP .SH SIGNALS .B Syslogd ---- syslogd.c 2005-05-23 09:48:29.031197346 -0500 -+++ syslogd.c.orig 2005-05-23 09:48:55.354145686 -0500 +Index: syslogd.c +=================================================================== +--- syslogd.c.orig 2009-11-24 18:12:55.083205000 +0100 ++++ syslogd.c 2009-11-24 18:12:55.320216000 +0100 @@ -594,6 +594,9 @@ int funix[MAXFUNIX] = { -1, }; #define SYNC_FILE 0x002 /* do fsync on file after printing */ #define ADDDATE 0x004 /* add a date to the message */ ++++++ sysklogd-1.4.1-signal.dif ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -1,5 +1,7 @@ ---- syslogd.c -+++ syslogd.c 2008-03-26 17:45:54.247851855 +0100 +Index: syslogd.c +=================================================================== +--- syslogd.c.orig 2009-11-24 18:12:55.787215000 +0100 ++++ syslogd.c 2009-11-24 18:12:56.480126000 +0100 @@ -770,6 +770,9 @@ extern int errno; int main(int argc, char **argv); char **crunch_list(char *list); @@ -158,16 +160,16 @@ +{ + char buf[100]; + leave++; -+ + +- int sig; +- + dprintf("syslogd: exiting on signal %d\n", sig); + (void) snprintf(buf, sizeof(buf), "exiting on signal %d", sig); + errno = 0; + logmsg(LOG_SYSLOG|LOG_INFO, buf, LocalHostName, ADDDATE); + signal(sig, SIG_IGN); +} - -- int sig; -- ++ +void dienow(void) { register struct filed *f; ++++++ sysklogd-1.4.1-sparc.patch ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -1,5 +1,7 @@ ---- ksym.c -+++ ksym.c Wed May 23 18:50:36 2001 +Index: ksym.c +=================================================================== +--- ksym.c.orig 2000-09-12 23:53:31.000000000 +0200 ++++ ksym.c 2009-11-24 18:12:52.424467000 +0100 @@ -112,6 +112,7 @@ #include <stdlib.h> #include <malloc.h> @@ -8,7 +10,7 @@ #include "klogd.h" #include "ksyms.h" -@@ -770,6 +771,84 @@ +@@ -770,6 +771,84 @@ extern char * ExpandKadds(line, el) if ( (num_syms == 0) || (kp = strstr(line, "[<")) == (char *) 0 ) { ++++++ sysklogd-1.4.1-sysmap-prior-to-2.5.patch ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:39.000000000 +0100 @@ -17,9 +17,11 @@ klogd.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) ---- sysklogd-1.4.1/klogd.c -+++ sysklogd-1.4.1/klogd.c 2009-08-12 14:19:17.333901686 +0200 -@@ -275,6 +275,8 @@ +Index: klogd.c +=================================================================== +--- klogd.c.orig 2009-11-24 18:12:56.937035000 +0100 ++++ klogd.c 2009-11-24 18:12:57.166028000 +0100 +@@ -275,6 +275,8 @@ _syscall3(int,ksyslog,int, type, char *, #define ksyslog klogctl #endif @@ -28,7 +30,7 @@ #define LOG_BUFFER_SIZE 4096 #define LOG_LINE_LENGTH 1000 -@@ -999,6 +1001,23 @@ +@@ -999,6 +1001,23 @@ static void SetBufSize(void) } } @@ -52,7 +54,7 @@ int main(argc, argv) -@@ -1166,6 +1185,9 @@ +@@ -1166,6 +1185,9 @@ int main(argc, argv) else openlog("kernel", 0, LOG_KERN); ++++++ sysklogd-1.4.1-unix_sockets.patch ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:40.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:40.000000000 +0100 @@ -1,6 +1,8 @@ ---- syslog.conf.5 -+++ syslog.conf.5 2004-09-16 13:21:07.144284248 -0700 -@@ -159,6 +159,16 @@ +Index: syslog.conf.5 +=================================================================== +--- syslog.conf.5.orig 1999-08-21 12:49:14.000000000 +0200 ++++ syslog.conf.5 2009-11-24 18:12:55.068205000 +0100 +@@ -159,6 +159,16 @@ command before .BR syslogd (8) is started. @@ -17,9 +19,11 @@ .SS Terminal and Console If the file you specified is a tty, special tty-handling is done, same with ---- syslogd.c -+++ syslogd.c 2004-09-16 13:21:07.150143661 -0700 -@@ -638,6 +638,10 @@ +Index: syslogd.c +=================================================================== +--- syslogd.c.orig 2009-11-24 18:12:54.611301000 +0100 ++++ syslogd.c 2009-11-24 18:12:55.083205000 +0100 +@@ -633,6 +633,10 @@ struct filed { struct sockaddr_in f_addr; #endif } f_forw; /* forwarding address */ @@ -30,7 +34,7 @@ char f_fname[MAXFNAME]; } f_un; char f_prevline[MAXSVLINE]; /* last message logged */ -@@ -649,6 +653,8 @@ +@@ -644,6 +648,8 @@ struct filed { int f_repeatcount; /* number of "repeated" msgs */ int f_flags; /* store some additional flags */ }; @@ -39,7 +43,7 @@ /* * Intervals at which we flush out "message repeated" messages, -@@ -679,10 +685,11 @@ +@@ -674,10 +680,11 @@ int repeatinterval[] = { 30, 60 }; /* # #define F_FORW_SUSP 7 /* suspended host forwarding */ #define F_FORW_UNKN 8 /* unknown host forwarding */ #define F_PIPE 9 /* named pipe */ @@ -52,7 +56,7 @@ }; struct filed *Files = (struct filed *) 0; -@@ -1949,6 +1956,32 @@ +@@ -1941,6 +1948,32 @@ void fprintlog(f, from, flags, msg) (void) fsync(f->f_file); break; @@ -85,7 +89,7 @@ case F_USERS: case F_WALL: f->f_time = now; -@@ -2357,6 +2390,7 @@ +@@ -2347,6 +2380,7 @@ void init() case F_PIPE: case F_TTY: case F_CONSOLE: @@ -93,7 +97,7 @@ (void) close(f->f_file); break; } -@@ -2509,7 +2543,11 @@ +@@ -2499,7 +2533,11 @@ void init() case F_PIPE: case F_TTY: case F_CONSOLE: @@ -106,7 +110,7 @@ if (f->f_file == -1) printf(" (unused)"); break; -@@ -2727,8 +2765,37 @@ +@@ -2717,8 +2755,37 @@ void cfline(line, f) switch (*p) { case '@': ++++++ sysklogd-1.4.1-utf8.patch ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:40.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:40.000000000 +0100 @@ -1,6 +1,8 @@ ---- sysklogd-1.4.1/syslogd.c 2004-09-26 11:33:01.771437000 +0900 -+++ sysklogd-1.4.1/syslogd.c 2004-09-26 11:41:27.136610056 +0900 -@@ -1539,7 +1539,7 @@ +Index: syslogd.c +=================================================================== +--- syslogd.c.orig 2009-11-24 18:12:55.320216000 +0100 ++++ syslogd.c 2009-11-24 18:12:55.787215000 +0100 +@@ -1538,7 +1538,7 @@ void printline(hname, msg) else if (c < 040) { *q++ = '^'; *q++ = c ^ 0100; ++++++ sysklogd-ipv6.diff ++++++ --- /var/tmp/diff_new_pack.GUZeLm/_old 2009-11-27 14:52:40.000000000 +0100 +++ /var/tmp/diff_new_pack.GUZeLm/_new 2009-11-27 14:52:40.000000000 +0100 @@ -1,5 +1,7 @@ ---- CHANGES Sun Mar 11 20:35:51 2001 -+++ CHANGES Fri Aug 2 11:28:10 2002 +Index: CHANGES +=================================================================== +--- CHANGES.orig 2001-03-11 20:35:51.000000000 +0100 ++++ CHANGES 2009-11-24 18:12:53.132378000 +0100 @@ -1,3 +1,7 @@ +Version 1.4.1-usagi (2001/03/21) + - syslogd IPv6 support @@ -8,9 +10,11 @@ Version 1.4.1 . klogd will set the console log level only if `-c' is given on the ---- Makefile Fri Aug 2 12:11:24 2002 -+++ Makefile Fri Aug 2 11:58:42 2002 -@@ -6,7 +6,7 @@ +Index: Makefile +=================================================================== +--- Makefile.orig 1998-10-12 22:25:15.000000000 +0200 ++++ Makefile 2009-11-24 18:12:53.137377000 +0100 +@@ -3,7 +3,7 @@ CC= gcc #CFLAGS= -g -DSYSV -Wall #LDFLAGS= -g @@ -19,9 +23,11 @@ LDFLAGS= -s # Look where your install program is. ---- syslogd.c Fri Aug 2 12:11:25 2002 -+++ syslogd.c Fri Aug 2 12:00:16 2002 -@@ -604,6 +604,7 @@ +Index: syslogd.c +=================================================================== +--- syslogd.c.orig 2009-11-24 18:12:52.661468000 +0100 ++++ syslogd.c 2009-11-24 18:12:53.143385000 +0100 +@@ -599,6 +599,7 @@ int funix[MAXFUNIX] = { -1, }; * This table contains plain text for h_errno errors used by the * net subsystem. */ @@ -29,7 +35,7 @@ const char *sys_h_errlist[] = { "No problem", /* NETDB_SUCCESS */ "Authoritative answer: host not found", /* HOST_NOT_FOUND */ -@@ -612,6 +613,7 @@ +@@ -607,6 +608,7 @@ const char *sys_h_errlist[] = { "Valid name, no data record of requested type", /* NO_DATA */ "no address, look for MX record" /* NO_ADDRESS */ }; @@ -37,7 +43,7 @@ /* * This structure represents the files that will have log -@@ -630,7 +632,18 @@ +@@ -625,7 +627,18 @@ struct filed { char f_uname[MAXUNAMES][UNAMESZ+1]; struct { char f_hname[MAXHOSTNAMELEN+1]; @@ -56,7 +62,7 @@ } f_forw; /* forwarding address */ char f_fname[MAXFNAME]; } f_un; -@@ -737,7 +750,11 @@ +@@ -732,7 +745,11 @@ char LocalHostName[MAXHOSTNAMELEN+1]; /* char *LocalDomain; /* our local domain name */ int InetInuse = 0; /* non-zero if INET sockets are being used */ int finet = -1; /* Internet datagram socket */ @@ -68,7 +74,7 @@ int Initialized = 0; /* set when we have initialized ourselves */ int MarkInterval = 20 * 60; /* interval between marks in seconds */ int MarkSeq = 0; /* mark sequence number */ -@@ -764,10 +781,10 @@ +@@ -759,10 +776,10 @@ void fprintlog(register struct filed *f, void endtty(); void wallmsg(register struct filed *f, struct iovec *iov); void reapchild(); @@ -81,7 +87,7 @@ void die(int sig); #ifndef TESTING void doexit(int sig); -@@ -787,6 +804,10 @@ +@@ -782,6 +799,10 @@ static int create_unix_socket(const char #endif #ifdef SYSLOG_INET static int create_inet_socket(); @@ -92,7 +98,7 @@ #endif int main(argc, argv) -@@ -821,7 +842,12 @@ +@@ -816,7 +837,12 @@ int main(argc, argv) #ifndef TESTING int fd; #ifdef SYSLOG_INET @@ -105,7 +111,7 @@ char *from; #endif pid_t ppid = getpid(); -@@ -1142,11 +1168,21 @@ +@@ -1137,11 +1163,21 @@ int main(argc, argv) memset(line, '\0', sizeof(line)); i = recvfrom(finet, line, MAXLINE - 2, 0, \ (struct sockaddr *) &frominet, &len); @@ -128,7 +134,7 @@ /* * Here we could check if the host is permitted * to send us syslog messages. We just have to -@@ -1233,17 +1269,50 @@ +@@ -1227,17 +1263,50 @@ static int create_unix_socket(const char static int create_inet_socket() { int fd, on = 1; @@ -179,7 +185,7 @@ if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, \ (char *) &on, sizeof(on)) < 0 ) { logerror("setsockopt(REUSEADDR), suspending inet"); -@@ -1259,13 +1328,77 @@ +@@ -1253,13 +1322,77 @@ static int create_inet_socket() close(fd); return -1; } @@ -257,7 +263,7 @@ #endif char ** -@@ -1687,8 +1820,12 @@ +@@ -1679,8 +1812,12 @@ void fprintlog(f, from, flags, msg) register int l; char line[MAXLINE + 1]; time_t fwd_suspend; @@ -270,7 +276,7 @@ dprintf("Called fprintlog, "); -@@ -1742,22 +1879,27 @@ +@@ -1734,22 +1871,27 @@ void fprintlog(f, from, flags, msg) fwd_suspend); } break; @@ -300,7 +306,7 @@ dprintf("Retries: %d\n", f->f_prevcount); if ( --f->f_prevcount < 0 ) { dprintf("Giving up.\n"); -@@ -1768,7 +1910,9 @@ +@@ -1760,7 +1902,9 @@ void fprintlog(f, from, flags, msg) } else { dprintf("%s found, resuming.\n", f->f_un.f_forw.f_hname); @@ -310,7 +316,7 @@ f->f_prevcount = 0; f->f_type = F_FORW; goto f_forw; -@@ -1791,27 +1935,31 @@ +@@ -1783,27 +1927,31 @@ void fprintlog(f, from, flags, msg) dprintf("Not sending message to remote.\n"); else { f->f_time = now; @@ -350,7 +356,7 @@ e, strerror(e)); f->f_type = F_FORW_SUSP; errno = e; -@@ -2035,28 +2183,53 @@ +@@ -2025,28 +2173,53 @@ void reapchild() /* * Return a printable representation of a host address. */ @@ -412,7 +418,7 @@ if (isupper(*p)) *p = tolower(*p); -@@ -2064,17 +2237,17 @@ +@@ -2054,17 +2227,17 @@ const char *cvthname(f) * Notice that the string still contains the fqdn, but your * hostname and domain are separated by a '\0'. */ @@ -433,7 +439,7 @@ } count++; } -@@ -2082,9 +2255,9 @@ +@@ -2072,9 +2245,9 @@ const char *cvthname(f) if (LocalHosts) { count=0; while (LocalHosts[count]) { @@ -445,7 +451,7 @@ } count++; } -@@ -2092,7 +2265,7 @@ +@@ -2082,7 +2255,7 @@ const char *cvthname(f) } } @@ -454,7 +460,7 @@ } void domark() -@@ -2142,7 +2315,7 @@ +@@ -2132,7 +2305,7 @@ void debug_switch() * Print syslogd errors some place. */ void logerror(type) @@ -463,7 +469,7 @@ { char buf[100]; -@@ -2236,6 +2409,7 @@ +@@ -2226,6 +2399,7 @@ void init() #else char cline[BUFSIZ]; #endif @@ -471,7 +477,7 @@ struct servent *sp; sp = getservbyname("syslog", "udp"); -@@ -2246,6 +2420,7 @@ +@@ -2236,6 +2410,7 @@ void init() return; } LogPort = sp->s_port; @@ -479,7 +485,7 @@ /* * Close all open log files and free log descriptor array. -@@ -2394,6 +2569,10 @@ +@@ -2384,6 +2559,10 @@ void init() InetInuse = 0; } inetm = finet; @@ -490,7 +496,7 @@ #endif Initialized = 1; -@@ -2481,7 +2660,7 @@ +@@ -2471,7 +2650,7 @@ void cfline(line, f) int singlpri = 0; int ignorepri = 0; int syncfile; @@ -499,7 +505,7 @@ struct hostent *hp; #endif char buf[MAXLINE]; -@@ -2640,6 +2819,9 @@ +@@ -2630,6 +2809,9 @@ void cfline(line, f) #ifdef SYSLOG_INET (void) strcpy(f->f_un.f_forw.f_hname, ++p); dprintf("forwarding host: %s\n", p); /*ASP*/ @@ -509,7 +515,7 @@ if ( (hp = gethostbyname(p)) == NULL ) { f->f_type = F_FORW_UNKN; f->f_prevcount = INET_RETRY_MAX; -@@ -2654,6 +2836,7 @@ +@@ -2644,6 +2826,7 @@ void cfline(line, f) f->f_un.f_forw.f_addr.sin_port = LogPort; if ( f->f_type == F_FORW ) memcpy((char *) &f->f_un.f_forw.f_addr.sin_addr, hp->h_addr, hp->h_length); @@ -517,4 +523,3 @@ /* * Otherwise the host might be unknown due to an * inaccessible nameserver (perhaps on the same - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at Fri Nov 27 14:52:16 CET 2009. -------- --- yast2-network/yast2-network.changes 2009-11-24 14:00:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2009-11-25 15:18:54.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 25 15:15:11 CET 2009 - mzugec(a)suse.cz + +- disable ipv6 (bnc#558020) +- 2.19.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-network-2.19.1.tar.bz2 New: ---- yast2-network-2.19.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.gugDT0/_old 2009-11-27 14:45:09.000000000 +0100 +++ /var/tmp/diff_new_pack.gugDT0/_new 2009-11-27 14:45:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.19.1) +# spec file for package yast2-network (Version 2.19.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,13 +19,13 @@ Name: yast2-network -Version: 2.19.1 +Version: 2.19.2 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.19.1.tar.bz2 +Source0: yast2-network-2.19.2.tar.bz2 Prefix: /usr Group: System/YaST -License: GPL v2 or later +License: GPLv2+ # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm BuildRequires: update-desktop-files @@ -54,7 +54,7 @@ Summary: YaST2 - Network Configuration %package devel-doc -License: GPL v2 or later +License: GPLv2+ Group: System/YaST Summary: YaST2 - Developer documentation for yast2-network @@ -65,7 +65,7 @@ This package contains autogenerated documentation for yast2-network %prep -%setup -n yast2-network-2.19.1 +%setup -n yast2-network-2.19.2 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-network-2.19.1.tar.bz2 -> yast2-network-2.19.2.tar.bz2 ++++++ ++++ 9308 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.19.1/autodocs-ycp.ami new/yast2-network-2.19.2/autodocs-ycp.ami --- old/yast2-network-2.19.1/autodocs-ycp.ami 2009-11-24 12:52:59.000000000 +0100 +++ new/yast2-network-2.19.2/autodocs-ycp.ami 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -# -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ - -# Builds source documentation for YCP sources -# Uses ycpdoc -# PARAMETERS: -# AUTODOCS_YCP: Files that the ycp autodocs is built from -# Optional - the default is $(srcdir)/../../src/*.ycp -# AUTODOCS_PM: Files that the perl autodocs is built from -# Optional - the default is $(srcdir)/../../src/*.pm -# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs -# Optional - the default is no subdir, $(docdir)/autodocs -# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ -# Optional - the default is $(srcdir)/../../src - -htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs - -html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) -CLEANFILES = $(html_DATA) pod2htm*.tmp - -AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) -AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) -AUTODOCS_STRIP ?= $(srcdir)/../../src - -index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) -#including *.pm, for the index - ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) - for i in $(AUTODOCS_PM); do \ - b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ - pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ - echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ - done 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.19.1/configure.in new/yast2-network-2.19.2/configure.in --- old/yast2-network-2.19.1/configure.in 2009-11-24 12:52:59.000000000 +0100 +++ new/yast2-network-2.19.2/configure.in 2009-09-17 09:47:15.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-network dnl -dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.10 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.19.0, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.18.47, 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.19.0" +VERSION="2.18.47" 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.19.1/doc/autodocs/Makefile.am new/yast2-network-2.19.2/doc/autodocs/Makefile.am --- old/yast2-network-2.19.1/doc/autodocs/Makefile.am 2009-08-25 17:26:45.000000000 +0200 +++ new/yast2-network-2.19.2/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -AUTODOCS_YCP = $(srcdir)/../../src/*/*.ycp -include $(top_srcdir)/autodocs-ycp.ami 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.19.1/doc/autoinst new/yast2-network-2.19.2/doc/autoinst --- old/yast2-network-2.19.1/doc/autoinst 2009-08-25 17:26:45.000000000 +0200 +++ new/yast2-network-2.19.2/doc/autoinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,132 +0,0 @@ -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.19.1/doc/avm.html new/yast2-network-2.19.2/doc/avm.html --- old/yast2-network-2.19.1/doc/avm.html 2009-08-25 17:26:45.000000000 +0200 +++ new/yast2-network-2.19.2/doc/avm.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,192 +0,0 @@ -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.19.1/doc/devices.html new/yast2-network-2.19.2/doc/devices.html --- old/yast2-network-2.19.1/doc/devices.html 2009-08-25 17:26:45.000000000 +0200 +++ new/yast2-network-2.19.2/doc/devices.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,287 +0,0 @@ -<!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.19.1/doc/Makefile.am new/yast2-network-2.19.2/doc/Makefile.am --- old/yast2-network-2.19.1/doc/Makefile.am 2009-08-25 17:26:45.000000000 +0200 +++ new/yast2-network-2.19.2/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -# -# Makefile.am for y2c_network/doc -# - -SUBDIRS = autodocs # files hwinfo - -htmldir = $(docdir) - -doc_DATA = autoinst -html_DATA = $(wildcard *.html) - -all-local: todo.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.19.1/doc/skel.html new/yast2-network-2.19.2/doc/skel.html --- old/yast2-network-2.19.1/doc/skel.html 2009-08-25 17:26:45.000000000 +0200 +++ new/yast2-network-2.19.2/doc/skel.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -<!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.19.1/doc/todo.html new/yast2-network-2.19.2/doc/todo.html --- old/yast2-network-2.19.1/doc/todo.html 2009-11-24 13:27:23.000000000 +0100 +++ new/yast2-network-2.19.2/doc/todo.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,254 +0,0 @@ -<!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.19.1/doc/Todo.txt new/yast2-network-2.19.2/doc/Todo.txt --- old/yast2-network-2.19.1/doc/Todo.txt 2009-08-25 17:26:45.000000000 +0200 +++ new/yast2-network-2.19.2/doc/Todo.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,233 +0,0 @@ -# $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.19.1/src/modules/Lan.ycp new/yast2-network-2.19.2/src/modules/Lan.ycp --- old/yast2-network-2.19.1/src/modules/Lan.ycp 2009-11-24 12:52:01.000000000 +0100 +++ new/yast2-network-2.19.2/src/modules/Lan.ycp 2009-11-25 15:17:59.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Network card data * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: Lan.ycp 59723 2009-11-23 16:28:52Z kmachalkova $ + * $Id: Lan.ycp 59756 2009-11-25 14:17:58Z mzugec $ * * Representation of the configuration of network cards. * Input and output routines. @@ -75,6 +75,7 @@ // ipv6 module global boolean ipv6=true; + /** * Hotplug type ("" if not hot pluggable) */ @@ -127,6 +128,29 @@ return down; } +void readIPv6(){ + ipv6=true; + + list<string> filelist = ["sysctl.conf"]; + string filepath = "/etc/"; + string regexp = "^[[:space:]]*(net.ipv6.conf.all.disable_ipv6)[[:space:]]*=[[:space:]]*1"; +// uncomment bellow to read from old place +// filelist = ["ipv6", "50-ipv6.conf"]; +// filepath ="/etc/modprobe.d/"; +// regexp = "^[[:space:]]*(install ipv6 /bin/true)"; + + foreach(string file, filelist,{ + string filename=sformat("%1/%2", filepath, file); + if (FileUtils::Exists(filename)){ + foreach(string row, splitstring((string)SCR::Read(.target.string, filename), "\n"), { + if (size(regexptokenize(String::CutBlanks(row), regexp))>0){ + y2milestone("IPv6 is disabled."); + ipv6=false; + } + }); + } + }); +} /** * Lan::Read (`cache) will do nothing if initialized already. @@ -224,11 +248,7 @@ ProgressNextStage(_("Reading network configuration...")); NetworkConfig::Read(); - foreach(string file, ["ipv6", "50-ipv6.conf"],{ - string filename=sformat("/etc/modprobe.d/%1", file); - if (FileUtils::Exists(filename)) - if (((map<string, any>)SCR::Execute (.target.bash_output, sformat("grep ipv6 %1|cut -d# -f1|grep -q ipv6", filename)))["exit"]:0==0) ipv6=false; - }); + readIPv6(); sleep(sl); @@ -296,7 +316,22 @@ } void writeIPv6(){ - SCR::Write(.target.string, "/etc/modprobe.d/50-ipv6.conf", sformat("%1install ipv6 /bin/true", ipv6?"#":"")); +// uncomment to write to old place (and comment code bellow) +// SCR::Write(.target.string, "/etc/modprobe.d/50-ipv6.conf", sformat("%1install ipv6 /bin/true", ipv6?"#":"")); + string filename = "/etc/sysctl.conf"; + string sysctl = (string)SCR::Read(.target.string, filename); + string sysctl_row = sformat("%1net.ipv6.conf.all.disable_ipv6 = 1", ipv6?"# ":""); + boolean found = false; //size(regexptokenize(sysctl, "(net.ipv6.conf.all.disable_ipv6)"))>0; + list<string> file=[]; + foreach(string row, splitstring(sysctl, "\n"), { + if (size(regexptokenize(row, "(net.ipv6.conf.all.disable_ipv6)"))>0){ + row = sysctl_row; + found = true; + } + file=add(file, row); + }); + if (!found) file=add(file, sysctl_row); + SCR::Write(.target.string, filename, mergestring(file, "\n")); SCR::Write(.sysconfig.windowmanager.KDE_USE_IPV6, ipv6?"yes":"no"); } 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.19.1/VERSION new/yast2-network-2.19.2/VERSION --- old/yast2-network-2.19.1/VERSION 2009-11-24 14:06:00.000000000 +0100 +++ new/yast2-network-2.19.2/VERSION 2009-11-25 15:15:10.000000000 +0100 @@ -1 +1 @@ -2.19.1 +2.19.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 libmcrypt for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package libmcrypt for openSUSE:Factory checked in at Fri Nov 27 14:44:53 CET 2009. -------- --- libmcrypt/libmcrypt.changes 2008-01-16 13:25:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/libmcrypt/libmcrypt.changes 2009-11-03 20:19:41.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 3 19:09:27 UTC 2009 - coolo(a)novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmcrypt.spec ++++++ --- /var/tmp/diff_new_pack.p26gFg/_old 2009-11-27 14:44:14.000000000 +0100 +++ /var/tmp/diff_new_pack.p26gFg/_new 2009-11-27 14:44:14.000000000 +0100 @@ -20,11 +20,11 @@ Name: libmcrypt BuildRequires: gcc-c++ -License: GPL v2 or later; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Group: System/Libraries AutoReqProv: on Version: 2.5.8 -Release: 91 +Release: 92 Summary: Data Encryption Library Source: %{name}-%{version}.tar.bz2 Source1: %{name}-idea-0.9.tar.bz2 @@ -52,7 +52,7 @@ Nikos Mavroyanopoulos <nmav(a)hellug.gr> %package devel -License: GPL v2 or later; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Development Package for Libmcrypt Group: Development/Libraries/C and C++ Requires: libmcrypt = %{version} ++++++ libmcrypt-2.5.8.diff ++++++ --- /var/tmp/diff_new_pack.p26gFg/_old 2009-11-27 14:44:14.000000000 +0100 +++ /var/tmp/diff_new_pack.p26gFg/_new 2009-11-27 14:44:14.000000000 +0100 @@ -1,6 +1,8 @@ ---- doc/mcrypt.3~orig 2002-12-19 12:54:53.000000000 +0100 -+++ doc/mcrypt.3 2002-12-19 12:56:27.000000000 +0100 -@@ -502,7 +502,14 @@ +Index: doc/mcrypt.3 +=================================================================== +--- doc/mcrypt.3.orig ++++ doc/mcrypt.3 +@@ -501,7 +501,14 @@ with dynamic module loading support. Thi internally in libltdl. Except for the dynamic module loading libmcrypt is thread safe. @@ -15,14 +17,16 @@ Some example programs follow here. Compile as "cc prog.c -lmcrypt", or "cc prog.c -lmcrypt -lltdl" depending on your installation. Libltdl is used for opening dynamic libraries (modules). ---- configure.in 2003-01-03 10:28:57.000000000 +0100 -+++ configure.in 2003-01-10 11:56:48.000000000 +0100 -@@ -80,7 +80,7 @@ - AC_MSG_RESULT($opt_disable_ltdl) +Index: configure.in +=================================================================== +--- configure.in.orig ++++ configure.in +@@ -80,7 +80,7 @@ opt_enable_ltdl=$enableval) + AC_MSG_RESULT($opt_enable_ltdl) MCRYPT_MODE_MODULES="cbc cfb ctr ecb ncfb nofb ofb stream" -MCRYPT_ALGORITHM_MODULES="threeway cast-128 gost rijndael-128 safer-sk64 twofish \ +MCRYPT_ALGORITHM_MODULES="idea mars rc6 skipjack threeway cast-128 gost rijndael-128 safer-sk64 twofish \ arcfour cast-256 loki97 rijndael-192 saferplus wake \ - blowfish-compat des panama rijndael-256 serpent xtea \ + blowfish-compat des rijndael-256 serpent xtea \ blowfish enigma rc2 safer-sk128 tripledes" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mhash for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package mhash for openSUSE:Factory checked in at Fri Nov 27 14:44:03 CET 2009. -------- --- mhash/mhash.changes 2009-03-06 15:09:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/mhash/mhash.changes 2009-11-03 20:20:31.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 3 19:09:30 UTC 2009 - coolo(a)novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mhash.spec ++++++ --- /var/tmp/diff_new_pack.OFK3YS/_old 2009-11-27 14:43:29.000000000 +0100 +++ /var/tmp/diff_new_pack.OFK3YS/_new 2009-11-27 14:43:29.000000000 +0100 @@ -20,10 +20,10 @@ Name: mhash Version: 0.9.9.9 -Release: 2 +Release: 3 AutoReqProv: on Group: Development/Libraries/C and C++ -License: GPL v2 or later +License: GPLv2+ Url: http://mhash.sourceforge.net/ Summary: A Library for Working with Strong Hashes (Like MD5) Source: %{name}-%{version}.tar.bz2 @@ -42,7 +42,7 @@ Sascha Schumann <sascha(a)schumann.cx> %package devel -License: GPL v2 or later +License: GPLv2+ Summary: Static Library and Header Files for mhash Library Provides: mhash:/usr/include/mhash.h Requires: mhash = %{version} glibc-devel ++++++ mhash-0.9.9.9-shared.diff ++++++ --- /var/tmp/diff_new_pack.OFK3YS/_old 2009-11-27 14:43:29.000000000 +0100 +++ /var/tmp/diff_new_pack.OFK3YS/_new 2009-11-27 14:43:29.000000000 +0100 @@ -1,8 +1,10 @@ ---- lib/Makefile.am +Index: lib/Makefile.am +=================================================================== +--- lib/Makefile.am.orig +++ lib/Makefile.am -@@ -27,6 +27,8 @@ +@@ -27,6 +27,8 @@ libmhash_la_SOURCES = $(FRAMEWORK) $(KEY - libmhash_la_LDFLAGS = -version-info 2 + libmhash_la_LDFLAGS = -version-info 2:1 +libmhash_la_CFLAGS = -fPIC + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ladspa for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package ladspa for openSUSE:Factory checked in at Fri Nov 27 14:43:16 CET 2009. -------- --- ladspa/ladspa.changes 2009-11-17 08:59:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/ladspa/ladspa.changes 2009-11-25 15:53:16.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 25 13:58:09 UTC 2009 - mseben(a)novell.com + +- added blop-ladspa_dir.diff to correct ladspa dir for 64 bit arch +- corrected blop-wdautil-fix.diff (bnc#553647) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- blop-ladspa_dir.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ladspa-devel.spec ++++++ --- /var/tmp/diff_new_pack.5pmrlK/_old 2009-11-27 14:40:50.000000000 +0100 +++ /var/tmp/diff_new_pack.5pmrlK/_new 2009-11-27 14:40:50.000000000 +0100 @@ -21,8 +21,8 @@ Name: ladspa-devel Summary: Include Files mandatory for Development. Version: 1.12.code10.3 -Release: 105 -License: GPL v2 or later +Release: 106 +License: GPLv2+ Group: Development/Libraries/C and C++ Source: ladspa_sdk_1.12.tar.bz2 Url: http://www.ladspa.org/ ++++++ ladspa.spec ++++++ --- /var/tmp/diff_new_pack.5pmrlK/_old 2009-11-27 14:40:50.000000000 +0100 +++ /var/tmp/diff_new_pack.5pmrlK/_new 2009-11-27 14:40:50.000000000 +0100 @@ -38,8 +38,8 @@ %define blepvco_version 0.1.0 Summary: The Linux Audio Developer's Simple Plug-In API Version: 1.12.code10.3.1 -Release: 119 -License: GPL v2 or later +Release: 120 +License: GPLv2+ Group: Development/Libraries/C and C++ AutoReq: on Autoprov: off @@ -92,7 +92,8 @@ Patch23: alienwah-float_complex.diff Patch25: pvoc-0.1.10-depend-copts-fix.diff Patch26: swh-nostatic-lib.diff -Patch27: blop-wdautil-fix.diff +Patch27: blop-ladspa_dir.diff +Patch28: blop-wdautil-fix.diff Url: http://www.ladspa.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -150,7 +151,8 @@ (cd blop-%{blop_version} %patch5 %patch6 -%patch27 -p1 +%patch27 +%patch28 ) (cd vcf-%{vcf_version} %patch7 ++++++ blop-ladspa_dir.diff ++++++ --- src/wavedata.c 2009-11-25 13:53:57.000000000 +0000 +++ src/wavedata.c 2009-11-25 13:54:07.000000000 +0000 @@ -38,7 +38,7 @@ /* Get LADPSA_PATH, if available */ ladspa_path = getenv("LADSPA_PATH"); if (!ladspa_path) - ladspa_path = "/usr/lib/ladspa:/usr/local/lib/ladspa"; + ladspa_path = "/usr/lib/ladspa:/usr/local/lib/ladspa/usr/lib64/ladspa:/usr/local/lib64/ladspa"; start = ladspa_path; while (*start != '\0') ++++++ blop-wdautil-fix.diff ++++++ --- /var/tmp/diff_new_pack.5pmrlK/_old 2009-11-27 14:40:50.000000000 +0100 +++ /var/tmp/diff_new_pack.5pmrlK/_new 2009-11-27 14:40:50.000000000 +0100 @@ -1,9 +1,5 @@ ---- - src/wdatutil.c | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - ---- a/src/wdatutil.c -+++ b/src/wdatutil.c +--- src/wdatutil.c ++++ src/wdatutil.c @@ -269,13 +269,13 @@ /* * Fixed data and tables @@ -25,7 +21,7 @@ fprintf (wdat_fp, "\n"); /* * Sample data -@@ -326,13 +326,13 @@ +@@ -326,7 +326,7 @@ fprintf (wdat_fp, "\n"); } @@ -34,10 +30,3 @@ fprintf (wdat_fp, "\n"); /* * Function to get Wavedata - the sample rate is needed to calculate - * frequencies and related things - */ -- fprintf (wdat_fp, "int\n"); -+ fprintf (wdat_fp, "static int\n"); - fprintf (wdat_fp, "blop_get_%s (Wavedata * w, unsigned long sample_rate)\n", data_name); - fprintf (wdat_fp, "{\n"); - fprintf (wdat_fp, "\tWavetable * t;\n"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xine-lib for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package xine-lib for openSUSE:Factory checked in at Fri Nov 27 14:40:36 CET 2009. -------- --- xine-lib/xine-lib.changes 2009-09-30 18:05:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/xine-lib/xine-lib.changes 2009-11-18 16:11:34.000000000 +0100 @@ -1,0 +2,35 @@ +Wed Nov 18 15:11:00 UTC 2009 - lnussel(a)suse.de + +- enable libmodplug on >= 11.2 + +------------------------------------------------------------------- +Sat Nov 14 15:31:00 CEST 2009 - Manfred.Tremmel(a)iiv.de + +- merged packman and openSUSE package +- update to 1.1.16.3 + * Security fixes: + - Fix another possible int overflow in the 4XM demuxer. + (ref. TKADV2009-004, CVE-2009-0385) + - Fix an integer overflow in the Quicktime demuxer. + * Enable libmpeg2new (if configured with --enable-libmpeg2new). + This is not yet production code; the old mpeg2 decoder remains the default. + * Add support for OpenBSD. + * Fix a build failure on *BSD due to some rather useful GNUisms. + * Protect audio loop so it cannot write to a paused device (fix + pause/resume freeze with pulseaudio). + * Fix build with libavutil >= 50.0.0. + * Fix segfaults when playing VCDs. + * Fix calculation of frame duration for ffmpeg-decoded formats. + * Don't assume that ID3v2 tags with no content mean "end of ID3 data". +- changes from 1.1.16.1 to 1.1.16.2: + * Build fixes related to ImageMagick 6.4 & later. + * Fix an error in Matroska PTS calculation. + * Some front ends hang due to the hang fixes in 1.1.16. Fix this by + removing a break statement. + * Fix broken size checks in various input plugins (ref. CVE-2008-5239). + * More malloc checking (ref. CVE-2008-5240). + * Fix race conditions in gapless_switch (ref. kde bug #180339) + * Fix a possible integer overflow in the 4XM demuxer. + (TKADV2009-004, CVE-2009-0385) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- vdr-xine-0.8.2.diff.bz2 xine-lib-1.1.14-ia64-is-not-alpha.diff xine-lib-1.1.16.1-crippled.tar.bz2 xine-lib-1.1.16.1.tar.bz2 xine-lib-1.1.7-install-plugins-helper.diff xine-lib-assert.patch xine-lib-demuxcheckfor_mad_ffmpeg-LOCAL.diff xine-lib-mjpegplugin.diff xine-lib-TKADV2009-004.diff New: ---- vdr-xine-0.9.3.diff.bz2 xine-lib-1.1.16.3-assert.patch xine-lib-1.1.16.3-cdda.diff xine-lib-1.1.16.3-crippled.tar.bz2 xine-lib-1.1.16.3-demuxcheckfor_mad_ffmpeg.patch xine-lib-1.1.16.3-glitch-free-pulseaudio.patch xine-lib-1.1.16.3-ia64-is-not-alpha.diff xine-lib-1.1.16.3-install-plugins-helper.diff xine-lib-1.1.16.3-mjpegplugin.diff xine-lib-1.1.16.3.tar.bz2 xine-lib-libdvdread_udf.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xine-lib.spec ++++++ ++++ 1211 lines (skipped) ++++ between xine-lib/xine-lib.spec ++++ and /mounts/work_src_done/STABLE/xine-lib/xine-lib.spec ++++++ README.SuSE ++++++ --- /var/tmp/diff_new_pack.FAbvJD/_old 2009-11-27 14:36:25.000000000 +0100 +++ /var/tmp/diff_new_pack.FAbvJD/_new 2009-11-27 14:36:25.000000000 +0100 @@ -20,7 +20,7 @@ CSS decoding needs extra library (libdvdcss), which is not part of SuSE Linux Advanced users can build an RPM package and install also the additional -"xine-internal" rpm, which contains all protected codecs. +"libxine1-codecs" rpm, which contains all protected codecs. See also http://www.opensuse.org/XINE#Legal_Matters ++++++ vdr-xine-0.8.2.diff.bz2 -> vdr-xine-0.9.3.diff.bz2 ++++++ Files xine-lib/vdr-xine-0.8.2.diff.bz2 and /mounts/work_src_done/STABLE/xine-lib/vdr-xine-0.9.3.diff.bz2 differ ++++++ xine-lib-1.1.16.3-assert.patch ++++++ --- xine-lib-1.1.16.3.orig/src/audio_out/audio_alsa_out.c 2008-06-25 15:04:09.000000000 +0200 +++ xine-lib-1.1.16.3/src/audio_out/audio_alsa_out.c 2009-11-14 10:52:16.423781020 +0100 @@ -41,6 +41,7 @@ #ifdef HAVE_ALLOCA_H #include <alloca.h> #endif +#include <assert.h> #define ALSA_PCM_NEW_HW_PARAMS_API #define ALSA_PCM_NEW_SW_PARAMS_API ++++++ xine-lib-1.1.16.3-cdda.diff ++++++ diff -ur xine-lib-1.1.16.3.orig/src/demuxers/demux_cdda.c xine-lib-1.1.16.3/src/demuxers/demux_cdda.c --- xine-lib-1.1.16.3.orig/src/demuxers/demux_cdda.c 2008-06-15 01:15:00.000000000 +0200 +++ xine-lib-1.1.16.3/src/demuxers/demux_cdda.c 2009-05-07 19:43:04.000000000 +0200 @@ -60,6 +60,7 @@ input_plugin_t *input; int status; + int send_newpts; int seek_flag; /* this is set when a seek just occurred */ } demux_cdda_t; @@ -91,9 +92,9 @@ buf->extra_info->input_time = buf->pts / 90; buf->decoder_flags |= BUF_FLAG_FRAME_END; - if (this->seek_flag) { - _x_demux_control_newpts(this->stream, buf->pts, BUF_FLAG_SEEK); - this->seek_flag = 0; + if (this->send_newpts) { + _x_demux_control_newpts(this->stream, buf->pts, this->seek_flag); + this->send_newpts = this->seek_flag = 0; } this->audio_fifo->put (this->audio_fifo, buf); @@ -146,9 +147,14 @@ this->input->seek(this->input, start_pos & ~3, SEEK_SET); else this->input->seek(this->input, start_time * CD_BYTES_PER_SECOND, SEEK_SET); - this->seek_flag = 1; + this->status = DEMUX_OK; - _x_demux_flush_engine (this->stream); + + this->send_newpts = 1; + if (playing) { + this->seek_flag = BUF_FLAG_SEEK; + _x_demux_flush_engine (this->stream); + } return this->status; } diff -ur xine-lib-1.1.16.3.orig/src/input/input_cdda.c xine-lib-1.1.16.3/src/input/input_cdda.c --- xine-lib-1.1.16.3.orig/src/input/input_cdda.c 2009-02-17 03:55:21.000000000 +0100 +++ xine-lib-1.1.16.3/src/input/input_cdda.c 2009-05-12 00:16:12.000000000 +0200 @@ -113,7 +113,7 @@ *************************************************************************/ #define MAX_TRACKS 99 -#define CACHED_FRAMES 500 +#define CACHED_FRAMES 100 typedef struct { int start; @@ -1433,6 +1433,73 @@ return err; } +static inline char *_cdda_append (/*const*/ char *first, const char *second) +{ + if (!first) + return strdup (second); + + char *result = (char *) realloc (first, strlen (first) + strlen (second) + 1); + strcat (result, second); + return result; +} + +static void _cdda_parse_cddb_info (cdda_input_plugin_t *this, char *buffer, char **dtitle) +{ + /* buffer should be no more than 2048 bytes... */ + char buf[2048]; + int track_no; + + if (sscanf (buffer, "DTITLE=%s", &buf[0]) == 1) { + char *pt = strchr (buffer, '='); + if (pt) { + ++pt; + + *dtitle = _cdda_append (*dtitle, pt); + pt = strdup (*dtitle); + + char *title = strstr (pt, " / "); + if (title) + { + *title = 0; + title += 3; + free (this->cddb.disc_artist); + this->cddb.disc_artist = strdup (pt); + } + else + title = pt; + + free (this->cddb.disc_title); + this->cddb.disc_title = strdup (title); + + free (pt); + } + } + else if (sscanf (buffer, "DYEAR=%s", &buf[0]) == 1) { + char *pt = strchr (buffer, '='); + if (pt && strlen (pt) == 5) + this->cddb.disc_year = strdup (pt + 1); + } + else if(sscanf(buffer, "DGENRE=%s", &buf[0]) == 1) { + char *pt = strchr(buffer, '='); + if (pt) + this->cddb.disc_category = strdup (pt + 1); + } + else if (sscanf (buffer, "TTITLE%d=%s", &track_no, &buf[0]) == 2) { + char *pt = strchr(buffer, '='); + this->cddb.track[track_no].title = _cdda_append (this->cddb.track[track_no].title, pt + 1); + } + else if (!strncmp (buffer, "EXTD=", 5)) + { + if (!this->cddb.disc_year) + { + int nyear; + char *y = strstr (buffer, "YEAR:"); + if (y && sscanf (y + 5, "%4d", &nyear) == 1) + asprintf (&this->cddb.disc_year, "%d", nyear); + } + } +} + /* * Try to load cached cddb infos */ @@ -1465,82 +1532,16 @@ return 0; } else { - char buffer[256], *ln; - char buf[256]; - int tnum; + char buffer[2048], *ln; char *dtitle = NULL; - while ((ln = fgets(buffer, 255, fd)) != NULL) { - - buffer[strlen(buffer) - 1] = '\0'; - - if (sscanf(buffer, "DTITLE=%s", &buf[0]) == 1) { - char *pt, *artist, *title; - - pt = strchr(buffer, '='); - if (pt) { - pt++; - - if (dtitle != NULL) - { - dtitle = (char *) realloc(dtitle, strlen(dtitle) + strlen(pt) + 1); - strcat(dtitle, pt); - pt = dtitle; - } - dtitle = strdup(pt); - - artist = pt; - title = strstr(pt, " / "); - if (title) { - *title++ = '\0'; - title += 2; - } - else { - title = artist; - artist = NULL; - } + while ((ln = fgets(buffer, sizeof (buffer) - 1, fd)) != NULL) { - if (artist) - this->cddb.disc_artist = strdup(artist); + int length = strlen (buffer); + if (length && buffer[length - 1] == '\n') + buffer[length - 1] = '\0'; - this->cddb.disc_title = strdup(title); - } - } - else if (sscanf(buffer, "DYEAR=%s", &buf[0]) == 1) { - char *pt; - - pt = strrchr(buffer, '='); - pt++; - if (pt != NULL && strlen(pt) == 4) - this->cddb.disc_year = strdup(pt); - } - else if (sscanf(buffer, "TTITLE%d=%s", &tnum, &buf[0]) == 2) { - char *pt; - - pt = strchr(buffer, '='); - if (pt) - pt++; - if (this->cddb.track[tnum].title == NULL) - this->cddb.track[tnum].title = strdup(pt); - else - { - this->cddb.track[tnum].title - = (char *) realloc(this->cddb.track[tnum].title, strlen(this->cddb.track[tnum].title) + strlen(pt) + 1); - strcat(this->cddb.track[tnum].title, pt); - } - } - else { - if (!strncmp(buffer, "EXTD=", 5)) { - char *y; - int nyear; - - y = strstr(buffer, "YEAR:"); - if (y && this->cddb.disc_year == NULL) { - if (sscanf(y+5, "%4d", &nyear) == 1) - asprintf(&this->cddb.disc_year, "%d", nyear); - } - } - } + _cdda_parse_cddb_info (this, buffer, &dtitle); } fclose(fd); free(dtitle); @@ -1803,82 +1804,13 @@ memset(&buffercache, 0, sizeof(buffercache)); while (strcmp(buffer, ".")) { - char buf[2048]; - int tnum; size_t bufsize = strlen(buffercache); memset(&buffer, 0, sizeof(buffer)); _cdda_cddb_socket_read(this, buffer, sizeof(buffer) - 1); snprintf(buffercache + bufsize, sizeof(buffercache) - bufsize, "%s\n", buffer); - if (sscanf(buffer, "DTITLE=%s", &buf[0]) == 1) { - char *pt, *artist, *title; - - pt = strrchr(buffer, '='); - if (pt) { - pt++; - - if (dtitle != NULL) - { - dtitle = (char *) realloc(dtitle, strlen(dtitle) + strlen(pt) + 1); - strcat(dtitle, pt); - pt = dtitle; - } - dtitle = strdup(pt); - - artist = pt; - title = strstr(pt, " / "); - if (title) { - *title++ = '\0'; - title += 2; - } - else { - title = artist; - artist = NULL; - } - - if (artist) { - this->cddb.disc_artist = strdup(artist); - } - this->cddb.disc_title = strdup(title); - } - } - else if(sscanf(buffer, "DYEAR=%s", &buf[0]) == 1) { - char *pt; - - pt = strrchr(buffer, '='); - pt++; - if (pt != NULL && strlen(pt) == 4) - this->cddb.disc_year = strdup(pt); - } - else if (sscanf(buffer, "TTITLE%d=%s", &tnum, &buf[0]) == 2) { - char *pt; - - pt = strrchr(buffer, '='); - if (pt) { - pt++; - if (this->cddb.track[tnum].title == NULL) - this->cddb.track[tnum].title = strdup(pt); - else - { - this->cddb.track[tnum].title - = (char *) realloc(this->cddb.track[tnum].title, strlen(this->cddb.track[tnum].title) + strlen(pt) + 1); - strcat(this->cddb.track[tnum].title, pt); - } - } - } - else { - if (!strncmp(buffer, "EXTD=", 5)) { - char *y; - int nyear; - - y = strstr(buffer, "YEAR:"); - if (y && this->cddb.disc_year == NULL) { - if (sscanf(y+5, "%4d", &nyear) == 1) - asprintf(&this->cddb.disc_year, "%d", nyear); - } - } - } + _cdda_parse_cddb_info (this, buffer, &dtitle); } free(dtitle); @@ -2491,6 +2423,9 @@ } lprintf("Track %d Title: %s\n", this->track+1, pt); + char tracknum[4]; + snprintf(tracknum, 4, "%d", this->track+1); + _x_meta_info_set_utf8(this->stream, XINE_META_INFO_TRACK_NUMBER, tracknum); _x_meta_info_set_utf8(this->stream, XINE_META_INFO_TITLE, pt); } ++++++ xine-lib-1.1.16.1-crippled.tar.bz2 -> xine-lib-1.1.16.3-crippled.tar.bz2 ++++++ ++++ 173474 lines of diff (skipped) ++++++ xine-lib-1.1.16.3-demuxcheckfor_mad_ffmpeg.patch ++++++ >From 8861e0d755127fde4b57d32561491853e49a0edc Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <lnussel(a)suse.de> Date: Fri, 25 Jul 2008 15:07:23 +0200 Subject: [PATCH] xine-lib-demuxcheckfor_mad_ffmpeg-LOCAL.diff =================================================================== --- src/xine-engine/load_plugins.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) --- xine-lib-1.1.16.3.orig/src/xine-engine/load_plugins.c 2009-02-10 18:21:07.000000000 +0100 +++ xine-lib-1.1.16.3/src/xine-engine/load_plugins.c 2009-11-14 11:00:26.719796977 +0100 @@ -2487,9 +2487,18 @@ plugin_catalog_t *catalog = self->plugin_catalog; int list_id; + int havempgdecoder = 0; + const char * const * p; pthread_mutex_lock (&catalog->lock); + _build_list_typed_plugins(&catalog, catalog->plugin_lists[PLUGIN_AUDIO_DECODER - 1]); + for (p = catalog->ids; p && *p; p++) { + if (strcmp (*p, "mad") == 0 || strcmp (*p, "ffmpegaudio") == 0) { + havempgdecoder = 1; + break; + } + } /* calc length of output string and create an array of strings to concatenate */ size_t len = 0; @@ -2501,7 +2510,13 @@ if (node->plugin_class || _load_plugin_class(self, node, NULL)) { demux_class_t *const cls = (demux_class_t *)node->plugin_class; if( (extensions[list_id] = cls->get_extensions(cls)) != NULL ) - len += strlen(extensions[list_id]) +1; + { + if(havempgdecoder || !strstr(extensions[list_id], "mp3")) { + len += strlen(extensions[list_id]) +1; + } else { + extensions[list_id] = NULL; + } + } } } ++++++ xine-lib-1.1.16.3-glitch-free-pulseaudio.patch ++++++ diff -uNr xine-lib-1.1.15.orig/src/xine-engine/audio_out.c xine-lib-1.1.15/src/xine-engine/audio_out.c --- xine-lib-1.1.15.orig/src/xine-engine/audio_out.c 2008-07-10 18:19:10.000000000 +0200 +++ xine-lib-1.1.15/src/xine-engine/audio_out.c 2009-01-10 21:57:20.000000000 +0100 @@ -1151,8 +1151,17 @@ /* * calculate gap: + * + * HACK (rwa): If we have no video stream we do not need an AV sync and so + * we assume a gap of 0. This seems to avoid the skips in the + * first seconds when playing audio-only via the "glitch-free" + * pulseaudio server. */ - gap = in_buf->vpts - hw_vpts; + if (in_buf && in_buf->stream && in_buf->stream->video_decoder_plugin) { + gap = in_buf->vpts - hw_vpts; + } else { + gap = 0; + } lprintf ("hw_vpts : %" PRId64 " buffer_vpts : %" PRId64 " gap : %" PRId64 "\n", hw_vpts, in_buf->vpts, gap); ++++++ xine-lib-1.1.14-ia64-is-not-alpha.diff -> xine-lib-1.1.16.3-ia64-is-not-alpha.diff ++++++ --- xine-lib/xine-lib-1.1.14-ia64-is-not-alpha.diff 2009-01-29 01:28:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/xine-lib/xine-lib-1.1.16.3-ia64-is-not-alpha.diff 2009-11-14 17:38:41.000000000 +0100 @@ -7,11 +7,11 @@ configure.ac | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) -Index: xine-lib-1.1.16.1/configure.ac +Index: xine-lib-1.1.16.3/configure.ac =================================================================== ---- xine-lib-1.1.16.1.orig/configure.ac -+++ xine-lib-1.1.16.1/configure.ac -@@ -2311,10 +2311,13 @@ case "$host_or_hostalias" in +--- xine-lib-1.1.16.3.orig/configure.ac 2009-04-02 20:44:45.000000000 +0200 ++++ xine-lib-1.1.16.3/configure.ac 2009-11-14 10:45:11.618782275 +0100 +@@ -2328,10 +2328,13 @@ mips-*) AC_DEFINE_UNQUOTED(FPM_MIPS,,[Define to select libmad fixed point arithmetic implementation]) ;; ++++++ xine-lib-1.1.7-install-plugins-helper.diff -> xine-lib-1.1.16.3-install-plugins-helper.diff ++++++ --- xine-lib/xine-lib-1.1.7-install-plugins-helper.diff 2008-05-17 02:58:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/xine-lib/xine-lib-1.1.16.3-install-plugins-helper.diff 2009-11-14 17:39:25.000000000 +0100 @@ -1,8 +1,7 @@ -Index: xine-lib-1.1.12/configure.ac -=================================================================== ---- xine-lib-1.1.12.orig/configure.ac -+++ xine-lib-1.1.12/configure.ac -@@ -2560,6 +2560,28 @@ fi +diff -uNr xine-lib-1.1.16.3.orig/configure.ac xine-lib-1.1.16.3/configure.ac +--- xine-lib-1.1.16.3.orig/configure.ac 2009-04-02 20:44:45.000000000 +0200 ++++ xine-lib-1.1.16.3/configure.ac 2009-11-14 10:39:51.933031529 +0100 +@@ -2553,6 +2553,28 @@ AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno") @@ -31,53 +30,9 @@ dnl --------------------------------------------- dnl some include paths ( !!! DO NOT REMOVE !!! ) -Index: xine-lib-1.1.12/src/xine-engine/xine.c -=================================================================== ---- xine-lib-1.1.12.orig/src/xine-engine/xine.c -+++ xine-lib-1.1.12/src/xine-engine/xine.c -@@ -1780,6 +1780,15 @@ void xine_init (xine_t *this) { - 0, NULL, this); - - /* -+ * enable/disable option for the plugins helper -+ */ -+ this->config->register_bool(this->config, -+ "media.plugins_helper", 1, -+ _("Run plugins helper"), -+ _("Searches the internet for missing plugins"), -+ 0, NULL, this); -+ -+ /* - * keep track of all opened streams - */ - this->streams = xine_list_new(); -Index: xine-lib-1.1.12/src/xine-engine/video_decoder.c -=================================================================== ---- xine-lib-1.1.12.orig/src/xine-engine/video_decoder.c -+++ xine-lib-1.1.12/src/xine-engine/video_decoder.c -@@ -37,6 +37,7 @@ - - #include "xine_internal.h" - #include "xineutils.h" -+#include "install_plugins_helper.h" - #include <sched.h> - - #define SPU_SLEEP_INTERVAL (90000/2) -@@ -376,6 +377,10 @@ static void *video_decoder_loop (void *s - stream->video_decoder_plugin = _x_get_video_decoder (stream, streamtype); - - _x_stream_info_set(stream, XINE_STREAM_INFO_VIDEO_HANDLED, (stream->video_decoder_plugin != NULL)); -+ if(buf->type != buftype_unknown && !stream->video_decoder_plugin) -+ _x_install_plugins_helper(stream,"decoder-video", buf->type, _x_buf_video_name( buf->type )); -+ -+ - } - - if (stream->video_decoder_plugin) -Index: xine-lib-1.1.12/src/xine-engine/audio_decoder.c -=================================================================== ---- xine-lib-1.1.12.orig/src/xine-engine/audio_decoder.c -+++ xine-lib-1.1.12/src/xine-engine/audio_decoder.c +diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.16.3/src/xine-engine/audio_decoder.c +--- xine-lib-1.1.16.3.orig/src/xine-engine/audio_decoder.c 2009-02-10 18:32:23.000000000 +0100 ++++ xine-lib-1.1.16.3/src/xine-engine/audio_decoder.c 2009-11-14 10:39:51.934031409 +0100 @@ -41,6 +41,7 @@ #include "xine_internal.h" @@ -86,7 +41,7 @@ static void *audio_decoder_loop (void *stream_gen) { -@@ -339,6 +340,10 @@ static void *audio_decoder_loop (void *s +@@ -341,6 +342,10 @@ _x_stream_info_set(stream, XINE_STREAM_INFO_AUDIO_HANDLED, (stream->audio_decoder_plugin != NULL)); @@ -97,73 +52,9 @@ } if (audio_type != stream->audio_type) { -Index: xine-lib-1.1.12/src/xine-engine/Makefile.am -=================================================================== ---- xine-lib-1.1.12.orig/src/xine-engine/Makefile.am -+++ xine-lib-1.1.12/src/xine-engine/Makefile.am -@@ -19,7 +19,7 @@ libxine_la_SOURCES = xine.c metronom.c c - video_overlay.c osd.c scratch.c demux.c vo_scale.c \ - xine_interface.c post.c tvmode.c broadcaster.c io_helper.c \ - input_rip.c input_cache.c info_helper.c refcounter.c \ -- alphablend.c -+ alphablend.c install_plugins_helper.c - - # FIXME: these are currently unused: - EXTRA_DIST = lrb.c lrb.h accel_xvmc.h -@@ -39,7 +39,8 @@ xineinclude_HEADERS = buffer.h metronom - audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \ - video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h \ - plugin_catalog.h audio_decoder.h video_decoder.h post.h \ -- io_helper.h broadcaster.h info_helper.h refcounter.h alphablend.h -+ io_helper.h broadcaster.h info_helper.h refcounter.h alphablend.h \ -+ install_plugins_helper.h - - noinst_HEADERS = bswap.h ffmpeg_bswap.h - -Index: xine-lib-1.1.12/src/xine-engine/install_plugins_helper.h -=================================================================== ---- /dev/null -+++ xine-lib-1.1.12/src/xine-engine/install_plugins_helper.h -@@ -0,0 +1,35 @@ -+/* -+ * Copyright (C) 2007 Sascha Sommer -+ * -+ * This file is part of xine, a free video player. -+ * -+ * xine is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * xine is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -+ * -+ * helper functions to query the internet for additional codecs -+ */ -+ -+#ifndef PLUGINS_HELPER_H -+#define PLUGINS_HELPER_H -+ -+#include <inttypes.h> -+#include "xine_internal.h" -+ -+/* -+ * execute install plugins helper -+ */ -+void _x_install_plugins_helper(xine_stream_t *stream, char* plugin_type, uint32_t type, char* plugin_desc) XINE_PROTECTED; -+ -+ -+#endif -Index: xine-lib-1.1.12/src/xine-engine/install_plugins_helper.c -=================================================================== ---- /dev/null -+++ xine-lib-1.1.12/src/xine-engine/install_plugins_helper.c +diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.16.3/src/xine-engine/install_plugins_helper.c +--- xine-lib-1.1.16.3.orig/src/xine-engine/install_plugins_helper.c 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.16.3/src/xine-engine/install_plugins_helper.c 2009-11-14 10:39:51.935031218 +0100 @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2007 Sascha Sommer @@ -271,3 +162,105 @@ + } +} + +diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.16.3/src/xine-engine/install_plugins_helper.h +--- xine-lib-1.1.16.3.orig/src/xine-engine/install_plugins_helper.h 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.16.3/src/xine-engine/install_plugins_helper.h 2009-11-14 10:39:51.935031218 +0100 +@@ -0,0 +1,35 @@ ++/* ++ * Copyright (C) 2007 Sascha Sommer ++ * ++ * This file is part of xine, a free video player. ++ * ++ * xine is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * xine is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ++ * ++ * helper functions to query the internet for additional codecs ++ */ ++ ++#ifndef PLUGINS_HELPER_H ++#define PLUGINS_HELPER_H ++ ++#include <inttypes.h> ++#include "xine_internal.h" ++ ++/* ++ * execute install plugins helper ++ */ ++void _x_install_plugins_helper(xine_stream_t *stream, char* plugin_type, uint32_t type, char* plugin_desc) XINE_PROTECTED; ++ ++ ++#endif +diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/Makefile.am xine-lib-1.1.16.3/src/xine-engine/Makefile.am +--- xine-lib-1.1.16.3.orig/src/xine-engine/Makefile.am 2008-07-13 00:23:52.000000000 +0200 ++++ xine-lib-1.1.16.3/src/xine-engine/Makefile.am 2009-11-14 10:39:51.935031218 +0100 +@@ -19,7 +19,7 @@ + video_overlay.c osd.c scratch.c demux.c vo_scale.c \ + xine_interface.c post.c tvmode.c broadcaster.c io_helper.c \ + input_rip.c input_cache.c info_helper.c refcounter.c \ +- alphablend.c ++ alphablend.c install_plugins_helper.c + + # FIXME: these are currently unused: + EXTRA_DIST = lrb.c lrb.h accel_xvmc.h +@@ -39,7 +39,8 @@ + audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \ + video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h \ + plugin_catalog.h audio_decoder.h video_decoder.h post.h \ +- io_helper.h broadcaster.h info_helper.h refcounter.h alphablend.h ++ io_helper.h broadcaster.h info_helper.h refcounter.h alphablend.h \ ++ install_plugins_helper.h + + noinst_HEADERS = bswap.h ffmpeg_bswap.h + +diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/video_decoder.c xine-lib-1.1.16.3/src/xine-engine/video_decoder.c +--- xine-lib-1.1.16.3.orig/src/xine-engine/video_decoder.c 2009-02-10 18:32:24.000000000 +0100 ++++ xine-lib-1.1.16.3/src/xine-engine/video_decoder.c 2009-11-14 10:39:51.934031409 +0100 +@@ -37,6 +37,7 @@ + + #include "xine_internal.h" + #include "xineutils.h" ++#include "install_plugins_helper.h" + #include <sched.h> + + #define SPU_SLEEP_INTERVAL (90000/2) +@@ -376,6 +377,10 @@ + stream->video_decoder_plugin = _x_get_video_decoder (stream, streamtype); + + _x_stream_info_set(stream, XINE_STREAM_INFO_VIDEO_HANDLED, (stream->video_decoder_plugin != NULL)); ++ if(buf->type != buftype_unknown && !stream->video_decoder_plugin) ++ _x_install_plugins_helper(stream,"decoder-video", buf->type, _x_buf_video_name( buf->type )); ++ ++ + } + + if (stream->video_decoder_plugin) +diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/xine.c xine-lib-1.1.16.3/src/xine-engine/xine.c +--- xine-lib-1.1.16.3.orig/src/xine-engine/xine.c 2009-02-18 12:37:43.000000000 +0100 ++++ xine-lib-1.1.16.3/src/xine-engine/xine.c 2009-11-14 10:39:51.934031409 +0100 +@@ -1773,6 +1773,15 @@ + 0, NULL, this); + + /* ++ * enable/disable option for the plugins helper ++ */ ++ this->config->register_bool(this->config, ++ "media.plugins_helper", 1, ++ _("Run plugins helper"), ++ _("Searches the internet for missing plugins"), ++ 0, NULL, this); ++ ++ /* + * keep track of all opened streams + */ + this->streams = xine_list_new(); ++++++ xine-lib-1.1.16.3-mjpegplugin.diff ++++++ ++++ 1251 lines (skipped) ++++++ xine-lib-1.1.16.1-crippled.tar.bz2 -> xine-lib-1.1.16.3.tar.bz2 ++++++ xine-lib/xine-lib-1.1.16.1-crippled.tar.bz2 /mounts/work_src_done/STABLE/xine-lib/xine-lib-1.1.16.3.tar.bz2 differ: byte 11, line 1 ++++++ xine-lib-libdvdread_udf.diff ++++++ # HG changeset patch # User Tobias Rautenkranz <mail(a)tobias.rautenkranz.ch> # Date 1202208482 -3600 # Node ID 100241ff36f0730a15018a58456fb86eb590bf18 # Parent 07c29261ed98fdb710a241c6711dac0215b6074a Fix playback of DVDs with a broken UDF file system (aka DVD-Movie-Protect). diff -r 07c29261ed98 -r 100241ff36f0 src/input/libdvdnav/dvd_udf.c --- a/src/input/libdvdnav/dvd_udf.c Thu Jan 31 22:02:04 2008 +0000 +++ b/src/input/libdvdnav/dvd_udf.c Tue Feb 05 11:48:02 2008 +0100 @@ -38,9 +38,15 @@ #include <sys/stat.h> #include <unistd.h> #include <inttypes.h> +#ifndef __WIN32__ +#include <fnmatch.h> +#endif #include "dvd_reader.h" #include "dvd_udf.h" + +#include "ifo_types.h" +#include "ifo_read.h" /* Private but located in/shared with dvd_reader.c */ extern int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number, @@ -774,7 +780,9 @@ static int UDFFindPartition( dvd_reader_ return part->valid; } -uint32_t UDFFindFile( dvd_reader_t *device, char *filename, + + +static uint32_t UDFFindFileReal( dvd_reader_t *device, char *filename, uint32_t *filesize ) { uint8_t LogBlock_base[ DVD_VIDEO_LB_LEN + 2048 ]; @@ -856,6 +864,84 @@ uint32_t UDFFindFile( dvd_reader_t *devi return partition.Start + File.Location; } +/** + * Get the offset from the ifo files to allow playback of DVDs + * with a deliberately broken UDF file system (aka DVD-Movie-Protect). + * When the file is not an IFO or VOB, it calls the real UDF routine. + */ +uint32_t UDFFindFile( dvd_reader_t *device, char *filename, + uint32_t *filesize ) +{ +#ifndef __WIN32__ + if (!fnmatch("/VIDEO_TS/VTS_[0-9][0-9]_[0-9].???", filename, FNM_PATHNAME)) { +#else + if (strlen("/VIDEO_TS/VTS_01_1.VOB") == strlen(filename) + && !strncmp(filename, "/VIDEO_TS/VTS_", strlen("/VIDEO_TS/VTS_")) ) { +#endif + size_t len = strlen(filename); + char *extension = &filename[len-3]; + if (!strcmp(extension, "IFO") || !strcmp(extension, "VOB")) { + int title = atoi(&filename[len-8]); + int part = atoi(&filename[len-5]); + + ifo_handle_t *ifo_handle = ifoOpen(device, 0); + if (0 == ifo_handle) + return 0; + + uint32_t tmp_filesize; + uint32_t offset = UDFFindFileReal(device, "/VIDEO_TS/VIDEO_TS.IFO", &tmp_filesize); + + int i; + for (i=0; i<ifo_handle->tt_srpt->nr_of_srpts; i++) + if (title == ifo_handle->tt_srpt->title[i].title_set_nr) + break; + + if (i == ifo_handle->tt_srpt->nr_of_srpts) { + /* not found */ + ifoClose(ifo_handle); + return 0; + } + offset += ifo_handle->tt_srpt->title[i].title_set_sector; + ifoClose(ifo_handle); + + if (!strcmp(extension, "VOB")) { + ifo_handle = ifoOpen(device, title); + if (0 == ifo_handle) + return 0; + + switch(part) { + case 0: + if (0 == ifo_handle->vtsi_mat->vtsm_vobs) { + ifoClose(ifo_handle); + return 0; + } + offset += ifo_handle->vtsi_mat->vtsm_vobs; + break; + case 1: + if (0 == ifo_handle->vtsi_mat->vtstt_vobs) { + ifoClose(ifo_handle); + return 0; + } + offset += ifo_handle->vtsi_mat->vtstt_vobs; + break; + default: /* can't get other parts (also no need to) */ + offset = 0; + break; + } + + ifoClose(ifo_handle); + } + + + *filesize = 1000000; /* File size unknown */ + if (offset != 0) + return offset; + } + } + + return UDFFindFileReal( device, filename, filesize); +} + /** ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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