October 2008 - openSUSE Commits - openSUSE Mailing Lists

commit gnome-screensaver
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package gnome-screensaver checked in at Tue Oct 28 00:03:45 CET 2008. -------- --- GNOME/gnome-screensaver/gnome-screensaver.changes 2008-10-23 12:55:20.000000000 +0200 +++ /d/STABLE/gnome-screensaver/gnome-screensaver.changes 2008-10-27 17:37:27.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 27 17:40:35 CEST 2008 - thoenig(a)suse.de + +- Updated gnome-screensaver-finger-print.patch to fix some issues + as stated in bnc#438624 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-screensaver.spec ++++++ --- /var/tmp/diff_new_pack.xI6264/_old 2008-10-28 00:03:02.000000000 +0100 +++ /var/tmp/diff_new_pack.xI6264/_new 2008-10-28 00:03:02.000000000 +0100 @@ -29,7 +29,7 @@ BuildRequires: dbus-1-devel dbus-1-glib %endif Version: 2.24.0 -Release: 2 +Release: 3 Url: http://www.gnome.org/ Group: System/GUI/GNOME License: GPL v2 or later @@ -149,6 +149,9 @@ %files lang -f %{name}.lang %changelog +* Mon Oct 27 2008 thoenig(a)suse.de +- Updated gnome-screensaver-finger-print.patch to fix some issues + as stated in bnc#438624 * Thu Oct 23 2008 rodrigo(a)novell.com - Added gnome-screensaver-finger-print.patch for finger print authentication on lock screen dialog (fate#301953) ++++++ gnome-screensaver-finger-print.patch ++++++ --- /var/tmp/diff_new_pack.xI6264/_old 2008-10-28 00:03:02.000000000 +0100 +++ /var/tmp/diff_new_pack.xI6264/_new 2008-10-28 00:03:02.000000000 +0100 @@ -1,8 +1,6 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -917,6 +917,21 @@ if test "x$have_libnotify" = "xyes"; the +--- configure.ac 2008-10-27 05:38:10.000000000 -0400 ++++ configure.ac 2008-10-27 05:38:22.000000000 -0400 +@@ -917,6 +917,21 @@ fi dnl --------------------------------------------------------------------------- @@ -24,10 +22,8 @@ dnl Finish dnl --------------------------------------------------------------------------- -Index: src/gnome-screensaver-dialog.c -=================================================================== ---- src/gnome-screensaver-dialog.c.orig -+++ src/gnome-screensaver-dialog.c +--- src/gnome-screensaver-dialog.c 2008-10-27 05:38:10.000000000 -0400 ++++ src/gnome-screensaver-dialog.c 2008-10-27 05:41:09.000000000 -0400 @@ -30,6 +30,11 @@ #include <sys/wait.h> #include <unistd.h> @@ -40,7 +36,7 @@ #include <glib/gi18n.h> #include <gdk/gdkx.h> #include <gtk/gtk.h> -@@ -66,6 +71,12 @@ static GOptionEntry entries [] = { +@@ -66,6 +71,12 @@ { NULL } }; @@ -53,7 +49,7 @@ static char * get_id_string (GtkWidget *widget) { -@@ -333,19 +344,132 @@ response_cb (GSLockPlug *plug, +@@ -333,12 +344,119 @@ } } @@ -101,7 +97,7 @@ + gboolean retry; + struct fp_img *img = NULL; + -+ auth_message_handler_idle (_("Scan your finger now"), plug); ++ auth_message_handler_idle (_("Please enter password or swipe your finger"), plug); + + do { + int r; @@ -173,21 +169,7 @@ again = TRUE; res = do_auth_check (plug); - - if (res) { - again = FALSE; -- g_idle_add ((GSourceFunc)quit_response_ok, NULL); -+ -+#ifdef WITH_LIBFPRINT -+ if (fprint_thread != -1) -+ pthread_kill (fprint_thread, SIGKILL); -+#endif -+ -+ g_idle_add ((GSourceFunc) quit_response_ok, NULL); - } else { - loop_counter++; - -@@ -529,6 +653,22 @@ lock_initialization (int *argc, +@@ -529,6 +647,22 @@ return TRUE; } @@ -210,7 +192,7 @@ int main (int argc, char **argv) -@@ -548,6 +688,34 @@ main (int argc, +@@ -548,6 +682,34 @@ g_thread_init (NULL); } @@ -245,7 +227,7 @@ g_type_init (); gs_profile_start (NULL); -@@ -603,6 +771,14 @@ main (int argc, +@@ -603,6 +765,14 @@ if (xvkbd_running) kill (xvkbd_pid, 9); @@ -260,11 +242,9 @@ gs_profile_end (NULL); gs_debug_shutdown (); -Index: src/Makefile.am -=================================================================== ---- src/Makefile.am.orig -+++ src/Makefile.am -@@ -31,6 +31,7 @@ INCLUDES = \ +--- src/Makefile.am 2008-10-27 05:38:10.000000000 -0400 ++++ src/Makefile.am 2008-10-27 05:38:22.000000000 -0400 +@@ -31,6 +31,7 @@ $(DBUS_CFLAGS) \ $(LIBGNOMEKBDUI_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ @@ -272,7 +252,7 @@ $(NULL) bin_PROGRAMS = \ -@@ -150,6 +151,7 @@ gnome_screensaver_dialog_LDADD = \ +@@ -150,6 +151,7 @@ $(AUTH_LIBS) \ $(LIBGNOMEKBDUI_LIBS) \ $(LIBNOTIFY_LIBS) \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 elilo
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package elilo checked in at Mon Oct 27 23:57:20 CET 2008. -------- --- arch/i386/elilo/elilo.changes 2008-10-17 08:54:15.000000000 +0200 +++ /d/STABLE/elilo/elilo.changes 2008-10-27 18:18:25.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Oct 27 18:16:02 CET 2008 - rw(a)suse.de + +- elilo.pl + * Mask 'relocatable' (unless supported). (bnc#438276) + * Remove old files from target directory. (bnc#398416) + +------------------------------------------------------------------- @@ -4 +11,2 @@ -- add ExclusiveArch ia64 x86 x86_64 +- elilo.spec + * Add ExclusiveArch ia64 x86 x86_64 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ elilo.spec ++++++ --- /var/tmp/diff_new_pack.X27986/_old 2008-10-27 23:56:28.000000000 +0100 +++ /var/tmp/diff_new_pack.X27986/_new 2008-10-27 23:56:28.000000000 +0100 @@ -21,7 +21,7 @@ Name: elilo Summary: EFI Linux Loader Version: 3.8 -Release: 22 +Release: 23 ExclusiveArch: ia64 %ix86 x86_64 Group: System/Boot AutoReqProv: on @@ -61,7 +61,9 @@ %patch4 -p1 %patch5 -p1 perl -pe 's{\@EDITION\@}{%{version}-%{release}}; - s{\@LIBEXECDIR\@}{%{_libexecdir}}' < %{SOURCE1} > elilo.pl && + s{\@LIBEXECDIR\@}{%{_libexecdir}}; + s{\@ARCH\@}{%{_target_cpu}}; + ' < %{SOURCE1} > elilo.pl && perl -pi -e 's{/usr/lib}{%{_libexecdir}}' Make.defaults chmod 555 elilo.pl && touch -r %{SOURCE1} elilo.pl ! fgrep '%%{version}-%%{release}' elilo.pl @@ -78,6 +80,7 @@ install tools/eliloalt $RPM_BUILD_ROOT/sbin install -p -m 555 elilo.pl $RPM_BUILD_ROOT/sbin/elilo %if 0 +install -D -p elilo.5 $RPM_BUILD_ROOT/usr/share/man/man5/elilo.conf.5 install -D -p elilo.8 $RPM_BUILD_ROOT/usr/share/man/man8/elilo.8 %endif @@ -95,12 +98,18 @@ /sbin/elilo /sbin/eliloalt %if 0 +/usr/share/man/man5/* /usr/share/man/man8/* %endif %changelog +* Mon Oct 27 2008 rw(a)suse.de +- elilo.pl + * Mask 'relocatable' (unless supported). (bnc#438276) + * Remove old files from target directory. (bnc#398416) * Fri Oct 17 2008 olh(a)suse.de -- add ExclusiveArch ia64 x86 x86_64 +- elilo.spec + * Add ExclusiveArch ia64 x86 x86_64 * Thu Jul 31 2008 rw(a)suse.de - elilo.efi * Update to final elilo-3.8 for uEFI support. (fate#301882) ++++++ elilo.pl ++++++ --- /var/tmp/diff_new_pack.X27986/_old 2008-10-27 23:56:28.000000000 +0100 +++ /var/tmp/diff_new_pack.X27986/_new 2008-10-27 23:56:28.000000000 +0100 @@ -1,21 +1,24 @@ #!/usr/bin/perl -w -# $Id: elilo.pl,v 0.14 2008/07/30 09:36:48 rw Exp $ +# $Id: elilo.pl,v 0.16 2008/10/27 17:15:29 rw Exp $ use strict; -my $C = $0; $C =~ s%^.*/%%; +my $C = $0; $C =~ s{^.*/}{}; my $dbg = (exists( $ENV{"ELILO_DEBUG"})) ? $ENV{"ELILO_DEBUG"} : ""; my $Edition = q(@EDITION@); +my $Arch = q(@ARCH@); +my $LibD = q(@LIBEXECDIR@); my $MPold = "$dbg/boot"; my $MPnew = "$dbg/boot/efi"; -my $Dlibold = "$dbg@LIBEXECDIR@/elilo"; -my $Dlib = "$dbg@LIBEXECDIR@/efi"; +my $Dlibold = "$dbg$LibD/elilo"; +my $Dlib = "$dbg$LibD/efi"; my $Fconf = "elilo.conf"; my $Sconf = "$dbg/etc/" . $Fconf; my $Reserved = qr(^(efi-mountpoint|vendor-directory|elilo-origin))o; my %Sconf = (); +my $keep = 0; my $test = 0; my $verbose = 0; my $warn = 0; @@ -36,7 +39,7 @@ $[ = 0; sub Version() { - my $v = q($Revision: 0.14 $ ); + my $v = q($Revision: 0.16 $ ); $v =~ s/^\$ Rev.*:\ ([0-9.]+)\ \$\ /$1/x; $v .= " (part of elilo-$Edition)" if ( $Edition ne "\@EDITION\@" ); print "$C version $v\n"; @@ -74,6 +77,7 @@ my( $out, $tmp, $c, @f, %f, $opt); my $default_label = ""; my $default_loc; + my $image = ""; my @Out = (); $out = "$dir/$Fconf"; $tmp = "$out.tmp"; @@ -95,28 +99,55 @@ } while ( <IN> ) { next if ( m/$Reserved/xo ); - if ( m%^\s*(?:image|initrd)\s*=\s*% ) { + if ( m{^\s*(?:image|initrd)\s*=\s*} ) { chomp; - s%^(\s*(?:image|initrd)\s*=\s*)(/\S+/)?([^/\s]+)\s*$%$1$3%; - my( $t, $p, $f) = ($1, $2, $3); + s{^(\s*(image|initrd)\s*=\s*)(/\S+/)?([^/\s]+)\s*$}{$1$4}; + my( $t, $p, $f) = ($2, $3, $4); + #Info( 0, "$C: $in: $.: t=$t p=$p f=$f\n"); $_ .= "\n"; if ( ! defined( $p) ) { $p = "/boot/"; } + $image = "" if ( $t eq "image" ); if ( ! defined( $f) ) { Warn( "$in: $.: invalid file-specification\n" . ">> $_"); $c++; + } elsif ( $opt && ! -r "$dbg$p$f" ) { + Info( 0, "$C: $in: $.: missing optional '$p$f' skipped\n"); } elsif ( exists( $f{$f}) ) { + $image = $dbg . "$p$f" if ( $t eq "image" ); Info( 3, "$in: $.: file duplication skipped (previous: $f{$f})\n" . ">> $_"); - } elsif ( $opt && ! -r "$dbg$p$f" ) { - Info( 0, "$C: $in: $.: missing optional '$p$f' skipped\n"); } else { + $image = $dbg . "$p$f" if ( $t eq "image" ); push @f, $dbg . "$p$f"; $f{$f} = $.; } - } elsif (m%^(\s*label\s*=\s*)(\S+)%) { + } elsif ( $image && m{^(\s*description\s*=\s*")([^"]+)(".*)$} ) { + my( $p, $d, $s) = ($1, $2, $3); + my $t = ""; + if ( $d =~ m{\%L} ) { + if ( -l $image ) { + ($t = readlink( $image)) =~ s{^vmlinuz-}{}; + } else { + #($t = $image) =~ s{^.*vmlinux-}{}; + $t = "no symlink"; + } + Info( 2, " \%L => '$t'\n"); + $d =~ s{\%L}{$t}; + } elsif ( $d =~ m{\%G} ) { + my $cmd = "/sbin/get_kernel_version"; + if ( -x $cmd ) { + chomp( $t = `$cmd $image`); + } else { + $t = ""; + } + $d =~ s{\%G}{$t}; + Info( 2, " \%G => '$t'\n"); + } + $_ = $p . $d . $s . "\n"; + } elsif (m{^(\s*label\s*=\s*)(\S+)}) { my ($pre, $label) = ($1, $2); if (exists $Labels{$label}) { my $t = 1; @@ -129,11 +160,18 @@ $_ = $pre . $l . "\n"; } $Labels{$label} = 1; - } elsif (m%^\s*default\s*=\s*(\S+)%) { + } elsif (m{^\s*default\s*=\s*(\S+)}) { $default_label = $1; $default_loc = $#Out + 1; - } elsif (m%^\s*read-only\s*$%) { - $_ = "#read-only # Deprecated! (May be forced by appending 'ro')\n"; + } elsif (m{^\s*read-only\s*$}) { + $_ = "#read-only # Deprecated!" . + " (Add comment in '$Sconf' to overrule.)" . + "\n"; + Info( 2, " $in: $.: deprecated 'read-only' ignored.\n"); + } elsif (m{^\s*relocatable\s*$} && $Arch =~ m{86}) { + $_ = "#relocatable # Unsupported on this architecture!\n" . + "# (May be forced by adding a comment in '$Sconf'.)\n"; + Info( 2, " $in: $.: unsupported 'relocatable' ignored.\n"); } push @Out, $_; } @@ -170,7 +208,6 @@ sub System($@) { my( $fatal, @C) = @_; my $cmd = $C[0]; - my $rc = ($fatal) ? 1 : 0; foreach my $c ( @C[1..$#C] ) { if ( $c =~ /\s/ ) { @@ -184,12 +221,28 @@ system @C; if ($? == -1) { - Panic( $rc, "$C[0]: failed to execute: $!\n"); + Panic( $fatal, "$C[0]: failed to execute: $!\n"); } elsif ($? & 127) { - Panic( $rc, sprintf( "$C[0]: died with signal %d, %s coredump\n", + Panic( $fatal, sprintf( "$C[0]: died with signal %d, %s coredump\n", ($? & 127), ($? & 128) ? 'with' : 'without')); } elsif ( $? >> 8 != 0 ) { - Panic( $rc, "$C[0]: failed\n"); + Panic( $fatal, "$C[0]: failed\n"); + } +} + +sub Purge($) { + my( $d) = @_; + if ( $keep ) { + Info( 1, "## skip removal of old files from '$d'\n"); + return 0; + } + Info( 1, "## remove old files from '$d'\n"); + my @F = glob( "$d/*"); + foreach my $f ( @F ) { + next if ( $f =~ m{.*/elilo.(conf|efi)$} ); + Info( 1, "> rm $f\n"); + next if ($test); + unlink( $f); } } @@ -250,24 +303,24 @@ sub isMP($) { my ( $d) = @_; - Info( 3, "### isMP($d):\n"); - foreach my $f ( ("/proc/mounts", "/etc/mtab") ) { - Info( 4, "#### looking in $f\n"); + my @I = ("/proc/mounts", "/etc/mtab"); + Info( 3, "### isMP($d):"); + foreach my $f ( @I ) { open( IN, "< $f") || next; while ( <IN> ) { chomp; my @F = split; if ( $F[1] eq $d ) { - Info( 3, "### found in '$f' line $. => true\n"); + Info( 3, " found in '$f' line $. => true\n"); close( IN); return( 1); } } close( IN); - Info( 3, "### not found in $f => false\n"); + Info( 3, " not found in '$f' => false\n"); return( 0); } - Info( 3, "### no info available => false\n"); + Info( 3, " not found in [" . join( ", ", @I) . "] => false\n"); return( 0); } @@ -282,22 +335,36 @@ pod2usage(2) unless ( GetOptions( \%Opt, 'help|h', 'man|m', 'version|V', 'verbose|v+', - 'test|t', 'purge') && ! $Opt{'help'} ); + 'test|t', 'keep|k') && ! $Opt{'help'} ); Version() if ( $Opt{'version'} ); pod2usage(-exitstatus => 0, -verbose => 2) if ( $Opt{'man'} ); pod2usage(1) if ( $Opt{'help'} ); $test = 1 if ( $Opt{'test'} ); + $keep = 1 if ( $Opt{'keep'} ); $verbose += $Opt{'verbose'} if ( $Opt{'verbose'} ); } -# try to read variables $Sconf +# run-time init +if ( $Arch =~ m{ARCH} ) { + chomp( $Arch = qx{uname -m}); + Info( 3, "### Arch: '$Arch'\n"); +} +if ( $Dlib =~ m{LIBEXECDIR} ) { + $Dlib = "$dbg/usr/lib" . (($Arch eq "x86_64") ? "64/" : "/"); + $Dlibold = $Dlib . "elilo"; + $Dlib = $Dlib . "efi"; + $Dlib = $Dlibold if (! -r "$Dlib/elilo.efi" && -r "$Dlibold/elilo.efi"); + Info( 3, "### Dlib: '$Dlib'\n"); +} + +# try to read variables from $Sconf %Sconf = Parse( $Sconf); # check environment if ( exists( $Sconf{"efi-mountpoint"}) ) { $MP = $dbg . $Sconf{"efi-mountpoint"}; - Panic( 1, "EFI partions specification in $Sconf invalid.\n") + Panic( 2, "EFI partition specification in $Sconf invalid.\n") unless ( -d $MP ); # or is it "$MP/efi"? } elsif ( -d $MPnew . "/efi/" . $VD || isMP($MPnew) ) { $MP = $MPnew; @@ -305,7 +372,7 @@ $MP = $MPold; } else { Info( 1, "## Neither new ($MPnew/efi/$VD) nor old ($MPold/efi/$VD)?\n"); - Panic( 2, "EFI partiton not found.\n"); + Panic( 2, "EFI partition not found.\n"); } Info( 2, "## Mount-point '$MP'...\n"); if ( exists( $Sconf{"vendor-directory"}) ) { @@ -315,12 +382,15 @@ } $D = $MP . "/efi/" . $VD; Info( 1, "## Using '$D'...\n"); -System( 1, "mkdir", "-p", $D) unless ( -d $D ); +System( 2, "mkdir", "-p", $D) unless ( -d $D ); if ( -r $Sconf ) { # extract kernels and initrds and write fixed .conf my @F = Transfer( $Sconf, $D); + # remove old files + Purge( $D); # copy stuff + Info( 1, "## copy new files to '$D'\n"); unshift @F, "$Dlib/elilo.efi"; foreach ( @F ) { Install( 0, "-p", $_, $D); @@ -329,12 +399,14 @@ InstallFPSWA( $MP); } elsif ( $MP eq $MPold && -r "$D/$Fconf" ) { # assume old setup with only '/vmlinuz' and '/initrd' - Install( 1, "-p", "$Dlib/elilo.efi", $D); + Install( 2, "-p", "$Dlib/elilo.efi", $D); InstallFPSWA( $MP); } elsif ( $MP eq $MPold ) { Panic( 2, "$D/$Fconf: not found\n"); -} else { +} elsif ( ! -e $Sconf ) { Panic( 2, "$Sconf: not found\n"); +} else { + Panic( 2, "$Sconf: not readable\n"); } if ( $warn > 0 ) { @@ -353,6 +425,7 @@ /sbin/elilo [options] Options: + -k --keep don't purge old files -t --test test only -v --verbose increase verbosity -h --help brief help message ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 dapl
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package dapl checked in at Mon Oct 27 23:56:17 CET 2008. -------- --- dapl/dapl.changes 2008-10-20 12:24:58.000000000 +0200 +++ /d/STABLE/dapl/dapl.changes 2008-10-27 20:13:35.237576000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 27 20:13:18 CET 2008 - jjolly(a)suse.de + +- Updated to v2.0.14 from OFED 1.4 rc3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- dapl-2.0.13.tar.bz2 New: ---- dapl-2.0.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dapl.spec ++++++ --- /var/tmp/diff_new_pack.L26820/_old 2008-10-27 23:55:59.000000000 +0100 +++ /var/tmp/diff_new_pack.L26820/_new 2008-10-27 23:55:59.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package dapl (Version 2.0.13) +# spec file for package dapl (Version 2.0.14) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,8 +21,8 @@ Name: dapl ExcludeArch: s390 s390x Summary: A Library for userspace access to RDMA devices using OS Agnostic DAT APIs -Version: 2.0.13 -Release: 2 +Version: 2.0.14 +Release: 1 License: BSD 3-Clause; GPL v2 or later; GPLv2 or later, CPLv1.0, BSD 3 Clause Group: System/Libraries Source0: %{name}-%{version}.tar.bz2 @@ -120,6 +120,7 @@ echo ofa-v2-ipath0-1 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"ipath0 1" ""' >> %_sysconfdir/dat.conf; echo ofa-v2-ipath0-2 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"ipath0 2" ""' >> %_sysconfdir/dat.conf; echo ofa-v2-ehca0-2 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"ehca0 1" ""' >> %_sysconfdir/dat.conf; +echo ofa-v2-iwarp u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 '"eth2 0" ""' >> %_sysconfdir/dat.conf; %postun /sbin/ldconfig @@ -142,11 +143,13 @@ %_libdir/*.so %changelog +* Mon Oct 27 2008 jjolly(a)suse.de +- Updated to v2.0.14 from OFED 1.4 rc3 * Mon Oct 20 2008 ihno(a)suse.de - Excludearch for s390 s390x * Fri Sep 12 2008 jjolly(a)suse.de - Updated to v2.0.13 from OFED 1.4 RC1 and changed from dapl2 to dapl -* Tue Apr 29 2008 crrodriguez(a)suse.de +* Mon Apr 28 2008 crrodriguez(a)suse.de - do not build unusable static libraries - fix -devel package requires * Mon Mar 03 2008 jjolly(a)suse.de ++++++ dapl-2.0.13-build_error.patch ++++++ --- /var/tmp/diff_new_pack.L26820/_old 2008-10-27 23:55:59.000000000 +0100 +++ /var/tmp/diff_new_pack.L26820/_new 2008-10-27 23:55:59.000000000 +0100 @@ -9,29 +9,33 @@ srcdir = @srcdir@ -@@ -3447,26 +3447,6 @@ +@@ -3447,30 +3447,6 @@ dist-hook: dapl.spec cp dapl.spec $(distdir) -install-exec-hook: -- if test -e $(sysconfdir)/dat.conf; then \ -- sed -e '/ofa-v2-.* u2/d' < $(sysconfdir)/dat.conf > /tmp/$$$$ofadapl; \ -- cp /tmp/$$$$ofadapl $(sysconfdir)/dat.conf; \ +- if ! test -d $(DESTDIR)$(sysconfdir); then \ +- mkdir -p $(DESTDIR)$(sysconfdir); \ - fi; \ -- echo ofa-v2-ib0 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 '"ib0 0" ""' >> $(sysconfdir)/dat.conf; \ -- echo ofa-v2-ib1 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 '"ib1 0" ""' >> $(sysconfdir)/dat.conf; \ -- echo ofa-v2-mthca0-1 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"mthca0 1" ""' >> $(sysconfdir)/dat.conf; \ -- echo ofa-v2-mthca0-2 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"mthca0 2" ""' >> $(sysconfdir)/dat.conf; \ -- echo ofa-v2-mlx4_0-1 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"mlx4_0 1" ""' >> $(sysconfdir)/dat.conf; \ -- echo ofa-v2-mlx4_0-2 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"mlx4_0 2" ""' >> $(sysconfdir)/dat.conf; -- echo ofa-v2-ipath0-1 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"ipath0 1" ""' >> $(sysconfdir)/dat.conf; \ -- echo ofa-v2-ipath0-2 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"ipath0 2" ""' >> $(sysconfdir)/dat.conf; -- echo ofa-v2-ehca0-2 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"ehca0 1" ""' >> $(sysconfdir)/dat.conf; +- if test -e $(DESTDIR)$(sysconfdir)/dat.conf; then \ +- sed -e '/ofa-v2-.* u2/d' < $(DESTDIR)$(sysconfdir)/dat.conf > /tmp/$$$$ofadapl; \ +- cp /tmp/$$$$ofadapl $(DESTDIR)$(sysconfdir)/dat.conf; \ +- fi; \ +- echo ofa-v2-ib0 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 '"ib0 0" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ +- echo ofa-v2-ib1 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 '"ib1 0" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ +- echo ofa-v2-mthca0-1 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"mthca0 1" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ +- echo ofa-v2-mthca0-2 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"mthca0 2" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ +- echo ofa-v2-mlx4_0-1 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"mlx4_0 1" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ +- echo ofa-v2-mlx4_0-2 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"mlx4_0 2" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ +- echo ofa-v2-ipath0-1 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"ipath0 1" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ +- echo ofa-v2-ipath0-2 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"ipath0 2" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ +- echo ofa-v2-ehca0-2 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 '"ehca0 1" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ +- echo ofa-v2-iwarp u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 '"eth2 0" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; - -uninstall-hook: -- if test -e $(sysconfdir)/dat.conf; then \ -- sed -e '/ofa-v2-.* u2/d' < $(sysconfdir)/dat.conf > /tmp/$$$$ofadapl; \ -- cp /tmp/$$$$ofadapl $(sysconfdir)/dat.conf; \ +- if test -e $(DESTDIR)$(sysconfdir)/dat.conf; then \ +- sed -e '/ofa-v2-.* u2/d' < $(DESTDIR)$(sysconfdir)/dat.conf > /tmp/$$$$ofadapl; \ +- cp /tmp/$$$$ofadapl $(DESTDIR)$(sysconfdir)/dat.conf; \ - fi; # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. ++++++ dapl-2.0.13.tar.bz2 -> dapl-2.0.14.tar.bz2 ++++++ ++++ 2004 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 compat-dapl
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package compat-dapl checked in at Mon Oct 27 23:55:51 CET 2008. -------- --- compat-dapl/compat-dapl.changes 2008-10-27 19:33:16.000000000 +0100 +++ /d/STABLE/compat-dapl/compat-dapl.changes 2008-10-27 22:55:18.848146000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 27 22:55:14 CET 2008 - ro(a)suse.de + +- fix build on ia64 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- compat-dapl-ia64_buildfix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compat-dapl.spec ++++++ --- /var/tmp/diff_new_pack.y26159/_old 2008-10-27 23:55:25.000000000 +0100 +++ /var/tmp/diff_new_pack.y26159/_new 2008-10-27 23:55:25.000000000 +0100 @@ -21,11 +21,12 @@ Name: compat-dapl Summary: Userspace RDMA API (supports DAT 1.2 specification) Version: 1.2.11 -Release: 1 +Release: 2 License: BSD 3-Clause; GPL v2 or later Group: System/Libraries Source0: %{name}-%{version}.tar.bz2 Patch1: compat-dapl-1.2.10-build_errors.patch +Patch2: compat-dapl-ia64_buildfix.patch # Patch2: dapl.atomic.patch # Patch3: dapl.arch.patch Url: http://www.openfabrics.org @@ -86,6 +87,7 @@ %prep %setup -q %patch1 +%patch2 # %patch2 -p1 # %patch3 -p1 @@ -146,6 +148,8 @@ %_libdir/libdat.so %changelog +* Mon Oct 27 2008 ro(a)suse.de +- fix build on ia64 * Mon Oct 27 2008 jjolly(a)suse.de - Updated to v1.2.11 from OFED 1.4 rc3 - Updated the build error patch ++++++ compat-dapl-ia64_buildfix.patch ++++++ --- dapl/udapl/linux/dapl_osd.h +++ dapl/udapl/linux/dapl_osd.h @@ -79,7 +79,8 @@ #include <ctype.h> #if !defined(REDHAT_EL5) && (defined(__ia64__)) -#include <asm/atomic.h> +#include <asm/intrinsics.h> +#include <linux/types.h> #endif /* Useful debug definitions */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 compat-dapl
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package compat-dapl checked in at Mon Oct 27 23:55:02 CET 2008. -------- --- compat-dapl/compat-dapl.changes 2008-09-12 10:41:08.000000000 +0200 +++ /d/STABLE/compat-dapl/compat-dapl.changes 2008-10-27 19:33:16.726864000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 27 19:32:23 CET 2008 - jjolly(a)suse.de + +- Updated to v1.2.11 from OFED 1.4 rc3 +- Updated the build error patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- compat-dapl-1.2.10.tar.bz2 New: ---- compat-dapl-1.2.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compat-dapl.spec ++++++ --- /var/tmp/diff_new_pack.B20774/_old 2008-10-27 23:51:28.000000000 +0100 +++ /var/tmp/diff_new_pack.B20774/_new 2008-10-27 23:51:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package compat-dapl (Version 1.2.10) +# spec file for package compat-dapl (Version 1.2.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: compat-dapl Summary: Userspace RDMA API (supports DAT 1.2 specification) -Version: 1.2.10 +Version: 1.2.11 Release: 1 License: BSD 3-Clause; GPL v2 or later Group: System/Libraries @@ -31,6 +31,7 @@ Url: http://www.openfabrics.org BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libibverbs-devel librdmacm-devel +ExcludeArch: s390 s390x %description Along with the OpenIB kernel drivers, libdat and libdapl provides a @@ -112,6 +113,7 @@ echo OpenIB-mthca0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 2" ""' >> %_sysconfdir/dat.conf; echo OpenIB-mlx4_0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 1" ""' >> %_sysconfdir/dat.conf; echo OpenIB-mlx4_0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 2" ""' >> %_sysconfdir/dat.conf; +echo OpenIB-iwarp u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"eth2 0" ""' >> %_sysconfdir/dat.conf; %postun /sbin/ldconfig @@ -144,6 +146,9 @@ %_libdir/libdat.so %changelog +* Mon Oct 27 2008 jjolly(a)suse.de +- Updated to v1.2.11 from OFED 1.4 rc3 +- Updated the build error patch * Fri Sep 12 2008 jjolly(a)suse.de - Updated to v1.2.10 and changed the package name to compat-dapl * Tue Mar 04 2008 jjolly(a)suse.de ++++++ compat-dapl-1.2.10-build_errors.patch ++++++ --- /var/tmp/diff_new_pack.B20774/_old 2008-10-27 23:51:28.000000000 +0100 +++ /var/tmp/diff_new_pack.B20774/_new 2008-10-27 23:51:28.000000000 +0100 @@ -1,35 +1,30 @@ --- Makefile.in +++ Makefile.in -@@ -14,7 +14,7 @@ - - @SET_MAKE@ - --# $Id: $ -+# $Id: Makefile.in,v 1.1 2008/09/09 21:03:10 jjolly Exp jjolly $ - - - srcdir = @srcdir@ -@@ -3206,24 +3206,6 @@ +@@ -3206,28 +3206,6 @@ dist-hook: dapl.spec cp dapl.spec $(distdir) -install-exec-hook: -- if test -e $(sysconfdir)/dat.conf; then \ +- if ! test -d $(DESTDIR)$(sysconfdir); then \ +- mkdir -p $(DESTDIR)$(sysconfdir); \ +- fi; \ +- if test -e $(DESTDIR)$(sysconfdir)/dat.conf; then \ - echo "exec-hook"; \ -- sed -e '/OpenIB-.*/d' < $(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \ -- cp /tmp/$$$$OpenIBdapl $(sysconfdir)/dat.conf; \ +- sed -e '/OpenIB-.*/d' < $(DESTDIR)$(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \ +- cp /tmp/$$$$OpenIBdapl $(DESTDIR)$(sysconfdir)/dat.conf; \ - fi; \ -- echo OpenIB-cma u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib0 0" ""' >> $(sysconfdir)/dat.conf; \ -- echo OpenIB-cma-1 u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib1 0" ""' >> $(sysconfdir)/dat.conf; \ -- echo OpenIB-mthca0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 1" ""' >> $(sysconfdir)/dat.conf; \ -- echo OpenIB-mthca0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 2" ""' >> $(sysconfdir)/dat.conf; \ -- echo OpenIB-mlx4_0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 1" ""' >> $(sysconfdir)/dat.conf; \ -- echo OpenIB-mlx4_0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 2" ""' >> $(sysconfdir)/dat.conf; +- echo OpenIB-cma u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib0 0" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ +- echo OpenIB-cma-1 u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib1 0" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ +- echo OpenIB-mthca0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 1" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ +- echo OpenIB-mthca0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 2" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ +- echo OpenIB-mlx4_0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 1" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ +- echo OpenIB-mlx4_0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 2" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ +- echo OpenIB-iwarp u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"eth2 0" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; - -uninstall-hook: -- if test -e $(sysconfdir)/dat.conf; then \ -- sed -e '/OpenIB-.* u1/d' < $(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \ -- cp /tmp/$$$$OpenIBdapl $(sysconfdir)/dat.conf; \ +- if test -e $(DESTDIR)$(sysconfdir)/dat.conf; then \ +- sed -e '/OpenIB-.* u1/d' < $(DESTDIR)$(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \ +- cp /tmp/$$$$OpenIBdapl $(DESTDIR)$(sysconfdir)/dat.conf; \ - fi; # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. ++++++ compat-dapl-1.2.10.tar.bz2 -> compat-dapl-1.2.11.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compat-dapl-1.2.10/ChangeLog new/compat-dapl-1.2.11/ChangeLog --- old/compat-dapl-1.2.10/ChangeLog 2008-09-02 00:53:09.000000000 +0200 +++ new/compat-dapl-1.2.11/ChangeLog 2008-10-03 14:45:09.000000000 +0200 @@ -1,3 +1,70 @@ +commit 0480c0c77988379cd125b4e9c90a2e2629fe8b19 +Author: Arlin Davis <arlin.r.davis(a)intel.com> +Date: Fri Oct 3 05:40:33 2008 -0700 + + dat.conf: add OpenIB-iwarp entry for iwarp devices + + Signed-off-by: Arlin Davis <ardavis(a)ichips.intel.com> + +commit 492e82a582debe5fc460c5a8e69727eaabaebcd6 +Author: Arlin Davis <arlin.r.davis(a)intel.com> +Date: Fri Oct 3 05:30:29 2008 -0700 + + dapl: adjust max_rdma_read_iov to 1 for query on iWARP devices + + iWarp spec allows only one iov on rdma reads + + Signed-off-by: Arlin Davis <ardavis(a)ichips.intel.com> + +commit 7ef6ffee2f03ed9db5839430a6e7cfd4204e8bef +Author: Arlin Davis <arlin.r.davis(a)intel.com> +Date: Wed Oct 1 08:18:04 2008 -0700 + + dtest: reduce default IOV's during dat_ep_create for iWARP devices + + iWarp adapters tend to have less IOV resources then IB adapters. + + Signed-off-by: Arlin Davis <ardavis(a)ichips.intel.com> + +commit 0f84c5abba2552b20a33ef4029bb08b37037bb6c +Author: Arlin Davis <arlin.r.davis(a)intel.com> +Date: Fri Sep 26 08:54:48 2008 -0700 + + Revert "Release 1.2.11" + + This reverts commit 536622b9a13d35902718d7bb6636fe8fe68dd4c4. + + need to add more fixes to release package. + +commit 536622b9a13d35902718d7bb6636fe8fe68dd4c4 +Author: Arlin Davis <arlin.r.davis(a)intel.com> +Date: Wed Sep 24 12:09:40 2008 -0700 + + Release 1.2.11 + + Signed-off-by: Arlin Davis <ardavis(a)ichips.intel.com> + +commit f8cffc13d43ea4a951363a0b578252c397c8bac7 +Author: Arlin Davis <arlin.r.davis(a)intel.com> +Date: Wed Sep 24 08:33:53 2008 -0700 + + build: $(DESTDIR) prepend needed on install hooks for dat.conf + + All install directives that automake creates automatically + have $(DESTDIR) prepended to them so that a make + DESTDIR=<some_path> install will work. The hand written + install hooks for dat.conf was missing DESTDIR. + + Signed-off-by: Doug Ledford <dledford(a)redhat.com> + +commit ec8e8ac767d7f3aeaa6ac53ed77ddc0d47600df5 +Author: Arlin Davis <arlin.r.davis(a)intel.com> +Date: Mon Sep 1 15:52:12 2008 -0700 + + Release 1.2.10 + + Signed-off by: Arlin Davis ardavis(a)ichips.intel.com + commit 68a166aa7ebf8944164c4befc91c437068db7633 Author: Arlin Davis <arlin.r.davis(a)intel.com> Date: Mon Sep 1 15:41:27 2008 -0700 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compat-dapl-1.2.10/configure new/compat-dapl-1.2.11/configure --- old/compat-dapl-1.2.10/configure 2008-09-02 00:53:31.000000000 +0200 +++ new/compat-dapl-1.2.11/configure 2008-10-03 14:46:11.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for compat-dapl 1.2.10 general(a)lists.openfabrics.org. +# Generated by GNU Autoconf 2.59 for compat-dapl 1.2.11 general(a)lists.openfabrics.org. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -421,8 +421,8 @@ # Identity of this package. PACKAGE_NAME='compat-dapl' PACKAGE_TARNAME='compat-dapl' -PACKAGE_VERSION='1.2.10 general(a)lists.openfabrics.org' -PACKAGE_STRING='compat-dapl 1.2.10 general(a)lists.openfabrics.org' +PACKAGE_VERSION='1.2.11 general(a)lists.openfabrics.org' +PACKAGE_STRING='compat-dapl 1.2.11 general(a)lists.openfabrics.org' PACKAGE_BUGREPORT='' ac_unique_file="dat/udat/udat.c" @@ -952,7 +952,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures compat-dapl 1.2.10 general(a)lists.openfabrics.org to adapt to many kinds of systems. +\`configure' configures compat-dapl 1.2.11 general(a)lists.openfabrics.org to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1018,7 +1018,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of compat-dapl 1.2.10 general(a)lists.openfabrics.org:";; + short | recursive ) echo "Configuration of compat-dapl 1.2.11 general(a)lists.openfabrics.org:";; esac cat <<\_ACEOF @@ -1158,7 +1158,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -compat-dapl configure 1.2.10 general(a)lists.openfabrics.org +compat-dapl configure 1.2.11 general(a)lists.openfabrics.org generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1172,7 +1172,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by compat-dapl $as_me 1.2.10 general(a)lists.openfabrics.org, which was +It was created by compat-dapl $as_me 1.2.11 general(a)lists.openfabrics.org, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1818,7 +1818,7 @@ # Define the identity of the package. PACKAGE=compat-dapl - VERSION=1.2.10 + VERSION=1.2.11 cat >>confdefs.h <<_ACEOF @@ -20213,7 +20213,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by compat-dapl $as_me 1.2.10 general(a)lists.openfabrics.org, which was +This file was extended by compat-dapl $as_me 1.2.11 general(a)lists.openfabrics.org, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20276,7 +20276,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -compat-dapl config.status 1.2.10 general(a)lists.openfabrics.org +compat-dapl config.status 1.2.11 general(a)lists.openfabrics.org configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compat-dapl-1.2.10/configure.in new/compat-dapl-1.2.11/configure.in --- old/compat-dapl-1.2.10/configure.in 2008-09-02 00:53:05.000000000 +0200 +++ new/compat-dapl-1.2.11/configure.in 2008-10-03 14:45:04.000000000 +0200 @@ -1,11 +1,11 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT(compat-dapl, 1.2.10 general(a)lists.openfabrics.org) +AC_INIT(compat-dapl, 1.2.11 general(a)lists.openfabrics.org) AC_CONFIG_SRCDIR([dat/udat/udat.c]) AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(compat-dapl, 1.2.10) +AM_INIT_AUTOMAKE(compat-dapl, 1.2.11) AM_PROG_LIBTOOL diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compat-dapl-1.2.10/dapl/common/dapl_evd_dequeue.c new/compat-dapl-1.2.11/dapl/common/dapl_evd_dequeue.c --- old/compat-dapl-1.2.10/dapl/common/dapl_evd_dequeue.c 2008-07-25 23:14:18.000000000 +0200 +++ new/compat-dapl-1.2.11/dapl/common/dapl_evd_dequeue.c 2008-09-24 21:29:20.000000000 +0200 @@ -71,6 +71,10 @@ DAT_EVENT *local_event; DAT_RETURN dat_status; + dapl_dbg_log (DAPL_DBG_TYPE_API, + "dapl_evd_dequeue (%p, %p)\n", + evd_handle, + event); DAPL_CNTR(DCNT_EVD_DEQUEUE); evd_ptr = (DAPL_EVD *)evd_handle; @@ -133,6 +137,9 @@ dapl_os_unlock ( &evd_ptr->header.lock ); bail: + dapl_dbg_log (DAPL_DBG_TYPE_RTN, + "dapl_evd_dequeue () returns 0x%x\n", + dat_status); return dat_status; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compat-dapl-1.2.10/dapl/openib_cma/dapl_ib_util.c new/compat-dapl-1.2.11/dapl/openib_cma/dapl_ib_util.c --- old/compat-dapl-1.2.10/dapl/openib_cma/dapl_ib_util.c 2008-09-01 23:02:13.000000000 +0200 +++ new/compat-dapl-1.2.11/dapl/openib_cma/dapl_ib_util.c 2008-10-03 14:45:09.000000000 +0200 @@ -506,7 +506,14 @@ ia_attr->transport_attr = NULL; ia_attr->num_vendor_attr = 0; ia_attr->vendor_attr = NULL; - ia_attr->max_iov_segments_per_rdma_read = dev_attr.max_sge; + /* iWARP spec. - 1 sge for RDMA reads */ + if (hca_ptr->ib_hca_handle->device->transport_type + == IBV_TRANSPORT_IWARP) + ia_attr->max_iov_segments_per_rdma_read = 1; + else + ia_attr->max_iov_segments_per_rdma_read = + dev_attr.max_sge; + ia_attr->max_iov_segments_per_rdma_write = dev_attr.max_sge; /* save rd_atom for peer validation during connect requests */ hca_ptr->ib_trans.max_rdma_rd_in = dev_attr.max_qp_rd_atom; @@ -538,7 +545,13 @@ ep_attr->max_request_iov = dev_attr.max_sge; ep_attr->max_rdma_read_in = dev_attr.max_qp_rd_atom; ep_attr->max_rdma_read_out= dev_attr.max_qp_init_rd_atom; - ep_attr->max_rdma_read_iov= dev_attr.max_sge; + /* iWARP spec. - 1 sge for RDMA reads */ + if (hca_ptr->ib_hca_handle->device->transport_type + == IBV_TRANSPORT_IWARP) + ep_attr->max_rdma_read_iov = 1; + else + ep_attr->max_rdma_read_iov = dev_attr.max_sge; + ep_attr->max_rdma_write_iov= dev_attr.max_sge; dapl_log(DAPL_DBG_TYPE_UTIL, "dapl_query_hca: MAX msg %llu dto %d iov %d" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compat-dapl-1.2.10/dapl.spec new/compat-dapl-1.2.11/dapl.spec --- old/compat-dapl-1.2.10/dapl.spec 2008-09-02 00:54:06.000000000 +0200 +++ new/compat-dapl-1.2.11/dapl.spec 2008-10-03 14:47:24.000000000 +0200 @@ -32,7 +32,7 @@ # # $Id: $ Name: compat-dapl -Version: 1.2.10 +Version: 1.2.11 Release: 1%{?dist} Summary: A Library for userspace access to RDMA devices using OS Agnostic DAT API v1.2. @@ -83,6 +83,7 @@ make DESTDIR=%{buildroot} install # remove unpackaged files from the buildroot rm -f %{buildroot}%{_libdir}/*.la +rm -f %{buildroot}%{_sysconfdir}/*.conf %clean rm -rf %{buildroot} @@ -99,6 +100,7 @@ echo OpenIB-mthca0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 2" ""' >> %{_sysconfdir}/dat.conf echo OpenIB-mlx4_0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 1" ""' >> %{_sysconfdir}/dat.conf echo OpenIB-mlx4_0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 2" ""' >> %{_sysconfdir}/dat.conf +echo OpenIB-iwarp u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"eth2 0" ""' >> %{_sysconfdir}/dat.conf %postun /sbin/ldconfig @@ -129,6 +131,9 @@ %{_mandir}/man5/*.5* %changelog +* Fri Oct 07 2008 Arlin Davis <ardavis(a)ichips.intel.com> - 1.2.11 +- DAT/DAPL Version 1.2.11 Release 1, OFED 1.4 rc3 + * Mon Sep 01 2008 Arlin Davis <ardavis(a)ichips.intel.com> - 1.2.10 - DAT/DAPL Version 1.2.10 Release 1, OFED 1.4 rc1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compat-dapl-1.2.10/dapl.spec.in new/compat-dapl-1.2.11/dapl.spec.in --- old/compat-dapl-1.2.10/dapl.spec.in 2008-09-02 00:53:09.000000000 +0200 +++ new/compat-dapl-1.2.11/dapl.spec.in 2008-10-03 14:45:10.000000000 +0200 @@ -83,6 +83,7 @@ make DESTDIR=%{buildroot} install # remove unpackaged files from the buildroot rm -f %{buildroot}%{_libdir}/*.la +rm -f %{buildroot}%{_sysconfdir}/*.conf %clean rm -rf %{buildroot} @@ -99,6 +100,7 @@ echo OpenIB-mthca0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 2" ""' >> %{_sysconfdir}/dat.conf echo OpenIB-mlx4_0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 1" ""' >> %{_sysconfdir}/dat.conf echo OpenIB-mlx4_0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 2" ""' >> %{_sysconfdir}/dat.conf +echo OpenIB-iwarp u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"eth2 0" ""' >> %{_sysconfdir}/dat.conf %postun /sbin/ldconfig @@ -129,6 +131,9 @@ %{_mandir}/man5/*.5* %changelog +* Fri Oct 07 2008 Arlin Davis <ardavis(a)ichips.intel.com> - 1.2.11 +- DAT/DAPL Version 1.2.11 Release 1, OFED 1.4 rc3 + * Mon Sep 01 2008 Arlin Davis <ardavis(a)ichips.intel.com> - 1.2.10 - DAT/DAPL Version 1.2.10 Release 1, OFED 1.4 rc1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compat-dapl-1.2.10/Makefile.am new/compat-dapl-1.2.11/Makefile.am --- old/compat-dapl-1.2.10/Makefile.am 2008-09-01 21:47:46.000000000 +0200 +++ new/compat-dapl-1.2.11/Makefile.am 2008-10-03 14:45:10.000000000 +0200 @@ -383,22 +383,26 @@ cp dapl.spec $(distdir) install-exec-hook: - if test -e $(sysconfdir)/dat.conf; then \ + if ! test -d $(DESTDIR)$(sysconfdir); then \ + mkdir -p $(DESTDIR)$(sysconfdir); \ + fi; \ + if test -e $(DESTDIR)$(sysconfdir)/dat.conf; then \ echo "exec-hook"; \ - sed -e '/OpenIB-.*/d' < $(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \ - cp /tmp/$$$$OpenIBdapl $(sysconfdir)/dat.conf; \ + sed -e '/OpenIB-.*/d' < $(DESTDIR)$(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \ + cp /tmp/$$$$OpenIBdapl $(DESTDIR)$(sysconfdir)/dat.conf; \ fi; \ - echo OpenIB-cma u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib0 0" ""' >> $(sysconfdir)/dat.conf; \ - echo OpenIB-cma-1 u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib1 0" ""' >> $(sysconfdir)/dat.conf; \ - echo OpenIB-mthca0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 1" ""' >> $(sysconfdir)/dat.conf; \ - echo OpenIB-mthca0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 2" ""' >> $(sysconfdir)/dat.conf; \ - echo OpenIB-mlx4_0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 1" ""' >> $(sysconfdir)/dat.conf; \ - echo OpenIB-mlx4_0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 2" ""' >> $(sysconfdir)/dat.conf; + echo OpenIB-cma u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib0 0" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ + echo OpenIB-cma-1 u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib1 0" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ + echo OpenIB-mthca0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 1" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ + echo OpenIB-mthca0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 2" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ + echo OpenIB-mlx4_0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 1" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ + echo OpenIB-mlx4_0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 2" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ + echo OpenIB-iwarp u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"eth2 0" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; uninstall-hook: - if test -e $(sysconfdir)/dat.conf; then \ - sed -e '/OpenIB-.* u1/d' < $(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \ - cp /tmp/$$$$OpenIBdapl $(sysconfdir)/dat.conf; \ + if test -e $(DESTDIR)$(sysconfdir)/dat.conf; then \ + sed -e '/OpenIB-.* u1/d' < $(DESTDIR)$(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \ + cp /tmp/$$$$OpenIBdapl $(DESTDIR)$(sysconfdir)/dat.conf; \ fi; SUBDIRS = . test/dtest test/dapltest diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compat-dapl-1.2.10/Makefile.in new/compat-dapl-1.2.11/Makefile.in --- old/compat-dapl-1.2.10/Makefile.in 2008-09-02 00:53:30.000000000 +0200 +++ new/compat-dapl-1.2.11/Makefile.in 2008-10-03 14:46:10.000000000 +0200 @@ -3207,22 +3207,26 @@ cp dapl.spec $(distdir) install-exec-hook: - if test -e $(sysconfdir)/dat.conf; then \ + if ! test -d $(DESTDIR)$(sysconfdir); then \ + mkdir -p $(DESTDIR)$(sysconfdir); \ + fi; \ + if test -e $(DESTDIR)$(sysconfdir)/dat.conf; then \ echo "exec-hook"; \ - sed -e '/OpenIB-.*/d' < $(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \ - cp /tmp/$$$$OpenIBdapl $(sysconfdir)/dat.conf; \ + sed -e '/OpenIB-.*/d' < $(DESTDIR)$(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \ + cp /tmp/$$$$OpenIBdapl $(DESTDIR)$(sysconfdir)/dat.conf; \ fi; \ - echo OpenIB-cma u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib0 0" ""' >> $(sysconfdir)/dat.conf; \ - echo OpenIB-cma-1 u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib1 0" ""' >> $(sysconfdir)/dat.conf; \ - echo OpenIB-mthca0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 1" ""' >> $(sysconfdir)/dat.conf; \ - echo OpenIB-mthca0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 2" ""' >> $(sysconfdir)/dat.conf; \ - echo OpenIB-mlx4_0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 1" ""' >> $(sysconfdir)/dat.conf; \ - echo OpenIB-mlx4_0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 2" ""' >> $(sysconfdir)/dat.conf; + echo OpenIB-cma u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib0 0" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ + echo OpenIB-cma-1 u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib1 0" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ + echo OpenIB-mthca0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 1" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ + echo OpenIB-mthca0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 2" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ + echo OpenIB-mlx4_0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 1" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ + echo OpenIB-mlx4_0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 2" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \ + echo OpenIB-iwarp u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"eth2 0" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; uninstall-hook: - if test -e $(sysconfdir)/dat.conf; then \ - sed -e '/OpenIB-.* u1/d' < $(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \ - cp /tmp/$$$$OpenIBdapl $(sysconfdir)/dat.conf; \ + if test -e $(DESTDIR)$(sysconfdir)/dat.conf; then \ + sed -e '/OpenIB-.* u1/d' < $(DESTDIR)$(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \ + cp /tmp/$$$$OpenIBdapl $(DESTDIR)$(sysconfdir)/dat.conf; \ fi; # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compat-dapl-1.2.10/test/dapltest/include/dapl_proto.h new/compat-dapl-1.2.11/test/dapltest/include/dapl_proto.h --- old/compat-dapl-1.2.10/test/dapltest/include/dapl_proto.h 2008-08-26 19:26:26.000000000 +0200 +++ new/compat-dapl-1.2.11/test/dapltest/include/dapl_proto.h 2008-09-24 21:28:35.000000000 +0200 @@ -40,7 +40,6 @@ #include <stdlib.h> #include <stdarg.h> #include <string.h> -#include <netdb.h> #endif #include "dapl_mdep.h" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compat-dapl-1.2.10/test/dtest/dtest.c new/compat-dapl-1.2.11/test/dtest/dtest.c --- old/compat-dapl-1.2.10/test/dtest/dtest.c 2008-09-01 22:39:15.000000000 +0200 +++ new/compat-dapl-1.2.11/test/dtest/dtest.c 2008-10-03 14:45:05.000000000 +0200 @@ -94,7 +94,7 @@ /* Initial msg receive buf, RMR exchange, and Rdma-write notification */ #define MSG_BUF_COUNT 3 -#define MSG_IOV_COUNT 4 +#define MSG_IOV_COUNT 2 static DAT_RMR_TRIPLET rmr_recv_msg[MSG_BUF_COUNT]; static DAT_LMR_HANDLE h_lmr_recv_msg = DAT_HANDLE_NULL; static DAT_LMR_CONTEXT lmr_context_recv_msg; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 evolution-data-server
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package evolution-data-server checked in at Mon Oct 27 21:48:28 CET 2008. -------- --- GNOME/evolution-data-server/evolution-data-server.changes 2008-10-27 12:15:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/evolution-data-server/evolution-data-server.changes 2008-10-27 19:10:15.989463000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 27 19:05:54 CET 2008 - aj(a)suse.de + +- The package is called libevoldap-2_4-2. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-data-server.spec ++++++ --- /var/tmp/diff_new_pack.v10561/_old 2008-10-27 21:48:16.000000000 +0100 +++ /var/tmp/diff_new_pack.v10561/_new 2008-10-27 21:48:16.000000000 +0100 @@ -48,7 +48,7 @@ AutoReqProv: on Summary: Evolution Data Server Version: 2.24.1 -Release: 3 +Release: 4 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.24/%{name}-%{… # PATCH-FIX-UPSTREAM evolution-data-server-1.11.5-cert-auth-complete.patch bgo253574 -- Fix has been submitted to bgo. Patch3: evolution-data-server-1.11.5-cert-auth-complete.patch @@ -64,7 +64,7 @@ Requires: libsoup >= 2.2.6 Requires: mozilla-nss %if %suse_version > 1100 -Requires: libevoldap2 +Requires: libevoldap-2_4-2 %endif %description @@ -186,6 +186,8 @@ %{_datadir}/gtk-doc/html/* %changelog +* Mon Oct 27 2008 aj(a)suse.de +- The package is called libevoldap-2_4-2. * Mon Oct 27 2008 kukuk(a)suse.de - Requires to evoldap2-devel should be libevoldap2 for main package [bnc#439152]. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sysconfig
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package sysconfig checked in at Mon Oct 27 17:34:30 CET 2008. -------- --- sysconfig/sysconfig.changes 2008-10-21 11:24:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2008-10-27 16:42:49.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Oct 27 16:38:30 CET 2008 - mt(a)suse.de + +- version 0.71.9 +- Fixed to fallback to the static (yast2) settings in netconfig+NM + auto policy when NetworkManager does not provide any (bnc#434575). +- Fixes to set the NIS domainname correctly (bnc#437725). +- Fixed typo in netconfig.8 manual page (bnc#438647), updated it. +- Implemented DNS / modify_resolvconf to netconfig and dhcp client + NIS update hooks, cleaned up variables (bnc#434575, bnc#437725). +- Fixed erroneous move of yast2-network WRITE_HOSTNAME_TO_HOSTS + variable from network/dhcp to network/config while 11.1 beta. +- Removed commented out/obsolete rc.config related update hooks. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- netconfig-allow-nm-modify.diff netconfig-awk_filter-fix.diff netconfig-createtime-fix.diff netconfig-print-errors.diff network-remotefs-bug-433987.diff sysconfig-0.71.8-syntax.diff sysconfig-0.71.8.tar.bz2 New: ---- sysconfig-0.71.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.A29957/_old 2008-10-27 17:33:55.000000000 +0100 +++ /var/tmp/diff_new_pack.A29957/_new 2008-10-27 17:33:55.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package sysconfig (Version 0.71.8) +# spec file for package sysconfig (Version 0.71.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: sysconfig -Version: 0.71.8 -Release: 3 +Version: 0.71.9 +Release: 1 Summary: The sysconfig scheme Group: System/Base License: GPL v2 or later @@ -30,12 +30,6 @@ BuildRequires: sysfsutils BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 -Patch0: netconfig-awk_filter-fix.diff -Patch1: netconfig-createtime-fix.diff -Patch2: %name-%version-syntax.diff -Patch3: network-remotefs-bug-433987.diff -Patch4: netconfig-print-errors.diff -Patch5: netconfig-allow-nm-modify.diff %description This package provides the SuSE system configuration scheme. @@ -56,12 +50,6 @@ %prep %setup -n sysconfig-%{version} -%patch0 -p0 -%patch1 -p0 -%patch2 -p0 -%patch3 -p0 -%patch4 -p0 -%patch5 -p0 %build autoreconf --force --install @@ -116,7 +104,6 @@ %doc /usr/share/doc/packages/sysconfig %_mandir/*/* /usr/share/omc/svcinfo.d/network.xml -/var/adm/fillup-templates/remove_old_netconfig /var/adm/fillup-templates/sysconfig.dhcp-network /var/adm/fillup-templates/sysconfig.config-network %dir /var/lock/subsys/sysconfig @@ -127,14 +114,6 @@ fi # package update ? if [ ${1:-0} -gt 1 ]; then - # update from pre-9.1 to post-10.2 still needs to be checked - # update from pre-9.1? - #if ! [ -x sbin/getcfg ]; then - # cat > etc/sysconfig/network/__conversion_for_getconfig_needed__ <<-EOF - # This directory contains network configuration files that need to be - # converted by /etc/sysconfig/network/scripts/convert_for_getconfig. - # EOF - #fi # conversion of persistent name rules if [ -f /etc/udev/rules.d/30-net_persistent_names.rules ] ; then mv -v /etc/udev/rules.d/30-net_persistent_names.rules \ @@ -146,20 +125,6 @@ fi %post -#etc/sysconfig/network/scripts/oldnet2new.sh -## look if dhclient.rc.config is present -#if [ -f etc/rc.config.d/dhclient.rc.config ] ; then -# mv etc/rc.config.d/dhclient.rc.config etc/rc.config.d/dhcp.rc.config -#fi -## but prefer dhcpcd.rc.config as template (because it has more variables and is used more frequently) -#if [ -f etc/rc.config.d/dhcpcd.rc.config ] ; then -# mv etc/rc.config.d/dhcpcd.rc.config etc/rc.config.d/dhcp.rc.config -#fi -# update from pre-9.1 to post-10.2 still needs to be checked -#if [ -f etc/sysconfig/network/__conversion_for_getconfig_needed__ ]; then -# etc/sysconfig/network/scripts/convert_for_getconfig etc/sysconfig/network -# if [ $? = 0 ]; then rm etc/sysconfig/network/__conversion_for_getconfig_needed__; fi -#fi pushd etc/sysconfig/network >/dev/null for i in ifcfg-ppp* ifcfg-ippp* ifcfg-dsl* ifcfg-modem* ; do case $i in @@ -236,6 +201,44 @@ echo "Removing old autogenerated device configuration files:" rm -vf $(grep -sl "HOTPLUG-FLAG: *autocreated" /etc/sysconfig/hardware/hwcfg-*) rm -vf /etc/sysconfig/storage +# convert dns / modify_resolvconf to netconfig (update to >= 11.1) +if [ -e etc/sysconfig/network/scripts/convert_dns_to_netconfig ] ; then + ROOT=$PWD bash etc/sysconfig/network/scripts/convert_dns_to_netconfig +fi +if test -f etc/sysconfig/network/scripts/functions.rpm-utils ; then + # we provide own, improved variant of the remove_and_set suse + # rpm macro that is able to handle files in subdirs, ... + . etc/sysconfig/network/scripts/functions.rpm-utils + # conversion should be done by convert_dns_to_netconfig + # now remove dns variables obsoleted by netconfig + sysconfig_remove_and_set network/config no MODIFY_NAMED_CONF_DYNAMICALLY + sysconfig_remove_and_set network/config no MODIFY_RESOLV_CONF_DYNAMICALLY + sysconfig_remove_and_set network/config no MODIFY_RESOLV_CONF_STATIC_DNS + sysconfig_remove_and_set network/dhcp no DHCLIENT_MODIFY_RESOLV_CONF + sysconfig_remove_and_set network/dhcp no DHCLIENT_KEEP_SEARCHLIST + # convert & remove nis variables obsoleted by netconfig + sysconfig_remove_and_set network/dhcp yes DHCLIENT_MODIFY_NIS_CONF + eval `grep "^[[:space:]]*NETCONFIG_NIS_POLICY=" etc/sysconfig/network/config` + if test "x$DHCLIENT_MODIFY_NIS_CONF" = xno -a "$NETCONFIG_NIS_POLICY" = auto ; then + echo "Disabled NIS in netconfig due to DHCLIENT_MODIFY_NIS_CONF=no" + sed -e "s/^[[:space:]]*$NETCONFIG_NIS_POLICY$=.*/\1=''/g" \ + -i etc/sysconfig/network/config + fi + sysconfig_remove_and_set network/dhcp yes DHCLIENT_SET_DOMAINNAME + eval `grep "^[[:space:]]*NETCONFIG_NIS_SETDOMAINNAME=" etc/sysconfig/network/config` + if test "x$DHCLIENT_SET_DOMAINNAME" = xno -a "$NETCONFIG_NIS_SETDOMAINNAME" = yes ; then + echo "Disabled setting of NIS domainname in netconfig due to DHCLIENT_SET_DOMAINNAME=no" + sed -e "s/^[[:space:]]*$NETCONFIG_NIS_SETDOMAINNAME$=.*/\1='no'/g" \ + -i etc/sysconfig/network/config + fi + # remove nis variables obsoleted by netconfig (new default is "yes") + sysconfig_remove_and_set network/dhcp no DHCLIENT_MODIFY_NTP_CONF + # remove another obsolete variables + sysconfig_remove_and_set network/dhcp no DHCLIENT_ADDITIONAL_OPTIONS + sysconfig_remove_and_set network/dhcp no DHCLIENT_SCRIPT_EXE + # erroneous move from network/dhcp to network/config while 11.1 beta + sysconfig_remove_and_set network/config no WRITE_HOSTNAME_TO_HOSTS +fi %postun %{insserv_cleanup} @@ -245,6 +248,17 @@ %{stop_on_removal network} %changelog +* Mon Oct 27 2008 mt(a)suse.de +- version 0.71.9 +- Fixed to fallback to the static (yast2) settings in netconfig+NM + auto policy when NetworkManager does not provide any (bnc#434575). +- Fixes to set the NIS domainname correctly (bnc#437725). +- Fixed typo in netconfig.8 manual page (bnc#438647), updated it. +- Implemented DNS / modify_resolvconf to netconfig and dhcp client + NIS update hooks, cleaned up variables (bnc#434575, bnc#437725). +- Fixed erroneous move of yast2-network WRITE_HOSTNAME_TO_HOSTS + variable from network/dhcp to network/config while 11.1 beta. +- Removed commented out/obsolete rc.config related update hooks. * Tue Oct 21 2008 mt(a)suse.de - Fixed changes file to use bnc#433780 instead of bnc#428978 * Mon Oct 20 2008 mt(a)suse.de @@ -685,7 +699,7 @@ * Thu Aug 17 2006 kukuk(a)suse.de - Remove undocumented ifservices.template directory to break down build dependencies. -* Tue Jun 27 2006 schwab(a)suse.de +* Mon Jun 26 2006 schwab(a)suse.de - Handle aoa-soundbus subsystem. * Fri Jun 02 2006 zoz(a)suse.de - Changed comment for LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY; now @@ -702,7 +716,7 @@ * Tue May 30 2006 zoz(a)suse.de - Don't load module 'bonding' multiple times but create and delete bonding interfaces via sysfs attribute. (Bug 157936) -* Tue May 23 2006 poeml(a)suse.de +* Mon May 22 2006 poeml(a)suse.de - fix dhcpcd-hook so that syslog picks up a changed hostname during bootup, by reloading syslog. The reload was already being done during IP address change ("renew state") but not during "up" @@ -1681,7 +1695,7 @@ - rename wlan configuration files, that could not be converted to mac address / bus id to 'ifcfg-type-wlan' - ifcfg-pci-... --> ifcfg-bus-pci-... [#38248] -* Sun Apr 04 2004 poeml(a)suse.de +* Sat Apr 03 2004 poeml(a)suse.de - more work on convert_for_getconfig [#35445]: - try to mount sysfs if it is not mounted - do not ignore 'unconfigured' NICs -- the UNIQUE string matches, @@ -2402,7 +2416,7 @@ * Tue Aug 06 2002 ihno(a)suse.de - New Parameter WAIT_FOR_INTERFACES to wait for interfaces to be configured. Default is nowait (empty value) -* Sat Aug 03 2002 poeml(a)suse.de +* Fri Aug 02 2002 poeml(a)suse.de - package Olaf's ifup-802.1q * Thu Aug 01 2002 mmj(a)suse.de - Add PreReq: for fillup_and_insserv @@ -2633,7 +2647,7 @@ - Lots of script updates, version 0.23.5 * Tue Feb 05 2002 poeml(a)suse.de - autoconfiscated, version 0.23.4 -* Tue Feb 05 2002 poeml(a)suse.de +* Mon Feb 04 2002 poeml(a)suse.de - update ifup-dhcp - add link /sbin/ifstatus-dhcp -> ifup-dhcp - add modify_resolvconf and man page (moved from aaa_base package) ++++++ sysconfig-0.71.8.tar.bz2 -> sysconfig-0.71.9.tar.bz2 ++++++ ++++ 3046 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 yast2-wagon
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package yast2-wagon checked in at Mon Oct 27 17:34:26 CET 2008. -------- --- yast2-wagon/yast2-wagon.changes 2008-10-17 13:17:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-wagon/yast2-wagon.changes 2008-10-27 17:11:17.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Oct 27 12:52:02 CET 2008 - locilka(a)suse.cz + +- Calling inst_prepareprogress before inst_kickoff (bnc #438848). +- 2.17.3 + +------------------------------------------------------------------- +Wed Oct 22 19:15:47 CEST 2008 - locilka(a)suse.cz + +- Enhanced self-update mechanism to use packages as fallback when + no patches (for package management) are installable. + +------------------------------------------------------------------- +Fri Oct 17 14:18:43 CEST 2008 - locilka(a)suse.cz + +- PatchCD control file moved here from yast2-online-update. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-wagon-2.17.2.tar.bz2 New: ---- yast2-wagon-2.17.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-wagon.spec ++++++ --- /var/tmp/diff_new_pack.d29294/_old 2008-10-27 17:33:15.000000000 +0100 +++ /var/tmp/diff_new_pack.d29294/_new 2008-10-27 17:33:15.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-wagon (Version 2.17.2) +# spec file for package yast2-wagon (Version 2.17.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,17 +19,18 @@ Name: yast2-wagon -Version: 2.17.2 +Version: 2.17.3 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-wagon-2.17.2.tar.bz2 +Source0: yast2-wagon-2.17.3.tar.bz2 Prefix: /usr # Possibility to restart YaST Requires: yast2 >= 2.17.33 -Requires: yast2-online-update +Requires: yast2-online-update >= 2.17.9 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update +Provides: yast2-online-update:/usr/share/applications/YaST2/cd_update.desktop BuildArch: noarch Summary: YaST2 - Migration Tool for Service Packs @@ -45,7 +46,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-wagon-2.17.2 +%setup -n yast2-wagon-2.17.3 %build %{prefix}/bin/y2tool y2autoconf @@ -75,10 +76,18 @@ /usr/share/YaST2/modules/*.ycp /usr/share/YaST2/modules/*.ybc %dir /usr/share/YaST2/control +%{prefix}/share/applications/YaST2/*.desktop /usr/share/YaST2/control/online_migration.xml %doc %{prefix}/share/doc/packages/yast2-wagon - %changelog +* Mon Oct 27 2008 locilka(a)suse.cz +- Calling inst_prepareprogress before inst_kickoff (bnc #438848). +- 2.17.3 +* Wed Oct 22 2008 locilka(a)suse.cz +- Enhanced self-update mechanism to use packages as fallback when + no patches (for package management) are installable. +* Fri Oct 17 2008 locilka(a)suse.cz +- PatchCD control file moved here from yast2-online-update. * Fri Oct 17 2008 locilka(a)suse.cz - Added wagon_update_proposal client and DUP proposal functions in Wagon module. ++++++ yast2-wagon-2.17.2.tar.bz2 -> yast2-wagon-2.17.3.tar.bz2 ++++++ ++++ 3326 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-wagon-2.17.2/src/clients/wagon_selfupdate.ycp new/yast2-wagon-2.17.3/src/clients/wagon_selfupdate.ycp --- old/yast2-wagon-2.17.2/src/clients/wagon_selfupdate.ycp 2008-10-14 15:47:19.000000000 +0200 +++ new/yast2-wagon-2.17.3/src/clients/wagon_selfupdate.ycp 2008-10-22 19:13:55.000000000 +0200 @@ -22,6 +22,7 @@ import "Wagon"; import "FileUtils"; import "ProductControl"; + import "ProductFeatures"; import "Internet"; import "OnlineUpdateCallbacks"; import "Popup"; @@ -32,6 +33,112 @@ return `back; } + boolean SolverRunWithFeedback () { + UI::OpenDialog (`Label (_("Solving the package dependencies..."))); + boolean ret = Pkg::PkgSolve (false); + UI::CloseDialog(); + + return ret; + } + + /** + * Tries to upgrade packages got as parameter. + * + * @param list <string> of packages + */ + integer UpgradePackages (list <string> & packages) { + // Check the input + packages = filter (string one_package, packages, { + return (one_package != nil && one_package != ""); + }); + + integer pkgs_affected = 0; + + map <string, list <string> > installed_versions = $[]; + + boolean some_packages_selected = false; + + foreach (string one_package, packages, { + // All packages of the given name + list <map <string, any> > respros = Pkg::ResolvableProperties (one_package, `package, ""); + + // All installed packages of the given name + list <map <string, any> > installed = filter (map <string, any> one_respro, respros, { + return (one_respro["status"]:`unknown == `installed); + }); + + // All available packages of the given name + list <map <string, any> > available = filter (map <string, any> one_respro, respros, { + return (one_respro["status"]:`unknown == `available); + }); + + // Such package is not installed + if (size (installed) < 1) { + y2milestone ("Package %1 is not installed", one_package); + return; + } + + // Er, installed but not available + if (size (available) < 1) { + y2warning ("Package %1 is installed but not available", one_package); + return; + } + + // Remember the installed version(s) + installed_versions[one_package] = maplist (map <string,any> one_installed, installed, { + return one_installed["version"]:"unknown"; + }); + + // Force upgrade/install + y2milestone ("Selecting package %1 for installation", one_package); + if (Pkg::ResolvableInstall (one_package, `package) == true) { + some_packages_selected = true; + } else { + y2error ("Cannot install package %1", one_package); + } + }); + + if (some_packages_selected != true) { + y2milestone ("No packages have been selected for upgrade"); + return pkgs_affected; + } + + // Calling solver to select the best version + SolverRunWithFeedback(); + + y2milestone ("Some packages have been selected, checking..."); + + // Check whether the selected version is different to the already installed one + foreach (string one_package, list <string> previously_installed_versions, installed_versions, { + list <map <string, any> > respros = Pkg::ResolvableProperties (one_package, `package, ""); + + // All selected packages of the given name + list <map <string, any> > selected = filter (map <string, any> one_respro, respros, { + return (one_respro["status"]:`unknown == `selected); + }); + + // The package of a given name is selected + if (size (selected) > 0) { + boolean selection_differs = false; + + foreach (map <string, any> one_selected, selected, { + if (! contains (previously_installed_versions, one_selected["version"]:"some-version")) { + pkgs_affected = pkgs_affected + 1; + selection_differs = true; + break; + } + }); + + if (selection_differs != true) { + y2milestone ("Selection of packages doesn't differ, neutralizing package: %1", one_package); + Pkg::ResolvableNeutral (one_package, `package, false); + } + } + }); + + return pkgs_affected; + } + Wagon::InitPkg(); list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); @@ -42,8 +149,23 @@ // Here the update stack updates itself integer selected = Pkg::ResolvablePreselectPatches (`affects_pkg_manager); + // No patches selected + if (selected < 1) { + y2milestone ("There are no patches that would affect the package manager, trying packages..."); + + any pkgs = ProductFeatures::GetFeature ("software", "packages_affecting_pkg_manager"); + + if (pkgs == nil || pkgs == "" || pkgs == []) { + y2warning ("No packages_affecting_pkg_manager provided"); + } else { + list <string> packages = (list <string>) pkgs; + y2milestone ("Packages to upgrade: %1", packages); + selected = UpgradePackages (packages); + } + } + if (selected < 1) { - y2milestone ("There are no patches that would affect the package manager"); + y2milestone ("Neither patches nor packages for self-update have been selected"); return ret; } @@ -51,7 +173,7 @@ while (solved != true) { // Trying to solve automatically - solved = Pkg::PkgSolve (false); + solved = SolverRunWithFeedback(); symbol ret_sel = nil; // PkgSolve didn't report any problem @@ -60,9 +182,9 @@ ret = `restart_same_step; // There are some issues in selecting the patches } else { - repeat { + while (true) { // Try to solve them manually - UI::OpenDialog(`opt(`defaultsize), `PackageSelector (`id(`selector), `opt(`youMode))); + UI::OpenDialog(`opt(`defaultsize), `PackageSelector (`id(`selector), `opt(`summaryMode))); ret_sel = (symbol) UI::RunPkgSelection (`id(`selector)); UI::CloseDialog(); @@ -80,6 +202,7 @@ `yes_button )) { ret = `abort; + break; // Try again } else { continue; @@ -87,8 +210,15 @@ // Solved manually } else if (ret_sel == `accept) { ret = `restart_same_step; + break; } - } until (ret_sel == `cancel || ret_sel == `accept); + } + } + + if (ret == `abort) { + solved = nil; + y2warning ("Aborting..."); + break; } if (! Wagon::AcceptLicenses()) { @@ -97,8 +227,12 @@ } } - OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); - WFM::call ("online_update_install"); + if (solved == true) { + y2milestone ("Calling update..."); + OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); + any ret = WFM::call ("online_update_install"); + y2milestone ("Update returned: %1", ret); + } return ret; } 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-wagon-2.17.2/src/config/cd_update.desktop new/yast2-wagon-2.17.3/src/config/cd_update.desktop --- old/yast2-wagon-2.17.2/src/config/cd_update.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-wagon-2.17.3/src/config/cd_update.desktop 2008-10-17 14:12:07.000000000 +0200 @@ -0,0 +1,25 @@ +[Desktop Entry] +Type=Application +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Software; + +X-KDE-ModuleType=Library +X-KDE-RootOnly=true +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=wagon + +X-SuSE-YaST-Group=Software +X-SuSE-YaST-Argument=PatchCD +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst= +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInstResource= + +Icon=yast-cd_update +Exec=/sbin/yast2 wagon PatchCD + +Name=Patch CD Update +GenericName=Install patches from CD to correct and improve your existing installation +X-KDE-SubstituteUID=true +StartupNotify=true 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-wagon-2.17.2/src/config/Makefile.am new/yast2-wagon-2.17.3/src/config/Makefile.am --- old/yast2-wagon-2.17.2/src/config/Makefile.am 2008-09-25 16:07:25.000000000 +0200 +++ new/yast2-wagon-2.17.3/src/config/Makefile.am 2008-10-17 14:09:23.000000000 +0200 @@ -6,6 +6,6 @@ control_DATA = $(wildcard *.xml) -desktop_DATA = +desktop_DATA = $(wildcard *.desktop) EXTRA_DIST = $(desktop_DATA) $(control_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-wagon-2.17.2/src/config/online_migration.xml new/yast2-wagon-2.17.3/src/config/online_migration.xml --- old/yast2-wagon-2.17.2/src/config/online_migration.xml 2008-10-17 13:18:42.000000000 +0200 +++ new/yast2-wagon-2.17.3/src/config/online_migration.xml 2008-10-27 12:58:08.000000000 +0100 @@ -11,8 +11,8 @@ <textdomain>online-migration</textdomain> <globals> -  - <debug_workflow config:type="boolean">true</debug_workflow> +  + <debug_workflow config:type="boolean">false</debug_workflow> <default_subworkflow>manual</default_subworkflow> @@ -26,6 +26,7 @@ <module>welcome</module> <module>update_online_mechanism</module> <module>suse_register_workflow</module> + <module>prepare_progress</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -52,6 +53,7 @@ <module>suse_register_workflow</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> + <module>prepare_progress</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -74,6 +76,7 @@  <module>update_url_dialog</module> <module>suse_register_workflow</module> + <module>prepare_progress</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -97,6 +100,7 @@ <module>update_url_dialog</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> + <module>prepare_progress</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -117,6 +121,7 @@ <module>welcome</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> + <module>prepare_progress</module> <module>wagon_kickoff</module> <module>wagon_rpmcopy</module> <module>suseconfig_after_update</module> @@ -130,6 +135,20 @@ </subworkflows> </globals> + <software> +  + <packages_affecting_pkg_manager config:type="list"> + <package>yast2-wagon</package> + <package>yast2-online-update</package> + <package>yast2-pkg-bindings</package> + <package>libzypp</package> + </packages_affecting_pkg_manager> + </software> + <proposals config:type="list"> <proposal> <label>Distribution Upgrade Settings</label> @@ -236,6 +255,12 @@ <proposal>wagon_proposal</proposal> </module> +  + <module> + <name>prepare_progress</name> + <execute>inst_prepareprogress</execute> + </module> + <module> <name>wagon_kickoff</name> <execute>inst_kickoff</execute> 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-wagon-2.17.2/src/modules/Wagon.ycp new/yast2-wagon-2.17.3/src/modules/Wagon.ycp --- old/yast2-wagon-2.17.2/src/modules/Wagon.ycp 2008-10-17 13:06:45.000000000 +0200 +++ new/yast2-wagon-2.17.3/src/modules/Wagon.ycp 2008-10-17 14:09:58.000000000 +0200 @@ -118,6 +118,11 @@ */ global void Init (map <string, any> commands) { if (haskey (commands, "command")) { + if (commands["command"]:"" == "cd_update") { + // Backward compatibility + commands["command"] = "PatchCD"; + } + y2milestone ("Starting workflow defined: %1", commands["command"]:""); SetUpdateWorkflow (commands["command"]:""); } else { 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-wagon-2.17.2/VERSION new/yast2-wagon-2.17.3/VERSION --- old/yast2-wagon-2.17.2/VERSION 2008-10-17 13:17:38.000000000 +0200 +++ new/yast2-wagon-2.17.3/VERSION 2008-10-27 17:17:46.000000000 +0100 @@ -1 +1 @@ -2.17.2 +2.17.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit skelcd-control-openSUSE
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package skelcd-control-openSUSE checked in at Mon Oct 27 17:33:01 CET 2008. -------- --- skelcd-control-openSUSE/skelcd-control-openSUSE.changes 2008-10-13 14:39:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/skelcd-control-openSUSE/skelcd-control-openSUSE.changes 2008-10-27 17:28:47.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Oct 27 17:27:38 CET 2008 - locilka(a)suse.cz + +- Desktop 'startkde4' replaced with 'startkde' (bnc #438212). +- Calling inst_prepareprogress also during Upgrade, all control + files changed (bnc #438848). +- Removing label for user_non_interactive (bnc #401319). +- Disabling users and auth in LiveCD second stage (bnc #435965). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.n27583/_old 2008-10-27 17:32:41.000000000 +0100 +++ /var/tmp/diff_new_pack.n27583/_new 2008-10-27 17:32:41.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-control-openSUSE (Version 2008.10.13) +# spec file for package skelcd-control-openSUSE (Version 2008.10.27) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ License: YaST License Group: Metapackages AutoReqProv: off -Version: 2008.10.13 +Version: 2008.10.27 Release: 1 Summary: SuSE Linux Professional Control file BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,6 +64,12 @@ /CD1/control.xml %changelog +* Mon Oct 27 2008 locilka(a)suse.cz +- Desktop 'startkde4' replaced with 'startkde' (bnc #438212). +- Calling inst_prepareprogress also during Upgrade, all control + files changed (bnc #438848). +- Removing label for user_non_interactive (bnc #401319). +- Disabling users and auth in LiveCD second stage (bnc #435965). * Mon Oct 13 2008 locilka(a)suse.cz - Fixed text in openSUSE control file (bnc #432911). * Wed Oct 08 2008 locilka(a)suse.cz @@ -328,7 +334,7 @@ - added congratulate text to the control file (#170881) * Thu Apr 20 2006 mvidner(a)suse.cz - added globals/disable_register_w3m (#167255, jdsn) -* Sat Apr 15 2006 jsrain(a)suse.cz +* Fri Apr 14 2006 jsrain(a)suse.cz - removed update system selection from update proposal (#165832) * Fri Apr 14 2006 jsrain(a)suse.cz - changed control files according to (#165509 @@ -349,7 +355,7 @@ - changed title for registration in installation workflow * Thu Mar 09 2006 mvidner(a)suse.cz - added network/startmode=ifplugd (#156388). -* Wed Mar 08 2006 jsrain(a)suse.cz +* Tue Mar 07 2006 jsrain(a)suse.cz - adapted for online update (jdsn) * Thu Mar 02 2006 jsrain(a)suse.cz - added suse_resgister to installation workflow @@ -448,7 +454,7 @@ * Thu Apr 01 2004 nashif(a)suse.de - Added missing workflow step to shut network down in second phase of installation (#37546, #37763) -* Thu Apr 01 2004 nashif(a)suse.de +* Wed Mar 31 2004 nashif(a)suse.de - removed network proposal from update workflow * Wed Mar 31 2004 nashif(a)suse.de - show warning about suboptimal distribution ++++++ control.xml ++++++ --- /var/tmp/diff_new_pack.n27583/_old 2008-10-27 17:32:41.000000000 +0100 +++ /var/tmp/diff_new_pack.n27583/_new 2008-10-27 17:32:41.000000000 +0100 @@ -235,8 +235,8 @@ <one_supported_desktop> <name>kde</name> -  - <desktop>startkde4</desktop> +  + <desktop>startkde</desktop> <label_id>desktop_kde</label_id> <logon>kdm4</logon> <cursor>DMZ</cursor> @@ -859,6 +859,14 @@ <execute>inst_proposal</execute> <proposal>initial</proposal> </module> +  + <module> + <label>Perform Installation</label> + <name>prepareprogress</name> + </module> <module> <label>Perform Update</label> <name>do_resize</name> @@ -1167,7 +1175,6 @@ <name>user</name> </module> <module> - <label>Users</label> <name>user_non_interactive</name>  <execute>inst_user</execute> @@ -1218,6 +1225,8 @@ <enable_back>no</enable_back> <enable_next>no</enable_next> </module> + <module> - <label>Users</label> <name>user_non_interactive</name>  <execute>inst_user</execute> </module> <module> - <label>Users</label> <name>live_cleanup</name> <enable_back>no</enable_back> </module> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 squid3
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package squid3 checked in at Mon Oct 27 17:32:52 CET 2008. -------- --- squid3/squid3.changes 2008-10-13 14:53:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/squid3/squid3.changes 2008-10-27 16:49:18.347878000 +0100 @@ -1,0 +2,13 @@ +Mon Oct 27 16:48:56 CET 2008 - kssingvo(a)suse.de + +- update to squid-3.0.STABLE10, fixes mainly: + bad assert in forwarding + Segfault on failed TCP DNS query + DNS requests getting stuck in idns queue + FTP PUT gives bad gateway + ... and few minor ones. For complete list see: + http://www.squid-cache.org/Versions/v3/3.0/changesets/SQUID_3_0_STABLE10.ht… +- removed old patches, which were included upstream now +- renamed sysconfig.squid to sysconfig.squid3 (bnc#439006) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- b8898.patch b8900.patch b8902.patch b8904.patch b8905.patch b8906.patch b8907.patch squid-3.0.STABLE9-RELEASENOTES.html squid-3.0.STABLE9.tar.bz2 New: ---- squid-3.0.STABLE10-RELEASENOTES.html squid-3.0.STABLE10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid3.spec ++++++ --- /var/tmp/diff_new_pack.k27281/_old 2008-10-27 17:32:35.000000000 +0100 +++ /var/tmp/diff_new_pack.k27281/_new 2008-10-27 17:32:35.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package squid3 (Version 3.0.STABLE9) +# spec file for package squid3 (Version 3.0.STABLE10) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,8 +21,8 @@ BuildRequires: db-devel expat gcc-c++ krb5-devel libexpat-devel libxml2-devel BuildRequires: openldap2-devel opensp-devel pam-devel sharutils Summary: Squid Version 3 WWW Proxy Server -Version: 3.0.STABLE9 -Release: 5 +Version: 3.0.STABLE10 +Release: 1 License: GPL v2 or later Url: http://www.squid-cache.org/Versions/v3 Group: Productivity/Networking/Web/Proxy @@ -51,15 +51,15 @@ # please read every file if there is interest about what the patch changes # or just visit: http://www.squid-cache.org/Versions/v3/3.0/changesets/ # -Patch01: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8898.patch -Patch02: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8900.patch -Patch03: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8902.patch -Patch04: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8904.patch -Patch05: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8905.patch -Patch06: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8906.patch -Patch07: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8907.patch -# Patch08: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8741.patch -# Patch09: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8742.patch +# Patch01: http://www.squid-cache.org/Versions/v3/3.0/changesets/ +# Patch02: http://www.squid-cache.org/Versions/v3/3.0/changesets/ +# Patch03: http://www.squid-cache.org/Versions/v3/3.0/changesets/ +# Patch04: http://www.squid-cache.org/Versions/v3/3.0/changesets/ +# Patch05: http://www.squid-cache.org/Versions/v3/3.0/changesets/ +# Patch06: http://www.squid-cache.org/Versions/v3/3.0/changesets/ +# Patch07: http://www.squid-cache.org/Versions/v3/3.0/changesets/ +# Patch08: http://www.squid-cache.org/Versions/v3/3.0/changesets/ +# Patch09: http://www.squid-cache.org/Versions/v3/3.0/changesets/ # Patch10: http://www.squid-cache.org/Versions/v3/3.0/changesets/ # Patch11: http://www.squid-cache.org/Versions/v3/3.0/changesets/ # Patch12: http://www.squid-cache.org/Versions/v3/3.0/changesets/ @@ -160,13 +160,13 @@ %prep %setup -q -n squid-%{version} %patch -p1 -%patch1 -p0 -%patch2 -p0 -%patch3 -p0 -%patch4 -p0 -%patch5 -p0 -%patch6 -p0 -%patch7 -p0 +# %patch1 -p0 +# %patch2 -p0 +# %patch3 -p0 +# %patch4 -p0 +# %patch5 -p0 +# %patch6 -p0 +# %patch7 -p0 # %patch8 -p0 # %patch9 -p0 # %patch10 -p1 @@ -375,7 +375,7 @@ done ln -fs /usr/share/squid/errors/English %{buildroot}%{squidconfdir}/errors install -d -m 755 $RPM_BUILD_ROOT/var/adm/fillup-templates -install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.squid +install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.squid3 # remove unpackaged files rm -f $RPM_BUILD_ROOT/usr/man/man8/*.8 @@ -460,7 +460,7 @@ %_sbindir/yp_auth /usr/share/squid/mime.conf /usr/share/squid/mime.conf.default -/var/adm/fillup-templates/sysconfig.squid +/var/adm/fillup-templates/sysconfig.squid3 %dir %{_libdir}/squid %{_libdir}/squid/cachemgr.cgi %doc %{_mandir}/man*/* @@ -472,6 +472,16 @@ #%doc squid_ldapauth.conf %changelog +* Mon Oct 27 2008 kssingvo(a)suse.de +- update to squid-3.0.STABLE10, fixes mainly: + bad assert in forwarding + Segfault on failed TCP DNS query + DNS requests getting stuck in idns queue + FTP PUT gives bad gateway + ... and few minor ones. For complete list see: + http://www.squid-cache.org/Versions/v3/3.0/changesets/SQUID_3_0_STABLE10.ht… +- removed old patches, which were included upstream now +- renamed sysconfig.squid to sysconfig.squid3 (bnc#439006) * Mon Oct 13 2008 kssingvo(a)suse.de - reenabled linux-netfilter in configure as seems to work now again * Thu Oct 02 2008 kssingvo(a)suse.de ++++++ squid-3.0.STABLE9-RELEASENOTES.html -> squid-3.0.STABLE10-RELEASENOTES.html ++++++ --- squid3/squid-3.0.STABLE9-RELEASENOTES.html 2008-09-11 10:52:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/squid3/squid-3.0.STABLE10-RELEASENOTES.html 2008-10-14 11:59:00.000000000 +0200 @@ -2,10 +2,10 @@ <HTML> <HEAD> <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.21"> - <TITLE>Squid 3.0.STABLE9 release notes</TITLE> + <TITLE>Squid 3.0.STABLE10 release notes</TITLE> </HEAD> <BODY> -<H1>Squid 3.0.STABLE9 release notes</H1> +<H1>Squid 3.0.STABLE10 release notes</H1> <H2>Squid Developers</H2>$Id: release-3.0.sgml,v 1.30.2.5 2008/02/28 00:26:31 amosjeffries Exp $ <HR> @@ -15,7 +15,7 @@ <HR> <H2><A NAME="s1">1. Notice</A></H2> -<P>The Squid Team are pleased to announce the release of Squid-3.0.STABLE9.</P> +<P>The Squid Team are pleased to announce the release of Squid-3.0.STABLE10.</P> <P>This new release is available for download from <A HREF="http://www.squid-cache.org/Versions/v3/3.0/">http://www.squid-cache.org/Versions/v3/3.0/</A> or the <A HREF="http://www.squid-cache.org/Mirrors/http-mirrors.html">mirrors</A>.</P> ++++++ squid-3.0.STABLE9.tar.bz2 -> squid-3.0.STABLE10.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/ChangeLog new/squid-3.0.STABLE10/ChangeLog --- old/squid-3.0.STABLE9/ChangeLog 2008-09-09 18:06:36.000000000 +0200 +++ new/squid-3.0.STABLE10/ChangeLog 2008-10-14 13:22:20.000000000 +0200 @@ -1,3 +1,12 @@ +Changes to squid-3.0.STABLE10 (14 Oct 2008): + + - Bug 2391: Regression: bad assert in forwarding + - Bug 2447: Segfault on failed TCP DNS query + - Bug 2393: DNS requests getting stuck in idns queue + - Bug 2433: FTP PUT gives bad gateway + - Bug 2465: Limited DragonflyBSD support + - ... and other minor bugs and documentation + Changes to squid-3.0.STABLE9 (9 Sep 2008): - Policy Enforcement: COSS is unusable in 3.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/configure new/squid-3.0.STABLE10/configure --- old/squid-3.0.STABLE9/configure 2008-09-09 18:06:45.000000000 +0200 +++ new/squid-3.0.STABLE10/configure 2008-10-14 13:22:33.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Revision: 1.488.2.3 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for Squid Web Proxy 3.0.STABLE9. +# Generated by GNU Autoconf 2.61 for Squid Web Proxy 3.0.STABLE10. # # Report bugs to <http://www.squid-cache.org/bugs/>. # @@ -729,8 +729,8 @@ # Identity of this package. PACKAGE_NAME='Squid Web Proxy' PACKAGE_TARNAME='squid' -PACKAGE_VERSION='3.0.STABLE9' -PACKAGE_STRING='Squid Web Proxy 3.0.STABLE9' +PACKAGE_VERSION='3.0.STABLE10' +PACKAGE_STRING='Squid Web Proxy 3.0.STABLE10' PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/' ac_unique_file="src/main.cc" @@ -1509,7 +1509,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Squid Web Proxy 3.0.STABLE9 to adapt to many kinds of systems. +\`configure' configures Squid Web Proxy 3.0.STABLE10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1579,7 +1579,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Squid Web Proxy 3.0.STABLE9:";; + short | recursive ) echo "Configuration of Squid Web Proxy 3.0.STABLE10:";; esac cat <<\_ACEOF @@ -1666,7 +1666,7 @@ --enable-ssl Enable ssl gatewaying support using OpenSSL --enable-forw-via-db Enable Forw/Via database --enable-cache-digests Use Cache Digests - see http://www.squid-cache.org/FAQ/FAQ-16.html + see http://wiki.squid-cache.org/SquidFaq/CacheDigests --enable-default-err-language=lang Select default language for Error pages (see errors directory) @@ -1888,7 +1888,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Squid Web Proxy configure 3.0.STABLE9 +Squid Web Proxy configure 3.0.STABLE10 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1902,7 +1902,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Squid Web Proxy $as_me 3.0.STABLE9, which was +It was created by Squid Web Proxy $as_me 3.0.STABLE10, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2576,7 +2576,7 @@ # Define the identity of the package. PACKAGE='squid' - VERSION='3.0.STABLE9' + VERSION='3.0.STABLE10' cat >>confdefs.h <<_ACEOF @@ -45270,7 +45270,7 @@ if test "$SQUID_MAXFD" -lt 512 ; then echo "WARNING: $SQUID_MAXFD may not be enough filedescriptors if your" echo " cache will be very busy. Please see the FAQ page" - echo " http://www.squid-cache.org/FAQ/FAQ-11.html#filedescriptors" + echo " http://wiki.squid-cache.org/SquidFaq/TroubleShooting" echo " on how to increase your filedescriptor limit" sleep 10 fi @@ -46797,7 +46797,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Squid Web Proxy $as_me 3.0.STABLE9, which was +This file was extended by Squid Web Proxy $as_me 3.0.STABLE10, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -46850,7 +46850,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Squid Web Proxy config.status 3.0.STABLE9 +Squid Web Proxy config.status 3.0.STABLE10 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/configure.in new/squid-3.0.STABLE10/configure.in --- old/squid-3.0.STABLE9/configure.in 2008-09-09 18:06:45.000000000 +0200 +++ new/squid-3.0.STABLE10/configure.in 2008-10-14 13:22:33.000000000 +0200 @@ -5,7 +5,7 @@ dnl dnl dnl -AC_INIT(Squid Web Proxy, 3.0.STABLE9, http://www.squid-cache.org/bugs/, squid) +AC_INIT(Squid Web Proxy, 3.0.STABLE10, http://www.squid-cache.org/bugs/, squid) AC_PREREQ(2.52) AM_CONFIG_HEADER(include/autoconf.h) AC_CONFIG_AUX_DIR(cfgaux) @@ -935,7 +935,7 @@ AC_ARG_ENABLE(cache-digests, [ --enable-cache-digests Use Cache Digests - see http://www.squid-cache.org/FAQ/FAQ-16.html], + see http://wiki.squid-cache.org/SquidFaq/CacheDigests], [ if test "$enableval" = "yes" ; then echo "USE_CACHE_DIGESTS enabled" AC_DEFINE(USE_CACHE_DIGESTS,1,[Use Cache Digests for locating objects in neighbor caches. This code is still semi-experimental.]) @@ -3051,7 +3051,7 @@ if test "$SQUID_MAXFD" -lt 512 ; then echo "WARNING: $SQUID_MAXFD may not be enough filedescriptors if your" echo " cache will be very busy. Please see the FAQ page" - echo " http://www.squid-cache.org/FAQ/FAQ-11.html#filedescriptors" + echo " http://wiki.squid-cache.org/SquidFaq/TroubleShooting" echo " on how to increase your filedescriptor limit" sleep 10 fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/helpers/ntlm_auth/fakeauth/fakeauth_auth.c new/squid-3.0.STABLE10/helpers/ntlm_auth/fakeauth/fakeauth_auth.c --- old/squid-3.0.STABLE9/helpers/ntlm_auth/fakeauth/fakeauth_auth.c 2008-09-09 18:06:41.000000000 +0200 +++ new/squid-3.0.STABLE10/helpers/ntlm_auth/fakeauth/fakeauth_auth.c 2008-10-14 13:22:29.000000000 +0200 @@ -428,7 +428,10 @@ } else SEND2("TT %s", data); } else if (strncasecmp(buf, "KK ", 3) == 0) { - if (!ntlmCheckHeader((ntlmhdr *) decoded, NTLM_AUTHENTICATE)) { + if(!decoded) { + SEND2("BH received KK with no data! user=%s", user); + } + else if (!ntlmCheckHeader((ntlmhdr *) decoded, NTLM_AUTHENTICATE)) { if (!ntlmDecodeAuth((struct ntlm_authenticate *) decoded, user, 256)) { lc(user); if (strip_domain_enabled) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/include/config.h new/squid-3.0.STABLE10/include/config.h --- old/squid-3.0.STABLE9/include/config.h 2008-09-09 18:06:41.000000000 +0200 +++ new/squid-3.0.STABLE10/include/config.h 2008-10-14 13:22:29.000000000 +0200 @@ -111,6 +111,9 @@ #elif defined(__OpenBSD__) #define _SQUID_OPENBSD_ +#elif defined(__DragonFly__) +#define _SQUID_DRAGONFLY_ + #elif defined(__CYGWIN32__) || defined(__CYGWIN__) #define _SQUID_CYGWIN_ #define _SQUID_WIN32_ @@ -340,7 +343,7 @@ /* * Don't allow inclusion of malloc.h on FreeBSD, Next and OpenBSD */ -#if defined(HAVE_MALLOC_H) && (defined(_SQUID_FREEBSD_) || defined(_SQUID_NEXT_) || defined(_SQUID_OPENBSD_)) +#if defined(HAVE_MALLOC_H) && (defined(_SQUID_FREEBSD_) || defined(_SQUID_NEXT_) || defined(_SQUID_OPENBSD_) || defined(_SQUID_DRAGONFLY_)) #undef HAVE_MALLOC_H #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/include/version.h new/squid-3.0.STABLE10/include/version.h --- old/squid-3.0.STABLE9/include/version.h 2008-09-09 18:06:45.000000000 +0200 +++ new/squid-3.0.STABLE10/include/version.h 2008-10-14 13:22:33.000000000 +0200 @@ -9,5 +9,5 @@ */ #ifndef SQUID_RELEASE_TIME -#define SQUID_RELEASE_TIME 1220976395 +#define SQUID_RELEASE_TIME 1223983338 #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/RELEASENOTES.html new/squid-3.0.STABLE10/RELEASENOTES.html --- old/squid-3.0.STABLE9/RELEASENOTES.html 2008-09-09 18:07:36.000000000 +0200 +++ new/squid-3.0.STABLE10/RELEASENOTES.html 2008-10-14 13:23:23.000000000 +0200 @@ -2,10 +2,10 @@ <HTML> <HEAD> <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.21"> - <TITLE>Squid 3.0.STABLE8 release notes</TITLE> + <TITLE>Squid 3.0.STABLE10 release notes</TITLE> </HEAD> <BODY> -<H1>Squid 3.0.STABLE8 release notes</H1> +<H1>Squid 3.0.STABLE10 release notes</H1> <H2>Squid Developers</H2>$Id: release-3.0.sgml,v 1.30.2.5 2008/02/28 00:26:31 amosjeffries Exp $ <HR> @@ -15,7 +15,7 @@ <HR> <H2><A NAME="s1">1. Notice</A></H2> -<P>The Squid Team are pleased to announce the release of Squid-3.0.STABLE8.</P> +<P>The Squid Team are pleased to announce the release of Squid-3.0.STABLE10.</P> <P>This new release is available for download from <A HREF="http://www.squid-cache.org/Versions/v3/3.0/">http://www.squid-cache.org/Versions/v3/3.0/</A> or the <A HREF="http://www.squid-cache.org/Mirrors/http-mirrors.html">mirrors</A>.</P> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/src/ACLARP.cc new/squid-3.0.STABLE10/src/ACLARP.cc --- old/squid-3.0.STABLE9/src/ACLARP.cc 2008-09-09 18:06:42.000000000 +0200 +++ new/squid-3.0.STABLE10/src/ACLARP.cc 2008-10-14 13:22:30.000000000 +0200 @@ -67,7 +67,7 @@ #endif #include <net/route.h> #include <net/if.h> -#if defined(_SQUID_FREEBSD_) || defined(_SQUID_NETBSD_) || defined(_SQUID_OPENBSD_) +#if defined(_SQUID_FREEBSD_) || defined(_SQUID_NETBSD_) || defined(_SQUID_OPENBSD_) || defined(_SQUID_DRAGONFLY_) #include <net/if_arp.h> #endif #if HAVE_NETINET_IF_ETHER_H @@ -438,7 +438,7 @@ return (0 == splayLastResult); } -#elif defined(_SQUID_FREEBSD_) || defined(_SQUID_NETBSD_) || defined(_SQUID_OPENBSD_) +#elif defined(_SQUID_FREEBSD_) || defined(_SQUID_NETBSD_) || defined(_SQUID_OPENBSD_) || defined(_SQUID_DRAGONFLY_) struct arpreq arpReq; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/src/cf.data.pre new/squid-3.0.STABLE10/src/cf.data.pre --- old/squid-3.0.STABLE9/src/cf.data.pre 2008-09-09 18:06:44.000000000 +0200 +++ new/squid-3.0.STABLE10/src/cf.data.pre 2008-10-14 13:22:31.000000000 +0200 @@ -871,6 +871,12 @@ If you set this parameter none (the default), there will be no limit imposed. + + Configuration Format is: + reply_body_max_size SIZE UNITS [acl ...] + ie. + reply_body_max_size 10 MB + DOC_END COMMENT_START diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/src/comm_select_win32.cc new/squid-3.0.STABLE10/src/comm_select_win32.cc --- old/squid-3.0.STABLE9/src/comm_select_win32.cc 2008-09-09 18:06:44.000000000 +0200 +++ new/squid-3.0.STABLE10/src/comm_select_win32.cc 2008-10-14 13:22:31.000000000 +0200 @@ -684,15 +684,6 @@ statHistCount(&statCounter.comm_dns_incoming, nevents); } -static void -commSelectRegisterWithCacheManager(void) -{ - CacheManager::GetInstance()-> - registerAction("comm_select_incoming", - "comm_incoming() stats", - commIncomingStats, 0, 1); -} - void comm_select_init(void) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/src/dns_internal.cc new/squid-3.0.STABLE10/src/dns_internal.cc --- old/squid-3.0.STABLE9/src/dns_internal.cc 2008-09-09 18:06:44.000000000 +0200 +++ new/squid-3.0.STABLE10/src/dns_internal.cc 2008-10-14 13:22:32.000000000 +0200 @@ -105,8 +105,8 @@ int need_vc; struct timeval start_t; - struct timeval sent_t; + struct timeval queue_t; dlink_node lru; IDNSCB *callback; void *callback_data; @@ -715,6 +715,7 @@ nsvc * vc = (nsvc *)data; if (status != COMM_OK) { + debugs(78, 1, "idnsInitVCConnected: Failed to connect to nameserver " << inet_ntoa(nameservers[vc->ns].S.sin_addr) << " using TCP!"); comm_close(fd); return; } @@ -739,6 +740,7 @@ { nsvc *vc = cbdataAlloc(nsvc); nameservers[ns].vc = vc; + vc->ns = ns; struct IN_ADDR addr; @@ -776,6 +778,11 @@ nsvc *vc = nameservers[ns].vc; + if (!vc) { + debugs(78, 1, "idnsSendQuery: Failed to initiate TCP connection to nameserver " << inet_ntoa(nameservers[ns].S.sin_addr) << "!"); + return; + } + vc->queue->reset(); short head = htons(q->sz); @@ -817,7 +824,7 @@ q->nsends++; - q->sent_t = current_time; + q->queue_t = q->sent_t = current_time; if (x < 0) debugs(50, 1, "idnsSendQuery: FD " << DnsSocket << ": sendto: " << xstrerror()); @@ -830,6 +837,7 @@ } nameservers[ns].nqueries++; + q->queue_t = current_time; dlinkAdd(q, &q->lru, &lru_list); idnsTickleQueue(); } @@ -1095,20 +1103,29 @@ idns_query *q; event_queued = 0; + if (0 == nns) + /* name servers went away; reconfiguring or shutting down */ + return; + for (n = lru_list.tail; n; n = p) { - if (0 == nns) - /* name servers went away; reconfiguring or shutting down */ - break; - q = (idns_query *)n->data; + p = n->prev; + q = static_cast<idns_query*>(n->data); - if (tvSubDsec(q->sent_t, current_time) < Config.Timeout.idns_retransmit * (1 << (q->nsends - 1) % nns)) - break; + /* Anything to process in the queue? */ + if (tvSubDsec(q->queue_t, current_time) < Config.Timeout.idns_retransmit ) + break; + + /* Query timer expired? */ + if (tvSubDsec(q->sent_t, current_time) < Config.Timeout.idns_retransmit * 1 << ((q->nsends - 1) / nns)) { + dlinkDelete(&q->lru, &lru_list); + q->queue_t = current_time; + dlinkAdd(q, &q->lru, &lru_list); + continue; + } debugs(78, 3, "idnsCheckQueue: ID 0x" << std::hex << std::setfill('0') << std::setw(4) << q->id << "timeout" ); - p = n->prev; - dlinkDelete(&q->lru, &lru_list); if (tvSubDsec(q->start_t, current_time) < Config.Timeout.idns_query) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/src/forward.cc new/squid-3.0.STABLE10/src/forward.cc --- old/squid-3.0.STABLE9/src/forward.cc 2008-09-09 18:06:44.000000000 +0200 +++ new/squid-3.0.STABLE10/src/forward.cc 2008-10-14 13:22:32.000000000 +0200 @@ -697,7 +697,7 @@ ErrorState *anErr = errorCon(ERR_DNS_FAIL, HTTP_SERVICE_UNAVAILABLE, request); - anErr->dnsserver_msg = xstrdup(dns_error_message); + anErr->dnsserver_msg = xstrdup(dns_error_message_safe()); fail(anErr); @@ -1205,12 +1205,9 @@ FwdServer *fs = servers; assert(fs); - // some callers use one condition, some use the other; are they the same? - assert((fs->code == HIER_DIRECT) == !fs->_peer); - const char *nextHop = NULL; - if (fs->_peer) { + if (fs->_peer) { // went to peer, log peer host name nextHop = fs->_peer->name; } else { @@ -1221,7 +1218,7 @@ nextHop = fd_table[server_fd].ipaddr; if (!Config.onoff.log_ip_on_direct || !nextHop[0]) nextHop = request->host; // domain name - } + } assert(nextHop); hierarchyNote(&request->hier, fs->code, nextHop); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/src/fqdncache.cc new/squid-3.0.STABLE10/src/fqdncache.cc --- old/squid-3.0.STABLE9/src/fqdncache.cc 2008-09-09 18:06:44.000000000 +0200 +++ new/squid-3.0.STABLE10/src/fqdncache.cc 2008-10-14 13:22:32.000000000 +0200 @@ -823,3 +823,14 @@ } #endif /*SQUID_SNMP */ + +/// XXX: a hack to work around the missing DNS error info +// see http://www.squid-cache.org/bugs/show_bug.cgi?id=2459 +const char * +dns_error_message_safe() +{ + if (dns_error_message) + return dns_error_message; + debugs(35,1, "Internal error: lost DNS error info"); + return "lost DNS error"; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/src/ftp.cc new/squid-3.0.STABLE10/src/ftp.cc --- old/squid-3.0.STABLE9/src/ftp.cc 2008-09-09 18:06:44.000000000 +0200 +++ new/squid-3.0.STABLE10/src/ftp.cc 2008-10-14 13:22:32.000000000 +0200 @@ -3352,8 +3352,12 @@ void FtpStateData::doneSendingRequestBody() { - debugs(9,3,HERE << "doneSendingRequestBody"); - ftpWriteTransferDone(this); + debugs(9,3,HERE); + dataComplete(); +/* NP: RFC 959 3.3. DATA CONNECTION MANAGEMENT + * if transfer type is 'stream' call dataComplete() + * otherwise leave open. (reschedule control channel read?) + */ } // a hack to ensure we do not double-complete on the forward entry. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/src/protos.h new/squid-3.0.STABLE10/src/protos.h --- old/squid-3.0.STABLE9/src/protos.h 2008-09-09 18:06:45.000000000 +0200 +++ new/squid-3.0.STABLE10/src/protos.h 2008-10-14 13:22:32.000000000 +0200 @@ -135,6 +135,8 @@ SQUIDCEXTERN void dnsInit(void); extern void dnsRegisterWithCacheManager(CacheManager & manager); SQUIDCEXTERN void dnsSubmit(const char *lookup, HLPCB * callback, void *data); +/// XXX: a temporary hack to work around the missing DNS error info +const char *dns_error_message_safe(); /* dns_internal.c */ SQUIDCEXTERN void idnsInit(void); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/src/store_client.cc new/squid-3.0.STABLE10/src/store_client.cc --- old/squid-3.0.STABLE9/src/store_client.cc 2008-09-09 18:06:45.000000000 +0200 +++ new/squid-3.0.STABLE10/src/store_client.cc 2008-10-14 13:22:32.000000000 +0200 @@ -143,13 +143,10 @@ void store_client::callback(ssize_t sz, bool error) { - StoreIOBuffer result (sz, 0 ,copyInto.data); + StoreIOBuffer result(sz, 0 ,copyInto.data); - if (sz < 0) { + if (error) { result.flags.error = 1; - result.length = 0; - } else { - result.flags.error = error ? 1 : 0; } result.offset = cmp_offset; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/src/StoreIOBuffer.h new/squid-3.0.STABLE10/src/StoreIOBuffer.h --- old/squid-3.0.STABLE9/src/StoreIOBuffer.h 2008-09-09 18:06:44.000000000 +0200 +++ new/squid-3.0.STABLE10/src/StoreIOBuffer.h 2008-10-14 13:22:31.000000000 +0200 @@ -43,12 +43,20 @@ { public: - StoreIOBuffer():length(0), offset (0), data (NULL){flags.error = 0;} + StoreIOBuffer():length(0), offset (0), data (NULL) {flags.error = 0;} StoreIOBuffer(size_t aLength, int64_t anOffset, char *someData) : - length (aLength), offset (anOffset), data (someData) + offset (anOffset), data (someData) { - flags.error = 0; + /* maintain own state: detect size errors now */ + if (aLength <0) { + flags.error = 1; + length = 0; + } + else { + flags.error = 0; + length = aLength; + } } /* Create a StoreIOBuffer from a MemBuf and offset */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/src/store_log.cc new/squid-3.0.STABLE10/src/store_log.cc --- old/squid-3.0.STABLE9/src/store_log.cc 2008-09-09 18:06:45.000000000 +0200 +++ new/squid-3.0.STABLE10/src/store_log.cc 2008-10-14 13:22:32.000000000 +0200 @@ -127,7 +127,7 @@ void storeLogOpen(void) { - if (strcmp(Config.Log.store, "none") == 0) { + if (Config.Log.store == NULL || strcmp(Config.Log.store, "none") == 0) { debugs(20, 1, "Store logging disabled"); return; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/src/tunnel.cc new/squid-3.0.STABLE10/src/tunnel.cc --- old/squid-3.0.STABLE9/src/tunnel.cc 2008-09-09 18:06:45.000000000 +0200 +++ new/squid-3.0.STABLE10/src/tunnel.cc 2008-10-14 13:22:32.000000000 +0200 @@ -568,7 +568,7 @@ debugs(26, 4, "tunnelConnect: Unknown host: " << tunnelState->host); err = errorCon(ERR_DNS_FAIL, HTTP_NOT_FOUND, request); *tunnelState->status_ptr = HTTP_NOT_FOUND; - err->dnsserver_msg = xstrdup(dns_error_message); + err->dnsserver_msg = xstrdup(dns_error_message_safe()); err->callback = tunnelErrorComplete; err->callback_data = tunnelState; errorSend(tunnelState->client.fd(), err); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/src/url.cc new/squid-3.0.STABLE10/src/url.cc --- old/squid-3.0.STABLE9/src/url.cc 2008-09-09 18:06:45.000000000 +0200 +++ new/squid-3.0.STABLE10/src/url.cc 2008-10-14 13:22:32.000000000 +0200 @@ -647,7 +647,7 @@ URLHostName::init(char const *aUrl) { Host[0] = '\0'; - url = url; + url = aUrl; } void diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/tools/Makefile.am new/squid-3.0.STABLE10/tools/Makefile.am --- old/squid-3.0.STABLE9/tools/Makefile.am 2008-09-09 18:06:45.000000000 +0200 +++ new/squid-3.0.STABLE10/tools/Makefile.am 2008-10-14 13:22:33.000000000 +0200 @@ -23,6 +23,8 @@ libexec_PROGRAMS = \ cachemgr$(CGIEXT) +DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf + squidclient_SOURCES = squidclient.cc cachemgr__CGIEXT__SOURCES = cachemgr.cc cachemgr__CGIEXT__CXXFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CXXFLAGS) @@ -32,8 +34,6 @@ EXTRA_DIST = \ cachemgr.conf -DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf - $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h install-data-local: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/squid-3.0.STABLE9/tools/Makefile.in new/squid-3.0.STABLE10/tools/Makefile.in --- old/squid-3.0.STABLE9/tools/Makefile.in 2008-09-09 18:06:45.000000000 +0200 +++ new/squid-3.0.STABLE10/tools/Makefile.in 2008-10-14 13:22:33.000000000 +0200 @@ -318,6 +318,7 @@ @SQUID_CPPUNIT_INC@ $(am__empty) TESTS = $(check_PROGRAMS) SUBDIRS = +DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf squidclient_SOURCES = squidclient.cc cachemgr__CGIEXT__SOURCES = cachemgr.cc cachemgr__CGIEXT__CXXFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CXXFLAGS) @@ -325,7 +326,6 @@ EXTRA_DIST = \ cachemgr.conf -DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf # Don't automatically uninstall config files # @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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