May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit mpfr
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package mpfr checked in at Fri May 26 12:55:17 CEST 2006. -------- --- mpfr/mpfr.changes 2006-05-15 14:28:13.000000000 +0200 +++ mpfr/mpfr.changes 2006-05-26 12:38:15.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 26 12:38:05 CEST 2006 - rguenther(a)suse.de + +- Skip testsuite for s390. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mpfr.spec ++++++ --- /var/tmp/diff_new_pack.xJCX3q/_old 2006-05-26 12:55:09.000000000 +0200 +++ /var/tmp/diff_new_pack.xJCX3q/_new 2006-05-26 12:55:09.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Requires: gmp Version: 2.2.0 -Release: 2 +Release: 3 Summary: The MPFR library for multiple-precision floating-point computations with exact rounding URL: http://www.mpfr.org/ Source: mpfr-%{version}.tar.bz2 @@ -69,7 +69,9 @@ %build %configure --enable-shared --enable-thread-safe make %{?jobs:-j%jobs} +%ifnarch s390 make check %{?jobs:-j%jobs} +%endif %install @@ -104,6 +106,8 @@ /usr/include/* %changelog -n mpfr +* Fri May 26 2006 - rguenther(a)suse.de +- Skip testsuite for s390. * Mon May 15 2006 - rguenther(a)suse.de - Add provides to mpfr-devel to fix updating from gmp-devel. * Sat May 13 2006 - rguenther(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit gcc
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package gcc checked in at Fri May 26 12:52:30 CEST 2006. -------- --- gcc/cross-alpha-gcc-icecream-backend.changes 2006-05-17 11:53:33.000000000 +0200 +++ gcc/cross-alpha-gcc-icecream-backend.changes 2006-05-25 22:39:03.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 25 22:38:48 CEST 2006 - rguenther(a)suse.de + +- Update to 4.1.1 release. + +------------------------------------------------------------------- cross-arm-gcc-icecream-backend.changes: same change cross-avr-gcc.changes: same change cross-hppa-gcc-icecream-backend.changes: same change cross-i386-gcc-icecream-backend.changes: same change cross-ia64-gcc-icecream-backend.changes: same change cross-ppc-gcc-icecream-backend.changes: same change cross-ppc64-gcc-icecream-backend.changes: same change cross-s390-gcc-icecream-backend.changes: same change cross-s390x-gcc-icecream-backend.changes: same change cross-x86_64-gcc-icecream-backend.changes: same change gcc.changes: same change Old: ---- pr21041.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-alpha-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.Q48q9h/_old 2006-05-26 12:50:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Q48q9h/_new 2006-05-26 12:50:41.000000000 +0200 @@ -25,7 +25,7 @@ URL: http://gcc.gnu.org/ License: GPL, LGPL Version: 4.1.1 -Release: 3 +Release: 4 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %if %{gcc_for_opt} @@ -51,7 +51,6 @@ Patch9: endless-loop-warning.patch Patch10: program-transform-name.diff Patch12: gcc4-ppc64-m32-m64-multilib-only.patch -Patch15: pr21041.diff Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch37: pr20425.patch @@ -136,7 +135,6 @@ %if !%{build_nof} %patch12 %endif -%patch15 %patch23 %patch24 %patch37 @@ -370,6 +368,8 @@ /usr/share/icecream-envs %changelog -n cross-alpha-gcc-icecream-backend +* Thu May 25 2006 - rguenther(a)suse.de +- Update to 4.1.1 release. * Wed May 17 2006 - rguenther(a)suse.de - Update to gcc-4_1-branch head. * Mon May 15 2006 - rguenther(a)suse.de cross-arm-gcc-icecream-backend.spec: same change ++++++ cross-avr-gcc.spec ++++++ --- /var/tmp/diff_new_pack.Q48q9h/_old 2006-05-26 12:50:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Q48q9h/_new 2006-05-26 12:50:41.000000000 +0200 @@ -24,7 +24,7 @@ URL: http://gcc.gnu.org/ License: GPL, LGPL Version: 4.1.1 -Release: 3 +Release: 4 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %if %{gcc_for_opt} @@ -50,7 +50,6 @@ Patch9: endless-loop-warning.patch Patch10: program-transform-name.diff Patch12: gcc4-ppc64-m32-m64-multilib-only.patch -Patch15: pr21041.diff Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch37: pr20425.patch @@ -132,7 +131,6 @@ %if !%{build_nof} %patch12 %endif -%patch15 %patch23 %patch24 %patch37 @@ -333,6 +331,8 @@ %{_prefix} %changelog -n cross-avr-gcc +* Thu May 25 2006 - rguenther(a)suse.de +- Update to 4.1.1 release. * Wed May 17 2006 - rguenther(a)suse.de - Update to gcc-4_1-branch head. * Mon May 15 2006 - rguenther(a)suse.de ++++++ cross-hppa-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.Q48q9h/_old 2006-05-26 12:50:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Q48q9h/_new 2006-05-26 12:50:41.000000000 +0200 @@ -25,7 +25,7 @@ URL: http://gcc.gnu.org/ License: GPL, LGPL Version: 4.1.1 -Release: 3 +Release: 4 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %if %{gcc_for_opt} @@ -51,7 +51,6 @@ Patch9: endless-loop-warning.patch Patch10: program-transform-name.diff Patch12: gcc4-ppc64-m32-m64-multilib-only.patch -Patch15: pr21041.diff Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch37: pr20425.patch @@ -136,7 +135,6 @@ %if !%{build_nof} %patch12 %endif -%patch15 %patch23 %patch24 %patch37 @@ -370,6 +368,8 @@ /usr/share/icecream-envs %changelog -n cross-hppa-gcc-icecream-backend +* Thu May 25 2006 - rguenther(a)suse.de +- Update to 4.1.1 release. * Wed May 17 2006 - rguenther(a)suse.de - Update to gcc-4_1-branch head. * Mon May 15 2006 - rguenther(a)suse.de cross-i386-gcc-icecream-backend.spec: same change cross-ia64-gcc-icecream-backend.spec: same change cross-ppc-gcc-icecream-backend.spec: same change cross-ppc64-gcc-icecream-backend.spec: same change cross-s390-gcc-icecream-backend.spec: same change cross-s390x-gcc-icecream-backend.spec: same change cross-x86_64-gcc-icecream-backend.spec: same change ++++++ gcc.spec ++++++ --- /var/tmp/diff_new_pack.Q48q9h/_old 2006-05-26 12:50:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Q48q9h/_new 2006-05-26 12:50:41.000000000 +0200 @@ -85,7 +85,7 @@ URL: http://gcc.gnu.org/ License: GPL Version: 4.1.1 -Release: 3 +Release: 4 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %if %{gcc_for_opt} @@ -113,7 +113,6 @@ Patch9: endless-loop-warning.patch Patch10: program-transform-name.diff Patch12: gcc4-ppc64-m32-m64-multilib-only.patch -Patch15: pr21041.diff Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch37: pr20425.patch @@ -172,7 +171,6 @@ Group: Development/Languages/C and C++ Autoreqprov: on Requires: gcc = %{version}-%{release} -Requires: libstdc++ = %{version}-%{release} Requires: libstdc++-devel = %{version}-%{release} Provides: c++_compiler @@ -185,7 +183,7 @@ Summary: Include Files and Libraries mandatory for Development Group: System/Libraries Autoreqprov: on -Requires: libstdc++ = %{version}-%{release} +Requires: libstdc++ >= %{version}-%{release} Requires: gcc Requires: glibc-devel %ifarch ia64 @@ -204,7 +202,7 @@ Summary: Include Files and Libraries mandatory for Development Group: System/Libraries Autoreqprov: on -Requires: libstdc++-64bit = %{version}-%{release} +Requires: libstdc++-64bit >= %{version}-%{release} Requires: gcc %description -n libstdc++-devel-64bit @@ -311,7 +309,7 @@ Group: Development/Languages/Other Autoreqprov: on Requires: gcc = %{version}-%{release} -Requires: libobjc = %{version}-%{release} +Requires: libobjc >= %{version}-%{release} %description objc This package contains the GNU Objective C compiler. Objective C is an @@ -334,7 +332,7 @@ Group: Development/Languages/Other Autoreqprov: on Requires: gcc = %{version}-%{release} -Requires: libobjc-64bit = %{version}-%{release} +Requires: libobjc-64bit >= %{version}-%{release} %description objc-64bit This is a re-packaged binary rpm. For the package source, please look @@ -377,7 +375,6 @@ Group: Development/Languages/Java Autoreqprov: on Requires: gcc = %{version}-%{release} -Requires: libgcj = %{version}-%{release} Requires: libgcj-devel = %{version}-%{release} %description java @@ -401,7 +398,7 @@ Group: Development/Libraries/Java Autoreqprov: on Requires: libstdc++-devel = %{version}-%{release} -Requires: libgcj = %{version}-%{release} +Requires: libgcj >= %{version}-%{release} Requires: gtk2-devel Requires: libart_lgpl-devel Requires: glibc-devel @@ -559,7 +556,6 @@ %if !%{build_nof} %patch12 %endif -%patch15 %patch23 %patch24 %patch37 @@ -1706,6 +1702,8 @@ %endif %changelog -n gcc +* Thu May 25 2006 - rguenther(a)suse.de +- Update to 4.1.1 release. * Wed May 17 2006 - rguenther(a)suse.de - Update to gcc-4_1-branch head. * Mon May 15 2006 - rguenther(a)suse.de ++++++ gcc-4.1.1.tar.bz2 ++++++ gcc/gcc-4.1.1.tar.bz2 gcc/gcc-4.1.1.tar.bz2 differ: char 11, line 1 ++++++ gcc.spec.in ++++++ --- gcc/gcc.spec.in 2006-05-17 12:57:37.000000000 +0200 +++ gcc/gcc.spec.in 2006-05-25 22:39:13.000000000 +0200 @@ -131,7 +131,6 @@ Patch9: endless-loop-warning.patch Patch10: program-transform-name.diff Patch12: gcc4-ppc64-m32-m64-multilib-only.patch -Patch15: pr21041.diff Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch37: pr20425.patch @@ -181,7 +180,6 @@ Group: Development/Languages/C and C++ Autoreqprov: on Requires: gcc@gcc_suffix@ = %{version}-%{release} -Requires: libstdc++@gcc_suffix@ = %{version}-%{release} Requires: libstdc++-devel@gcc_suffix@ = %{version}-%{release} Provides: c++_compiler @@ -193,7 +191,7 @@ Summary: Include Files and Libraries mandatory for Development Group: System/Libraries Autoreqprov: on -Requires: libstdc++@gcc_suffix@ = %{version}-%{release} +Requires: libstdc++@gcc_suffix@ >= %{version}-%{release} Requires: gcc@gcc_suffix@ Requires: glibc-devel %ifarch ia64 @@ -211,7 +209,7 @@ Summary: Include Files and Libraries mandatory for Development (64 bit) Group: System/Libraries Autoreqprov: on -Requires: libstdc++@gcc_suffix@-64bit = %{version}-%{release} +Requires: libstdc++@gcc_suffix@-64bit >= %{version}-%{release} Requires: gcc@gcc_suffix@ %description -n libstdc++-devel@gcc_suffix@-64bit @@ -284,7 +282,7 @@ Group: Development/Languages/Other Autoreqprov: on Requires: gcc@gcc_suffix@ = %{version}-%{release} -Requires: libobjc@gcc_suffix@ = %{version}-%{release} +Requires: libobjc@gcc_suffix@ >= %{version}-%{release} %description objc This package contains the GNU Objective C compiler. Objective C is an @@ -305,7 +303,7 @@ Group: Development/Languages/Other Autoreqprov: on Requires: gcc@gcc_suffix@ = %{version}-%{release} -Requires: libobjc@gcc_suffix@-64bit = %{version}-%{release} +Requires: libobjc@gcc_suffix@-64bit >= %{version}-%{release} %description objc-64bit This package contains the GNU Objective C compiler. Objective C is an @@ -335,7 +333,6 @@ Group: Development/Languages/Java Autoreqprov: on Requires: gcc@gcc_suffix@ = %{version}-%{release} -Requires: libgcj@gcc_suffix@ = %{version}-%{release} Requires: libgcj-devel@gcc_suffix@ = %{version}-%{release} %description java @@ -357,7 +354,7 @@ Group: Development/Libraries/Java Autoreqprov: on Requires: libstdc++-devel@gcc_suffix@ = %{version}-%{release} -Requires: libgcj@gcc_suffix@ = %{version}-%{release} +Requires: libgcj@gcc_suffix@ >= %{version}-%{release} Requires: gtk2-devel Requires: libart_lgpl-devel Requires: glibc-devel @@ -491,7 +488,6 @@ %if !%{build_nof} %patch12 %endif -%patch15 %patch23 %patch24 %patch37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit evolution-data-server
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package evolution-data-server checked in at Fri May 26 12:49:58 CEST 2006. -------- --- GNOME/evolution-data-server/evolution-data-server.changes 2006-05-23 05:59:28.000000000 +0200 +++ evolution-data-server/evolution-data-server.changes 2006-05-25 09:24:08.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 25 09:22:49 CEST 2006 - sragavan(a)novell.com + +- Fixes (bnc) + 176615 - Added a new camel stream vfs for saving to remote shares. + +------------------------------------------------------------------- New: ---- camel-vfs-stream.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-data-server.spec ++++++ --- /var/tmp/diff_new_pack.PqMvXE/_old 2006-05-26 12:48:57.000000000 +0200 +++ /var/tmp/diff_new_pack.PqMvXE/_new 2006-05-26 12:48:57.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Evolution Data Server Version: 1.6.0 -Release: 50 +Release: 51 Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.6/%{name}-%{v… #Patch3: evolution-data-server-gcc4.patch Patch5: evolution-data-server-configure.patch @@ -88,6 +88,7 @@ Patch67: imap-locking.patch Patch68: bnc-177394.patch Patch69: eds-updated-translations.diff +Patch70: camel-vfs-stream.diff Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libsoup >= 2.2.6 mozilla-nss @@ -187,6 +188,7 @@ %patch67 %patch68 %patch69 +%patch70 %build rename no nb po/no.* @@ -237,6 +239,9 @@ %{prefix}/share/gtk-doc/html/* %changelog -n evolution-data-server +* Thu May 25 2006 - sragavan(a)novell.com +- Fixes (bnc) + 176615 - Added a new camel stream vfs for saving to remote shares. * Tue May 23 2006 - sragavan(a)novell.com - Updated translations (Srini) * Mon May 22 2006 - fejj(a)suse.de ++++++ camel-vfs-stream.diff ++++++ --- configure.in.old 2006-05-23 07:34:48.254719640 +0200 +++ configure.in 2006-05-23 07:35:07.050359111 +0200 @@ -1199,7 +1199,7 @@ AC_MSG_ERROR([*** zlib is required]) fi -EVO_SET_COMPILE_FLAGS(CAMEL, gthread-2.0 gmodule-2.0 gobject-2.0 $mozilla_nss, +EVO_SET_COMPILE_FLAGS(CAMEL, gthread-2.0 gmodule-2.0 gobject-2.0 $mozilla_nss gnome-vfs-2.0, $THREADS_CFLAGS $KRB4_CFLAGS $KRB5_CFLAGS $MANUAL_NSS_CFLAGS, -lz $THREADS_LIBS $KRB4_LDFLAGS $KRB5_LDFLAGS $MANUAL_NSS_LIBS) AC_SUBST(CAMEL_CFLAGS) Index: camel/Makefile.am =================================================================== RCS file: /cvs/gnome/evolution-data-server/camel/Makefile.am,v retrieving revision 1.213 diff -u -p -r1.213 Makefile.am --- camel/Makefile.am 4 Jan 2006 23:47:07 -0000 1.213 +++ camel/Makefile.am 23 May 2006 03:54:24 -0000 @@ -201,6 +201,7 @@ libcamel_1_2_la_SOURCES = \ camel-stream-fs.c \ camel-stream-mem.c \ camel-stream-null.c \ + camel-stream-vfs.c \ camel-stream.c \ camel-string-utils.c \ camel-text-index.c \ @@ -270,6 +271,7 @@ libcamelinclude_HEADERS = \ camel-stream-mem.h \ camel-stream-null.h \ camel-stream-process.h \ + camel-stream-vfs.h \ camel-stream.h \ camel-string-utils.h \ camel-text-index.h \ --- /dev/null 2006-04-26 01:42:37.000000000 +0530 +++ camel/camel-stream-vfs.c 2006-05-18 16:42:45.000000000 +0530 @@ -0,0 +1,281 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* camel-stream-vfs.c : file system based stream */ + +/* + * Authors: Srinivasa Ragavan <sragavan(a)novell.com> + * + * Copyright 2006 Novell, Inc. (www.novell.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU Lesser General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <errno.h> +#include <string.h> + +#include <glib/gstdio.h> + +#include "camel-file-utils.h" +#include "camel-operation.h" +#include "camel-private.h" +#include "camel-stream-vfs.h" + +static CamelSeekableStreamClass *parent_class = NULL; + +/* Returns the class for a CamelStreamVFS */ +#define CSVFS_CLASS(so) CAMEL_STREAM_VFS_CLASS (CAMEL_OBJECT_GET_CLASS(so)) + +static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n); +static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n); +/* static int stream_flush (CamelStream *stream); */ +static int stream_close (CamelStream *stream); +static off_t stream_seek (CamelSeekableStream *stream, off_t offset, + CamelStreamSeekPolicy policy); + +static void +camel_stream_vfs_class_init (CamelStreamVFSClass *camel_stream_vfs_class) +{ + CamelSeekableStreamClass *camel_seekable_stream_class = + CAMEL_SEEKABLE_STREAM_CLASS (camel_stream_vfs_class); + CamelStreamClass *camel_stream_class = + CAMEL_STREAM_CLASS (camel_stream_vfs_class); + + parent_class = CAMEL_SEEKABLE_STREAM_CLASS (camel_type_get_global_classfuncs (camel_seekable_stream_get_type ())); + + /* virtual method overload */ + camel_stream_class->read = stream_read; + camel_stream_class->write = stream_write; +/* camel_stream_class->flush = stream_flush; */ + camel_stream_class->close = stream_close; + + camel_seekable_stream_class->seek = stream_seek; +} + +static void +camel_stream_vfs_init (gpointer object, gpointer klass) +{ + CamelStreamVFS *stream = CAMEL_STREAM_VFS (object); + + stream->handle = (gpointer) -1; + ((CamelSeekableStream *)stream)->bound_end = CAMEL_STREAM_UNBOUND; +} + +static void +camel_stream_vfs_finalize (CamelObject *object) +{ + CamelStreamVFS *stream_vfs = CAMEL_STREAM_VFS (object); + + if (stream_vfs->handle != -1) + close (stream_vfs->handle); +} + + +CamelType +camel_stream_vfs_get_type (void) +{ + static CamelType camel_stream_vfs_type = CAMEL_INVALID_TYPE; + + if (camel_stream_vfs_type == CAMEL_INVALID_TYPE) { + camel_stream_vfs_type = camel_type_register (camel_seekable_stream_get_type (), "CamelStreamVFS", + sizeof (CamelStreamVFS), + sizeof (CamelStreamVFSClass), + (CamelObjectClassInitFunc) camel_stream_vfs_class_init, + NULL, + (CamelObjectInitFunc) camel_stream_vfs_init, + (CamelObjectFinalizeFunc) camel_stream_vfs_finalize); + } + + return camel_stream_vfs_type; +} + +/** + * camel_stream_vfs_new_with_handle: + * @handle: a GnomeVFS handle + * + * Creates a new fs stream using the given GnomeVFS handle @handle as the + * backing store. When the stream is destroyed, the file descriptor + * will be closed. + * + * Returns a new #CamelStreamVFS + **/ +CamelStream * +camel_stream_vfs_new_with_handle (GnomeVFSHandle *handle) +{ + CamelStreamVFS *stream_vfs; + off_t offset; + GnomeVFSResult result; + + if (!handle) + return NULL; + + stream_vfs = CAMEL_STREAM_VFS (camel_object_new (camel_stream_vfs_get_type ())); + stream_vfs->handle = handle; + gnome_vfs_seek (handle, GNOME_VFS_SEEK_CURRENT, 0); + offset = 0; + CAMEL_SEEKABLE_STREAM (stream_vfs)->position = offset; + + return CAMEL_STREAM (stream_vfs); +} + +/** + * camel_stream_vfs_new_with_uri: + * @name: a file uri + * @flags: flags as in open(2) + * @mode: a file mode + * + * Creates a new #CamelStreamVFS corresponding to the named file, flags, + * and mode. + * + * Returns the new stream, or %NULL on error. + **/ +CamelStream * +camel_stream_vfs_new_with_uri (const char *name, int flags, mode_t mode) +{ + GnomeVFSResult result; + GnomeVFSHandle *handle; + int vfs_flag; + + if (flags & O_WRONLY) + vfs_flag = vfs_flag | GNOME_VFS_OPEN_WRITE; + if (flags & O_RDONLY) + vfs_flag = vfs_flag | GNOME_VFS_OPEN_READ; + if (flags & O_RDWR) + vfs_flag = vfs_flag | GNOME_VFS_OPEN_READ |GNOME_VFS_OPEN_WRITE; + + if (flags & O_CREAT) + result = gnome_vfs_create (&handle, name, vfs_flag, flags & O_TRUNC, mode); + else + result = gnome_vfs_open (&handle, name, vfs_flag); + + if (result != GNOME_VFS_OK) { + return NULL; + } + + return camel_stream_vfs_new_with_handle (handle); +} + +static ssize_t +stream_read (CamelStream *stream, char *buffer, size_t n) +{ + CamelStreamVFS *stream_vfs = CAMEL_STREAM_VFS (stream); + CamelSeekableStream *seekable = CAMEL_SEEKABLE_STREAM (stream); + ssize_t nread = 0; + GnomeVFSResult result; + + if (seekable->bound_end != CAMEL_STREAM_UNBOUND) + n = MIN (seekable->bound_end - seekable->position, n); + + result = gnome_vfs_read (stream_vfs->handle, buffer, n, &nread); + + if (nread > 0 && result == GNOME_VFS_OK) + seekable->position += nread; + else if (nread == 0) + stream->eos = TRUE; + + return nread; +} + +static ssize_t +stream_write (CamelStream *stream, const char *buffer, size_t n) +{ + CamelStreamVFS *stream_vfs = CAMEL_STREAM_VFS (stream); + CamelSeekableStream *seekable = CAMEL_SEEKABLE_STREAM (stream); + ssize_t nwritten = 0; + GnomeVFSResult result; + + if (seekable->bound_end != CAMEL_STREAM_UNBOUND) + n = MIN (seekable->bound_end - seekable->position, n); + + result = gnome_vfs_write (stream_vfs->handle, buffer, n, &nwritten); + + if (nwritten > 0 && result == GNOME_VFS_OK) + seekable->position += nwritten; + + return nwritten; +} + +/* static int */ +/* stream_flush (CamelStream *stream) */ +/* { */ +/* return fsync(((CamelStreamVFS *)stream)->handle); */ +/* } */ + +static int +stream_close (CamelStream *stream) +{ + GnomeVFSResult result; + + result = gnome_vfs_close(((CamelStreamVFS *)stream)->handle); + + if (result != GNOME_VFS_OK) + return -1; + + ((CamelStreamVFS *)stream)->handle = NULL; + return 0; +} + +static off_t +stream_seek (CamelSeekableStream *stream, off_t offset, CamelStreamSeekPolicy policy) +{ + CamelStreamVFS *stream_vfs = CAMEL_STREAM_VFS (stream); + off_t real = 0; + GnomeVFSResult result; + GnomeVFSHandle *handle = stream_vfs->handle; + + switch (policy) { + case CAMEL_STREAM_SET: + real = offset; + break; + case CAMEL_STREAM_CUR: + real = stream->position + offset; + break; + case CAMEL_STREAM_END: + if (stream->bound_end == CAMEL_STREAM_UNBOUND) { + result = gnome_vfs_seek (handle, GNOME_VFS_SEEK_END, offset); + if (result != GNOME_VFS_OK) + return -1; + gnome_vfs_tell (handle, &real); + if (real != -1) { + if (real<stream->bound_start) + real = stream->bound_start; + stream->position = real; + } + return real; + } + real = stream->bound_end + offset; + break; + } + + if (stream->bound_end != CAMEL_STREAM_UNBOUND) + real = MIN (real, stream->bound_end); + real = MAX (real, stream->bound_start); + + result = gnome_vfs_seek (handle, GNOME_VFS_SEEK_START, real); + if (result != GNOME_VFS_OK) + return -1; + + if (real != stream->position && ((CamelStream *)stream)->eos) + ((CamelStream *)stream)->eos = FALSE; + + stream->position = real; + + return real; +} --- /dev/null 2006-04-26 01:42:37.000000000 +0530 +++ camel/camel-stream-vfs.h 2006-05-18 16:41:12.000000000 +0530 @@ -0,0 +1,72 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* camel-stream-vfs.h :stream based on unix filesystem */ + +/* + * Author: + * Srinivasa Ragavan <sragavan(a)novell.com> + * + * Copyright 2006 Novell, Inc. (www.novell.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU Lesser General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + + +#ifndef CAMEL_STREAM_VFS_H +#define CAMEL_STREAM_VFS_H 1 + + +#ifdef __cplusplus +extern "C" { +#pragma } +#endif /* __cplusplus */ + +/* for open flags */ +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <libgnomevfs/gnome-vfs.h> + +#include <camel/camel-seekable-stream.h> + +#define CAMEL_STREAM_VFS_TYPE (camel_stream_vfs_get_type ()) +#define CAMEL_STREAM_VFS(obj) (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_VFS_TYPE, CamelStreamVFS)) +#define CAMEL_STREAM_VFS_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_VFS_TYPE, CamelStreamVFSClass)) +#define CAMEL_IS_STREAM_VFS(o) (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_VFS_TYPE)) + +typedef struct _CamelStreamVFS CamelStreamVFS; + +struct _CamelStreamVFS { + CamelSeekableStream parent_object; + + GnomeVFSHandle *handle; +}; + +typedef struct { + CamelSeekableStreamClass parent_class; + +} CamelStreamVFSClass; + +/* Standard Camel function */ +CamelType camel_stream_vfs_get_type (void); + +/* public methods */ +CamelStream * camel_stream_vfs_new_with_uri (const char *uri, int flags, mode_t mode); + + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* CAMEL_STREAM_VFS_H */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit evolution
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package evolution checked in at Fri May 26 12:48:48 CEST 2006. -------- --- GNOME/evolution/evolution.changes 2006-05-23 15:40:56.000000000 +0200 +++ evolution/evolution.changes 2006-05-25 09:29:24.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 25 09:27:50 CEST 2006 - sragavan(a)novell.com + +- Fixes (bnc) + 176615 - Added support for remote shares + +------------------------------------------------------------------- New: ---- bnc-176615-gnome-vfs-samba.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.6hHZ0P/_old 2006-05-26 12:47:36.000000000 +0200 +++ /var/tmp/diff_new_pack.6hHZ0P/_new 2006-05-26 12:47:36.000000000 +0200 @@ -21,7 +21,7 @@ Autoreqprov: on Obsoletes: bonobo-conf Version: 2.6.0 -Release: 54 +Release: 55 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.6/%{name}-%{version}.tar.… Source1: summerdance-about2.png @@ -99,6 +99,7 @@ Patch80: bnc-176714-open-attachments-dbl-click.diff Patch81: evo-updated-translations.diff Patch82: evolution-cs.patch +Patch83: bnc-176615-gnome-vfs-samba.diff URL: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: filesystem gconf2 shared-mime-info @@ -385,6 +386,7 @@ %patch80 %patch81 %patch82 +%patch83 %build rename no nb po/no.* @@ -506,6 +508,9 @@ %{prefix}/share/gnome-pilot/conduits/*.conduit %changelog -n evolution +* Thu May 25 2006 - sragavan(a)novell.com +- Fixes (bnc) + 176615 - Added support for remote shares * Tue May 23 2006 - sbrabec(a)suse.cz - Czech typo fix. * Mon May 22 2006 - sragavan(a)novell.com ++++++ bnc-176615-gnome-vfs-samba.diff ++++++ ++++ 749 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit dovecot
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package dovecot checked in at Fri May 26 12:46:35 CEST 2006. -------- --- dovecot/dovecot.changes 2006-05-16 19:01:21.000000000 +0200 +++ dovecot/dovecot.changes 2006-05-25 08:52:52.000000000 +0200 @@ -1,0 +2,39 @@ +Thu May 25 08:18:17 CEST 2006 - mrueckert(a)suse.de + +- Update to 1.0.beta8: + * Fixed a security hole with mbox: "1 LIST .. *" command could + list all directories and files under the mbox root directory, so + if your mails were stored in eg. /var/mail/%u/ directory, the + command would list everything under /var/mail. + + + Unless nfs_check=no or mmap_disable=yes, check for the first login + if the user's index directory exists in NFS mount. If so, refuse to + run. This is done only on first login to avoid constant extra + overhead. + + If we have plugins set and imap_capability unset, figure out the + IMAP capabilities automatically by running imap binary at startup. + The generated capability list isn't updated until Dovecot is + restarted completely, so if you add or remove IMAP plugins you + should restart. If you have problems related to this, set + imap_capabilities setting manually to work around it. + + Added auth_username_format setting + - pop3_lock_session setting wasn't really working + - Lots of fixes related to quota handling. It's still not working + perfectly though. + - Lots of index handling fixes, especially with mmap_disable=yes + - Maildir: saving mails could have sometimes caused "Append with UID + n, but next_uid = m" errors + - flock() locking never timeouted because ignoring SIGALRM caused the + system call just to be restarted when SIGALRM occurred (probably not + with all OSes though?) + - kqueue: Fixed "Unrecognized event". Patch by Vaclav Haisman + +- removed dovecot-1.0.beta7_directory-traversal.patch: + the patch is included in 1.0.beta8 +- dovecot-1.0.beta3_indexfixes.patch: included in beta8 +- replaced dovecot-1.0.beta1_pie.patch with + dovecot-1.0.beta6_pie.patch: rediff for new version +- no longer use %{_libdir}/dovecot as libexecdir. We use + %{_prefix}/lib/dovecot now. + +------------------------------------------------------------------- Old: ---- dovecot-1.0.beta1_pie.patch dovecot-1.0.beta3.tar.bz2 dovecot-1.0.beta3_indexfixes.patch dovecot-1.0.beta7_directory-traversal.patch New: ---- dovecot-1.0.beta6_pie.patch dovecot-1.0.beta8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dovecot.spec ++++++ --- /var/tmp/diff_new_pack.r9KoHd/_old 2006-05-26 12:45:44.000000000 +0200 +++ /var/tmp/diff_new_pack.r9KoHd/_new 2006-05-26 12:45:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package dovecot (Version 1.0.beta3) +# spec file for package dovecot (Version 1.0.beta8) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,22 +11,24 @@ # norootforbuild Name: dovecot -BuildRequires: krb5-devel mysql-devel openldap2 openldap2-devel pam-devel pkgconfig postgresql-devel sqlite-devel -Version: 1.0.beta3 -Release: 13 +Version: 1.0.beta8 +Release: 1 +# Group: Productivity/Networking/Email/Servers License: LGPL, X11/MIT +# BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: krb5-devel mysql-devel openldap2 openldap2-devel pam-devel pkgconfig postgresql-devel sqlite-devel Prereq: /usr/sbin/useradd, /usr/sbin/usermod, /usr/sbin/groupadd +# URL: http://www.dovecot.org -Source: http://www.dovecot.org/test/%{name}-%{version}.tar.bz2 +Source: http://www.dovecot.org/test/%{name}-%{version}.tar.gz Source1: dovecot-lda.tar.bz2 Source2: %{name}.init Source3: %{name}.pam Source4: %{name}.README.SuSE -Patch1: dovecot-1.0.beta3_indexfixes.patch -Patch2: dovecot-1.0.beta7_directory-traversal.patch -Patch9: dovecot-1.0.beta1_pie.patch +Patch9: dovecot-1.0.beta6_pie.patch +# Summary: IMAP and POP3 Server Written Primarily with Security in Mind %description @@ -46,8 +48,6 @@ %prep %setup -a 1 -%patch1 -%patch2 %patch9 %{__sed} -i -e 's|#ssl_disable = no|ssl_disable = yes|' %{name}-example.conf %{__sed} -i -e 's|/usr/libexec|%{_libdir}|g' %{name}-example.conf @@ -78,7 +78,7 @@ --with-prefetch-userdb \ --with-storages="maildir,mbox" \ --sysconfdir=%{_sysconfdir}/%{name} \ - --libexecdir=%{_libdir} \ + --libexecdir=%{_prefix}/lib/ \ --with-moduledir=%{_libdir}/%{name}/modules %{__make} pushd dovecot-lda @@ -86,7 +86,7 @@ %configure \ --with-dovecot=../ \ --sysconfdir=%{_sysconfdir}/%{name} \ - --libexecdir=%{_libdir} \ + --libexecdir=%{_prefix}/lib/ \ --with-moduledir=%{_libdir}/%{name}/modules %{__make} popd @@ -94,9 +94,8 @@ %install %makeinstall docdir=%{_docdir}/%{name} -pushd dovecot-lda - %makeinstall docdir=%{_docdir}/%{name} -popd + +%makeinstall -C dovecot-lda docdir=%{_docdir}/%{name} find %{buildroot}%{_libdir}/%{name}/modules/ -type f -name \*.la -print0 | xargs -r0 rm -v find %{buildroot}%{_libdir}/%{name}/modules/ -type f -name \*.a -print0 | xargs -r0 rm -v %{__install} -m 0755 -d \ @@ -119,7 +118,7 @@ %{__install} -m 0644 dovecot-lda/ChangeLog %{buildroot}%{_docdir}/%{name}/ChangeLog.lda # additional docs for the main package %{__install} -m 0644 \ - ABOUT-NLS COPYING COPYING.MIT NEWS TODO AUTHORS COPYING.LGPL README ChangeLog \ + COPYING COPYING.MIT NEWS TODO AUTHORS COPYING.LGPL README ChangeLog \ %{buildroot}%{_docdir}/%{name}/ %{__gzip} -9v %{buildroot}%{_docdir}/%{name}/ChangeLog # install the init script @@ -151,19 +150,21 @@ %dir %{_sysconfdir}/%{name} %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}/* %config(noreplace) %{_sysconfdir}/pam.d/%{name} -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/checkpassword-reply -%{_libdir}/%{name}/dovecot-auth -%{_libdir}/%{name}/rawlog -%{_libdir}/%{name}/imap* -%{_libdir}/%{name}/pop3* -%{_libdir}/%{name}/deliver -%{_libdir}/%{name}/dict -%{_libdir}/%{name}/gdbhelper -%{_libdir}/%{name}/ssl-build-param +%dir %{_prefix}/lib/%{name} +%{_prefix}/lib/%{name}/checkpassword-reply +%{_prefix}/lib/%{name}/dovecot-auth +%{_prefix}/lib/%{name}/rawlog +%{_prefix}/lib/%{name}/imap* +%{_prefix}/lib/%{name}/pop3* +%{_prefix}/lib/%{name}/deliver +%{_prefix}/lib/%{name}/dict +%{_prefix}/lib/%{name}/gdbhelper +%{_prefix}/lib/%{name}/ssl-build-param +%{_prefix}/lib/%{name}/sievec # # plugins # +%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/modules/ %{_libdir}/%{name}/modules/lib01_quota_plugin.so %{_libdir}/%{name}/modules/lib02_trash_plugin.so @@ -180,6 +181,11 @@ %{_libdir}/%{name}/modules/lda/lib02_trash_plugin.so %dir %{_libdir}/%{name}/modules/pop3 %{_libdir}/%{name}/modules/pop3/lib01_convert_plugin.so +%{_libdir}/%{name}/modules/pop3/lib01_quota_plugin.so +# acl plugin +%{_libdir}/%{name}/modules/imap/lib01_acl_plugin.so +%{_libdir}/%{name}/modules/lda/lib01_acl_plugin.so +%{_libdir}/%{name}/modules/lib01_acl_plugin.so # # documentation # @@ -191,6 +197,40 @@ %dir %attr(0750, root, %{name}) %{_var}/run/%{name}/login %changelog -n dovecot +* Thu May 25 2006 - mrueckert(a)suse.de +- Update to 1.0.beta8: + * Fixed a security hole with mbox: "1 LIST .. *" command could + list all directories and files under the mbox root directory, so + if your mails were stored in eg. /var/mail/%%u/ directory, the + command would list everything under /var/mail. + + Unless nfs_check=no or mmap_disable=yes, check for the first login + if the user's index directory exists in NFS mount. If so, refuse to + run. This is done only on first login to avoid constant extra + overhead. + + If we have plugins set and imap_capability unset, figure out the + IMAP capabilities automatically by running imap binary at startup. + The generated capability list isn't updated until Dovecot is + restarted completely, so if you add or remove IMAP plugins you + should restart. If you have problems related to this, set + imap_capabilities setting manually to work around it. + + Added auth_username_format setting +- pop3_lock_session setting wasn't really working +- Lots of fixes related to quota handling. It's still not working + perfectly though. +- Lots of index handling fixes, especially with mmap_disable=yes +- Maildir: saving mails could have sometimes caused "Append with UID + n, but next_uid = m" errors +- flock() locking never timeouted because ignoring SIGALRM caused the + system call just to be restarted when SIGALRM occurred (probably not + with all OSes though?) +- kqueue: Fixed "Unrecognized event". Patch by Vaclav Haisman +- removed dovecot-1.0.beta7_directory-traversal.patch: + the patch is included in 1.0.beta8 +- dovecot-1.0.beta3_indexfixes.patch: included in beta8 +- replaced dovecot-1.0.beta1_pie.patch with + dovecot-1.0.beta6_pie.patch: rediff for new version +- no longer use %%{_libdir}/dovecot as libexecdir. We use + %%{_prefix}/lib/dovecot now. * Tue May 16 2006 - mrueckert(a)suse.de - added dovecot-1.0.beta7_directory-traversal.patch: Fix Mailbox names list disclosure with mboxes (#175188) ++++++ dovecot-1.0.beta1_pie.patch -> dovecot-1.0.beta6_pie.patch ++++++ --- dovecot/dovecot-1.0.beta1_pie.patch 2006-02-08 15:26:00.000000000 +0100 +++ dovecot/dovecot-1.0.beta6_pie.patch 2006-05-25 08:52:52.000000000 +0200 @@ -18,7 +18,7 @@ AC_ARG_ENABLE(debug, [ --enable-debug Enable some extra checks for debugging], if test x$enableval = xyes; then -@@ -1640,6 +1649,30 @@ +@@ -1636,6 +1645,30 @@ STORAGE_LIBS="$STORAGE_LIBS $index_libs" AC_SUBST(STORAGE_LIBS) @@ -49,8 +49,9 @@ dnl ** dnl ** SQL drivers dnl ** -@@ -1730,3 +1763,4 @@ - echo "Building with GSSAPI support ........ : $have_gssapi" +@@ -1727,3 +1760,5 @@ echo "Building with user database modules . :$userdb" echo "Building with password lookup modules :$passdb" + echo "Building with SQL drivers ............:$sql_drivers" +echo "Building with PIE: $want_pie" ++ ++++++ dovecot-lda.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dovecot-lda/ChangeLog new/dovecot-lda/ChangeLog --- old/dovecot-lda/ChangeLog 2006-02-08 17:04:54.000000000 +0100 +++ new/dovecot-lda/ChangeLog 2006-05-25 07:39:54.000000000 +0200 @@ -1,3 +1,94 @@ +2006-05-12 21:03 cras + + * src/sieve-cmu.c: Don't log keeps. + +2006-05-12 21:00 cras + + * src/: deliver.c, sieve-cmu.c: Do some more logging. + +2006-05-12 20:42 cras + + * src/libsieve/: bc_emit.c, script.c, sievec.c: Replaced syslog() + calls with Dovecot's i_info/i_error calls + +2006-05-12 20:41 cras + + * src/libsieve/: Makefile.am, sievec.c: Compile sievec binary. + +2006-05-12 20:24 cras + + * src/: common.h, deliver.c, smtpclient.c: Added sendmail_path and + hostname settings. + +2006-05-12 20:19 cras + + * src/deliver.c: If there's no log_path defined, log to syslog. + Just like other parts of Dovecot. + +2006-05-04 00:59 cras + + * src/deliver.c: Use lib_signals_ignore() for SIGPIPE + +2006-04-28 15:53 cras + + * src/deliver.c: Ignore SIGXFSZ signal if it exists. We don't want + to crash if some file is too large. + +2006-04-28 15:48 cras + + * src/deliver.c: Remove all environment but TZ and HOME before + doing anything so the existing environment doesn't mess up + settings (especially MAIL). + +2006-04-21 15:32 cras + + * src/Makefile.am: Link mountpoint.o manually to get + mountpoint_get() included into binary, so quota plugin can use + it. + +2006-04-20 18:17 cras + + * src/deliver.c: Changed default socket to + /var/run/dovecot/auth-master again. Nowadays /var/run/dovecot is + world-rx so it's a better place for it. + +2006-04-13 21:47 cras + + * src/libsieve/bc_emit.c: Commented out a debug syslog message, + which I've no idea why it would be useful ever.. + +2006-04-13 21:46 cras + + * src/deliver.c: Use syslog_facility setting + +2006-04-13 20:45 cras + + * src/deliver.c: Unload modules after destroying storages + +2006-04-13 20:28 cras + + * src/deliver.c: Use mail_plugins and mail_plugin_dir settings + inside protocol lda {} + +2006-04-13 20:16 cras + + * src/deliver.c: Set also environments inside plugin { .. } + +2006-04-02 11:20 cras + + * src/deliver.c: Use mail_storage_parse_env() to parse lock_method + and mail storage flags. + +2006-03-25 10:44 cras + + * src/deliver.c: Getting sieve path from userdb wasn't working, it + was always overwritten by global sieve path. + +2006-03-21 10:15 cras + + * src/deliver.c: Fixed to compile with latest Dovecot's module-dir + changes. + 2006-02-08 17:00 cras * src/duplicate.c: Fixed to work with dotlock changes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dovecot-lda/src/Makefile.am new/dovecot-lda/src/Makefile.am --- old/dovecot-lda/src/Makefile.am 2006-01-12 15:32:50.000000000 +0100 +++ new/dovecot-lda/src/Makefile.am 2006-05-25 07:39:05.000000000 +0200 @@ -13,6 +13,11 @@ -I$(dovecotdir)/src/lib-storage/index/mbox \ -DSYSCONFDIR=\""$(sysconfdir)"\" +# get some functions included which only plugins use. liblib should probably +# be a shared library so this wouldn't be needed.. +unused_objects = \ + $(dovecotdir)/src/lib/mountpoint.o + libs = \ libsieve/libsieve.a \ $(dovecotdir)/src/lib-storage/register/libstorage-register.a \ @@ -23,7 +28,8 @@ $(dovecotdir)/src/lib-mail/libmail.a \ $(dovecotdir)/src/lib-dict/libdict.a \ $(dovecotdir)/src/lib-charset/libcharset.a \ - $(dovecotdir)/src/lib/liblib.a + $(dovecotdir)/src/lib/liblib.a \ + $(unused_objects) deliver_LDADD = \ $(libs) \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dovecot-lda/src/common.h new/dovecot-lda/src/common.h --- old/dovecot-lda/src/common.h 2006-02-08 15:19:08.000000000 +0100 +++ new/dovecot-lda/src/common.h 2006-05-25 07:39:05.000000000 +0200 @@ -7,6 +7,7 @@ struct sieve_settings { const char *hostname; const char *postmaster_address; + const char *sendmail_path; }; extern struct sieve_settings *sieve_set; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dovecot-lda/src/deliver.c new/dovecot-lda/src/deliver.c --- old/dovecot-lda/src/deliver.c 2006-02-08 15:19:08.000000000 +0100 +++ new/dovecot-lda/src/deliver.c 2006-05-25 07:39:05.000000000 +0200 @@ -34,7 +34,7 @@ #define SIEVE_SCRIPT_PATH "~/.dovecot.sieve" #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf" -#define DEFAULT_AUTH_SOCKET_PATH "/var/run/dovecot-auth-master" +#define DEFAULT_AUTH_SOCKET_PATH "/var/run/dovecot/auth-master" /* After buffer grows larger than this, create a temporary file to /tmp where to read the mail. */ @@ -337,7 +337,8 @@ value = p = strchr(line, '='); if (value == NULL) { if (strchr(line, '{') != NULL) { - if (strcmp(line, "protocol lda {") == 0) + if (strcmp(line, "protocol lda {") == 0 || + strcmp(line, "plugin {") == 0) lda_section = TRUE; sections++; } @@ -449,13 +450,18 @@ return input; } -static void open_logfile(void) +static void open_logfile(const char *username) { - if (getenv("LOG_PATH") == NULL) - i_set_failure_syslog("deliver", LOG_NDELAY, LOG_MAIL); - else { + const char *prefix; + + prefix = t_strdup_printf("deliver(%s)", username); + if (getenv("LOG_PATH") == NULL) { + const char *env = getenv("SYSLOG_FACILITY"); + i_set_failure_syslog(prefix, LOG_NDELAY, + env == NULL ? LOG_MAIL : atoi(env)); + } else { /* log to file or stderr */ - i_set_failure_file(getenv("LOG_PATH"), "deliver"); + i_set_failure_file(getenv("LOG_PATH"), prefix); } if (getenv("INFO_LOG_PATH") != NULL) @@ -477,7 +483,6 @@ return NULL; } - script_path = home_expand(SIEVE_SCRIPT_PATH); if (*script_path != '/' && *script_path != '\0') { /* relative path. change to absolute. */ script_path = t_strconcat(getenv("HOME"), "/", @@ -507,8 +512,8 @@ { const char *config_path = DEFAULT_CONFIG_FILE; const char *mailbox = "INBOX"; - const char *auth_socket; - const char *home, *destination, *mail_env, *str, *script_path; + const char *auth_socket, *env_tz; + const char *home, *destination, *user, *mail_env, *str, *script_path; const struct var_expand_table *table; enum mail_storage_flags flags; enum mail_storage_lock_method lock_method; @@ -525,8 +530,20 @@ lib_signals_init(); lib_signals_set_handler(SIGINT, TRUE, sig_die, NULL); lib_signals_set_handler(SIGTERM, TRUE, sig_die, NULL); - lib_signals_set_handler(SIGPIPE, FALSE, NULL, NULL); + lib_signals_ignore(SIGPIPE); lib_signals_set_handler(SIGALRM, FALSE, NULL, NULL); +#ifdef SIGXFSZ + lib_signals_set_handler(SIGXFSZ, FALSE, NULL, NULL); +#endif + + /* Clean up environment. */ + env_tz = getenv("TZ"); + home = getenv("HOME"); + env_clean(); + if (env_tz != NULL) + env_put(t_strconcat("TZ=", env_tz, NULL)); + if (home != NULL) + env_put(t_strconcat("HOME=", home, NULL)); destination = NULL; for (i = 1; i < argc; i++) { @@ -560,9 +577,26 @@ "Unknown argument: %s", argv[1]); } } + if (destination != NULL) + user = destination; + else if (geteuid() != 0) { + /* we're non-root. get our username. */ + struct passwd *pw; + + pw = getpwuid(geteuid()); + if (pw != NULL) + user = t_strdup(pw->pw_name); + else { + i_fatal("Couldn't lookup our username (uid=%s)", + dec2str(geteuid())); + } + } else { + i_fatal_status(EX_USAGE, + "destination user parameter (-d user) not given"); + } config_file_init(config_path); - open_logfile(); + open_logfile(user); if (destination != NULL) { auth_socket = getenv("AUTH_SOCKET_PATH"); @@ -579,27 +613,22 @@ could be written. If it fails, don't worry. */ (void)chdir(home); } - } else if (geteuid() != 0) { - /* we're non-root. get our username. */ - struct passwd *pw; - - pw = getpwuid(geteuid()); - if (pw != NULL) - destination = t_strdup(pw->pw_name); - } - - if (destination == NULL) { - i_fatal_status(EX_USAGE, - "destination user parameter (-d user) not given"); + } else { + destination = user; } sieve_set = i_new(struct sieve_settings, 1); - sieve_set->hostname = my_hostname; /* FIXME: configurable */ + sieve_set->hostname = getenv("HOSTNAME"); + if (sieve_set->hostname == NULL) + sieve_set->hostname = my_hostname; sieve_set->postmaster_address = getenv("POSTMASTER_ADDRESS"); if (sieve_set->postmaster_address == NULL) { i_fatal_status(EX_CONFIG, "postmaster_address setting not given"); } + sieve_set->sendmail_path = getenv("SENDMAIL_PATH"); + if (sieve_set->sendmail_path == NULL) + sieve_set->sendmail_path = "/usr/lib/sendmail"; dict_client_register(); mail_storage_init(); @@ -615,39 +644,24 @@ mail_env = expand_mail_env(mail_env, table); } - flags = 0; - if (getenv("FULL_FILESYSTEM_ACCESS") != NULL) - flags |= MAIL_STORAGE_FLAG_FULL_FS_ACCESS; - if (getenv("DEBUG") != NULL) - flags |= MAIL_STORAGE_FLAG_DEBUG; - if (getenv("MMAP_DISABLE") != NULL) - flags |= MAIL_STORAGE_FLAG_MMAP_DISABLE; - if (getenv("MMAP_NO_WRITE") != NULL) - flags |= MAIL_STORAGE_FLAG_MMAP_NO_WRITE; - if (getenv("MAIL_READ_MMAPED") != NULL) - flags |= MAIL_STORAGE_FLAG_MMAP_MAILS; - if (getenv("MAIL_SAVE_CRLF") != NULL) - flags |= MAIL_STORAGE_FLAG_SAVE_CRLF; - str = getenv("POP3_UIDL_FORMAT"); if (str != NULL && (str = strchr(str, '%')) != NULL && str != NULL && var_get_key(str + 1) == 'm') flags |= MAIL_STORAGE_FLAG_KEEP_HEADER_MD5; - str = getenv("LOCK_METHOD"); - if (str == NULL || strcmp(str, "flock") == 0) - lock_method = MAIL_STORAGE_LOCK_FLOCK; - else if (strcmp(str, "fcntl") == 0) - lock_method = MAIL_STORAGE_LOCK_FCNTL; - else if (strcmp(str, "dotlock") == 0) - lock_method = MAIL_STORAGE_LOCK_DOTLOCK; - else - i_fatal("Unknown lock_method: %s", str); - - modules = getenv("MODULE_DIR") == NULL ? NULL : - module_dir_load(getenv("MODULE_DIR"), TRUE); + if (getenv("MAIL_PLUGIN_DIR") == NULL) + modules = NULL; + else { + if (getenv("MAIL_PLUGIN_DIR") == NULL) { + i_fatal("MAIL_PLUGINS given but " + "MAIL_PLUGIN_DIR was not"); + } + modules = module_dir_load(getenv("MAIL_PLUGIN_DIR"), + getenv("MAIL_PLUGINS"), TRUE); + } /* FIXME: how should we handle namespaces? */ + mail_storage_parse_env(&flags, &lock_method); storage = mail_storage_create_with_data(mail_env, destination, flags, lock_method); if (storage == NULL) { @@ -705,10 +719,11 @@ mailbox_close(&box); duplicate_deinit(); - module_dir_unload(&modules); mail_storage_destroy(&mbox_storage); mail_storage_destroy(&storage); - mail_storage_deinit(); + + module_dir_unload(&modules); + mail_storage_deinit(); dict_client_unregister(); lib_signals_deinit(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dovecot-lda/src/libsieve/Makefile.am new/dovecot-lda/src/libsieve/Makefile.am --- old/dovecot-lda/src/libsieve/Makefile.am 2005-10-17 15:59:10.000000000 +0200 +++ new/dovecot-lda/src/libsieve/Makefile.am 2006-05-25 07:39:05.000000000 +0200 @@ -1,3 +1,7 @@ +pkglibexecdir = $(libexecdir)/dovecot + +pkglibexec_PROGRAMS = sievec + noinst_LIBRARIES = libsieve.a AM_YFLAGS = -d -p $* @@ -13,6 +17,15 @@ sieve-lex.c: sieve-lex.l $(LEX) -t sieve-lex.l > sieve-lex.c +sievec_SOURCES = \ + sievec.c \ + ../map.c \ + ../imparse.c + +sievec_LDADD = \ + libsieve.a \ + $(dovecotdir)/src/lib/liblib.a + libsieve_a_SOURCES = \ addr.y \ sieve.y \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dovecot-lda/src/libsieve/bc_emit.c new/dovecot-lda/src/libsieve/bc_emit.c --- old/dovecot-lda/src/libsieve/bc_emit.c 2005-10-14 22:21:47.000000000 +0200 +++ new/dovecot-lda/src/libsieve/bc_emit.c 2006-05-25 07:39:05.000000000 +0200 @@ -1,7 +1,7 @@ /* bc_emit.c -- sieve bytecode - pass 2 of the compiler * Rob Siemborski * Jen Smith - * $Id: bc_emit.c,v 1.2 2005/10/14 20:21:47 cras Exp $ + * $Id: bc_emit.c,v 1.4 2006/05/12 18:42:29 cras Exp $ */ /*********************************************************** Copyright 2001 by Carnegie Mellon University @@ -36,7 +36,6 @@ #include "bytecode.h" -#include <syslog.h> #include <sys/types.h> #include <unistd.h> @@ -321,7 +320,7 @@ /*debugging variable to check filelen*/ /*int location;*/ - syslog(LOG_DEBUG, "entered bc_action_emit with filelen: %d", filelen); + /*syslog(LOG_DEBUG, "entered bc_action_emit with filelen: %d", filelen);*/ /* All non-string data MUST be sizeof(int) byte alligned so the end of each string may require a pad */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dovecot-lda/src/libsieve/script.c new/dovecot-lda/src/libsieve/script.c --- old/dovecot-lda/src/libsieve/script.c 2005-10-15 15:31:26.000000000 +0200 +++ new/dovecot-lda/src/libsieve/script.c 2006-05-25 07:39:05.000000000 +0200 @@ -1,6 +1,6 @@ /* script.c -- sieve script functions * Larry Greenfield - * $Id: script.c,v 1.4 2005/10/15 13:31:26 cras Exp $ + * $Id: script.c,v 1.5 2006/05/12 18:42:29 cras Exp $ */ /*********************************************************** Copyright 1999 by Carnegie Mellon University @@ -32,7 +32,6 @@ #include <stdlib.h> #include <string.h> #include <ctype.h> -#include <syslog.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dovecot-lda/src/libsieve/sievec.c new/dovecot-lda/src/libsieve/sievec.c --- old/dovecot-lda/src/libsieve/sievec.c 2005-03-29 20:37:59.000000000 +0200 +++ new/dovecot-lda/src/libsieve/sievec.c 2006-05-25 07:39:05.000000000 +0200 @@ -1,6 +1,6 @@ /* sievec.c -- compile a sieve script to bytecode manually * Rob Siemborski - * $Id: sievec.c,v 1.1.1.1 2005/03/29 18:37:59 cras Exp $ + * $Id: sievec.c,v 1.3 2006/05/12 18:42:29 cras Exp $ */ /* * Copyright (c) 1999-2000 Carnegie Mellon University. All rights reserved. @@ -48,7 +48,6 @@ #endif #include "sieve_interface.h" -#include <syslog.h> #include "libconfig.h" #include "xmalloc.h" @@ -63,8 +62,7 @@ #include <sys/stat.h> #include <fcntl.h> -/* config.c stuff */ -const int config_need_data = 0; +struct et_list *_et_list = NULL; int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret); @@ -78,20 +76,16 @@ sieve_script_t *s; bytecode_info_t *bc; int c, fd, usage_error = 0; - char *alt_config = NULL; while ((c = getopt(argc, argv, "C:")) != EOF) switch (c) { - case 'C': /* alt config file */ - alt_config = optarg; - break; default: usage_error = 1; break; } if (usage_error || (argc - optind) < 2) { - printf("Syntax: %s [-C <altconfig>] <filename> <outputfile>\n", + printf("Syntax: %s <filename> <outputfile>\n", argv[0]); exit(1); } @@ -102,9 +96,6 @@ exit(1); } - /* Load configuration file. */ - config_read(alt_config); - if(is_script_parsable(instream, &err, &s) == TIMSIEVE_FAIL) { if(err) { printf("Unable to parse script: %s\n", err); @@ -140,9 +131,9 @@ } /* to make larry's stupid functions happy :) */ -void foo(void) +static void foo(void) { - fatal("stub function called", 0); + i_fatal("stub function called"); } sieve_vacation_t vacation = { 0, /* min response */ @@ -157,30 +148,24 @@ void *message_context __attribute__((unused)), const char **errmsg __attribute__((unused))) { - fatal("stub function called", 0); + i_fatal("stub function called"); return SIEVE_FAIL; } -int mysieve_error(int lineno, const char *msg, - void *i __attribute__((unused)), void *s) +static int mysieve_error(int lineno, const char *msg, + void *i __attribute__((unused)), void *s) { char buf[1024]; char **errstr = (char **) s; snprintf(buf, 80, "line %d: %s\r\n", lineno, msg); *errstr = xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30); - syslog(LOG_DEBUG, "%s", buf); + i_info("%s", buf); strcat(*errstr, buf); return SIEVE_OK; } -void fatal(const char *s, int code) -{ - printf("Fatal error: %s (%d)\r\n", s, code); - - exit(1); -} /* end the boilerplate */ /* returns TRUE or FALSE */ @@ -192,75 +177,75 @@ res = sieve_interp_alloc(&i, NULL); if (res != SIEVE_OK) { - syslog(LOG_ERR, "sieve_interp_alloc() returns %d\n", res); + i_error("sieve_interp_alloc() returns %d\n", res); return TIMSIEVE_FAIL; } res = sieve_register_redirect(i, (sieve_callback *) &foo); if (res != SIEVE_OK) { - syslog(LOG_ERR, "sieve_register_redirect() returns %d\n", res); + i_error("sieve_register_redirect() returns %d\n", res); return TIMSIEVE_FAIL; } res = sieve_register_discard(i, (sieve_callback *) &foo); if (res != SIEVE_OK) { - syslog(LOG_ERR, "sieve_register_discard() returns %d\n", res); + i_error("sieve_register_discard() returns %d\n", res); return TIMSIEVE_FAIL; } res = sieve_register_reject(i, (sieve_callback *) &foo); if (res != SIEVE_OK) { - syslog(LOG_ERR, "sieve_register_reject() returns %d\n", res); + i_error("sieve_register_reject() returns %d\n", res); return TIMSIEVE_FAIL; } res = sieve_register_fileinto(i, (sieve_callback *) &foo); if (res != SIEVE_OK) { - syslog(LOG_ERR, "sieve_register_fileinto() returns %d\n", res); + i_error("sieve_register_fileinto() returns %d\n", res); return TIMSIEVE_FAIL; } res = sieve_register_keep(i, (sieve_callback *) &foo); if (res != SIEVE_OK) { - syslog(LOG_ERR, "sieve_register_keep() returns %d\n", res); + i_error("sieve_register_keep() returns %d\n", res); return TIMSIEVE_FAIL; } res = sieve_register_imapflags(i, NULL); if (res != SIEVE_OK) { - syslog(LOG_ERR, "sieve_register_imapflags() returns %d\n", res); + i_error("sieve_register_imapflags() returns %d\n", res); return TIMSIEVE_FAIL; } res = sieve_register_size(i, (sieve_get_size *) &foo); if (res != SIEVE_OK) { - syslog(LOG_ERR, "sieve_register_size() returns %d\n", res); + i_error("sieve_register_size() returns %d\n", res); return TIMSIEVE_FAIL; } res = sieve_register_header(i, (sieve_get_header *) &foo); if (res != SIEVE_OK) { - syslog(LOG_ERR, "sieve_register_header() returns %d\n", res); + i_error("sieve_register_header() returns %d\n", res); return TIMSIEVE_FAIL; } res = sieve_register_envelope(i, (sieve_get_envelope *) &foo); if (res != SIEVE_OK) { - syslog(LOG_ERR, "sieve_register_envelope() returns %d\n", res); + i_error("sieve_register_envelope() returns %d\n", res); return TIMSIEVE_FAIL; } res = sieve_register_vacation(i, &vacation); if (res != SIEVE_OK) { - syslog(LOG_ERR, "sieve_register_vacation() returns %d\n", res); + i_error("sieve_register_vacation() returns %d\n", res); return TIMSIEVE_FAIL; } res = sieve_register_notify(i, &sieve_notify); if (res != SIEVE_OK) { - syslog(LOG_ERR, "sieve_register_notify() returns %d\n", res); + i_error("sieve_register_notify() returns %d\n", res); return TIMSIEVE_FAIL; } res = sieve_register_parse_error(i, &mysieve_error); if (res != SIEVE_OK) { - syslog(LOG_ERR, "sieve_register_parse_error() returns %d\n", res); + i_error("sieve_register_parse_error() returns %d\n", res); return TIMSIEVE_FAIL; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dovecot-lda/src/sieve-cmu.c new/dovecot-lda/src/sieve-cmu.c --- old/dovecot-lda/src/sieve-cmu.c 2006-02-08 15:19:08.000000000 +0100 +++ new/dovecot-lda/src/sieve-cmu.c 2006-05-25 07:39:05.000000000 +0200 @@ -106,14 +106,17 @@ /* ok, let's see if we've redirected this message before */ if (duplicate_check(dupeid, strlen(dupeid), sd->username)) { /*duplicate_log(m->id, sd->username, "redirect");*/ - i_info("Duplicated redirection (%s: %s -> %s)", m->id, - sd->username, rc->addr); + i_info("discarded duplicate forward (%s -> %s)", + str_sanitize(m->id, 80), str_sanitize(rc->addr, 80)); return SIEVE_OK; } } if ((res = mail_send_forward(m->mail, rc->addr)) == 0) { /* mark this message as redirected */ + i_info("forwarded id %s to <%s>", + m->id == NULL ? "" : str_sanitize(m->id, 80), + str_sanitize(rc->addr, 80)); if (dupeid != NULL) { duplicate_mark(dupeid, strlen(dupeid), sd->username, ioloop_time + DUPLICATE_DEFAULT_KEEP); @@ -131,22 +134,13 @@ static int sieve_discard(void *ac __attribute__((unused)), void *ic __attribute__((unused)), - void *sc, void *mc, + void *sc __attribute__((unused)), void *mc, const char **errmsg __attribute__((unused))) { - script_data_t *sd = (script_data_t *) sc; sieve_msgdata_t *md = mc; /* ok, we won't file it, but log it */ - if (md->id && strlen(md->id) < 80) { - i_info("sieve: discarded message to %s id %s", - sd->username, str_sanitize(md->id, 80)); - } - else { - i_info("sieve: discarded message to %s", - sd->username); - } - + i_info("discarded id %s", md->id == NULL ? "" : str_sanitize(md->id, 80)); return SIEVE_OK; } @@ -166,12 +160,14 @@ } if (strlen(md->return_path) == 0) { - i_info("sieve: discarded reject to <> for %s id %s", - sd->username, str_sanitize(md->id, 80)); + i_info("discarded reject to <> id %s", + md->id == NULL ? "" : str_sanitize(md->id, 80)); return SIEVE_OK; } if ((res = mail_send_rejection(md->mail, sd->username, rc->msg)) == 0) { + i_info("rejected id %s", + md->id == NULL ? "" : str_sanitize(md->id, 80)); return SIEVE_OK; } else { if (res == -1) { @@ -238,6 +234,8 @@ if (save_mail(sd->storage, fc->mailbox, md->mail, flags, keywords) < 0) return SIEVE_FAIL; + + i_info("saved mail to %s", md->mailbox); return SIEVE_OK; } @@ -398,8 +396,7 @@ if (sd->errors == NULL) { sd->errors = str_new(default_pool, 1024); - i_info("sieve parse error for %s: line %d: %s", - sd->username, lineno, msg); + i_info("sieve parse error: line %d: %s", lineno, msg); } str_printfa(sd->errors, "line %d: %s\n", lineno, msg); @@ -408,13 +405,10 @@ static int sieve_execute_error_handler(const char *msg, void *ic __attr_unused__, - void *sc, void *mc __attr_unused__) + void *sc __attr_unused__, + void *mc __attr_unused__) { - script_data_t *sd = (script_data_t *) sc; - - i_info("sieve runtime error for %s: %s", - sd->username, msg); - + i_info("sieve runtime error: %s", msg); return SIEVE_OK; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dovecot-lda/src/smtpclient.c new/dovecot-lda/src/smtpclient.c --- old/dovecot-lda/src/smtpclient.c 2006-01-13 19:31:30.000000000 +0100 +++ new/dovecot-lda/src/smtpclient.c 2006-05-25 07:39:05.000000000 +0200 @@ -40,7 +40,7 @@ * */ /* - * $Id: smtpclient.c,v 1.3 2006/01/13 15:15:52 cras Exp $ + * $Id: smtpclient.c,v 1.4 2006/05/12 18:24:40 cras Exp $ */ #include "common.h" @@ -67,18 +67,12 @@ close(fds[1]); /* make the pipe be stdin */ dup2(fds[0], 0); - execv("/usr/lib/sendmail", (char **) argv); - - /* if we're here we suck */ - printf("451 lmtpd: didn't exec() sendmail?!?\r\n"); - i_fatal("couldn't exec() sendmail"); + (void)execv(sieve_set->sendmail_path, (char **)argv); + i_fatal("couldn't exec() sendmail: %m"); } - if (p < 0) { - /* failure */ - *sm = NULL; - return p; - } + if (p == -1) + i_fatal("fork() failed: %m"); /* parent */ close(fds[0]); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit curlftpfs
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package curlftpfs checked in at Fri May 26 12:45:35 CEST 2006. -------- --- curlftpfs/curlftpfs.changes 2006-04-15 11:39:29.000000000 +0200 +++ curlftpfs/curlftpfs.changes 2006-05-25 15:11:25.000000000 +0200 @@ -1,0 +2,8 @@ +Thu May 25 15:03:29 CEST 2006 - cthiel(a)suse.de + +- update to version 0.8 + * Chunk downloading is now supported. You can now stream your music or + video, download more than one file, or browse the filesystem while you + download. + +------------------------------------------------------------------- Old: ---- curlftpfs-0.7.tar.bz2 New: ---- curlftpfs-0.8.patch curlftpfs-0.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ curlftpfs.spec ++++++ --- /var/tmp/diff_new_pack.4o3V8G/_old 2006-05-26 12:45:20.000000000 +0200 +++ /var/tmp/diff_new_pack.4o3V8G/_new 2006-05-26 12:45:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package curlftpfs (Version 0.7) +# spec file for package curlftpfs (Version 0.8) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,14 +11,15 @@ # norootforbuild Name: curlftpfs -Version: 0.7 -Release: 2 +Version: 0.8 +Release: 1 Summary: CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE and libcurl License: GPL URL: http://curlftpfs.sourceforge.net/ Group: System/Filesystems Autoreqprov: on Source: %{name}-%{version}.tar.bz2 +Patch: %{name}-%{version}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: curl-devel fuse-devel glib2-devel @@ -35,9 +36,11 @@ %prep %setup +%patch %build -%{configure} +autoreconf -fi +%configure make %install @@ -52,6 +55,11 @@ %{_mandir}/*/%{name}.* %changelog -n curlftpfs +* Thu May 25 2006 - cthiel(a)suse.de +- update to version 0.8 + * Chunk downloading is now supported. You can now stream your music or + video, download more than one file, or browse the filesystem while you + download. * Sat Apr 15 2006 - cthiel(a)suse.de - update to version 0.7 * Added big manpage with all options documented. ++++++ curlftpfs-0.8.patch ++++++ --- configure.ac +++ configure.ac @@ -9,7 +9,7 @@ PKG_CHECK_MODULES(GLIB, [glib-2.0]) PKG_CHECK_MODULES(FUSE, [fuse >= 2.2]) -LIBCURL_CHECK_CONFIG([yes], [7.15.2], [], [AC_MSG_ERROR(["libcurl not found"])]) +LIBCURL_CHECK_CONFIG([yes], [7.15.1], [], [AC_MSG_ERROR(["libcurl not found"])]) if test "$libcurl_protocol_FTP" != yes; then AC_MSG_ERROR(["We need libcurl with support for FTP protocol."]) fi ++++++ curlftpfs-0.7.tar.bz2 -> curlftpfs-0.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/curlftpfs-0.7/configure new/curlftpfs-0.8/configure --- old/curlftpfs-0.7/configure 2006-04-13 23:06:05.000000000 +0200 +++ new/curlftpfs-0.8/configure 2006-05-21 21:49:50.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for curlftpfs 0.7. +# Generated by GNU Autoconf 2.59 for curlftpfs 0.8. # # 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='curlftpfs' PACKAGE_TARNAME='curlftpfs' -PACKAGE_VERSION='0.7' -PACKAGE_STRING='curlftpfs 0.7' +PACKAGE_VERSION='0.8' +PACKAGE_STRING='curlftpfs 0.8' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. @@ -971,7 +971,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 curlftpfs 0.7 to adapt to many kinds of systems. +\`configure' configures curlftpfs 0.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1037,7 +1037,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of curlftpfs 0.7:";; + short | recursive ) echo "Configuration of curlftpfs 0.8:";; esac cat <<\_ACEOF @@ -1181,7 +1181,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -curlftpfs configure 0.7 +curlftpfs configure 0.8 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1195,7 +1195,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by curlftpfs $as_me 0.7, which was +It was created by curlftpfs $as_me 0.8, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1838,7 +1838,7 @@ # Define the identity of the package. PACKAGE='curlftpfs' - VERSION='0.7' + VERSION='0.8' cat >>confdefs.h <<_ACEOF @@ -19217,11 +19217,11 @@ echo "${ECHO_T}$libcurl_cv_lib_curl_version" >&6 _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse` - _libcurl_wanted=`echo 7.7.2 | $_libcurl_version_parse` + _libcurl_wanted=`echo 7.15.2 | $_libcurl_version_parse` if test $_libcurl_wanted -gt 0 ; then - echo "$as_me:$LINENO: checking for libcurl >= version 7.7.2" >&5 -echo $ECHO_N "checking for libcurl >= version 7.7.2... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for libcurl >= version 7.15.2" >&5 +echo $ECHO_N "checking for libcurl >= version 7.15.2... $ECHO_C" >&6 if test "${libcurl_cv_lib_version_ok+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20043,7 +20043,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by curlftpfs $as_me 0.7, which was +This file was extended by curlftpfs $as_me 0.8, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20106,7 +20106,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -curlftpfs config.status 0.7 +curlftpfs config.status 0.8 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/curlftpfs-0.7/configure.ac new/curlftpfs-0.8/configure.ac --- old/curlftpfs-0.7/configure.ac 2006-04-13 23:05:50.000000000 +0200 +++ new/curlftpfs-0.8/configure.ac 2006-05-21 21:45:47.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT(curlftpfs, 0.7) +AC_INIT(curlftpfs, 0.8) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) @@ -9,7 +9,7 @@ PKG_CHECK_MODULES(GLIB, [glib-2.0]) PKG_CHECK_MODULES(FUSE, [fuse >= 2.2]) -LIBCURL_CHECK_CONFIG([yes], [7.7.2], [], [AC_MSG_ERROR(["libcurl not found"])]) +LIBCURL_CHECK_CONFIG([yes], [7.15.2], [], [AC_MSG_ERROR(["libcurl not found"])]) if test "$libcurl_protocol_FTP" != yes; then AC_MSG_ERROR(["We need libcurl with support for FTP protocol."]) fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/curlftpfs-0.7/doc/curlftpfs.1 new/curlftpfs-0.8/doc/curlftpfs.1 --- old/curlftpfs-0.7/doc/curlftpfs.1 2006-04-13 22:30:43.000000000 +0200 +++ new/curlftpfs-0.8/doc/curlftpfs.1 2006-04-26 19:29:28.000000000 +0200 @@ -121,10 +121,12 @@ make curlftpfs pick the same IP address that is already used for the control connection .RE +.RS Disable the attempt to use the EPRT command instead of PORT by using \fIdisable_eprt\fP. EPRT is really PORT++. +.RE .TP .B interface=<name> Pass a string as parameter. This set the interface name to use as outgoing @@ -168,6 +170,10 @@ (SSL) Curlftpfs will not verify the hostname when connecting to a SSL enabled server. .TP +.B no_verify_peer +(SSL) Curlftpfs will not verify the certificate when connecting to a SSL +enabled server. +.TP .B pass=<password> (SSL) Pass phrase for the private key. .TP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/curlftpfs-0.7/ftpfs-ls.c new/curlftpfs-0.8/ftpfs-ls.c --- old/curlftpfs-0.7/ftpfs-ls.c 2006-04-12 18:58:39.000000000 +0200 +++ new/curlftpfs-0.8/ftpfs-ls.c 2006-05-20 19:49:18.000000000 +0200 @@ -1,3 +1,11 @@ +/* + FTP file system + Copyright (C) 2006 Robson Braga Araujo <robsonbraga(a)gmail.com> + + This program can be distributed under the terms of the GNU GPL. + See the file COPYING. +*/ + #define _XOPEN_SOURCE #include <time.h> #include <string.h> @@ -75,10 +83,17 @@ tt = time(NULL); gmtime_r(&tt, &tm); tm.tm_sec = tm.tm_min = tm.tm_hour = 0; - if(strchr(year, ':')) + if(strchr(year, ':')) { + int cur_mon = tm.tm_mon; // save current month strptime(date, "%H:%M,%b,%d", &tm); - else + // Unix systems omit the year for the last six months + if (cur_mon + 5 < tm.tm_mon) { // month from last year + DEBUG("correct year: cur_mon: %d, file_mon: %d\n", cur_mon, tm.tm_mon); + tm.tm_year--; // correct the year + } + } else { strptime(date, "%Y,%b,%d", &tm); + } sbuf->st_atime = sbuf->st_ctime = sbuf->st_mtime = mktime(&tm); @@ -222,6 +237,8 @@ if (sbuf) *sbuf = stat_buf; found = 1; } + + free(full_path); } free(line); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/curlftpfs-0.7/ftpfs-ls.h new/curlftpfs-0.8/ftpfs-ls.h --- old/curlftpfs-0.7/ftpfs-ls.h 2006-04-05 03:36:57.000000000 +0200 +++ new/curlftpfs-0.8/ftpfs-ls.h 2006-05-20 19:59:45.000000000 +0200 @@ -1,6 +1,14 @@ #ifndef __CURLFTPFS_FTPFS_LS_H__ #define __CURLFTPFS_FTPFS_LS_H__ +/* + FTP file system + Copyright (C) 2006 Robson Braga Araujo <robsonbraga(a)gmail.com> + + This program can be distributed under the terms of the GNU GPL. + See the file COPYING. +*/ + #include "cache.h" int parse_dir(const char* list, const char* dir, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/curlftpfs-0.7/ftpfs.c new/curlftpfs-0.8/ftpfs.c --- old/curlftpfs-0.7/ftpfs.c 2006-04-13 19:16:31.000000000 +0200 +++ new/curlftpfs-0.8/ftpfs.c 2006-05-21 21:38:18.000000000 +0200 @@ -28,6 +28,10 @@ #define CURLFTPFS_BAD_NOBODY 0x070f02 #define CURLFTPFS_BAD_SSL 0x070f03 +#define CURLFTPFS_BAD_READ ((size_t)-1) + +#define MAX_BUFFER_LEN (300*1024) + struct ftpfs ftpfs; static char error_buf[CURL_ERROR_SIZE]; @@ -35,6 +39,7 @@ uint8_t* p; size_t len; size_t size; + off_t begin_offset; }; static void usage(const char* progname); @@ -50,6 +55,7 @@ } } else buf->p = NULL; + buf->begin_offset = 0; buf->len = 0; buf->size = size; } @@ -205,6 +211,8 @@ struct buffer buf; int dirty; int copied; + off_t last_offset; + int can_shrink; }; enum { @@ -228,6 +236,7 @@ FTPFS_OPT("ssl_control", use_ssl, CURLFTPSSL_CONTROL), FTPFS_OPT("ssl_try", use_ssl, CURLFTPSSL_TRY), FTPFS_OPT("no_verify_hostname", no_verify_hostname, 1), + FTPFS_OPT("no_verify_peer", no_verify_peer, 1), FTPFS_OPT("cert=%s", cert, 0), FTPFS_OPT("cert_type=%s", cert_type, 0), FTPFS_OPT("key=%s", key, 0), @@ -293,6 +302,7 @@ static int ftpfs_getdir(const char* path, fuse_cache_dirh_t h, fuse_cache_dirfil_t filler) { + int err = 0; CURLcode curl_res; char* dir_path = get_dir_path(path, 0); @@ -301,6 +311,7 @@ buf_init(&buf, 0); pthread_mutex_lock(&ftpfs.lock); + curl_multi_remove_handle(ftpfs.multi, ftpfs.connection); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, dir_path); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf); curl_res = curl_easy_perform(ftpfs.connection); @@ -308,14 +319,15 @@ if (curl_res != 0) { DEBUG("%s\n", error_buf); + err = -EIO; + } else { + buf_add_mem(&buf, "\0", 1); + parse_dir(buf.p, dir_path + strlen(ftpfs.host) - 1, NULL, NULL, NULL, 0, h, filler); } - buf_add_mem(&buf, "\0", 1); - - parse_dir(buf.p, dir_path + strlen(ftpfs.host) - 1, NULL, NULL, NULL, 0, h, filler); free(dir_path); buf_free(&buf); - return 0; + return err; } static char* get_dir_path(const char* path, int strip) { @@ -347,6 +359,7 @@ buf_init(&buf, 0); pthread_mutex_lock(&ftpfs.lock); + curl_multi_remove_handle(ftpfs.multi, ftpfs.connection); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, dir_path); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf); curl_res = curl_easy_perform(ftpfs.connection); @@ -367,55 +380,199 @@ return 0; } -static int ftpfs_open(const char* path, struct fuse_file_info* fi) { - DEBUG("%d\n", fi->flags & O_ACCMODE); - if ((fi->flags & O_ACCMODE) == O_RDONLY) { - DEBUG("opening %s O_RDONLY\n", path); - } else if ((fi->flags & O_ACCMODE) == O_WRONLY) { - DEBUG("opening %s O_WRONLY\n", path); - } else if ((fi->flags & O_ACCMODE) == O_RDWR) { - DEBUG("opening %s O_RDWR\n", path); - } +static int check_running() { + int running_handles = 0; + curl_multi_perform(ftpfs.multi, &running_handles); + return running_handles; +} - char *full_path = g_strdup_printf("%s%s", ftpfs.host, path + 1); - - DEBUG("full_path: %s\n", full_path); - struct buffer buf; +static size_t ftpfs_read_chunk(const char* full_path, char* rbuf, + size_t size, off_t offset, + struct fuse_file_info* fi, + int update_offset) { + int running_handles = 0; int err = 0; - buf_init(&buf, 0); + struct ftpfs_file* fh = (struct ftpfs_file*) (uintptr_t) fi->fh; + + DEBUG("ftpfs_read_chunk: %s %p %d %lld %p %p\n", + full_path, rbuf, size, offset, fi, fh); pthread_mutex_lock(&ftpfs.lock); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf); - CURLcode curl_res = curl_easy_perform(ftpfs.connection); - if (curl_res != 0) { - err = -EACCES; - buf_free(&buf); - } else { - struct ftpfs_file* fh = (struct ftpfs_file*) - malloc(sizeof(struct ftpfs_file)); - fh->buf = buf; - fh->dirty = 0; - fh->copied = 0; - fi->fh = (unsigned long) fh; + + DEBUG("buffer size: %d %lld\n", fh->buf.len, fh->buf.begin_offset); + + if ((fh->buf.len < size + offset - fh->buf.begin_offset) || + offset < fh->buf.begin_offset || + offset > fh->buf.begin_offset + fh->buf.len) { + // We can't answer this from cache + if (ftpfs.current_fh != fh || + offset < fh->buf.begin_offset || + offset > fh->buf.begin_offset + fh->buf.len || + !check_running()) { + DEBUG("We need to restart the connection\n"); + DEBUG("%p %p\n", ftpfs.current_fh, fh); + DEBUG("%lld %lld\n", fh->buf.begin_offset, offset); + + buf_clear(&fh->buf); + fh->buf.begin_offset = offset; + ftpfs.current_fh = fh; + + curl_multi_remove_handle(ftpfs.multi, ftpfs.connection); + curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path); + curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &fh->buf); + if (offset) { + char range[15]; + snprintf(range, 15, "%lld-", offset); + curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_RANGE, range); + } + curl_multi_add_handle(ftpfs.multi, ftpfs.connection); + } + + while(CURLM_CALL_MULTI_PERFORM == + curl_multi_perform(ftpfs.multi, &running_handles)); + + curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_RANGE, NULL); + + while ((fh->buf.len < size + offset - fh->buf.begin_offset) && + running_handles) { + struct timeval timeout; + int rc; /* select() return code */ + + fd_set fdread; + fd_set fdwrite; + fd_set fdexcep; + int maxfd; + + FD_ZERO(&fdread); + FD_ZERO(&fdwrite); + FD_ZERO(&fdexcep); + + /* set a suitable timeout to play around with */ + timeout.tv_sec = 1; + timeout.tv_usec = 0; + + /* get file descriptors from the transfers */ + curl_multi_fdset(ftpfs.multi, &fdread, &fdwrite, &fdexcep, &maxfd); + + rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout); + + switch(rc) { + case -1: + /* select error */ + break; + case 0: + /* timeout, do something else */ + break; + default: + /* one or more of curl's file descriptors say there's data to read + or write */ + while(CURLM_CALL_MULTI_PERFORM == + curl_multi_perform(ftpfs.multi, &running_handles)); + break; + } + } + + if (running_handles == 0) { + int msgs_left = 1; + while (msgs_left) { + CURLMsg* msg = curl_multi_info_read(ftpfs.multi, &msgs_left); + if (msg == NULL || + msg->msg != CURLMSG_DONE || + msg->data.result != CURLE_OK) { + err = 1; + } + } + } + } + + size_t to_copy = fh->buf.len + fh->buf.begin_offset - offset; + size = size > to_copy ? to_copy : size; + if (rbuf) { + memcpy(rbuf, fh->buf.p + offset - fh->buf.begin_offset, size); + } + + if (update_offset) { + fh->last_offset = offset + size; + } + + // Check if the buffer is growing and we can delete a part of it + if (fh->can_shrink && fh->buf.len > MAX_BUFFER_LEN) { + DEBUG("Shrinking buffer from %d to %d bytes\n", + fh->buf.len, to_copy - size); + memmove(fh->buf.p, + fh->buf.p + offset - fh->buf.begin_offset + size, + to_copy - size); + fh->buf.len = to_copy - size; + fh->buf.begin_offset = offset + size; } + pthread_mutex_unlock(&ftpfs.lock); + if (err) return CURLFTPFS_BAD_READ; + return size; +} + +static int ftpfs_open(const char* path, struct fuse_file_info* fi) { + DEBUG("%d\n", fi->flags & O_ACCMODE); + int err = 0; + char *full_path = g_strdup_printf("%s%s", ftpfs.host, path + 1); + + struct ftpfs_file* fh = + (struct ftpfs_file*) malloc(sizeof(struct ftpfs_file)); + buf_init(&fh->buf, 0); + fh->dirty = 0; + fh->copied = 0; + fh->last_offset = 0; + fh->can_shrink = 0; + fi->fh = (unsigned long) fh; + + if ((fi->flags & O_ACCMODE) == O_RDONLY) { + // If it's read-only, we can load the file a bit at a time, as necessary. + DEBUG("opening %s O_RDONLY\n", path); + fh->can_shrink = 1; + size_t size = ftpfs_read_chunk(full_path, NULL, 1, 0, fi, 0); + + if (size == CURLFTPFS_BAD_READ) { + err = -EACCES; + buf_free(&fh->buf); + free(fh); + } + } else if ((fi->flags & O_ACCMODE) == O_WRONLY || + (fi->flags & O_ACCMODE) == O_RDWR) { + // If we want to write to the file, we have to load it all at once, + // modify it in memory and then upload it as a whole as most FTP servers + // don't support resume for uploads. + DEBUG("opening %s O_WRONLY or O_RDWR\n", path); + pthread_mutex_lock(&ftpfs.lock); + curl_multi_remove_handle(ftpfs.multi, ftpfs.connection); + curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path); + curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &fh->buf); + CURLcode curl_res = curl_easy_perform(ftpfs.connection); + pthread_mutex_unlock(&ftpfs.lock); + + if (curl_res != 0) { + err = -EACCES; + buf_free(&fh->buf); + free(fh); + } + } + free(full_path); return err; } static int ftpfs_read(const char* path, char* rbuf, size_t size, off_t offset, struct fuse_file_info* fi) { - (void) path; - struct ftpfs_file* fh = (struct ftpfs_file*) (uintptr_t) fi->fh; - if (offset >= fh->buf.len) return 0; - if (size > fh->buf.len - offset) { - size = fh->buf.len - offset; + int ret; + char *full_path = g_strdup_printf("%s%s", ftpfs.host, path + 1); + size_t size_read = ftpfs_read_chunk(full_path, rbuf, size, offset, fi, 1); + free(full_path); + if (size_read == CURLFTPFS_BAD_READ) { + ret = -EIO; + } else { + ret = size_read; } - memcpy(rbuf, fh->buf.p + offset, size); - - return size; + return ret; } static int ftpfs_mknod(const char* path, mode_t mode, dev_t rdev) { @@ -429,6 +586,7 @@ char *full_path = g_strdup_printf("%s%s", ftpfs.host, path + 1); pthread_mutex_lock(&ftpfs.lock); + curl_multi_remove_handle(ftpfs.multi, ftpfs.connection); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_INFILESIZE, 0); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_UPLOAD, 1); @@ -484,6 +642,7 @@ header = curl_slist_append(header, cmd); pthread_mutex_lock(&ftpfs.lock); + curl_multi_remove_handle(ftpfs.multi, ftpfs.connection); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_POSTQUOTE, header); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf); @@ -516,6 +675,7 @@ header = curl_slist_append(header, cmd); pthread_mutex_lock(&ftpfs.lock); + curl_multi_remove_handle(ftpfs.multi, ftpfs.connection); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_POSTQUOTE, header); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf); @@ -547,6 +707,7 @@ header = curl_slist_append(header, cmd); pthread_mutex_lock(&ftpfs.lock); + curl_multi_remove_handle(ftpfs.multi, ftpfs.connection); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_POSTQUOTE, header); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf); @@ -593,20 +754,21 @@ char* full_path = g_strdup_printf("%s%s", ftpfs.host, path + 1); pthread_mutex_lock(&ftpfs.lock); + curl_multi_remove_handle(ftpfs.multi, ftpfs.connection); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_INFILESIZE, fh->buf.len); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_UPLOAD, 1); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_READDATA, fh); CURLcode curl_res = curl_easy_perform(ftpfs.connection); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_UPLOAD, 0); + + fh->dirty = 0; pthread_mutex_unlock(&ftpfs.lock); if (curl_res != 0) { err = -EPERM; } - fh->dirty = 0; - free(full_path); return err; } @@ -620,8 +782,13 @@ static int ftpfs_release(const char* path, struct fuse_file_info* fi) { struct ftpfs_file* fh = (struct ftpfs_file*) (uintptr_t) fi->fh; ftpfs_flush(path, fi); + pthread_mutex_lock(&ftpfs.lock); + if (ftpfs.current_fh == fh) { + ftpfs.current_fh = NULL; + } buf_free(&fh->buf); free(fh); + pthread_mutex_unlock(&ftpfs.lock); return 0; } @@ -637,6 +804,7 @@ header = curl_slist_append(header, rnto); pthread_mutex_lock(&ftpfs.lock); + curl_multi_remove_handle(ftpfs.multi, ftpfs.connection); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_POSTQUOTE, header); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, ftpfs.host); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf); @@ -668,6 +836,7 @@ buf_init(&buf, 0); pthread_mutex_lock(&ftpfs.lock); + curl_multi_remove_handle(ftpfs.multi, ftpfs.connection); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, dir_path); curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf); curl_res = curl_easy_perform(ftpfs.connection); @@ -763,7 +932,7 @@ case FUSE_OPT_KEY_NONOPT: if (!ftpfs.host) { const char* prefix = ""; - if (strncmp(arg, "ftp://", 6)) { + if (strncmp(arg, "ftp://", 6) && strncmp(arg, "ftps://", 7)) { prefix = "ftp://"; } ftpfs.host = g_strdup_printf("%s%s%s", prefix, arg, @@ -815,6 +984,7 @@ " ssl_control enable SSL/TLS only for control connection\n" " ssl_try try SSL/TLS first but connect anyway\n" " no_verify_hostname does not verify the hostname (SSL)\n" +" no_verify_peer does not verify the peer (SSL)\n" " cert=STR client certificate file (SSL)\n" " cert_type=STR certificate file type (DER/PEM/ENG) (SSL)\n" " key=STR private key file name (SSL)\n" @@ -841,43 +1011,45 @@ "\n", progname); } -static void set_common_curl_stuff() { - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEFUNCTION, read_data); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_READFUNCTION, write_data); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_ERRORBUFFER, error_buf); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, ftpfs.host); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); +static void set_common_curl_stuff(CURL* easy) { + curl_easy_setopt_or_die(easy, CURLOPT_WRITEFUNCTION, read_data); + curl_easy_setopt_or_die(easy, CURLOPT_READFUNCTION, write_data); + curl_easy_setopt_or_die(easy, CURLOPT_ERRORBUFFER, error_buf); + curl_easy_setopt_or_die(easy, CURLOPT_URL, ftpfs.host); + curl_easy_setopt_or_die(easy, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); + curl_easy_setopt_or_die(easy, CURLOPT_NOSIGNAL, 1); + curl_easy_setopt_or_die(easy, CURLOPT_CUSTOMREQUEST, "LIST -a"); if (ftpfs.verbose) { - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_VERBOSE, TRUE); + curl_easy_setopt_or_die(easy, CURLOPT_VERBOSE, TRUE); } if (ftpfs.disable_epsv) { - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_FTP_USE_EPSV, FALSE); + curl_easy_setopt_or_die(easy, CURLOPT_FTP_USE_EPSV, FALSE); } if (ftpfs.skip_pasv_ip) { #ifdef CURLOPT_FTP_SKIP_PASV_IP - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_FTP_SKIP_PASV_IP, TRUE); + curl_easy_setopt_or_die(easy, CURLOPT_FTP_SKIP_PASV_IP, TRUE); #endif } if (ftpfs.ftp_port) { - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_FTPPORT, ftpfs.ftp_port); + curl_easy_setopt_or_die(easy, CURLOPT_FTPPORT, ftpfs.ftp_port); } if (ftpfs.disable_eprt) { - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_FTP_USE_EPRT, FALSE); + curl_easy_setopt_or_die(easy, CURLOPT_FTP_USE_EPRT, FALSE); } if (ftpfs.tcp_nodelay) { #ifdef CURLOPT_TCP_NODELAY /* CURLOPT_TCP_NODELAY is not defined in older versions */ - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_TCP_NODELAY, 1); + curl_easy_setopt_or_die(easy, CURLOPT_TCP_NODELAY, 1); #endif } - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_CONNECTTIMEOUT, ftpfs.connect_timeout); + curl_easy_setopt_or_die(easy, CURLOPT_CONNECTTIMEOUT, ftpfs.connect_timeout); /* CURLFTPSSL_CONTROL and CURLFTPSSL_ALL should make the connection fail if * the server doesn't support SSL but libcurl only honors this beginning @@ -899,71 +1071,79 @@ } fprintf(stderr, "\n"); } - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_FTP_SSL, ftpfs.use_ssl); + curl_easy_setopt_or_die(easy, CURLOPT_FTP_SSL, ftpfs.use_ssl); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_SSLCERT, ftpfs.cert); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_SSLCERTTYPE, ftpfs.cert_type); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_SSLKEY, ftpfs.key); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_SSLKEYTYPE, ftpfs.key_type); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_SSLKEYPASSWD, ftpfs.key_password); + curl_easy_setopt_or_die(easy, CURLOPT_SSLCERT, ftpfs.cert); + curl_easy_setopt_or_die(easy, CURLOPT_SSLCERTTYPE, ftpfs.cert_type); + curl_easy_setopt_or_die(easy, CURLOPT_SSLKEY, ftpfs.key); + curl_easy_setopt_or_die(easy, CURLOPT_SSLKEYTYPE, ftpfs.key_type); + curl_easy_setopt_or_die(easy, CURLOPT_SSLKEYPASSWD, ftpfs.key_password); if (ftpfs.engine) { - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_SSLENGINE, ftpfs.engine); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_SSLENGINE_DEFAULT, 1); + curl_easy_setopt_or_die(easy, CURLOPT_SSLENGINE, ftpfs.engine); + curl_easy_setopt_or_die(easy, CURLOPT_SSLENGINE_DEFAULT, 1); + } + + curl_easy_setopt_or_die(easy, CURLOPT_SSL_VERIFYPEER, TRUE); + if (ftpfs.no_verify_peer) { + curl_easy_setopt_or_die(easy, CURLOPT_SSL_VERIFYPEER, FALSE); } if (ftpfs.cacert || ftpfs.capath) { if (ftpfs.cacert) { - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_CAINFO, ftpfs.cacert); + curl_easy_setopt_or_die(easy, CURLOPT_CAINFO, ftpfs.cacert); } if (ftpfs.capath) { - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_CAPATH, ftpfs.capath); + curl_easy_setopt_or_die(easy, CURLOPT_CAPATH, ftpfs.capath); } - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_SSL_VERIFYPEER, TRUE); } if (ftpfs.ciphers) { - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_SSL_CIPHER_LIST, ftpfs.ciphers); + curl_easy_setopt_or_die(easy, CURLOPT_SSL_CIPHER_LIST, ftpfs.ciphers); } if (ftpfs.no_verify_hostname) { /* The default is 2 which verifies even the host string. This sets to 1 * which means verify the host but not the string. */ - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_SSL_VERIFYHOST, 1); + curl_easy_setopt_or_die(easy, CURLOPT_SSL_VERIFYHOST, 1); } - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_INTERFACE, ftpfs.interface); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_KRB4LEVEL, ftpfs.krb4); + curl_easy_setopt_or_die(easy, CURLOPT_INTERFACE, ftpfs.interface); + curl_easy_setopt_or_die(easy, CURLOPT_KRB4LEVEL, ftpfs.krb4); if (ftpfs.proxy) { - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_PROXY, ftpfs.proxy); + curl_easy_setopt_or_die(easy, CURLOPT_PROXY, ftpfs.proxy); /* Connection to FTP servers only make sense with a tunnel proxy */ } if (ftpfs.proxy || ftpfs.proxytunnel) { - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_HTTPPROXYTUNNEL, TRUE); + curl_easy_setopt_or_die(easy, CURLOPT_HTTPPROXYTUNNEL, TRUE); } if (ftpfs.proxyanyauth) { - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_PROXYAUTH, CURLAUTH_ANY); + curl_easy_setopt_or_die(easy, CURLOPT_PROXYAUTH, CURLAUTH_ANY); } else if (ftpfs.proxyntlm) { - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_PROXYAUTH, CURLAUTH_NTLM); + curl_easy_setopt_or_die(easy, CURLOPT_PROXYAUTH, CURLAUTH_NTLM); } else if (ftpfs.proxydigest) { - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST); + curl_easy_setopt_or_die(easy, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST); } else if (ftpfs.proxybasic) { - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_PROXYAUTH, CURLAUTH_BASIC); + curl_easy_setopt_or_die(easy, CURLOPT_PROXYAUTH, CURLAUTH_BASIC); } - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_USERPWD, ftpfs.user); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_PROXYUSERPWD, ftpfs.proxy_user); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_SSLVERSION, ftpfs.ssl_version); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_IPRESOLVE, ftpfs.ip_version); + curl_easy_setopt_or_die(easy, CURLOPT_USERPWD, ftpfs.user); + curl_easy_setopt_or_die(easy, CURLOPT_PROXYUSERPWD, ftpfs.proxy_user); + curl_easy_setopt_or_die(easy, CURLOPT_SSLVERSION, ftpfs.ssl_version); + curl_easy_setopt_or_die(easy, CURLOPT_IPRESOLVE, ftpfs.ip_version); } int main(int argc, char** argv) { int res; struct fuse_args args = FUSE_ARGS_INIT(argc, argv); CURLcode curl_res; + CURL* easy; + // Initialize curl library before we are a multithreaded program + curl_global_init(CURL_GLOBAL_ALL); + memset(&ftpfs, 0, sizeof(ftpfs)); ftpfs.curl_version = curl_version_info(CURLVERSION_NOW); @@ -980,8 +1160,8 @@ exit(1); } - ftpfs.connection = curl_easy_init(); - if (ftpfs.connection == NULL) { + easy = curl_easy_init(); + if (easy == NULL) { fprintf(stderr, "Error initializing libcurl\n"); exit(1); } @@ -1003,21 +1183,31 @@ exit(1); } - set_common_curl_stuff(); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, NULL); - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_NOBODY, ftpfs.safe_nobody); - curl_res = curl_easy_perform(ftpfs.connection); + set_common_curl_stuff(easy); + curl_easy_setopt_or_die(easy, CURLOPT_WRITEDATA, NULL); + curl_easy_setopt_or_die(easy, CURLOPT_NOBODY, ftpfs.safe_nobody); + curl_res = curl_easy_perform(easy); if (curl_res != 0) { fprintf(stderr, "Error connecting to ftp: %s\n", error_buf); exit(1); } - curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_NOBODY, 0); + curl_easy_setopt_or_die(easy, CURLOPT_NOBODY, 0); + ftpfs.multi = curl_multi_init(); + if (ftpfs.multi == NULL) { + fprintf(stderr, "Error initializing libcurl multi\n"); + exit(1); + } + + ftpfs.connection = easy; pthread_mutex_init(&ftpfs.lock, NULL); res = fuse_main(args.argc, args.argv, cache_init(&ftpfs_oper)); - curl_easy_cleanup(ftpfs.connection); - + curl_multi_remove_handle(ftpfs.multi, easy); + curl_easy_cleanup(easy); + curl_multi_cleanup(ftpfs.multi); + curl_global_cleanup(); + return res; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/curlftpfs-0.7/ftpfs.h new/curlftpfs-0.8/ftpfs.h --- old/curlftpfs-0.7/ftpfs.h 2006-04-13 04:36:10.000000000 +0200 +++ new/curlftpfs-0.8/ftpfs.h 2006-05-20 19:59:57.000000000 +0200 @@ -1,8 +1,17 @@ #ifndef __CURLFTPFS_FTPFS_H__ #define __CURLFTPFS_FTPFS_H__ +/* + FTP file system + Copyright (C) 2006 Robson Braga Araujo <robsonbraga(a)gmail.com> + + This program can be distributed under the terms of the GNU GPL. + See the file COPYING. +*/ + #include <curl/curl.h> #include <curl/easy.h> +#include <pthread.h> #include <glib.h> #include <pthread.h> @@ -11,6 +20,8 @@ char* mountpoint; pthread_mutex_t lock; CURL* connection; + CURLM* multi; + struct ftpfs_file* current_fh; unsigned blksize; GHashTable *filetab; int verbose; @@ -24,6 +35,7 @@ int connect_timeout; int use_ssl; int no_verify_hostname; + int no_verify_peer; char* cert; char* cert_type; char* key; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/curlftpfs-0.7/tests/ftpfs-ls_unittest.c new/curlftpfs-0.8/tests/ftpfs-ls_unittest.c --- old/curlftpfs-0.7/tests/ftpfs-ls_unittest.c 2006-04-05 03:36:58.000000000 +0200 +++ new/curlftpfs-0.8/tests/ftpfs-ls_unittest.c 2006-05-20 19:49:54.000000000 +0200 @@ -1,9 +1,19 @@ +/* + FTP file system + Copyright (C) 2006 Robson Braga Araujo <robsonbraga(a)gmail.com> + + This program can be distributed under the terms of the GNU GPL. + See the file COPYING. +*/ + #include "ftpfs.h" #include "ftpfs-ls.h" #include <stdlib.h> #include <stdio.h> #include <string.h> #include <assert.h> +#define _XOPEN_SOURCE /* glibc2 needs this */ +#include <time.h> struct ftpfs ftpfs; @@ -15,16 +25,16 @@ memset(&tm, 0, sizeof(tm)); \ strptime(date, "%H:%M:%S %d/%m/%Y", &tm); \ tt = mktime(&tm); \ - assert(sbuf.st_dev == dev); \ - assert(sbuf.st_ino == ino); \ - assert(sbuf.st_mode == mode); \ - assert(sbuf.st_nlink == nlink); \ - assert(sbuf.st_uid == uid); \ - assert(sbuf.st_gid == gid); \ - assert(sbuf.st_rdev == rdev); \ - assert(sbuf.st_size == size); \ - assert(sbuf.st_blksize == blksize); \ - assert(sbuf.st_blocks == blocks); \ + assert(sbuf.st_dev == (dev)); \ + assert(sbuf.st_ino == (ino)); \ + assert(sbuf.st_mode == (mode)); \ + assert(sbuf.st_nlink == (nlink)); \ + assert(sbuf.st_uid == (uid)); \ + assert(sbuf.st_gid == (gid)); \ + assert(sbuf.st_rdev == (rdev)); \ + assert(sbuf.st_size == (size)); \ + assert(sbuf.st_blksize == (blksize)); \ + assert(sbuf.st_blocks == (blocks)); \ assert(sbuf.st_atime == tt); \ assert(sbuf.st_ctime == tt); \ assert(sbuf.st_mtime == tt); \ @@ -32,17 +42,19 @@ int main(int argc, char **argv) { const char *list; + char line[256]; struct fuse_cache_operations dummy_oper; struct stat sbuf; int err; struct fuse_args args = FUSE_ARGS_INIT(argc, argv); char linkbuf[1024]; - char year[5]; char date[20]; time_t tt; + struct tm tm; + struct tm test_tm; tt = time(NULL); - strftime(year, 5, "%Y", gmtime(&tt)); + gmtime_r(&tt, &tm); ftpfs.blksize = 4096; memset(&dummy_oper, 0, sizeof(dummy_oper)); @@ -79,10 +91,18 @@ assert(!strcmp(linkbuf, "Science/molbio")); check(sbuf, 0, 0, S_IFLNK|S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH, 1, 0, 0, 0, 14, 4096, 8, "00:00:00 12/03/2004"); - list = "drwxr-xr-x 4 robson users 4096 Apr 3 15:50 tests\r\n"; - err = parse_dir(list, "/", "tests", &sbuf, NULL, 0, NULL, NULL); + // Test a date six months in the past + test_tm = tm; + test_tm.tm_mon -= 6; + if (test_tm.tm_mon < 0) { + test_tm.tm_mon += 12; + test_tm.tm_year--; + } + strftime(line, 256, + "drwxr-xr-x 4 robson users 4096 %b %d 00:00 tests\r\n", &test_tm); + err = parse_dir(line, "/", "tests", &sbuf, NULL, 0, NULL, NULL); assert(err == 0); - sprintf(date, "15:50:00 03/04/%s", year); + strftime(date, 20, "00:00:00 %d/%m/%Y", &test_tm); check(sbuf, 0, 0, S_IFDIR|S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH, 4, 0, 0, 0, 4096, 4096, 8, date); list = "dr-xr-xr-x 2 root 512 Apr 8 1994 etc\r\n"; @@ -90,10 +110,14 @@ assert(err == 0); check(sbuf, 0, 0, S_IFDIR|S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH, 2, 0, 0, 0, 512, 4096, 8, "00:00:00 08/04/1994"); - list = "---------- 1 owner group 1803128 Jul 10 10:18 ls-lR.Z\r\n"; - err = parse_dir(list, "/", "ls-lR.Z", &sbuf, NULL, 0, NULL, NULL); + // Test a date a little bit in the past + test_tm = tm; + strftime(line, 256, + "---------- 1 robson users 1803128 %b %d 00:00 ls-lR.Z\r\n", + &test_tm); + err = parse_dir(line, "/", "ls-lR.Z", &sbuf, NULL, 0, NULL, NULL); assert(err == 0); - sprintf(date, "10:18:00 10/07/%s", year); + strftime(date, 20, "00:00:00 %d/%m/%Y", &test_tm); check(sbuf, 0, 0, S_IFREG, 1, 0, 0, 0, 1803128, 4096, 3528, date); return 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit aaa_base
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package aaa_base checked in at Fri May 26 12:43:09 CEST 2006. -------- --- aaa_base/aaa_base.changes 2006-05-19 15:07:28.000000000 +0200 +++ aaa_base/aaa_base.changes 2006-05-25 15:09:54.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 25 15:09:01 CEST 2006 - olh(a)suse.de + +- boot.loadmodules is optional for boot.localfs (#130995) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.nyPaQj/_old 2006-05-26 12:42:05.000000000 +0200 +++ /var/tmp/diff_new_pack.nyPaQj/_new 2006-05-26 12:42:05.000000000 +0200 @@ -19,7 +19,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv Autoreqprov: on Version: 10.1 -Release: 44 +Release: 45 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -147,6 +147,8 @@ %defattr(-,root,root) %changelog -n aaa_base +* Thu May 25 2006 - olh(a)suse.de +- boot.loadmodules is optional for boot.localfs (#130995) * Fri May 19 2006 - ro(a)suse.de - added sysconfig variable DMAPI_PROBE to be able to set /proc/sys/fs/xfs/probe_dmapi early enough in the boot process ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.localfs new/aaa_base/etc/init.d/boot.localfs --- old/aaa_base/etc/init.d/boot.localfs 2006-04-20 15:34:00.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.localfs 2006-05-25 15:07:57.000000000 +0200 @@ -7,8 +7,8 @@ # ### BEGIN INIT INFO # Provides: boot.localfs -# Required-Start: boot.udev boot.loadmodules -# Should-Start: boot.ibmsis boot.md boot.lvm dasd_devfs_compat boot.scsidev boot.multipath +# Required-Start: boot.udev +# Should-Start: boot.ibmsis boot.md boot.lvm dasd_devfs_compat boot.scsidev boot.multipath boot.loadmodules # Required-Stop: # Default-Start: B # Default-Stop: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit CASA
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package CASA checked in at Fri May 26 12:41:23 CEST 2006. -------- --- CASA/CASA.changes 2006-05-23 04:24:56.000000000 +0200 +++ CASA/CASA.changes 2006-05-26 12:40:40.000000000 +0200 @@ -0,0 +1,8 @@ +-------------------------------------------------------------------- +Thu May 25 09:21:53 MST 2006 - cmashayekhi(a)novell.com +- casa-gnome-keyring.h was cleaned up. + +------------------------------------------------------------------ +Tue May 23 14:15:21 MST 2006 - cmashayekhi(a)novell.com +- Eliminated the gnome-kering.h header file. + @@ -2 +10 @@ -Monday May 22 14:01:31 MST 2006 - cmashayekhi(a)novell.com +Mon May 22 14:01:31 MST 2006 - cmashayekhi(a)novell.com Old: ---- CASA-1.6.641.tar.bz2 New: ---- CASA-1.6.658.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CASA.spec ++++++ --- /var/tmp/diff_new_pack.S1EiBP/_old 2006-05-26 12:40:52.000000000 +0200 +++ /var/tmp/diff_new_pack.S1EiBP/_new 2006-05-26 12:40:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package CASA (Version 1.6.641 ) +# spec file for package CASA (Version 1.6.658 ) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -23,7 +23,7 @@ Group: Productivity/Other Autoreqprov: on %define bldno 1.1.1 -Version: 1.6.641 +Version: 1.6.658 Release: 1 Summary: Novell Common Authentication Service Adapter (CASA) Source: %{name}-%{version}.tar.bz2 @@ -256,6 +256,14 @@ %{prefix}/CASA/help/en/* %changelog -n CASA +* Thu May 25 2006 - cmashayekhi(a)novell.com +- casa-gnome-keyring.h was cleaned up. +* Tue May 23 2006 - cmashayekhi(a)novell.com +- Eliminated the gnome-kering.h header file. +* Mon May 22 2006 - cmashayekhi(a)novell.com +- Fixed dependency cycle between CASA <-> gnome-keyring. +- Bug 176736. Fixed micasad startup/shutdown process to clean up + open files on shutdown and upgrade. * Thu May 11 2006 - jnorman(a)novell.com - Bug 174093. Set our process name to CASAManager so gnome-keyring knows who we are. @@ -837,8 +845,3 @@ -The image version to 1.5.0 Files: - Moving from version 1.0.0 to 1.5.0 as per PRD. -* Tue Jan 01 2000 - nobody(a)suse.de - Monday May 22 14:01:31 MST 2006 - cmashayekhi(a)novell.com -- Fixed dependency cycle between CASA <-> gnome-keyring. -- Bug 176736. Fixed micasad startup/shutdown process to clean up - open files on shutdown and upgrade. ++++++ CASA-1.6.641.tar.bz2 -> CASA-1.6.658.tar.bz2 ++++++ ++++ 2969 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit NetworkManager
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package NetworkManager checked in at Fri May 26 12:41:16 CEST 2006. -------- --- NetworkManager/NetworkManager.changes 2006-05-24 17:24:31.000000000 +0200 +++ NetworkManager/NetworkManager.changes 2006-05-25 17:02:52.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 25 16:58:39 CEST 2006 - rml(a)suse.de + +- For ndiswrapper, only use "AP_SCAN 2" if the network is not + broadcasting (Novell bug #178210) + +------------------------------------------------------------------- @@ -7 +13 @@ -- Bump version requirement on wpa_supplicant to 0.4.8-14.1 from +- Bump version requirement on wpa_supplicant to 0.4.8-14 from ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.S4UhXE/_old 2006-05-26 12:40:50.000000000 +0200 +++ /var/tmp/diff_new_pack.S4UhXE/_new 2006-05-26 12:40:50.000000000 +0200 @@ -31,7 +31,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ Autoreqprov: on Version: 0.6.2 -Release: 38 +Release: 39 Summary: Network Link Manager and User Applications Source0: NetworkManager-%{version}.tar.gz Source1: nm-icons.tar.gz @@ -261,11 +261,14 @@ %{_libdir}/libnm_glib.so.0.0.0 %changelog -n NetworkManager +* Thu May 25 2006 - rml(a)suse.de +- For ndiswrapper, only use "AP_SCAN 2" if the network is not + broadcasting (Novell bug #178210) * Wed May 24 2006 - rml(a)suse.de - Do not fallback to link-local IP generation on infrastructure wireless networks, only Ad-Hoc (Novell bug #178403) - Set and use the current locale directory (Novell bug #169096) -- Bump version requirement on wpa_supplicant to 0.4.8-14.1 from +- Bump version requirement on wpa_supplicant to 0.4.8-14 from 0.4.8-9 (Novell bug #175892) * Mon May 22 2006 - rml(a)suse.de - Fix ypbind/autofs behavior to never automatically start either, ++++++ nm-wireless-driver-workarounds-rml.patch ++++++ --- /var/tmp/diff_new_pack.S4UhXE/_old 2006-05-26 12:40:51.000000000 +0200 +++ /var/tmp/diff_new_pack.S4UhXE/_new 2006-05-26 12:40:51.000000000 +0200 @@ -133,9 +133,9 @@ - * - The wireless network is non-broadcast or user created - * - The wireless driver does not support WPA + * - The wireless driver does not support "AP_SCAN 1" -+ * (orinoco, prism54, airo, airo_cs, and ndiswrapper) -+ * - The wireless network is hidden and the driver does not -+ * support "AP_SCAN 1" with hidden networks (ipw2100 and ipw2200) ++ * (orinoco, prism54, airo, and airo_cs) ++ * - The wireless network is hidden and the driver does not support ++ * "AP_SCAN 1" with hidden networks (ipw2100, ipw2200, and ndiswrapper) + * - The wireless network is user created + * - The wireless driver does not support WPA + * Otherwise, we prefer "AP_SCAN 1". @@ -149,7 +149,7 @@ ap_scan = "AP_SCAN 2"; + else if (!strncmp (kernel_driver, "airo", 4)) + ap_scan = "AP_SCAN 2"; -+ else if (!strcmp (kernel_driver, "ndiswrapper")) ++ else if (!strcmp (kernel_driver, "ndiswrapper") && !nm_ap_get_broadcast (ap)) + ap_scan = "AP_SCAN 2"; + else if (!strcmp (kernel_driver, "ipw2100") || !strcmp (kernel_driver, "ipw2200")) + { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit 3ddiag
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package 3ddiag checked in at Fri May 26 12:39:49 CEST 2006. -------- --- 3ddiag/3ddiag.changes 2006-04-19 23:34:49.000000000 +0200 +++ 3ddiag/3ddiag.changes 2006-05-25 20:34:03.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 25 20:33:22 CEST 2006 - sndirsch(a)suse.de + +- nvidia.diff: + * also check for the nvidia driver in new updates path + (Bug #178853) + +------------------------------------------------------------------- New: ---- nvidia.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 3ddiag.spec ++++++ --- /var/tmp/diff_new_pack.YuTmw4/_old 2006-05-26 12:39:41.000000000 +0200 +++ /var/tmp/diff_new_pack.YuTmw4/_new 2006-05-26 12:39:41.000000000 +0200 @@ -16,12 +16,13 @@ Group: System/Base Autoreqprov: on Version: 0.734 -Release: 1 +Release: 6 Summary: A Tool to Verify the 3D Configuration Source: 3Ddiag-%{version}.tar.gz Source5: switch2nv Source6: switch2nvidia Source7: 3Ddiag-result +Patch: nvidia.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -35,6 +36,7 @@ %prep %setup -n 3Ddiag +%patch %build make CFLAGS="$RPM_OPT_FLAGS" @@ -70,6 +72,10 @@ /usr/bin/switch2nvidia %changelog -n 3ddiag +* Thu May 25 2006 - sndirsch(a)suse.de +- nvidia.diff: + * also check for the nvidia driver in new updates path + (Bug #178853) * Wed Apr 19 2006 - sndirsch(a)suse.de - 3Ddiag-0.734.tar.gz: * DRI driver support update (when "--ignoredb" option is used) ++++++ nvidia.diff ++++++ --- 3Ddiag.orig 2006-05-25 20:29:48.180478152 +0200 +++ 3Ddiag 2006-05-25 20:30:42.136057281 +0200 @@ -183,7 +183,7 @@ echo -n " $server ... " libdir="lib" test "$(arch)" == "x86_64" && libdir="lib64" - strings /usr/X11R6/$libdir/modules/drivers/nvidia_drv.so | \ + strings /usr/X11R6/$libdir/modules/{updates/,}drivers/nvidia_drv.so | \ grep -q "NVIDIA dlloader X Driver" if test $? -eq 0; then echo "done." ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-iscsi-client
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package yast2-iscsi-client checked in at Fri May 26 12:39:33 CEST 2006. -------- --- yast2-iscsi-client/yast2-iscsi-client.changes 2006-05-04 14:04:20.000000000 +0200 +++ yast2-iscsi-client/yast2-iscsi-client.changes 2006-05-25 18:19:21.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 25 18:17:55 CEST 2006 - mzugec(a)suse.cz + +- fixed #149055 - iscsi client login always asks for credentials + +------------------------------------------------------------------- Old: ---- yast2-iscsi-client-2.13.17.tar.bz2 New: ---- yast2-iscsi-client-2.13.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.oRxyeF/_old 2006-05-26 12:39:28.000000000 +0200 +++ /var/tmp/diff_new_pack.oRxyeF/_new 2006-05-26 12:39:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-iscsi-client (Version 2.13.17) +# spec file for package yast2-iscsi-client (Version 2.13.18) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-iscsi-client -Version: 2.13.17 -Release: 6 +Version: 2.13.18 +Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-client-2.13.17.tar.bz2 +Source0: yast2-iscsi-client-2.13.18.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite Requires: yast2 @@ -29,7 +29,7 @@ %prep -%setup -n yast2-iscsi-client-2.13.17 +%setup -n yast2-iscsi-client-2.13.18 %build %{prefix}/bin/y2tool y2autoconf @@ -65,6 +65,8 @@ %doc %{prefix}/share/doc/packages/yast2-iscsi-client %changelog -n yast2-iscsi-client +* Thu May 25 2006 - mzugec(a)suse.cz +- fixed #149055 - iscsi client login always asks for credentials * Thu May 04 2006 - mzugec(a)suse.cz - proofread * Mon Apr 24 2006 - mzugec(a)suse.cz ++++++ yast2-iscsi-client-2.13.17.tar.bz2 -> yast2-iscsi-client-2.13.18.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.17/Makefile.am new/yast2-iscsi-client-2.13.18/Makefile.am --- old/yast2-iscsi-client-2.13.17/Makefile.am 2006-05-04 13:58:15.000000000 +0200 +++ new/yast2-iscsi-client-2.13.18/Makefile.am 2006-05-25 18:03:24.000000000 +0200 @@ -8,6 +8,7 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -95,7 +96,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -116,7 +117,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -143,20 +144,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -200,12 +201,12 @@ fi check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + $(Y2TOOL) check-textdomain $(srcdir) stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.17/Makefile.in new/yast2-iscsi-client-2.13.18/Makefile.in --- old/yast2-iscsi-client-2.13.17/Makefile.in 2006-05-04 13:58:24.000000000 +0200 +++ new/yast2-iscsi-client-2.13.18/Makefile.in 2006-05-25 18:03:33.000000000 +0200 @@ -198,6 +198,7 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) @@ -227,7 +228,7 @@ $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1) @CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc @CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion # test ! -d $(srcdir)/po \ # || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am @@ -724,7 +725,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -745,7 +746,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -772,15 +773,15 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local @@ -827,12 +828,12 @@ fi check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + $(Y2TOOL) check-textdomain $(srcdir) stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules checkpo: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.17/VERSION new/yast2-iscsi-client-2.13.18/VERSION --- old/yast2-iscsi-client-2.13.17/VERSION 2006-04-24 08:37:59.000000000 +0200 +++ new/yast2-iscsi-client-2.13.18/VERSION 2006-05-25 18:14:00.000000000 +0200 @@ -1 +1 @@ -2.13.17 +2.13.18 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.17/configure new/yast2-iscsi-client-2.13.18/configure --- old/yast2-iscsi-client-2.13.17/configure 2006-05-04 13:58:21.000000000 +0200 +++ new/yast2-iscsi-client-2.13.18/configure 2006-05-25 18:03:30.000000000 +0200 @@ -2,7 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for yast2-iscsi-client 2.13.17. # -# Report bugs to <http://www.suse.de/feedback>. +# Report bugs to <http://bugs.opensuse.org/>. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -271,7 +271,7 @@ PACKAGE_TARNAME='yast2-iscsi-client' PACKAGE_VERSION='2.13.17' PACKAGE_STRING='yast2-iscsi-client 2.13.17' -PACKAGE_BUGREPORT='http://www.suse.de/feedback' +PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" ac_default_prefix=/usr @@ -812,7 +812,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <http://www.suse.de/feedback>. +Report bugs to <http://bugs.opensuse.org/>. _ACEOF fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.17/configure.in new/yast2-iscsi-client-2.13.18/configure.in --- old/yast2-iscsi-client-2.13.17/configure.in 2006-05-04 13:58:15.000000000 +0200 +++ new/yast2-iscsi-client-2.13.18/configure.in 2006-05-25 18:03:24.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-iscsi-client dnl -dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-iscsi-client, 2.13.17, http://www.suse.de/feedback, yast2-iscsi-client) +AC_INIT(yast2-iscsi-client, 2.13.17, http://bugs.opensuse.org/, yast2-iscsi-client) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.17/src/IscsiClient.ycp new/yast2-iscsi-client-2.13.18/src/IscsiClient.ycp --- old/yast2-iscsi-client-2.13.17/src/IscsiClient.ycp 2006-04-24 08:05:44.000000000 +0200 +++ new/yast2-iscsi-client-2.13.18/src/IscsiClient.ycp 2006-05-25 18:18:25.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: IscsiClient settings, input and output functions * Authors: Michal Zugec <mzugec(a)suse.cz> * - * $Id: IscsiClient.ycp 30374 2006-04-24 05:55:11Z mzugec $ + * $Id: IscsiClient.ycp 31156 2006-05-25 16:17:12Z mzugec $ * * Representation of the configuration of iscsi-client. * Input and output routines. @@ -59,6 +59,38 @@ SCR::Write(.etc.iscsid.all, config); } + +global map<string, any> getNode(string rec){ + map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, "iscsiadm -S -m node -r $REC", $["REC":rec]); +// y2internal("getting record ... %1", cmd); + if (cmd["exit"]:0!=0) return $[]; + map<string, any> auth = $[]; + foreach(string row, splitstring(cmd["stdout"]:"", "\n"), { + string key = splitstring(row," = ")[0]:""; + string val = splitstring(row," = ")[3]:""; + if(val == "<empty>") val=""; + switch(key){ + case("node.session.auth.authmethod"): + auth["authmethod"]=val; + break; + case("node.session.auth.username"): + auth["username"]=val; + break; + case("node.session.auth.password"): + auth["password"]=val; + break; + case("node.session.auth.username_in"): + auth["username_in"]=val; + break; + case("node.session.auth.password_in"): + auth["password_in"]=val; + break; + } + }); +// y2internal("%1", auth); + return auth; +} + // create map from given map in format needed by ini-agent map<string, any> createMap(map<string, any> old_map, list<string> comments) { @@ -194,6 +226,7 @@ y2milestone("reading current settings"); map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, "iscsiadm -m session"); if (size(retcode["stderr"]:"")>0) return false; +//y2internal("retcode %1", retcode); sessions = filter(string row, splitstring(retcode["stdout"]:"", "\n"), { return ( size(row)>0 && (search(row, "session")==nil) ); }); @@ -263,7 +296,7 @@ global boolean setValue(string record, string name, string value){ y2milestone("set %1 for record %3", name, record); string command = sformat("iscsiadm -m node -r %1 --op=update --name=%2 --value=%3", record, name, value); -// y2milestone("execute command - %1", command ); + y2milestone("execute command - %1", command ); boolean ret = true; map<string, any> retcode = (map<string, any>) SCR::Execute(.target.bash_output, command); if (size(retcode["stderr"]:"")>0) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.17/src/dialogs.ycp new/yast2-iscsi-client-2.13.18/src/dialogs.ycp --- old/yast2-iscsi-client-2.13.17/src/dialogs.ycp 2006-04-12 16:34:46.000000000 +0200 +++ new/yast2-iscsi-client-2.13.18/src/dialogs.ycp 2006-05-25 18:03:05.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Michal Zugec <mzugec(a)suse.cz> * - * $Id: dialogs.ycp 30067 2006-04-12 14:34:10Z mzugec $ + * $Id: dialogs.ycp 31155 2006-05-25 16:00:19Z mzugec $ */ { @@ -141,7 +141,7 @@ `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) ) ), - "init" : initDiscAuth, + "init" : initConnAuth, "handle" : handleDiscAuth, "validate_type" : `function, "validate_function" : validateConnAuth, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.17/src/widgets.ycp new/yast2-iscsi-client-2.13.18/src/widgets.ycp --- old/yast2-iscsi-client-2.13.17/src/widgets.ycp 2006-05-04 13:57:50.000000000 +0200 +++ new/yast2-iscsi-client-2.13.18/src/widgets.ycp 2006-05-25 18:13:46.000000000 +0200 @@ -32,6 +32,7 @@ } y2milestone("Time spent: %1 msec", time_spent); stdout = (list<string>)(SCR::Read(.background.newout)); +//y2internal("stdout %1", stdout); if (cont_loop) { return_code = (integer) SCR::Read(.background.status); if (return_code == 255) { @@ -197,6 +198,21 @@ setAuthOut(false); } +void initConnAuth(string key){ + setAuthIn(false); + setAuthOut(false); + map<string, any> auth = IscsiClient::getNode(curr_rec); + if (size(auth)>0) + { +// y2internal("%1", auth); + UI::ChangeWidget(`id(`user_in),`Value, auth["username_in"]:"" ); + UI::ChangeWidget(`id(`pass_in),`Value, auth["password_in"]:"" ); + if ((size(auth["username_in"]:"")>0)&&(size(auth["password_in"]:"")>0)) setAuthOut(true); + UI::ChangeWidget(`id(`user_out),`Value, auth["username"]:"" ); + UI::ChangeWidget(`id(`pass_out),`Value, auth["password"]:"" ); + if ((size(auth["username"]:"")>0)&&(size(auth["password"]:"")>0)) setAuthOut(true); + } +} // handle for enable/disable widgets in authentication dialog symbol handleDiscAuth(string key, map event){ if (event["EventReason"]:"" == "ValueChanged"){ @@ -220,13 +236,13 @@ return nil; } -boolean validateDiscAuth(any key, map event){ +global boolean validateDiscAuth(string key, map event){ return checkAuthEntry(); } // *******************Server Location *********************** // do discovery to selected portal -boolean validateServerLocation(any key, map event){ +boolean validateServerLocation(string key, map event){ boolean ret = true; string ip = tostring(UI::QueryWidget(`hostname, `Value)); string port = tostring(UI::QueryWidget(`port, `Value)); @@ -391,7 +407,7 @@ //***************** connection autentication ******************* // login to target with authentication -boolean validateConnAuth(any key, map event){ +global boolean validateConnAuth(string key, map event){ boolean ret = true; boolean auth_none = (boolean) UI::QueryWidget(`id(`auth_none), `Value); boolean auth_in = (boolean) UI::QueryWidget(`id(`auth_in), `Value); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-installation
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package yast2-installation checked in at Fri May 26 12:39:24 CEST 2006. -------- --- yast2-installation/yast2-installation.changes 2006-05-24 13:23:29.000000000 +0200 +++ yast2-installation/yast2-installation.changes 2006-05-25 08:59:13.000000000 +0200 @@ -1,0 +2,8 @@ +Thu May 25 08:46:56 CEST 2006 - jsrain(a)suse.cz + +- added possibility to specify add-on product URL as command-line + parameter of add-on.ycp (to run add-on product workflow via + autorun.sh) +- 2.13.114 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.13.113.tar.bz2 New: ---- yast2-installation-2.13.114.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.q2srbk/_old 2006-05-26 12:38:57.000000000 +0200 +++ /var/tmp/diff_new_pack.q2srbk/_new 2006-05-26 12:38:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.13.113) +# spec file for package yast2-installation (Version 2.13.114) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-installation -Version: 2.13.113 +Version: 2.13.114 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.13.113.tar.bz2 +Source0: yast2-installation-2.13.114.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite Requires: yast2 yast2-update @@ -48,7 +48,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-installation-2.13.113 +%setup -n yast2-installation-2.13.114 %build %{prefix}/bin/y2tool y2autoconf @@ -111,6 +111,11 @@ /usr/X11R6/share/fvwm/ %changelog -n yast2-installation +* Thu May 25 2006 - jsrain(a)suse.cz +- added possibility to specify add-on product URL as command-line + parameter of add-on.ycp (to run add-on product workflow via + autorun.sh) +- 2.13.114 * Wed May 24 2006 - jsrain(a)suse.cz - properly integrate YCP code for add-on product installation in running system (if YCP code present) (#178311) ++++++ yast2-installation-2.13.113.tar.bz2 -> yast2-installation-2.13.114.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.113/VERSION new/yast2-installation-2.13.114/VERSION --- old/yast2-installation-2.13.113/VERSION 2006-05-24 13:09:27.000000000 +0200 +++ new/yast2-installation-2.13.114/VERSION 2006-05-25 08:50:27.000000000 +0200 @@ -1 +1 @@ -2.13.113 +2.13.114 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.113/configure new/yast2-installation-2.13.114/configure --- old/yast2-installation-2.13.113/configure 2006-05-24 13:22:14.000000000 +0200 +++ new/yast2-installation-2.13.114/configure 2006-05-25 08:58:04.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.113. +# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.114. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-installation' PACKAGE_TARNAME='yast2-installation' -PACKAGE_VERSION='2.13.113' -PACKAGE_STRING='yast2-installation 2.13.113' +PACKAGE_VERSION='2.13.114' +PACKAGE_STRING='yast2-installation 2.13.114' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-installation 2.13.113 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.13.114 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-installation 2.13.113:";; + short | recursive ) echo "Configuration of yast2-installation 2.13.114:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-installation configure 2.13.113 +yast2-installation configure 2.13.114 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-installation $as_me 2.13.113, which was +It was created by yast2-installation $as_me 2.13.114, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-installation' - VERSION='2.13.113' + VERSION='2.13.114' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.113" +VERSION="2.13.114" RPMNAME="yast2-installation" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -2906,7 +2906,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-installation $as_me 2.13.113, which was +This file was extended by yast2-installation $as_me 2.13.114, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2961,7 +2961,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-installation config.status 2.13.113 +yast2-installation config.status 2.13.114 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/yast2-installation-2.13.113/configure.in new/yast2-installation-2.13.114/configure.in --- old/yast2-installation-2.13.113/configure.in 2006-05-24 13:22:05.000000000 +0200 +++ new/yast2-installation-2.13.114/configure.in 2006-05-25 08:57:56.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.13.113, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.13.114, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.113" +VERSION="2.13.114" RPMNAME="yast2-installation" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.113/control.pot new/yast2-installation-2.13.114/control.pot --- old/yast2-installation-2.13.113/control.pot 2006-05-16 13:34:45.000000000 +0200 +++ new/yast2-installation-2.13.114/control.pot 2006-05-24 15:14:53.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 13:34+0200\n" +"POT-Creation-Date: 2006-05-24 15:14+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: control/control.PROF.glade:63 control/control.glade:63 +#: control/control.PROF.glade:63 control/control.glade:64 msgid "" "\n" "Congratulations!\n" @@ -31,34 +31,34 @@ #: control/control.PROF.glade:422 control/control.PROF.glade:462 #: control/control.SLD.glade:79 control/control.SLD.glade:137 #: control/control.SLD.glade:431 control/control.SLD.glade:471 -#: control/control.SLES.glade:81 control/control.SLES.glade:127 -#: control/control.SLES.glade:183 control/control.SLES.glade:204 -#: control/control.SLES.glade:542 control/control.SLES.glade:582 -#: control/control.glade:75 control/control.glade:133 -#: control/control.glade:425 control/control.glade:465 +#: control/control.SLES.glade:84 control/control.SLES.glade:130 +#: control/control.SLES.glade:186 control/control.SLES.glade:207 +#: control/control.SLES.glade:545 control/control.SLES.glade:585 +#: control/control.glade:76 control/control.glade:134 +#: control/control.glade:426 control/control.glade:466 msgid "Installation Settings" msgstr "" #: control/control.PROF.glade:93 control/control.SLD.glade:98 -#: control/control.SLES.glade:100 control/control.SLES.glade:145 -#: control/control.glade:94 +#: control/control.SLES.glade:103 control/control.SLES.glade:148 +#: control/control.glade:95 msgid "Overview" msgstr "" #: control/control.PROF.glade:101 control/control.SLD.glade:106 -#: control/control.SLES.glade:109 control/control.SLES.glade:153 -#: control/control.glade:102 +#: control/control.SLES.glade:112 control/control.SLES.glade:156 +#: control/control.glade:103 msgid "Expert" msgstr "" #: control/control.PROF.glade:117 control/control.SLD.glade:123 -#: control/control.SLES.glade:169 control/control.glade:119 +#: control/control.SLES.glade:172 control/control.glade:120 msgid "Update Settings" msgstr "" #: control/control.PROF.glade:150 control/control.SLD.glade:157 -#: control/control.SLES.glade:222 control/control.SLES.glade:263 -#: control/control.glade:153 +#: control/control.SLES.glade:225 control/control.SLES.glade:266 +#: control/control.glade:154 msgid "Network Configuration" msgstr "" @@ -66,20 +66,20 @@ #: control/control.PROF.glade:663 control/control.PROF.glade:667 #: control/control.SLD.glade:197 control/control.SLD.glade:667 #: control/control.SLD.glade:672 control/control.SLD.glade:676 -#: control/control.SLES.glade:296 control/control.SLES.glade:307 -#: control/control.SLES.glade:316 control/control.SLES.glade:783 -#: control/control.SLES.glade:788 control/control.SLES.glade:792 -#: control/control.glade:193 control/control.glade:653 -#: control/control.glade:658 control/control.glade:662 +#: control/control.SLES.glade:299 control/control.SLES.glade:310 +#: control/control.SLES.glade:319 control/control.SLES.glade:786 +#: control/control.SLES.glade:791 control/control.SLES.glade:795 +#: control/control.glade:194 control/control.glade:654 +#: control/control.glade:659 control/control.glade:663 msgid "Hardware Configuration" msgstr "" #: control/control.PROF.glade:209 control/control.PROF.glade:305 #: control/control.PROF.glade:393 control/control.SLD.glade:216 #: control/control.SLD.glade:314 control/control.SLD.glade:402 -#: control/control.SLES.glade:335 control/control.SLES.glade:425 -#: control/control.SLES.glade:513 control/control.glade:212 -#: control/control.glade:308 control/control.glade:396 +#: control/control.SLES.glade:338 control/control.SLES.glade:428 +#: control/control.SLES.glade:516 control/control.glade:213 +#: control/control.glade:309 control/control.glade:397 msgid "Preparation" msgstr "" @@ -89,59 +89,59 @@ #: control/control.SLD.glade:222 control/control.SLD.glade:231 #: control/control.SLD.glade:320 control/control.SLD.glade:329 #: control/control.SLD.glade:426 control/control.SLD.glade:466 -#: control/control.SLES.glade:341 control/control.SLES.glade:350 -#: control/control.SLES.glade:431 control/control.SLES.glade:440 -#: control/control.SLES.glade:537 control/control.SLES.glade:577 -#: control/control.glade:218 control/control.glade:227 -#: control/control.glade:314 control/control.glade:323 -#: control/control.glade:420 control/control.glade:460 +#: control/control.SLES.glade:344 control/control.SLES.glade:353 +#: control/control.SLES.glade:434 control/control.SLES.glade:443 +#: control/control.SLES.glade:540 control/control.SLES.glade:580 +#: control/control.glade:219 control/control.glade:228 +#: control/control.glade:315 control/control.glade:324 +#: control/control.glade:421 control/control.glade:461 msgid "Language" msgstr "" #: control/control.PROF.glade:230 control/control.PROF.glade:326 #: control/control.SLD.glade:237 control/control.SLD.glade:335 -#: control/control.SLES.glade:356 control/control.SLES.glade:446 -#: control/control.glade:233 control/control.glade:329 +#: control/control.SLES.glade:359 control/control.SLES.glade:449 +#: control/control.glade:234 control/control.glade:330 msgid "License Agreement" msgstr "" #: control/control.PROF.glade:236 control/control.PROF.glade:332 #: control/control.SLD.glade:243 control/control.SLD.glade:341 -#: control/control.SLES.glade:362 control/control.SLES.glade:452 -#: control/control.glade:239 control/control.glade:335 +#: control/control.SLES.glade:365 control/control.SLES.glade:455 +#: control/control.glade:240 control/control.glade:336 msgid "Disk Activation" msgstr "" #: control/control.PROF.glade:242 control/control.PROF.glade:338 #: control/control.SLD.glade:249 control/control.SLD.glade:347 -#: control/control.SLES.glade:368 control/control.SLES.glade:458 -#: control/control.glade:245 control/control.glade:341 +#: control/control.SLES.glade:371 control/control.SLES.glade:461 +#: control/control.glade:246 control/control.glade:342 msgid "System Analysis" msgstr "" #: control/control.PROF.glade:248 control/control.PROF.glade:350 #: control/control.SLD.glade:255 control/control.SLD.glade:359 -#: control/control.SLES.glade:374 control/control.SLES.glade:470 -#: control/control.glade:251 control/control.glade:353 +#: control/control.SLES.glade:377 control/control.SLES.glade:473 +#: control/control.glade:252 control/control.glade:354 msgid "Add-On Products" msgstr "" #: control/control.PROF.glade:254 control/control.SLD.glade:261 -#: control/control.SLES.glade:380 control/control.glade:257 +#: control/control.SLES.glade:383 control/control.glade:258 msgid "Time Zone" msgstr "" -#: control/control.PROF.glade:263 control/control.glade:266 +#: control/control.PROF.glade:263 control/control.glade:267 msgid "Desktop Selection" msgstr "" #: control/control.PROF.glade:270 control/control.SLD.glade:279 -#: control/control.SLES.glade:390 control/control.glade:273 +#: control/control.SLES.glade:393 control/control.glade:274 msgid "Installation" msgstr "" #: control/control.PROF.glade:273 control/control.SLD.glade:282 -#: control/control.SLES.glade:393 control/control.glade:276 +#: control/control.SLES.glade:396 control/control.glade:277 msgid "Installation Summary" msgstr "" @@ -170,46 +170,46 @@ #: control/control.SLD.glade:721 control/control.SLD.glade:725 #: control/control.SLD.glade:740 control/control.SLD.glade:744 #: control/control.SLD.glade:748 control/control.SLD.glade:752 -#: control/control.SLES.glade:398 control/control.SLES.glade:404 -#: control/control.SLES.glade:408 control/control.SLES.glade:412 -#: control/control.SLES.glade:416 control/control.SLES.glade:547 -#: control/control.SLES.glade:553 control/control.SLES.glade:557 -#: control/control.SLES.glade:561 control/control.SLES.glade:587 -#: control/control.SLES.glade:593 control/control.SLES.glade:597 -#: control/control.SLES.glade:601 control/control.SLES.glade:692 -#: control/control.SLES.glade:696 control/control.SLES.glade:700 -#: control/control.SLES.glade:825 control/control.SLES.glade:829 -#: control/control.SLES.glade:833 control/control.SLES.glade:837 -#: control/control.SLES.glade:841 control/control.SLES.glade:856 -#: control/control.SLES.glade:860 control/control.SLES.glade:864 -#: control/control.SLES.glade:868 control/control.glade:281 -#: control/control.glade:287 control/control.glade:291 -#: control/control.glade:295 control/control.glade:299 -#: control/control.glade:430 control/control.glade:436 -#: control/control.glade:440 control/control.glade:444 -#: control/control.glade:470 control/control.glade:476 -#: control/control.glade:480 control/control.glade:484 -#: control/control.glade:571 control/control.glade:575 -#: control/control.glade:579 control/control.glade:695 -#: control/control.glade:699 control/control.glade:703 -#: control/control.glade:707 control/control.glade:711 -#: control/control.glade:726 control/control.glade:730 -#: control/control.glade:734 control/control.glade:738 +#: control/control.SLES.glade:401 control/control.SLES.glade:407 +#: control/control.SLES.glade:411 control/control.SLES.glade:415 +#: control/control.SLES.glade:419 control/control.SLES.glade:550 +#: control/control.SLES.glade:556 control/control.SLES.glade:560 +#: control/control.SLES.glade:564 control/control.SLES.glade:590 +#: control/control.SLES.glade:596 control/control.SLES.glade:600 +#: control/control.SLES.glade:604 control/control.SLES.glade:695 +#: control/control.SLES.glade:699 control/control.SLES.glade:703 +#: control/control.SLES.glade:828 control/control.SLES.glade:832 +#: control/control.SLES.glade:836 control/control.SLES.glade:840 +#: control/control.SLES.glade:844 control/control.SLES.glade:859 +#: control/control.SLES.glade:863 control/control.SLES.glade:867 +#: control/control.SLES.glade:871 control/control.glade:282 +#: control/control.glade:288 control/control.glade:292 +#: control/control.glade:296 control/control.glade:300 +#: control/control.glade:431 control/control.glade:437 +#: control/control.glade:441 control/control.glade:445 +#: control/control.glade:471 control/control.glade:477 +#: control/control.glade:481 control/control.glade:485 +#: control/control.glade:572 control/control.glade:576 +#: control/control.glade:580 control/control.glade:696 +#: control/control.glade:700 control/control.glade:704 +#: control/control.glade:708 control/control.glade:712 +#: control/control.glade:727 control/control.glade:731 +#: control/control.glade:735 control/control.glade:739 msgid "Perform Installation" msgstr "" #: control/control.PROF.glade:344 control/control.SLD.glade:353 -#: control/control.SLES.glade:464 control/control.glade:347 +#: control/control.SLES.glade:467 control/control.glade:348 msgid "System for Update" msgstr "" #: control/control.PROF.glade:357 control/control.SLD.glade:366 -#: control/control.SLES.glade:477 control/control.glade:360 +#: control/control.SLES.glade:480 control/control.glade:361 msgid "Update" msgstr "" #: control/control.PROF.glade:360 control/control.SLD.glade:369 -#: control/control.SLES.glade:480 control/control.glade:363 +#: control/control.SLES.glade:483 control/control.glade:364 msgid "Update Summary" msgstr "" @@ -220,41 +220,41 @@ #: control/control.SLD.glade:380 control/control.SLD.glade:384 #: control/control.SLD.glade:388 control/control.SLD.glade:392 #: control/control.SLD.glade:505 control/control.SLD.glade:509 -#: control/control.SLES.glade:485 control/control.SLES.glade:491 -#: control/control.SLES.glade:495 control/control.SLES.glade:499 -#: control/control.SLES.glade:503 control/control.SLES.glade:616 -#: control/control.SLES.glade:620 control/control.glade:368 -#: control/control.glade:374 control/control.glade:378 -#: control/control.glade:382 control/control.glade:386 -#: control/control.glade:499 control/control.glade:503 +#: control/control.SLES.glade:488 control/control.SLES.glade:494 +#: control/control.SLES.glade:498 control/control.SLES.glade:502 +#: control/control.SLES.glade:506 control/control.SLES.glade:619 +#: control/control.SLES.glade:623 control/control.glade:369 +#: control/control.glade:375 control/control.glade:379 +#: control/control.glade:383 control/control.glade:387 +#: control/control.glade:500 control/control.glade:504 msgid "Perform Update" msgstr "" #: control/control.PROF.glade:397 control/control.SLD.glade:406 -#: control/control.SLES.glade:517 control/control.glade:400 +#: control/control.SLES.glade:520 control/control.glade:401 msgid "System Information" msgstr "" #: control/control.PROF.glade:401 control/control.SLD.glade:410 -#: control/control.SLES.glade:521 control/control.glade:404 +#: control/control.SLES.glade:524 control/control.glade:405 msgid "Perform Repair" msgstr "" #: control/control.PROF.glade:411 control/control.PROF.glade:451 #: control/control.PROF.glade:674 control/control.SLD.glade:420 #: control/control.SLD.glade:460 control/control.SLD.glade:683 -#: control/control.SLES.glade:531 control/control.SLES.glade:571 -#: control/control.SLES.glade:799 control/control.glade:414 -#: control/control.glade:454 control/control.glade:669 +#: control/control.SLES.glade:534 control/control.SLES.glade:574 +#: control/control.SLES.glade:802 control/control.glade:415 +#: control/control.glade:455 control/control.glade:670 msgid "Base Installation" msgstr "" #: control/control.PROF.glade:505 control/control.PROF.glade:587 #: control/control.PROF.glade:748 control/control.SLD.glade:514 #: control/control.SLD.glade:596 control/control.SLD.glade:757 -#: control/control.SLES.glade:625 control/control.SLES.glade:707 -#: control/control.SLES.glade:873 control/control.glade:508 -#: control/control.glade:586 control/control.glade:743 +#: control/control.SLES.glade:628 control/control.SLES.glade:710 +#: control/control.SLES.glade:876 control/control.glade:509 +#: control/control.glade:587 control/control.glade:744 msgid "Configuration" msgstr "" @@ -264,12 +264,12 @@ #: control/control.SLD.glade:517 control/control.SLD.glade:523 #: control/control.SLD.glade:608 control/control.SLD.glade:613 #: control/control.SLD.glade:617 control/control.SLD.glade:621 -#: control/control.SLES.glade:628 control/control.SLES.glade:634 -#: control/control.SLES.glade:719 control/control.SLES.glade:724 -#: control/control.SLES.glade:728 control/control.SLES.glade:732 -#: control/control.glade:511 control/control.glade:517 -#: control/control.glade:598 control/control.glade:603 -#: control/control.glade:607 control/control.glade:611 +#: control/control.SLES.glade:631 control/control.SLES.glade:637 +#: control/control.SLES.glade:722 control/control.SLES.glade:727 +#: control/control.SLES.glade:731 control/control.SLES.glade:735 +#: control/control.glade:512 control/control.glade:518 +#: control/control.glade:599 control/control.glade:604 +#: control/control.glade:608 control/control.glade:612 msgid "Network" msgstr "" @@ -281,63 +281,63 @@ #: control/control.SLD.glade:539 control/control.SLD.glade:545 #: control/control.SLD.glade:551 control/control.SLD.glade:635 #: control/control.SLD.glade:641 control/control.SLD.glade:645 -#: control/control.SLES.glade:650 control/control.SLES.glade:656 -#: control/control.SLES.glade:662 control/control.SLES.glade:746 -#: control/control.SLES.glade:752 control/control.SLES.glade:756 -#: control/control.glade:529 control/control.glade:535 -#: control/control.glade:541 control/control.glade:621 -#: control/control.glade:627 control/control.glade:631 +#: control/control.SLES.glade:653 control/control.SLES.glade:659 +#: control/control.SLES.glade:665 control/control.SLES.glade:749 +#: control/control.SLES.glade:755 control/control.SLES.glade:759 +#: control/control.glade:530 control/control.glade:536 +#: control/control.glade:542 control/control.glade:622 +#: control/control.glade:628 control/control.glade:632 msgid "Online Update" msgstr "" #: control/control.PROF.glade:546 control/control.PROF.glade:648 #: control/control.PROF.glade:755 control/control.SLD.glade:555 #: control/control.SLD.glade:657 control/control.SLD.glade:764 -#: control/control.SLES.glade:666 control/control.SLES.glade:773 -#: control/control.SLES.glade:880 control/control.glade:545 -#: control/control.glade:643 control/control.glade:750 +#: control/control.SLES.glade:669 control/control.SLES.glade:776 +#: control/control.SLES.glade:883 control/control.glade:546 +#: control/control.glade:644 control/control.glade:751 msgid "Clean Up" msgstr "" #: control/control.PROF.glade:550 control/control.PROF.glade:654 #: control/control.SLD.glade:559 control/control.SLD.glade:663 -#: control/control.SLES.glade:670 control/control.SLES.glade:779 -#: control/control.glade:549 control/control.glade:649 +#: control/control.SLES.glade:673 control/control.SLES.glade:782 +#: control/control.glade:550 control/control.glade:650 msgid "Release Notes" msgstr "" #: control/control.PROF.glade:590 control/control.SLD.glade:599 -#: control/control.SLES.glade:710 control/control.glade:589 +#: control/control.SLES.glade:713 control/control.glade:590 msgid "Hostname" msgstr "" #: control/control.PROF.glade:595 control/control.SLD.glade:604 -#: control/control.SLES.glade:715 control/control.glade:594 +#: control/control.SLES.glade:718 control/control.glade:595 msgid "Root Password" msgstr "" #: control/control.PROF.glade:640 control/control.PROF.glade:644 #: control/control.SLD.glade:649 control/control.SLD.glade:653 -#: control/control.SLES.glade:765 control/control.SLES.glade:769 -#: control/control.glade:635 control/control.glade:639 +#: control/control.SLES.glade:768 control/control.SLES.glade:772 +#: control/control.glade:636 control/control.glade:640 msgid "Users" msgstr "" #: control/control.PROF.glade:683 control/control.PROF.glade:689 #: control/control.PROF.glade:693 control/control.SLD.glade:692 #: control/control.SLD.glade:698 control/control.SLD.glade:702 -#: control/control.SLES.glade:808 control/control.SLES.glade:814 -#: control/control.SLES.glade:818 control/control.glade:678 -#: control/control.glade:684 control/control.glade:688 +#: control/control.SLES.glade:811 control/control.SLES.glade:817 +#: control/control.SLES.glade:821 control/control.glade:679 +#: control/control.glade:685 control/control.glade:689 msgid "AutoYaST Settings" msgstr "" #: control/control.PROF.glade:751 control/control.SLD.glade:760 -#: control/control.SLES.glade:876 control/control.glade:746 +#: control/control.SLES.glade:879 control/control.glade:747 msgid "System Configuration" msgstr "" -#: control/control.SLD.glade:64 control/control.SLES.glade:66 +#: control/control.SLD.glade:64 control/control.SLES.glade:69 msgid "" "\n" "\n" @@ -352,9 +352,9 @@ msgstr "" #: control/control.SLD.glade:529 control/control.SLD.glade:533 -#: control/control.SLES.glade:640 control/control.SLES.glade:644 -#: control/control.SLES.glade:736 control/control.SLES.glade:740 -#: control/control.glade:523 control/control.glade:615 +#: control/control.SLES.glade:643 control/control.SLES.glade:647 +#: control/control.SLES.glade:739 control/control.SLES.glade:743 +#: control/control.glade:524 control/control.glade:616 msgid "Customer Center" msgstr "" @@ -362,6 +362,6 @@ msgid "Update Configuration" msgstr "" -#: control/control.SLES.glade:760 +#: control/control.SLES.glade:763 msgid "Service" msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.113/installation.pot new/yast2-installation-2.13.114/installation.pot --- old/yast2-installation-2.13.113/installation.pot 2006-05-16 13:34:45.000000000 +0200 +++ new/yast2-installation-2.13.114/installation.pot 2006-05-24 15:14:54.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 13:34+0200\n" +"POT-Creation-Date: 2006-05-24 15:14+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -255,7 +255,7 @@ #. placeholder for unknown URL #: src/clients/add-on_proposal.ycp:27 src/clients/add-on_proposal.ycp:31 #: src/include/add-on-workflow.ycp:416 src/include/add-on-workflow.ycp:421 -#: src/include/add-on-workflow.ycp:786 src/include/add-on-workflow.ycp:792 +#: src/include/add-on-workflow.ycp:809 src/include/add-on-workflow.ycp:815 msgid "Unknown" msgstr "" @@ -297,7 +297,7 @@ #. feedback heading #. main screen heading #: src/clients/inst_addon_update_sources.ycp:51 -#: src/include/add-on-workflow.ycp:779 +#: src/include/add-on-workflow.ycp:802 msgid "Add-On Product Installation" msgstr "" @@ -790,99 +790,99 @@ #. strings for main (wizard) layout #. Translators: This is title/brand - verify how to translate it correctly -#: src/clients/inst_suse_register.ycp:66 +#: src/clients/inst_suse_register.ycp:67 msgid "Novell Customer Center Configuration" msgstr "" #. Translators: Module Title for the Box -#: src/clients/inst_suse_register.ycp:69 +#: src/clients/inst_suse_register.ycp:70 msgid "Online Update Configuration" msgstr "" -#: src/clients/inst_suse_register.ycp:76 +#: src/clients/inst_suse_register.ycp:77 msgid "" "Get technical support and product updates and\n" "manage subscriptions with Novell Customer Center." msgstr "" -#: src/clients/inst_suse_register.ycp:80 +#: src/clients/inst_suse_register.ycp:81 msgid "Configure Now (Recommended)" msgstr "" -#: src/clients/inst_suse_register.ycp:81 +#: src/clients/inst_suse_register.ycp:82 msgid "Configure Later" msgstr "" -#: src/clients/inst_suse_register.ycp:83 +#: src/clients/inst_suse_register.ycp:84 msgid "Include for Convenience" msgstr "" #. Translators: Text for UI Label - capitalized -#: src/clients/inst_suse_register.ycp:84 +#: src/clients/inst_suse_register.ycp:85 #: src/clients/suse_register_auto.ycp:198 msgid "Hardware Profile" msgstr "" #. Translators: Text for UI Label - capitalized -#: src/clients/inst_suse_register.ycp:85 +#: src/clients/inst_suse_register.ycp:86 #: src/clients/suse_register_auto.ycp:200 msgid "Optional Information" msgstr "" -#: src/clients/inst_suse_register.ycp:86 +#: src/clients/inst_suse_register.ycp:87 msgid "Registration Code" msgstr "" -#: src/clients/inst_suse_register.ycp:87 -#: src/clients/inst_suse_register.ycp:186 +#: src/clients/inst_suse_register.ycp:88 +#: src/clients/inst_suse_register.ycp:187 msgid "Details..." msgstr "" #. strings for success popup -#: src/clients/inst_suse_register.ycp:91 +#: src/clients/inst_suse_register.ycp:92 msgid "Your configuration was successful." msgstr "" -#: src/clients/inst_suse_register.ycp:92 +#: src/clients/inst_suse_register.ycp:93 msgid "An update server has been added to your configuration." msgstr "" #. strings for manual interaction popup -#: src/clients/inst_suse_register.ycp:96 +#: src/clients/inst_suse_register.ycp:97 msgid "Manual Interaction Required" msgstr "" -#: src/clients/inst_suse_register.ycp:97 +#: src/clients/inst_suse_register.ycp:98 msgid "Needed Information" msgstr "" -#: src/clients/inst_suse_register.ycp:98 +#: src/clients/inst_suse_register.ycp:99 msgid "Continue" msgstr "" -#: src/clients/inst_suse_register.ycp:100 +#: src/clients/inst_suse_register.ycp:101 msgid "" "A Web browser will start in which to complete\n" "the configuration on the opened Web site." msgstr "" #. string for show information popup -#: src/clients/inst_suse_register.ycp:106 +#: src/clients/inst_suse_register.ycp:107 msgid "Registration and Privacy Information" msgstr "" -#: src/clients/inst_suse_register.ycp:110 +#: src/clients/inst_suse_register.ycp:111 msgid "" "The server requires additional system information. Activating \n" "submission of the hardware profile automatically." msgstr "" #. nonroot-message strings -#: src/clients/inst_suse_register.ycp:115 +#: src/clients/inst_suse_register.ycp:116 msgid "Update Source Issues" msgstr "" -#: src/clients/inst_suse_register.ycp:117 +#: src/clients/inst_suse_register.ycp:118 msgid "" "Registering as a regular user does not include the update source\n" "in the Online Update YaST module. If you continue and later want \n" @@ -893,28 +893,28 @@ msgstr "" #. error messages -#: src/clients/inst_suse_register.ycp:128 +#: src/clients/inst_suse_register.ycp:129 msgid "Error: Data received is invalid." msgstr "" -#: src/clients/inst_suse_register.ycp:129 +#: src/clients/inst_suse_register.ycp:130 msgid "Error: Could not retrieve data." msgstr "" -#: src/clients/inst_suse_register.ycp:131 +#: src/clients/inst_suse_register.ycp:132 msgid "" "No Web browser available.\n" "Run the suse_register command manually." msgstr "" -#: src/clients/inst_suse_register.ycp:135 +#: src/clients/inst_suse_register.ycp:136 msgid "" "Your registration requires interactive input that is not\n" "supported in text mode. Run YaST2 in the graphical mode or\n" "run the suse_register command manually." msgstr "" -#: src/clients/inst_suse_register.ycp:143 +#: src/clients/inst_suse_register.ycp:144 msgid "" "\n" "Configure your system to enable online updates by registering it with Novell.\n" @@ -923,7 +923,7 @@ "" msgstr "" -#: src/clients/inst_suse_register.ycp:151 +#: src/clients/inst_suse_register.ycp:152 msgid "" "\n" "To simplify the registration process, include information from your system\n" @@ -935,7 +935,7 @@ "" msgstr "" -#: src/clients/inst_suse_register.ycp:162 +#: src/clients/inst_suse_register.ycp:163 msgid "" "\n" "If you purchased your copy of this product, enable Registration Code\n" @@ -944,7 +944,7 @@ "" msgstr "" -#: src/clients/inst_suse_register.ycp:170 +#: src/clients/inst_suse_register.ycp:171 msgid "" "\n" "No information is passed to anyone outside Novell. The data is used for\n" @@ -955,25 +955,25 @@ msgstr "" #. further strings -#: src/clients/inst_suse_register.ycp:183 +#: src/clients/inst_suse_register.ycp:184 msgid "Checking..." msgstr "" -#: src/clients/inst_suse_register.ycp:184 -#: src/clients/inst_suse_register.ycp:187 +#: src/clients/inst_suse_register.ycp:185 +#: src/clients/inst_suse_register.ycp:188 msgid "Error" msgstr "" -#: src/clients/inst_suse_register.ycp:185 +#: src/clients/inst_suse_register.ycp:186 msgid "An error occurred while connecting to the server." msgstr "" -#: src/clients/inst_suse_register.ycp:188 +#: src/clients/inst_suse_register.ycp:189 msgid "Starting browser..." msgstr "" #. add update source -#: src/clients/inst_suse_register.ycp:734 +#: src/clients/inst_suse_register.ycp:742 msgid "Setting up online update source..." msgstr "" @@ -1144,7 +1144,7 @@ #. } #. dialog caption -#: src/clients/installation.ycp:140 src/modules/AddOnProduct.ycp:917 +#: src/clients/installation.ycp:140 src/modules/AddOnProduct.ycp:920 msgid "Initializing..." msgstr "" @@ -1605,7 +1605,7 @@ msgstr "" #. table cell, %1 is URL, %2 is directory name -#: src/include/add-on-workflow.ycp:419 src/include/add-on-workflow.ycp:790 +#: src/include/add-on-workflow.ycp:419 src/include/add-on-workflow.ycp:813 #, ycp-format msgid "URL: %1, Directory: %2" msgstr "" @@ -1668,35 +1668,35 @@ msgid "Dependencies of the selected add-on products cannot be fullfilled." msgstr "" -#: src/include/add-on-workflow.ycp:795 +#: src/include/add-on-workflow.ycp:818 #, ycp-format msgid "Product %1" msgstr "" #. table header -#: src/include/add-on-workflow.ycp:800 +#: src/include/add-on-workflow.ycp:823 msgid "Media" msgstr "" #. table header -#: src/include/add-on-workflow.ycp:802 +#: src/include/add-on-workflow.ycp:825 msgid "Product" msgstr "" #. message report -#: src/include/add-on-workflow.ycp:831 +#: src/include/add-on-workflow.ycp:854 msgid "Select a product to delete." msgstr "" #. popup error #. error report #: src/modules/AddOnProduct.ycp:769 src/modules/AddOnProduct.ycp:790 -#: src/modules/AddOnProduct.ycp:894 +#: src/modules/AddOnProduct.ycp:897 msgid "An error occurred while preparing the installation system." msgstr "" #. error report -#: src/modules/AddOnProduct.ycp:909 +#: src/modules/AddOnProduct.ycp:912 #, ycp-format msgid "Control file %1 not found on media." msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.113/src/clients/add-on.ycp new/yast2-installation-2.13.114/src/clients/add-on.ycp --- old/yast2-installation-2.13.113/src/clients/add-on.ycp 2006-05-04 13:05:28.000000000 +0200 +++ new/yast2-installation-2.13.114/src/clients/add-on.ycp 2006-05-25 07:55:01.000000000 +0200 @@ -38,8 +38,24 @@ // Initialize current sources Read(); -symbol ret = RunWizard(); +symbol ret = nil; +if (size (WFM::Args()) == 0) +{ + y2milestone ("Url not specified in the command line, asking user"); + ret = RunWizard(); +} +else +{ + string url = (string)WFM::Args(0); + y2milestone ("Specified URL %1", url); + do { + createResult = SourceManager::createSource (url); + y2milestone ("Source creating result: %1", createResult); + } while ( createResult == `again ); + AddOnProduct::last_ret = `next; + ret = RunAutorunWizard (); +} if (ret == `next) { ret = AddOnProduct::DoInstall (); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.113/src/include/add-on-workflow.ycp new/yast2-installation-2.13.114/src/include/add-on-workflow.ycp --- old/yast2-installation-2.13.113/src/include/add-on-workflow.ycp 2006-05-12 14:04:37.000000000 +0200 +++ new/yast2-installation-2.13.114/src/include/add-on-workflow.ycp 2006-05-24 14:34:05.000000000 +0200 @@ -773,6 +773,29 @@ return Sequencer::Run(aliases, sequence); } +symbol RunAutorunWizard() { + map aliases = $[ + "catalog" : ``(CatalogSelect ()), + "product" : ``(ProductSelect ()), + ]; + + map sequence = $[ + "ws_start" : "catalog", + "catalog" : $[ + `abort : `abort, + `next : "product", + `finish : `next, + ], + "product" : $[ + `abort : `abort, + `next : `next, + `finish : `next, + ], + ]; + return Sequencer::Run(aliases, sequence); + +} + void Redraw (boolean enable_back, boolean enable_next) { // main screen heading diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.113/src/modules/AddOnProduct.ycp new/yast2-installation-2.13.114/src/modules/AddOnProduct.ycp --- old/yast2-installation-2.13.113/src/modules/AddOnProduct.ycp 2006-05-24 10:28:42.000000000 +0200 +++ new/yast2-installation-2.13.114/src/modules/AddOnProduct.ycp 2006-05-25 08:06:21.000000000 +0200 @@ -857,12 +857,15 @@ global symbol DoInstall() { // Display /media.1/info.txt if such file exists // Display license and wait for agreement + // Not needed here, license already shown in the workflow + /* boolean license_ret = AcceptedLicenseAndInfoFile(src_id); if (license_ret != true) { y2milestone("Removing the current source ID %1", src_id); Pkg::SourceDelete(src_id); return nil; } + */ string control = Pkg::SourceProvideOptionalFile (src_id, 1, "/installation.xml"); // Fallback -- Source didn't provide needed controll file ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit desktop-data-SuSE
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package desktop-data-SuSE checked in at Fri May 26 12:38:47 CEST 2006. -------- --- desktop-data-SuSE/desktop-data-SuSE.changes 2006-04-20 17:16:41.000000000 +0200 +++ desktop-data-SuSE/desktop-data-SuSE.changes 2006-05-26 11:03:46.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 26 11:03:08 CEST 2006 - stbinner(a)suse.de + +- remove obsolete CREATE_XDG_MENUS entry from .fillup (#150130) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ desktop-data-SuSE.spec ++++++ --- /var/tmp/diff_new_pack.AjETnq/_old 2006-05-26 12:37:42.000000000 +0200 +++ /var/tmp/diff_new_pack.AjETnq/_new 2006-05-26 12:37:42.000000000 +0200 @@ -13,7 +13,7 @@ Name: desktop-data-SuSE BuildRequires: perl-RPC-XML update-desktop-files xdg-menu Version: 10.1 -Release: 27 +Release: 31 Summary: SUSE Theme Files for KDE and GNOME License: Other License(s), see package, GPL Group: System/GUI/Other @@ -92,6 +92,8 @@ /usr/bin/desktop-launch %changelog -n desktop-data-SuSE +* Fri May 26 2006 - stbinner(a)suse.de +- remove obsolete CREATE_XDG_MENUS entry from .fillup (#150130) * Thu Apr 20 2006 - coolo(a)suse.de - adding SLED menu files to the -SUSE package, so they get picked up for translation by collect-desktop-files (#168045) ++++++ desktop-data-SuSE.fillup ++++++ --- desktop-data-SuSE/desktop-data-SuSE.fillup 2006-02-10 14:02:11.000000000 +0100 +++ desktop-data-SuSE/desktop-data-SuSE.fillup 2006-05-26 11:03:06.000000000 +0200 @@ -7,15 +7,3 @@ # in /usr/X11R6/lib/X11/icons/ # X_MOUSE_CURSOR="crystalwhite" - -## Type: boolean -## Default: true -## Path: Desktop -## Description: create XDG menus for other windowmanagers -## (black, flux, openbox) -# -# Should SuSEconfig create XDG menus for other windowmanagers -# like blackbox, fluxbox, openbox? -# Possible values are lowercase "true" or "false". -# -CREATE_XDG_MENUS="true" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kernel-source
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package kernel-source checked in at Thu May 25 01:18:06 CEST 2006. -------- --- kernel-source/kernel-bigsmp.changes 2006-05-19 17:51:35.000000000 +0200 +++ kernel-source/kernel-bigsmp.changes 2006-05-24 18:54:22.000000000 +0200 @@ -1,0 +2,141 @@ +Wed May 24 13:13:52 CEST 2006 - agruen(a)suse.de + +- Fix the logic that detects when to build a debug package so that + it works in the OpenSUSE build service. + +------------------------------------------------------------------- +Tue May 23 23:44:54 CEST 2006 - kkeil(a)suse.de + +- patches.drivers/b44-fix_mac_address: b44: fix force mac address + before ifconfig up (169703). + +------------------------------------------------------------------- +Tue May 23 15:47:03 CEST 2006 - gregkh(a)suse.de + +- Update to 2.6.16.18 (lots of bugfixes and security updates, public and non-public ones) + - fs/compat.c: fix 'if (a |= b )' typo + - smbus unhiding kills thermal management + - PCI quirk: VIA IRQ fixup should only run for VIA southbridges + - VIA quirk fixup, additional PCI IDs + - Netfilter: do_add_counters race, possible oops or info leak (CVE-2006-0039) + - Remove cond_resched in gather_stats() + - page migration: Fix fallback behavior for dirty pages + - via-rhine: zero pad short packets on Rhine I ethernet cards + - Fix udev device creation + - smbfs: Fix slab corruption in samba error path + - scx200_acb: Fix resource name use after free + - limit request_fn recursion + - TG3: ethtool always report port is TP. + - PCI: correctly allocate return buffers for osc calls + - add migratepage address space op to shmem + - Fix ptrace_attach()/ptrace_traceme()/de_thread() race + - ptrace_attach: fix possible deadlock schenario with irqs + - md: Avoid oops when attempting to fix read errors on raid10 + - NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444) + - USB: ub oops in block_uevent + - selinux: check for failed kmalloc in security_sid_to_context() + - fs/locks.c: Fix sys_flock() race + - SCTP: Respect the real chunk length when walking parameters (CVE-2006-1858) + - SCTP: Validate the parameter length in HB-ACK chunk (CVE-2006-1857) + +- patches.drivers/altix-correct-ioc3-port-order.patch: Altix: + correct ioc3 port order (176896). +- patches.drivers/altix-correct-ioc4-port-order.patch: Altix: + correct ioc4 port order (176896). + +------------------------------------------------------------------- +Tue May 23 18:05:20 CEST 2006 - trenn(a)suse.de + +- patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch: + Fix for apic initialization bug using kdump (177741). + +------------------------------------------------------------------- +Tue May 23 17:46:10 CEST 2006 - perex(a)suse.de + +- patches.suse/rtnetlink-atomic2.patch: Fix debug traces for + bonding (might_sleep) (174843). + +------------------------------------------------------------------- +Tue May 23 17:38:05 CEST 2006 - schwab(a)suse.de + +- iosapic-move-irq: fix broken irq affinity [#176697]. + +------------------------------------------------------------------- +Tue May 23 16:11:35 CEST 2006 - ak(a)suse.de + +- patches.arch/x86_64-bad-addr-boundary: Fix off by one in + bad_addr checking in find_e820_area (166022). + +------------------------------------------------------------------- +Tue May 23 14:39:34 CEST 2006 - hare(a)suse.de + +- patches.drivers/aic79xx-remove-slave-alloc: Remove + slave_alloc() to avoid refcounting problems (#96728) + +------------------------------------------------------------------- +Mon May 22 17:25:04 CEST 2006 - trenn(a)suse.de + +- patches.fixes/acpi_ec_dummy.patch: Remove fake EC driver + unconditionally (kernel #6111). + +------------------------------------------------------------------- +Mon May 22 16:36:15 CEST 2006 - hare(a)suse.de + +- patches.fixes/sd-fix-unknown-size + Return '0' for unknown disk sizes (#176780 - LTC23895) + +------------------------------------------------------------------- +Mon May 22 15:17:11 CEST 2006 - hare(a)suse.de + +- patches.fixes/fusion-fix-kdump-drvinit + Fix LSI Fusion initialisation after kdump (#173275 - LTC23573) + +------------------------------------------------------------------- +Mon May 22 13:03:13 CEST 2006 - hare(a)suse.de + +- patches.drivers/open-iscsi-svn.diff + Update to svn r584 to really fix machine lockups (#176151) +- patches.drivers/mptfc-sles10-update + Fix several issues with the LSI Fusion FC driver (#173664) + +------------------------------------------------------------------- +Mon May 22 09:17:50 CEST 2006 - hare(a)suse.de + +- patches.arch/s390-zfcp-statistics.diff +- patches.arch/s390-zfcp-statistic-disclaimer.diff + Re-add zfcp statistics. +- Update config files. + +------------------------------------------------------------------- +Sat May 20 02:38:49 CEST 2006 - ak(a)suse.de + +- patches.suse/tcp-proc-listen: Fix deadlock + +------------------------------------------------------------------- +Fri May 19 20:54:39 CEST 2006 - gregkh(a)suse.de + +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs (175786). +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support (175786). + +------------------------------------------------------------------- +Fri May 19 20:54:14 CEST 2006 - gregkh(a)suse.de + +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs. +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support. + +------------------------------------------------------------------- +Fri May 19 20:28:57 CEST 2006 - gregkh(a)suse.de + +- patches.fixes/add-migratepage-address-space-op-to-shmem.patch: + [PATCH] add migratepage address space op to shmem (176147). +- patches.fixes/page-migration-Fix-fallback-behavior-for-dirty-pages.patch: + [PATCH] page migration: Fix fallback behavior for dirty pages + (176147). +- patches.fixes/remove-cond_resched-in-gather_stats.patch: + [PATCH] Remove cond_resched in gather_stats() (176147). + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-dummy.changes: same change kernel-iseries64.changes: same change kernel-kdump.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-smp.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-um.changes: same change kernel-xen.changes: same change kernel-xenpae.changes: same change New: ---- needed_space_in_mb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-bigsmp.spec ++++++ --- /var/tmp/diff_new_pack.zPHcNc/_old 2006-05-25 00:57:33.000000000 +0200 +++ /var/tmp/diff_new_pack.zPHcNc/_new 2006-05-25 00:57:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-bigsmp (Version 2.6.16.16) +# spec file for package kernel-bigsmp (Version 2.6.16.18) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,8 +20,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.16.16 -Release: 2 +Version: 2.6.16.18 +Release: 1 Summary: Kernel with Multiprocessor Support and PAE License: GPL Group: System/Kernel @@ -29,7 +29,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.16.16-%release +Provides: kernel = 2.6.16.18-%release %endif %endif Provides: kernel-bigsmp-nongpl @@ -97,8 +97,6 @@ %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 -# Are we building with debug symbols enabled? -%define with_debug %(set -- " %optflags "; [ "$1" = "${1/ -g }" ]; echo $? ) %define tolerate_unknown_new_config_options 0 # kABI change tolerance (default in maintenance should be 4, 8 or 15; # see scripts/kabi-checks) @@ -113,12 +111,12 @@ -Source Timestamp: 2006/05/19 14:42:27 UTC +Source Timestamp: 2006/05/24 16:52:45 UTC %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then - echo "The kernel-bigsmp-2.6.16.16.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.16.16.src.rpm." + echo "The kernel-bigsmp-2.6.16.18.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.16.18.src.rpm." exit 1 fi symbols=$( @@ -181,7 +179,7 @@ MAKE_ARGS="ARCH=$subarch" EOF %endif -%if %with_debug +%if %{defined __debug_package} cat >> ../.rpm-defs <<EOF MAKE_ARGS="\$MAKE_ARGS CONFIG_DEBUG_INFO=y" EOF @@ -244,7 +242,7 @@ add_vmlinux() { local vmlinux=boot/vmlinux-$KERNELRELEASE -%if %with_debug +%if %{defined __debug_package} local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) cp vmlinux %buildroot/$vmlinux @@ -448,6 +446,95 @@ %files -f kernel.files %changelog -n kernel-bigsmp +* Wed May 24 2006 - agruen(a)suse.de +- Fix the logic that detects when to build a debug package so that + it works in the OpenSUSE build service. +* Tue May 23 2006 - kkeil(a)suse.de +- patches.drivers/b44-fix_mac_address: b44: fix force mac address + before ifconfig up (169703). +* Tue May 23 2006 - trenn(a)suse.de +- patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch: + Fix for apic initialization bug using kdump (177741). +* Tue May 23 2006 - perex(a)suse.de +- patches.suse/rtnetlink-atomic2.patch: Fix debug traces for + bonding (might_sleep) (174843). +* Tue May 23 2006 - schwab(a)suse.de +- iosapic-move-irq: fix broken irq affinity [#176697]. +* Tue May 23 2006 - ak(a)suse.de +- patches.arch/x86_64-bad-addr-boundary: Fix off by one in + bad_addr checking in find_e820_area (166022). +* Tue May 23 2006 - gregkh(a)suse.de +- Update to 2.6.16.18 (lots of bugfixes and security updates, public and non-public ones) +- fs/compat.c: fix 'if (a |= b )' typo +- smbus unhiding kills thermal management +- PCI quirk: VIA IRQ fixup should only run for VIA southbridges +- VIA quirk fixup, additional PCI IDs +- Netfilter: do_add_counters race, possible oops or info leak (CVE-2006-0039) +- Remove cond_resched in gather_stats() +- page migration: Fix fallback behavior for dirty pages +- via-rhine: zero pad short packets on Rhine I ethernet cards +- Fix udev device creation +- smbfs: Fix slab corruption in samba error path +- scx200_acb: Fix resource name use after free +- limit request_fn recursion +- TG3: ethtool always report port is TP. +- PCI: correctly allocate return buffers for osc calls +- add migratepage address space op to shmem +- Fix ptrace_attach()/ptrace_traceme()/de_thread() race +- ptrace_attach: fix possible deadlock schenario with irqs +- md: Avoid oops when attempting to fix read errors on raid10 +- NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444) +- USB: ub oops in block_uevent +- selinux: check for failed kmalloc in security_sid_to_context() +- fs/locks.c: Fix sys_flock() race +- SCTP: Respect the real chunk length when walking parameters (CVE-2006-1858) +- SCTP: Validate the parameter length in HB-ACK chunk (CVE-2006-1857) +- patches.drivers/altix-correct-ioc3-port-order.patch: Altix: + correct ioc3 port order (176896). +- patches.drivers/altix-correct-ioc4-port-order.patch: Altix: + correct ioc4 port order (176896). +* Tue May 23 2006 - hare(a)suse.de +- patches.drivers/aic79xx-remove-slave-alloc: Remove + slave_alloc() to avoid refcounting problems (#96728) +* Mon May 22 2006 - trenn(a)suse.de +- patches.fixes/acpi_ec_dummy.patch: Remove fake EC driver + unconditionally (kernel #6111). +* Mon May 22 2006 - hare(a)suse.de +- patches.fixes/sd-fix-unknown-size + Return '0' for unknown disk sizes (#176780 - LTC23895) +* Mon May 22 2006 - hare(a)suse.de +- patches.fixes/fusion-fix-kdump-drvinit + Fix LSI Fusion initialisation after kdump (#173275 - LTC23573) +* Mon May 22 2006 - hare(a)suse.de +- patches.drivers/open-iscsi-svn.diff + Update to svn r584 to really fix machine lockups (#176151) +- patches.drivers/mptfc-sles10-update + Fix several issues with the LSI Fusion FC driver (#173664) +* Mon May 22 2006 - hare(a)suse.de +- patches.arch/s390-zfcp-statistics.diff +- patches.arch/s390-zfcp-statistic-disclaimer.diff + Re-add zfcp statistics. +- Update config files. +* Sat May 20 2006 - ak(a)suse.de +- patches.suse/tcp-proc-listen: Fix deadlock +* Fri May 19 2006 - gregkh(a)suse.de +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs (175786). +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support (175786). +* Fri May 19 2006 - gregkh(a)suse.de +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs. +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support. +* Fri May 19 2006 - gregkh(a)suse.de +- patches.fixes/add-migratepage-address-space-op-to-shmem.patch: + [PATCH] add migratepage address space op to shmem (176147). +- patches.fixes/page-migration-Fix-fallback-behavior-for-dirty-pages.patch: + [PATCH] page migration: Fix fallback behavior for dirty pages + (176147). +- patches.fixes/remove-cond_resched-in-gather_stats.patch: + [PATCH] Remove cond_resched in gather_stats() (176147). * Fri May 19 2006 - kraxel(a)suse.de - patches.fixes/nf_bridge-header-size: nf_bridge: ethernet header is 14 not 16 bytes (150410). kernel-debug.spec: same change kernel-default.spec: same change ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.zPHcNc/_old 2006-05-25 00:57:33.000000000 +0200 +++ /var/tmp/diff_new_pack.zPHcNc/_new 2006-05-25 00:57:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-dummy (Version 2.6.16.16) +# spec file for package kernel-dummy (Version 2.6.16.18) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,8 +16,8 @@ Autoreqprov: off Summary: Internal dummy package for synchronizing release numbers Group: System/Kernel -Version: 2.6.16.16 -Release: 2 +Version: 2.6.16.18 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -27,7 +27,7 @@ -------- Andreas Gruenbacher <agruen(a)suse.de> -Source Timestamp: 2006/05/19 14:42:27 UTC +Source Timestamp: 2006/05/24 16:52:45 UTC %install @@ -40,6 +40,95 @@ /etc/dummy %changelog -n kernel-dummy +* Wed May 24 2006 - agruen(a)suse.de +- Fix the logic that detects when to build a debug package so that + it works in the OpenSUSE build service. +* Tue May 23 2006 - kkeil(a)suse.de +- patches.drivers/b44-fix_mac_address: b44: fix force mac address + before ifconfig up (169703). +* Tue May 23 2006 - trenn(a)suse.de +- patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch: + Fix for apic initialization bug using kdump (177741). +* Tue May 23 2006 - perex(a)suse.de +- patches.suse/rtnetlink-atomic2.patch: Fix debug traces for + bonding (might_sleep) (174843). +* Tue May 23 2006 - schwab(a)suse.de +- iosapic-move-irq: fix broken irq affinity [#176697]. +* Tue May 23 2006 - ak(a)suse.de +- patches.arch/x86_64-bad-addr-boundary: Fix off by one in + bad_addr checking in find_e820_area (166022). +* Tue May 23 2006 - gregkh(a)suse.de +- Update to 2.6.16.18 (lots of bugfixes and security updates, public and non-public ones) +- fs/compat.c: fix 'if (a |= b )' typo +- smbus unhiding kills thermal management +- PCI quirk: VIA IRQ fixup should only run for VIA southbridges +- VIA quirk fixup, additional PCI IDs +- Netfilter: do_add_counters race, possible oops or info leak (CVE-2006-0039) +- Remove cond_resched in gather_stats() +- page migration: Fix fallback behavior for dirty pages +- via-rhine: zero pad short packets on Rhine I ethernet cards +- Fix udev device creation +- smbfs: Fix slab corruption in samba error path +- scx200_acb: Fix resource name use after free +- limit request_fn recursion +- TG3: ethtool always report port is TP. +- PCI: correctly allocate return buffers for osc calls +- add migratepage address space op to shmem +- Fix ptrace_attach()/ptrace_traceme()/de_thread() race +- ptrace_attach: fix possible deadlock schenario with irqs +- md: Avoid oops when attempting to fix read errors on raid10 +- NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444) +- USB: ub oops in block_uevent +- selinux: check for failed kmalloc in security_sid_to_context() +- fs/locks.c: Fix sys_flock() race +- SCTP: Respect the real chunk length when walking parameters (CVE-2006-1858) +- SCTP: Validate the parameter length in HB-ACK chunk (CVE-2006-1857) +- patches.drivers/altix-correct-ioc3-port-order.patch: Altix: + correct ioc3 port order (176896). +- patches.drivers/altix-correct-ioc4-port-order.patch: Altix: + correct ioc4 port order (176896). +* Tue May 23 2006 - hare(a)suse.de +- patches.drivers/aic79xx-remove-slave-alloc: Remove + slave_alloc() to avoid refcounting problems (#96728) +* Mon May 22 2006 - trenn(a)suse.de +- patches.fixes/acpi_ec_dummy.patch: Remove fake EC driver + unconditionally (kernel #6111). +* Mon May 22 2006 - hare(a)suse.de +- patches.fixes/sd-fix-unknown-size + Return '0' for unknown disk sizes (#176780 - LTC23895) +* Mon May 22 2006 - hare(a)suse.de +- patches.fixes/fusion-fix-kdump-drvinit + Fix LSI Fusion initialisation after kdump (#173275 - LTC23573) +* Mon May 22 2006 - hare(a)suse.de +- patches.drivers/open-iscsi-svn.diff + Update to svn r584 to really fix machine lockups (#176151) +- patches.drivers/mptfc-sles10-update + Fix several issues with the LSI Fusion FC driver (#173664) +* Mon May 22 2006 - hare(a)suse.de +- patches.arch/s390-zfcp-statistics.diff +- patches.arch/s390-zfcp-statistic-disclaimer.diff + Re-add zfcp statistics. +- Update config files. +* Sat May 20 2006 - ak(a)suse.de +- patches.suse/tcp-proc-listen: Fix deadlock +* Fri May 19 2006 - gregkh(a)suse.de +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs (175786). +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support (175786). +* Fri May 19 2006 - gregkh(a)suse.de +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs. +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support. +* Fri May 19 2006 - gregkh(a)suse.de +- patches.fixes/add-migratepage-address-space-op-to-shmem.patch: + [PATCH] add migratepage address space op to shmem (176147). +- patches.fixes/page-migration-Fix-fallback-behavior-for-dirty-pages.patch: + [PATCH] page migration: Fix fallback behavior for dirty pages + (176147). +- patches.fixes/remove-cond_resched-in-gather_stats.patch: + [PATCH] Remove cond_resched in gather_stats() (176147). * Fri May 19 2006 - kraxel(a)suse.de - patches.fixes/nf_bridge-header-size: nf_bridge: ethernet header is 14 not 16 bytes (150410). ++++++ kernel-iseries64.spec ++++++ --- /var/tmp/diff_new_pack.zPHcNc/_old 2006-05-25 00:57:34.000000000 +0200 +++ /var/tmp/diff_new_pack.zPHcNc/_new 2006-05-25 00:57:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-iseries64 (Version 2.6.16.16) +# spec file for package kernel-iseries64 (Version 2.6.16.18) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,8 +20,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.16.16 -Release: 2 +Version: 2.6.16.18 +Release: 1 Summary: 64-Bit Kernel for iSeries License: GPL Group: System/Kernel @@ -29,7 +29,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.16.16-%release +Provides: kernel = 2.6.16.18-%release %endif %endif Provides: kernel-iseries64-nongpl @@ -100,8 +100,6 @@ %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 -# Are we building with debug symbols enabled? -%define with_debug %(set -- " %optflags "; [ "$1" = "${1/ -g }" ]; echo $? ) %define tolerate_unknown_new_config_options 0 # kABI change tolerance (default in maintenance should be 4, 8 or 15; # see scripts/kabi-checks) @@ -114,12 +112,12 @@ -Source Timestamp: 2006/05/19 14:42:27 UTC +Source Timestamp: 2006/05/24 16:52:45 UTC %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then - echo "The kernel-iseries64-2.6.16.16.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.16.16.src.rpm." + echo "The kernel-iseries64-2.6.16.18.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.16.18.src.rpm." exit 1 fi symbols=$( @@ -182,7 +180,7 @@ MAKE_ARGS="ARCH=$subarch" EOF %endif -%if %with_debug +%if %{defined __debug_package} cat >> ../.rpm-defs <<EOF MAKE_ARGS="\$MAKE_ARGS CONFIG_DEBUG_INFO=y" EOF @@ -245,7 +243,7 @@ add_vmlinux() { local vmlinux=boot/vmlinux-$KERNELRELEASE -%if %with_debug +%if %{defined __debug_package} local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) cp vmlinux %buildroot/$vmlinux @@ -449,6 +447,95 @@ %files -f kernel.files %changelog -n kernel-iseries64 +* Wed May 24 2006 - agruen(a)suse.de +- Fix the logic that detects when to build a debug package so that + it works in the OpenSUSE build service. +* Tue May 23 2006 - kkeil(a)suse.de +- patches.drivers/b44-fix_mac_address: b44: fix force mac address + before ifconfig up (169703). +* Tue May 23 2006 - trenn(a)suse.de +- patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch: + Fix for apic initialization bug using kdump (177741). +* Tue May 23 2006 - perex(a)suse.de +- patches.suse/rtnetlink-atomic2.patch: Fix debug traces for + bonding (might_sleep) (174843). +* Tue May 23 2006 - schwab(a)suse.de +- iosapic-move-irq: fix broken irq affinity [#176697]. +* Tue May 23 2006 - ak(a)suse.de +- patches.arch/x86_64-bad-addr-boundary: Fix off by one in + bad_addr checking in find_e820_area (166022). +* Tue May 23 2006 - gregkh(a)suse.de +- Update to 2.6.16.18 (lots of bugfixes and security updates, public and non-public ones) +- fs/compat.c: fix 'if (a |= b )' typo +- smbus unhiding kills thermal management +- PCI quirk: VIA IRQ fixup should only run for VIA southbridges +- VIA quirk fixup, additional PCI IDs +- Netfilter: do_add_counters race, possible oops or info leak (CVE-2006-0039) +- Remove cond_resched in gather_stats() +- page migration: Fix fallback behavior for dirty pages +- via-rhine: zero pad short packets on Rhine I ethernet cards +- Fix udev device creation +- smbfs: Fix slab corruption in samba error path +- scx200_acb: Fix resource name use after free +- limit request_fn recursion +- TG3: ethtool always report port is TP. +- PCI: correctly allocate return buffers for osc calls +- add migratepage address space op to shmem +- Fix ptrace_attach()/ptrace_traceme()/de_thread() race +- ptrace_attach: fix possible deadlock schenario with irqs +- md: Avoid oops when attempting to fix read errors on raid10 +- NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444) +- USB: ub oops in block_uevent +- selinux: check for failed kmalloc in security_sid_to_context() +- fs/locks.c: Fix sys_flock() race +- SCTP: Respect the real chunk length when walking parameters (CVE-2006-1858) +- SCTP: Validate the parameter length in HB-ACK chunk (CVE-2006-1857) +- patches.drivers/altix-correct-ioc3-port-order.patch: Altix: + correct ioc3 port order (176896). +- patches.drivers/altix-correct-ioc4-port-order.patch: Altix: + correct ioc4 port order (176896). +* Tue May 23 2006 - hare(a)suse.de +- patches.drivers/aic79xx-remove-slave-alloc: Remove + slave_alloc() to avoid refcounting problems (#96728) +* Mon May 22 2006 - trenn(a)suse.de +- patches.fixes/acpi_ec_dummy.patch: Remove fake EC driver + unconditionally (kernel #6111). +* Mon May 22 2006 - hare(a)suse.de +- patches.fixes/sd-fix-unknown-size + Return '0' for unknown disk sizes (#176780 - LTC23895) +* Mon May 22 2006 - hare(a)suse.de +- patches.fixes/fusion-fix-kdump-drvinit + Fix LSI Fusion initialisation after kdump (#173275 - LTC23573) +* Mon May 22 2006 - hare(a)suse.de +- patches.drivers/open-iscsi-svn.diff + Update to svn r584 to really fix machine lockups (#176151) +- patches.drivers/mptfc-sles10-update + Fix several issues with the LSI Fusion FC driver (#173664) +* Mon May 22 2006 - hare(a)suse.de +- patches.arch/s390-zfcp-statistics.diff +- patches.arch/s390-zfcp-statistic-disclaimer.diff + Re-add zfcp statistics. +- Update config files. +* Sat May 20 2006 - ak(a)suse.de +- patches.suse/tcp-proc-listen: Fix deadlock +* Fri May 19 2006 - gregkh(a)suse.de +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs (175786). +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support (175786). +* Fri May 19 2006 - gregkh(a)suse.de +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs. +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support. +* Fri May 19 2006 - gregkh(a)suse.de +- patches.fixes/add-migratepage-address-space-op-to-shmem.patch: + [PATCH] add migratepage address space op to shmem (176147). +- patches.fixes/page-migration-Fix-fallback-behavior-for-dirty-pages.patch: + [PATCH] page migration: Fix fallback behavior for dirty pages + (176147). +- patches.fixes/remove-cond_resched-in-gather_stats.patch: + [PATCH] Remove cond_resched in gather_stats() (176147). * Fri May 19 2006 - kraxel(a)suse.de - patches.fixes/nf_bridge-header-size: nf_bridge: ethernet header is 14 not 16 bytes (150410). kernel-kdump.spec: same change ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.zPHcNc/_old 2006-05-25 00:57:34.000000000 +0200 +++ /var/tmp/diff_new_pack.zPHcNc/_new 2006-05-25 00:57:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ppc64 (Version 2.6.16.16) +# spec file for package kernel-ppc64 (Version 2.6.16.18) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,8 +19,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.16.16 -Release: 2 +Version: 2.6.16.18 +Release: 1 Summary: Kernel for ppc64 Systems License: GPL, LGPL Group: System/Kernel @@ -28,7 +28,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.16.16-%release +Provides: kernel = 2.6.16.18-%release %endif %endif Provides: kernel-ppc64-nongpl @@ -101,8 +101,6 @@ %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 -# Are we building with debug symbols enabled? -%define with_debug %(set -- " %optflags "; [ "$1" = "${1/ -g }" ]; echo $? ) %define tolerate_unknown_new_config_options 0 # kABI change tolerance (default in maintenance should be 4, 8 or 15; # see scripts/kabi-checks) @@ -128,12 +126,12 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux-pmac-benh/CREDITS for more details. -Source Timestamp: 2006/05/19 14:42:27 UTC +Source Timestamp: 2006/05/24 16:52:45 UTC %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then - echo "The kernel-ppc64-2.6.16.16.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.16.16.src.rpm." + echo "The kernel-ppc64-2.6.16.18.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.16.18.src.rpm." exit 1 fi symbols=$( @@ -196,7 +194,7 @@ MAKE_ARGS="ARCH=$subarch" EOF %endif -%if %with_debug +%if %{defined __debug_package} cat >> ../.rpm-defs <<EOF MAKE_ARGS="\$MAKE_ARGS CONFIG_DEBUG_INFO=y" EOF @@ -259,7 +257,7 @@ add_vmlinux() { local vmlinux=boot/vmlinux-$KERNELRELEASE -%if %with_debug +%if %{defined __debug_package} local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) cp vmlinux %buildroot/$vmlinux @@ -463,6 +461,95 @@ %files -f kernel.files %changelog -n kernel-ppc64 +* Wed May 24 2006 - agruen(a)suse.de +- Fix the logic that detects when to build a debug package so that + it works in the OpenSUSE build service. +* Tue May 23 2006 - kkeil(a)suse.de +- patches.drivers/b44-fix_mac_address: b44: fix force mac address + before ifconfig up (169703). +* Tue May 23 2006 - trenn(a)suse.de +- patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch: + Fix for apic initialization bug using kdump (177741). +* Tue May 23 2006 - perex(a)suse.de +- patches.suse/rtnetlink-atomic2.patch: Fix debug traces for + bonding (might_sleep) (174843). +* Tue May 23 2006 - schwab(a)suse.de +- iosapic-move-irq: fix broken irq affinity [#176697]. +* Tue May 23 2006 - ak(a)suse.de +- patches.arch/x86_64-bad-addr-boundary: Fix off by one in + bad_addr checking in find_e820_area (166022). +* Tue May 23 2006 - gregkh(a)suse.de +- Update to 2.6.16.18 (lots of bugfixes and security updates, public and non-public ones) +- fs/compat.c: fix 'if (a |= b )' typo +- smbus unhiding kills thermal management +- PCI quirk: VIA IRQ fixup should only run for VIA southbridges +- VIA quirk fixup, additional PCI IDs +- Netfilter: do_add_counters race, possible oops or info leak (CVE-2006-0039) +- Remove cond_resched in gather_stats() +- page migration: Fix fallback behavior for dirty pages +- via-rhine: zero pad short packets on Rhine I ethernet cards +- Fix udev device creation +- smbfs: Fix slab corruption in samba error path +- scx200_acb: Fix resource name use after free +- limit request_fn recursion +- TG3: ethtool always report port is TP. +- PCI: correctly allocate return buffers for osc calls +- add migratepage address space op to shmem +- Fix ptrace_attach()/ptrace_traceme()/de_thread() race +- ptrace_attach: fix possible deadlock schenario with irqs +- md: Avoid oops when attempting to fix read errors on raid10 +- NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444) +- USB: ub oops in block_uevent +- selinux: check for failed kmalloc in security_sid_to_context() +- fs/locks.c: Fix sys_flock() race +- SCTP: Respect the real chunk length when walking parameters (CVE-2006-1858) +- SCTP: Validate the parameter length in HB-ACK chunk (CVE-2006-1857) +- patches.drivers/altix-correct-ioc3-port-order.patch: Altix: + correct ioc3 port order (176896). +- patches.drivers/altix-correct-ioc4-port-order.patch: Altix: + correct ioc4 port order (176896). +* Tue May 23 2006 - hare(a)suse.de +- patches.drivers/aic79xx-remove-slave-alloc: Remove + slave_alloc() to avoid refcounting problems (#96728) +* Mon May 22 2006 - trenn(a)suse.de +- patches.fixes/acpi_ec_dummy.patch: Remove fake EC driver + unconditionally (kernel #6111). +* Mon May 22 2006 - hare(a)suse.de +- patches.fixes/sd-fix-unknown-size + Return '0' for unknown disk sizes (#176780 - LTC23895) +* Mon May 22 2006 - hare(a)suse.de +- patches.fixes/fusion-fix-kdump-drvinit + Fix LSI Fusion initialisation after kdump (#173275 - LTC23573) +* Mon May 22 2006 - hare(a)suse.de +- patches.drivers/open-iscsi-svn.diff + Update to svn r584 to really fix machine lockups (#176151) +- patches.drivers/mptfc-sles10-update + Fix several issues with the LSI Fusion FC driver (#173664) +* Mon May 22 2006 - hare(a)suse.de +- patches.arch/s390-zfcp-statistics.diff +- patches.arch/s390-zfcp-statistic-disclaimer.diff + Re-add zfcp statistics. +- Update config files. +* Sat May 20 2006 - ak(a)suse.de +- patches.suse/tcp-proc-listen: Fix deadlock +* Fri May 19 2006 - gregkh(a)suse.de +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs (175786). +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support (175786). +* Fri May 19 2006 - gregkh(a)suse.de +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs. +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support. +* Fri May 19 2006 - gregkh(a)suse.de +- patches.fixes/add-migratepage-address-space-op-to-shmem.patch: + [PATCH] add migratepage address space op to shmem (176147). +- patches.fixes/page-migration-Fix-fallback-behavior-for-dirty-pages.patch: + [PATCH] page migration: Fix fallback behavior for dirty pages + (176147). +- patches.fixes/remove-cond_resched-in-gather_stats.patch: + [PATCH] Remove cond_resched in gather_stats() (176147). * Fri May 19 2006 - kraxel(a)suse.de - patches.fixes/nf_bridge-header-size: nf_bridge: ethernet header is 14 not 16 bytes (150410). ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.zPHcNc/_old 2006-05-25 00:57:34.000000000 +0200 +++ /var/tmp/diff_new_pack.zPHcNc/_new 2006-05-25 00:57:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-s390 (Version 2.6.16.16) +# spec file for package kernel-s390 (Version 2.6.16.18) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,8 +20,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.16.16 -Release: 2 +Version: 2.6.16.18 +Release: 1 Summary: The Standard Kernel License: GPL Group: System/Kernel @@ -29,7 +29,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.16.16-%release +Provides: kernel = 2.6.16.18-%release %endif %endif Provides: kernel-s390-nongpl @@ -97,8 +97,6 @@ %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 -# Are we building with debug symbols enabled? -%define with_debug %(set -- " %optflags "; [ "$1" = "${1/ -g }" ]; echo $? ) %define tolerate_unknown_new_config_options 0 # kABI change tolerance (default in maintenance should be 4, 8 or 15; # see scripts/kabi-checks) @@ -111,12 +109,12 @@ -Source Timestamp: 2006/05/19 14:42:27 UTC +Source Timestamp: 2006/05/24 16:52:45 UTC %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then - echo "The kernel-s390-2.6.16.16.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.16.16.src.rpm." + echo "The kernel-s390-2.6.16.18.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.16.18.src.rpm." exit 1 fi symbols=$( @@ -179,7 +177,7 @@ MAKE_ARGS="ARCH=$subarch" EOF %endif -%if %with_debug +%if %{defined __debug_package} cat >> ../.rpm-defs <<EOF MAKE_ARGS="\$MAKE_ARGS CONFIG_DEBUG_INFO=y" EOF @@ -242,7 +240,7 @@ add_vmlinux() { local vmlinux=boot/vmlinux-$KERNELRELEASE -%if %with_debug +%if %{defined __debug_package} local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) cp vmlinux %buildroot/$vmlinux @@ -446,6 +444,95 @@ %files -f kernel.files %changelog -n kernel-s390 +* Wed May 24 2006 - agruen(a)suse.de +- Fix the logic that detects when to build a debug package so that + it works in the OpenSUSE build service. +* Tue May 23 2006 - kkeil(a)suse.de +- patches.drivers/b44-fix_mac_address: b44: fix force mac address + before ifconfig up (169703). +* Tue May 23 2006 - trenn(a)suse.de +- patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch: + Fix for apic initialization bug using kdump (177741). +* Tue May 23 2006 - perex(a)suse.de +- patches.suse/rtnetlink-atomic2.patch: Fix debug traces for + bonding (might_sleep) (174843). +* Tue May 23 2006 - schwab(a)suse.de +- iosapic-move-irq: fix broken irq affinity [#176697]. +* Tue May 23 2006 - ak(a)suse.de +- patches.arch/x86_64-bad-addr-boundary: Fix off by one in + bad_addr checking in find_e820_area (166022). +* Tue May 23 2006 - gregkh(a)suse.de +- Update to 2.6.16.18 (lots of bugfixes and security updates, public and non-public ones) +- fs/compat.c: fix 'if (a |= b )' typo +- smbus unhiding kills thermal management +- PCI quirk: VIA IRQ fixup should only run for VIA southbridges +- VIA quirk fixup, additional PCI IDs +- Netfilter: do_add_counters race, possible oops or info leak (CVE-2006-0039) +- Remove cond_resched in gather_stats() +- page migration: Fix fallback behavior for dirty pages +- via-rhine: zero pad short packets on Rhine I ethernet cards +- Fix udev device creation +- smbfs: Fix slab corruption in samba error path +- scx200_acb: Fix resource name use after free +- limit request_fn recursion +- TG3: ethtool always report port is TP. +- PCI: correctly allocate return buffers for osc calls +- add migratepage address space op to shmem +- Fix ptrace_attach()/ptrace_traceme()/de_thread() race +- ptrace_attach: fix possible deadlock schenario with irqs +- md: Avoid oops when attempting to fix read errors on raid10 +- NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444) +- USB: ub oops in block_uevent +- selinux: check for failed kmalloc in security_sid_to_context() +- fs/locks.c: Fix sys_flock() race +- SCTP: Respect the real chunk length when walking parameters (CVE-2006-1858) +- SCTP: Validate the parameter length in HB-ACK chunk (CVE-2006-1857) +- patches.drivers/altix-correct-ioc3-port-order.patch: Altix: + correct ioc3 port order (176896). +- patches.drivers/altix-correct-ioc4-port-order.patch: Altix: + correct ioc4 port order (176896). +* Tue May 23 2006 - hare(a)suse.de +- patches.drivers/aic79xx-remove-slave-alloc: Remove + slave_alloc() to avoid refcounting problems (#96728) +* Mon May 22 2006 - trenn(a)suse.de +- patches.fixes/acpi_ec_dummy.patch: Remove fake EC driver + unconditionally (kernel #6111). +* Mon May 22 2006 - hare(a)suse.de +- patches.fixes/sd-fix-unknown-size + Return '0' for unknown disk sizes (#176780 - LTC23895) +* Mon May 22 2006 - hare(a)suse.de +- patches.fixes/fusion-fix-kdump-drvinit + Fix LSI Fusion initialisation after kdump (#173275 - LTC23573) +* Mon May 22 2006 - hare(a)suse.de +- patches.drivers/open-iscsi-svn.diff + Update to svn r584 to really fix machine lockups (#176151) +- patches.drivers/mptfc-sles10-update + Fix several issues with the LSI Fusion FC driver (#173664) +* Mon May 22 2006 - hare(a)suse.de +- patches.arch/s390-zfcp-statistics.diff +- patches.arch/s390-zfcp-statistic-disclaimer.diff + Re-add zfcp statistics. +- Update config files. +* Sat May 20 2006 - ak(a)suse.de +- patches.suse/tcp-proc-listen: Fix deadlock +* Fri May 19 2006 - gregkh(a)suse.de +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs (175786). +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support (175786). +* Fri May 19 2006 - gregkh(a)suse.de +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs. +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support. +* Fri May 19 2006 - gregkh(a)suse.de +- patches.fixes/add-migratepage-address-space-op-to-shmem.patch: + [PATCH] add migratepage address space op to shmem (176147). +- patches.fixes/page-migration-Fix-fallback-behavior-for-dirty-pages.patch: + [PATCH] page migration: Fix fallback behavior for dirty pages + (176147). +- patches.fixes/remove-cond_resched-in-gather_stats.patch: + [PATCH] Remove cond_resched in gather_stats() (176147). * Fri May 19 2006 - kraxel(a)suse.de - patches.fixes/nf_bridge-header-size: nf_bridge: ethernet header is 14 not 16 bytes (150410). kernel-smp.spec: same change ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.zPHcNc/_old 2006-05-25 00:57:34.000000000 +0200 +++ /var/tmp/diff_new_pack.zPHcNc/_new 2006-05-25 00:57:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-source (Version 2.6.16.16) +# spec file for package kernel-source (Version 2.6.16.18) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -24,8 +24,8 @@ Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24 %endif PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status -Version: 2.6.16.16 -Release: 2 +Version: 2.6.16.18 +Release: 1 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 Source1: functions.sh Source2: source-post.sh @@ -93,7 +93,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2006/05/19 14:42:27 UTC +Source Timestamp: 2006/05/24 16:52:45 UTC %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -116,16 +116,16 @@ # Apply the patches needed for this architecture. %_sourcedir/guards %symbols < %_sourcedir/series.conf \ - > %_builddir/kernel-source-2.6.16.16/kernel-source.patches -for patch in $(< %_builddir/kernel-source-2.6.16.16/kernel-source.patches); do - if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.16.16/$patch; then + > %_builddir/kernel-source-2.6.16.18/kernel-source.patches +for patch in $(< %_builddir/kernel-source-2.6.16.18/kernel-source.patches); do + if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.16.18/$patch; then echo "*** Patch $patch failed ***" exit 1 fi done -%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.16.16 %release -KERNELRELEASE=2.6.16.16-%release +%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.16.18 %release +KERNELRELEASE=2.6.16.18-%release cat > %_builddir/%{name}-%{version}/.rpm-defs <<EOF KERNELRELEASE=$KERNELRELEASE SYMBOLS=$symbols @@ -146,8 +146,8 @@ ;; esac %_sourcedir/guards %symbols kernel-$flavor < %_sourcedir/series.conf \ - > %_builddir/kernel-source-2.6.16.16/kernel-$flavor.patches - diff -q %_builddir/kernel-source-2.6.16.16/kernel-{source,$flavor}.patches \ + > %_builddir/kernel-source-2.6.16.18/kernel-$flavor.patches + diff -q %_builddir/kernel-source-2.6.16.18/kernel-{source,$flavor}.patches \ || continue o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor mkdir -p $o @@ -274,6 +274,95 @@ %files -f kernel-source.files %changelog -n kernel-source +* Wed May 24 2006 - agruen(a)suse.de +- Fix the logic that detects when to build a debug package so that + it works in the OpenSUSE build service. +* Tue May 23 2006 - kkeil(a)suse.de +- patches.drivers/b44-fix_mac_address: b44: fix force mac address + before ifconfig up (169703). +* Tue May 23 2006 - trenn(a)suse.de +- patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch: + Fix for apic initialization bug using kdump (177741). +* Tue May 23 2006 - perex(a)suse.de +- patches.suse/rtnetlink-atomic2.patch: Fix debug traces for + bonding (might_sleep) (174843). +* Tue May 23 2006 - schwab(a)suse.de +- iosapic-move-irq: fix broken irq affinity [#176697]. +* Tue May 23 2006 - ak(a)suse.de +- patches.arch/x86_64-bad-addr-boundary: Fix off by one in + bad_addr checking in find_e820_area (166022). +* Tue May 23 2006 - gregkh(a)suse.de +- Update to 2.6.16.18 (lots of bugfixes and security updates, public and non-public ones) +- fs/compat.c: fix 'if (a |= b )' typo +- smbus unhiding kills thermal management +- PCI quirk: VIA IRQ fixup should only run for VIA southbridges +- VIA quirk fixup, additional PCI IDs +- Netfilter: do_add_counters race, possible oops or info leak (CVE-2006-0039) +- Remove cond_resched in gather_stats() +- page migration: Fix fallback behavior for dirty pages +- via-rhine: zero pad short packets on Rhine I ethernet cards +- Fix udev device creation +- smbfs: Fix slab corruption in samba error path +- scx200_acb: Fix resource name use after free +- limit request_fn recursion +- TG3: ethtool always report port is TP. +- PCI: correctly allocate return buffers for osc calls +- add migratepage address space op to shmem +- Fix ptrace_attach()/ptrace_traceme()/de_thread() race +- ptrace_attach: fix possible deadlock schenario with irqs +- md: Avoid oops when attempting to fix read errors on raid10 +- NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444) +- USB: ub oops in block_uevent +- selinux: check for failed kmalloc in security_sid_to_context() +- fs/locks.c: Fix sys_flock() race +- SCTP: Respect the real chunk length when walking parameters (CVE-2006-1858) +- SCTP: Validate the parameter length in HB-ACK chunk (CVE-2006-1857) +- patches.drivers/altix-correct-ioc3-port-order.patch: Altix: + correct ioc3 port order (176896). +- patches.drivers/altix-correct-ioc4-port-order.patch: Altix: + correct ioc4 port order (176896). +* Tue May 23 2006 - hare(a)suse.de +- patches.drivers/aic79xx-remove-slave-alloc: Remove + slave_alloc() to avoid refcounting problems (#96728) +* Mon May 22 2006 - trenn(a)suse.de +- patches.fixes/acpi_ec_dummy.patch: Remove fake EC driver + unconditionally (kernel #6111). +* Mon May 22 2006 - hare(a)suse.de +- patches.fixes/sd-fix-unknown-size + Return '0' for unknown disk sizes (#176780 - LTC23895) +* Mon May 22 2006 - hare(a)suse.de +- patches.fixes/fusion-fix-kdump-drvinit + Fix LSI Fusion initialisation after kdump (#173275 - LTC23573) +* Mon May 22 2006 - hare(a)suse.de +- patches.drivers/open-iscsi-svn.diff + Update to svn r584 to really fix machine lockups (#176151) +- patches.drivers/mptfc-sles10-update + Fix several issues with the LSI Fusion FC driver (#173664) +* Mon May 22 2006 - hare(a)suse.de +- patches.arch/s390-zfcp-statistics.diff +- patches.arch/s390-zfcp-statistic-disclaimer.diff + Re-add zfcp statistics. +- Update config files. +* Sat May 20 2006 - ak(a)suse.de +- patches.suse/tcp-proc-listen: Fix deadlock +* Fri May 19 2006 - gregkh(a)suse.de +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs (175786). +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support (175786). +* Fri May 19 2006 - gregkh(a)suse.de +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs. +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support. +* Fri May 19 2006 - gregkh(a)suse.de +- patches.fixes/add-migratepage-address-space-op-to-shmem.patch: + [PATCH] add migratepage address space op to shmem (176147). +- patches.fixes/page-migration-Fix-fallback-behavior-for-dirty-pages.patch: + [PATCH] page migration: Fix fallback behavior for dirty pages + (176147). +- patches.fixes/remove-cond_resched-in-gather_stats.patch: + [PATCH] Remove cond_resched in gather_stats() (176147). * Fri May 19 2006 - kraxel(a)suse.de - patches.fixes/nf_bridge-header-size: nf_bridge: ethernet header is 14 not 16 bytes (150410). ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.zPHcNc/_old 2006-05-25 00:57:34.000000000 +0200 +++ /var/tmp/diff_new_pack.zPHcNc/_new 2006-05-25 00:57:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-syms (Version 2.6.16.16) +# spec file for package kernel-syms (Version 2.6.16.18) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -48,10 +48,10 @@ Autoreqprov: off Summary: Kernel Symbol Versions (modversions) Group: Development/Sources -Version: 2.6.16.16 -Release: 2 +Version: 2.6.16.18 +Release: 1 Requires: linux -Requires: kernel-source = 2.6.16.16-%release +Requires: kernel-source = 2.6.16.18-%release Source11: arch-symbols Source12: guards Source21: config.conf @@ -84,7 +84,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2006/05/19 14:42:27 UTC +Source Timestamp: 2006/05/24 16:52:45 UTC %install @@ -127,6 +127,95 @@ /boot/symsets-*-*.tar.gz %changelog -n kernel-syms +* Wed May 24 2006 - agruen(a)suse.de +- Fix the logic that detects when to build a debug package so that + it works in the OpenSUSE build service. +* Tue May 23 2006 - kkeil(a)suse.de +- patches.drivers/b44-fix_mac_address: b44: fix force mac address + before ifconfig up (169703). +* Tue May 23 2006 - trenn(a)suse.de +- patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch: + Fix for apic initialization bug using kdump (177741). +* Tue May 23 2006 - perex(a)suse.de +- patches.suse/rtnetlink-atomic2.patch: Fix debug traces for + bonding (might_sleep) (174843). +* Tue May 23 2006 - schwab(a)suse.de +- iosapic-move-irq: fix broken irq affinity [#176697]. +* Tue May 23 2006 - ak(a)suse.de +- patches.arch/x86_64-bad-addr-boundary: Fix off by one in + bad_addr checking in find_e820_area (166022). +* Tue May 23 2006 - gregkh(a)suse.de +- Update to 2.6.16.18 (lots of bugfixes and security updates, public and non-public ones) +- fs/compat.c: fix 'if (a |= b )' typo +- smbus unhiding kills thermal management +- PCI quirk: VIA IRQ fixup should only run for VIA southbridges +- VIA quirk fixup, additional PCI IDs +- Netfilter: do_add_counters race, possible oops or info leak (CVE-2006-0039) +- Remove cond_resched in gather_stats() +- page migration: Fix fallback behavior for dirty pages +- via-rhine: zero pad short packets on Rhine I ethernet cards +- Fix udev device creation +- smbfs: Fix slab corruption in samba error path +- scx200_acb: Fix resource name use after free +- limit request_fn recursion +- TG3: ethtool always report port is TP. +- PCI: correctly allocate return buffers for osc calls +- add migratepage address space op to shmem +- Fix ptrace_attach()/ptrace_traceme()/de_thread() race +- ptrace_attach: fix possible deadlock schenario with irqs +- md: Avoid oops when attempting to fix read errors on raid10 +- NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444) +- USB: ub oops in block_uevent +- selinux: check for failed kmalloc in security_sid_to_context() +- fs/locks.c: Fix sys_flock() race +- SCTP: Respect the real chunk length when walking parameters (CVE-2006-1858) +- SCTP: Validate the parameter length in HB-ACK chunk (CVE-2006-1857) +- patches.drivers/altix-correct-ioc3-port-order.patch: Altix: + correct ioc3 port order (176896). +- patches.drivers/altix-correct-ioc4-port-order.patch: Altix: + correct ioc4 port order (176896). +* Tue May 23 2006 - hare(a)suse.de +- patches.drivers/aic79xx-remove-slave-alloc: Remove + slave_alloc() to avoid refcounting problems (#96728) +* Mon May 22 2006 - trenn(a)suse.de +- patches.fixes/acpi_ec_dummy.patch: Remove fake EC driver + unconditionally (kernel #6111). +* Mon May 22 2006 - hare(a)suse.de +- patches.fixes/sd-fix-unknown-size + Return '0' for unknown disk sizes (#176780 - LTC23895) +* Mon May 22 2006 - hare(a)suse.de +- patches.fixes/fusion-fix-kdump-drvinit + Fix LSI Fusion initialisation after kdump (#173275 - LTC23573) +* Mon May 22 2006 - hare(a)suse.de +- patches.drivers/open-iscsi-svn.diff + Update to svn r584 to really fix machine lockups (#176151) +- patches.drivers/mptfc-sles10-update + Fix several issues with the LSI Fusion FC driver (#173664) +* Mon May 22 2006 - hare(a)suse.de +- patches.arch/s390-zfcp-statistics.diff +- patches.arch/s390-zfcp-statistic-disclaimer.diff + Re-add zfcp statistics. +- Update config files. +* Sat May 20 2006 - ak(a)suse.de +- patches.suse/tcp-proc-listen: Fix deadlock +* Fri May 19 2006 - gregkh(a)suse.de +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs (175786). +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support (175786). +* Fri May 19 2006 - gregkh(a)suse.de +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs. +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support. +* Fri May 19 2006 - gregkh(a)suse.de +- patches.fixes/add-migratepage-address-space-op-to-shmem.patch: + [PATCH] add migratepage address space op to shmem (176147). +- patches.fixes/page-migration-Fix-fallback-behavior-for-dirty-pages.patch: + [PATCH] page migration: Fix fallback behavior for dirty pages + (176147). +- patches.fixes/remove-cond_resched-in-gather_stats.patch: + [PATCH] Remove cond_resched in gather_stats() (176147). * Fri May 19 2006 - kraxel(a)suse.de - patches.fixes/nf_bridge-header-size: nf_bridge: ethernet header is 14 not 16 bytes (150410). ++++++ kernel-um.spec ++++++ --- /var/tmp/diff_new_pack.zPHcNc/_old 2006-05-25 00:57:35.000000000 +0200 +++ /var/tmp/diff_new_pack.zPHcNc/_new 2006-05-25 00:57:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-um (Version 2.6.16.16) +# spec file for package kernel-um (Version 2.6.16.18) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,8 +20,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.16.16 -Release: 2 +Version: 2.6.16.18 +Release: 1 Summary: The User Mode Linux kernel. License: GPL Group: System/Kernel @@ -29,7 +29,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.16.16-%release +Provides: kernel = 2.6.16.18-%release %endif %endif Provides: kernel-um-nongpl @@ -97,8 +97,6 @@ %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 -# Are we building with debug symbols enabled? -%define with_debug %(set -- " %optflags "; [ "$1" = "${1/ -g }" ]; echo $? ) %define tolerate_unknown_new_config_options 0 # kABI change tolerance (default in maintenance should be 4, 8 or 15; # see scripts/kabi-checks) @@ -114,12 +112,12 @@ -Source Timestamp: 2006/05/19 14:42:27 UTC +Source Timestamp: 2006/05/24 16:52:45 UTC %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then - echo "The kernel-um-2.6.16.16.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.16.16.src.rpm." + echo "The kernel-um-2.6.16.18.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.16.18.src.rpm." exit 1 fi symbols=$( @@ -182,7 +180,7 @@ MAKE_ARGS="ARCH=$subarch" EOF %endif -%if %with_debug +%if %{defined __debug_package} cat >> ../.rpm-defs <<EOF MAKE_ARGS="\$MAKE_ARGS CONFIG_DEBUG_INFO=y" EOF @@ -245,7 +243,7 @@ add_vmlinux() { local vmlinux=boot/vmlinux-$KERNELRELEASE -%if %with_debug +%if %{defined __debug_package} local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) cp vmlinux %buildroot/$vmlinux @@ -449,6 +447,95 @@ %files -f kernel.files %changelog -n kernel-um +* Wed May 24 2006 - agruen(a)suse.de +- Fix the logic that detects when to build a debug package so that + it works in the OpenSUSE build service. +* Tue May 23 2006 - kkeil(a)suse.de +- patches.drivers/b44-fix_mac_address: b44: fix force mac address + before ifconfig up (169703). +* Tue May 23 2006 - trenn(a)suse.de +- patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch: + Fix for apic initialization bug using kdump (177741). +* Tue May 23 2006 - perex(a)suse.de +- patches.suse/rtnetlink-atomic2.patch: Fix debug traces for + bonding (might_sleep) (174843). +* Tue May 23 2006 - schwab(a)suse.de +- iosapic-move-irq: fix broken irq affinity [#176697]. +* Tue May 23 2006 - ak(a)suse.de +- patches.arch/x86_64-bad-addr-boundary: Fix off by one in + bad_addr checking in find_e820_area (166022). +* Tue May 23 2006 - gregkh(a)suse.de +- Update to 2.6.16.18 (lots of bugfixes and security updates, public and non-public ones) +- fs/compat.c: fix 'if (a |= b )' typo +- smbus unhiding kills thermal management +- PCI quirk: VIA IRQ fixup should only run for VIA southbridges +- VIA quirk fixup, additional PCI IDs +- Netfilter: do_add_counters race, possible oops or info leak (CVE-2006-0039) +- Remove cond_resched in gather_stats() +- page migration: Fix fallback behavior for dirty pages +- via-rhine: zero pad short packets on Rhine I ethernet cards +- Fix udev device creation +- smbfs: Fix slab corruption in samba error path +- scx200_acb: Fix resource name use after free +- limit request_fn recursion +- TG3: ethtool always report port is TP. +- PCI: correctly allocate return buffers for osc calls +- add migratepage address space op to shmem +- Fix ptrace_attach()/ptrace_traceme()/de_thread() race +- ptrace_attach: fix possible deadlock schenario with irqs +- md: Avoid oops when attempting to fix read errors on raid10 +- NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444) +- USB: ub oops in block_uevent +- selinux: check for failed kmalloc in security_sid_to_context() +- fs/locks.c: Fix sys_flock() race +- SCTP: Respect the real chunk length when walking parameters (CVE-2006-1858) +- SCTP: Validate the parameter length in HB-ACK chunk (CVE-2006-1857) +- patches.drivers/altix-correct-ioc3-port-order.patch: Altix: + correct ioc3 port order (176896). +- patches.drivers/altix-correct-ioc4-port-order.patch: Altix: + correct ioc4 port order (176896). +* Tue May 23 2006 - hare(a)suse.de +- patches.drivers/aic79xx-remove-slave-alloc: Remove + slave_alloc() to avoid refcounting problems (#96728) +* Mon May 22 2006 - trenn(a)suse.de +- patches.fixes/acpi_ec_dummy.patch: Remove fake EC driver + unconditionally (kernel #6111). +* Mon May 22 2006 - hare(a)suse.de +- patches.fixes/sd-fix-unknown-size + Return '0' for unknown disk sizes (#176780 - LTC23895) +* Mon May 22 2006 - hare(a)suse.de +- patches.fixes/fusion-fix-kdump-drvinit + Fix LSI Fusion initialisation after kdump (#173275 - LTC23573) +* Mon May 22 2006 - hare(a)suse.de +- patches.drivers/open-iscsi-svn.diff + Update to svn r584 to really fix machine lockups (#176151) +- patches.drivers/mptfc-sles10-update + Fix several issues with the LSI Fusion FC driver (#173664) +* Mon May 22 2006 - hare(a)suse.de +- patches.arch/s390-zfcp-statistics.diff +- patches.arch/s390-zfcp-statistic-disclaimer.diff + Re-add zfcp statistics. +- Update config files. +* Sat May 20 2006 - ak(a)suse.de +- patches.suse/tcp-proc-listen: Fix deadlock +* Fri May 19 2006 - gregkh(a)suse.de +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs (175786). +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support (175786). +* Fri May 19 2006 - gregkh(a)suse.de +- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata] + ahci: add ATI SB600 PCI IDs. +- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide: + ATI SB600 IDE support. +* Fri May 19 2006 - gregkh(a)suse.de +- patches.fixes/add-migratepage-address-space-op-to-shmem.patch: + [PATCH] add migratepage address space op to shmem (176147). +- patches.fixes/page-migration-Fix-fallback-behavior-for-dirty-pages.patch: + [PATCH] page migration: Fix fallback behavior for dirty pages + (176147). +- patches.fixes/remove-cond_resched-in-gather_stats.patch: + [PATCH] Remove cond_resched in gather_stats() (176147). * Fri May 19 2006 - kraxel(a)suse.de - patches.fixes/nf_bridge-header-size: nf_bridge: ethernet header is 14 not 16 bytes (150410). kernel-xen.spec: same change kernel-xenpae.spec: same change ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2006-05-19 17:51:26.000000000 +0200 +++ kernel-source/build-source-timestamp 2006-05-24 18:53:42.000000000 +0200 @@ -1 +1 @@ -2006/05/19 14:42:27 UTC +2006/05/24 16:52:45 UTC ++++++ config.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/default new/config/s390/default --- old/config/s390/default 2006-05-19 17:51:37.000000000 +0200 +++ new/config/s390/default 2006-05-22 13:32:00.000000000 +0200 @@ -931,10 +931,11 @@ CONFIG_NLS_UTF8=m # -# Profiling support +# Instrumentation Support # CONFIG_PROFILING=y CONFIG_OPROFILE=m +CONFIG_STATISTICS=y # # Kernel hacking @@ -1019,3 +1020,4 @@ CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m +CONFIG_SGRB=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/s390 new/config/s390/s390 --- old/config/s390/s390 2006-05-19 17:51:37.000000000 +0200 +++ new/config/s390/s390 2006-05-22 13:32:01.000000000 +0200 @@ -927,10 +927,11 @@ CONFIG_NLS_UTF8=m # -# Profiling support +# Instrumentation Support # CONFIG_PROFILING=y CONFIG_OPROFILE=m +CONFIG_STATISTICS=y # # Kernel hacking @@ -1015,3 +1016,4 @@ CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m +CONFIG_SGRB=y ++++++ minmem ++++++ --- kernel-source/minmem 2006-05-21 02:11:28.000000000 +0200 +++ kernel-source/minmem 2006-05-24 18:54:08.000000000 +0200 @@ -1 +1 @@ -514000 +1048576 ++++++ patches.arch.tar.bz2 ++++++ ++++ 4863 lines of diff (skipped) ++++++ patches.drivers.tar.bz2 ++++++ ++++ 2694 lines of diff (skipped) ++++++ patches.fixes.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/acpi_ec_dummy.patch new/patches.fixes/acpi_ec_dummy.patch --- old/patches.fixes/acpi_ec_dummy.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/acpi_ec_dummy.patch 2006-05-22 17:25:32.000000000 +0200 @@ -0,0 +1,65 @@ +From: Thomas Renninger <trenn(a)suse.de> +Subject: Remove fake EC driver unconditionally +Patch-mainline: yes +References: kernel #6111 + +acpi-ecdt-uid-hack +On some boxes ecdt uid may be equal to 0, so do not test for uids equality, so +that fake handler will be unconditionally removed to allow loading the real one. + +Signed-off-by: Jiri Slaby <jirislaby(a)gmail.com> +Signed-off-by: Thomas Renninger <trenn(a)suse.de> + + drivers/acpi/ec.c | 16 ++++++---------- + 1 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c +index f339bd4..de95a09 100644 + + +--- a/drivers/acpi/ec.c ++++ b/drivers/acpi/ec.c +@@ -989,7 +989,6 @@ static int acpi_ec_poll_add(struct acpi_ + int result = 0; + acpi_status status = AE_OK; + union acpi_ec *ec = NULL; +- unsigned long uid; + + ACPI_FUNCTION_TRACE("acpi_ec_add"); + +@@ -1012,10 +1011,9 @@ static int acpi_ec_poll_add(struct acpi_ + acpi_evaluate_integer(ec->common.handle, "_GLK", NULL, + &ec->common.global_lock); + +- /* If our UID matches the UID for the ECDT-enumerated EC, +- we now have the *real* EC info, so kill the makeshift one. */ +- acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid); +- if (ec_ecdt && ec_ecdt->common.uid == uid) { ++ /* XXX we doesn't test uids, because on some boxes ecdt uid = 0, see: ++ http://bugzilla.kernel.org/show_bug.cgi?id=6111 */ ++ if (ec_ecdt) { + acpi_remove_address_space_handler(ACPI_ROOT_OBJECT, + ACPI_ADR_SPACE_EC, + &acpi_ec_space_handler); +@@ -1059,7 +1057,6 @@ static int acpi_ec_intr_add(struct acpi_ + int result = 0; + acpi_status status = AE_OK; + union acpi_ec *ec = NULL; +- unsigned long uid; + + ACPI_FUNCTION_TRACE("acpi_ec_add"); + +@@ -1085,10 +1082,9 @@ static int acpi_ec_intr_add(struct acpi_ + acpi_evaluate_integer(ec->common.handle, "_GLK", NULL, + &ec->common.global_lock); + +- /* If our UID matches the UID for the ECDT-enumerated EC, +- we now have the *real* EC info, so kill the makeshift one. */ +- acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid); +- if (ec_ecdt && ec_ecdt->common.uid == uid) { ++ /* XXX we doesn't test uids, because on some boxes ecdt uid = 0, see: ++ http://bugzilla.kernel.org/show_bug.cgi?id=6111 */ ++ if (ec_ecdt) { + acpi_remove_address_space_handler(ACPI_ROOT_OBJECT, + ACPI_ADR_SPACE_EC, + &acpi_ec_space_handler); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/blk-limit-recursion new/patches.fixes/blk-limit-recursion --- old/patches.fixes/blk-limit-recursion 2006-05-03 13:44:40.000000000 +0200 +++ new/patches.fixes/blk-limit-recursion 1970-01-01 01:00:00.000000000 +0100 @@ -1,72 +0,0 @@ -From: Jens Axboe <axboe(a)suse.de> -Subject: Limit recursion of the request handler -Patch-mainline: -References: 170315 - -Don't recurse on block layer requeues, as they are most likely don't -because of driver/hardware starvation problems and rehitting the queue -directly from that path then only does harm. - -Same for blk_run_queue(), apply same level of 1-deep recursion that -blk_start_queue() does. - -Acked-by: -Signed-off-by: - ---- linux-2.6.16/block/elevator.c~ 2006-05-03 13:41:35.000000000 +0200 -+++ linux-2.6.16/block/elevator.c 2006-05-03 13:41:41.000000000 +0200 -@@ -314,6 +314,7 @@ void elv_insert(request_queue_t *q, stru - { - struct list_head *pos; - unsigned ordseq; -+ int unplug_it = 1; - - rq->q = q; - -@@ -378,6 +379,11 @@ void elv_insert(request_queue_t *q, stru - } - - list_add_tail(&rq->queuelist, pos); -+ /* -+ * most requeues happen because of a busy condition, don't -+ * force unplug of the queue for that case. -+ */ -+ unplug_it = 0; - break; - - default: -@@ -386,7 +392,7 @@ void elv_insert(request_queue_t *q, stru - BUG(); - } - -- if (blk_queue_plugged(q)) { -+ if (unplug_it && blk_queue_plugged(q)) { - int nrq = q->rq.count[READ] + q->rq.count[WRITE] - - q->in_flight; - ---- linux-2.6.16/block/ll_rw_blk.c~ 2006-05-03 13:41:38.000000000 +0200 -+++ linux-2.6.16/block/ll_rw_blk.c 2006-05-03 13:41:41.000000000 +0200 -@@ -1722,8 +1722,21 @@ void blk_run_queue(struct request_queue - - spin_lock_irqsave(q->queue_lock, flags); - blk_remove_plug(q); -- if (!elv_queue_empty(q)) -- q->request_fn(q); -+ -+ /* -+ * Only recurse once to avoid overrunning the stack, let the unplug -+ * handling reinvoke the handler shortly if we already got there. -+ */ -+ if (!elv_queue_empty(q)) { -+ if (!test_and_set_bit(QUEUE_FLAG_REENTER, &q->queue_flags)) { -+ q->request_fn(q); -+ clear_bit(QUEUE_FLAG_REENTER, &q->queue_flags); -+ } else { -+ blk_plug_device(q); -+ kblockd_schedule_work(&q->unplug_work); -+ } -+ } -+ - spin_unlock_irqrestore(q->queue_lock, flags); - } - EXPORT_SYMBOL(blk_run_queue); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/compat_sys_ppoll-typo.patch new/patches.fixes/compat_sys_ppoll-typo.patch --- old/patches.fixes/compat_sys_ppoll-typo.patch 2006-05-17 10:18:57.000000000 +0200 +++ new/patches.fixes/compat_sys_ppoll-typo.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -Subject: [PATCH] fs/compat.c: fix 'if (a |= b )' typo -From: Alexey Dobriyan <adobriyan(a)gmail.com> -X-Git-Commit: 3835a9bd07778d87dea37fbf190f70883515e8fc - -Mentioned by Mark Armbrust somewhere on Usenet. - - -Signed-off-by: Olaf Hering <olh(a)suse.de> - - fs/compat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: linux-2.6.16/fs/compat.c -=================================================================== ---- linux-2.6.16.orig/fs/compat.c -+++ linux-2.6.16/fs/compat.c -@@ -1901,7 +1901,7 @@ asmlinkage long compat_sys_ppoll(struct - } - - if (sigmask) { -- if (sigsetsize |= sizeof(compat_sigset_t)) -+ if (sigsetsize != sizeof(compat_sigset_t)) - return -EINVAL; - if (copy_from_user(&ss32, sigmask, sizeof(ss32))) - return -EFAULT; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ethtool-always-report-port-is-TP-on-tg3 new/patches.fixes/ethtool-always-report-port-is-TP-on-tg3 --- old/patches.fixes/ethtool-always-report-port-is-TP-on-tg3 2006-05-16 13:44:17.000000000 +0200 +++ new/patches.fixes/ethtool-always-report-port-is-TP-on-tg3 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -From: Karsten Keil <kkeil(a)suse.de> -Date: Fri May 12 11:59:11 2006 +0200 -Subject: [PATCH] ethtool always report port is TP on tg3 -Reference: 170869 -Is-Mainline: 2.6.17 - -Even with fiber cards ethtool reports that the connected port is TP, -the patch fix this. - -Signed-off-by: Karsten Keil <kkeil(a)suse.de> ---- - - drivers/net/tg3.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -5ed8e79c778ee803e44a325a1e15c0cb3f52d0ff -diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c -index beeb612..0b5bc93 100644 ---- a/drivers/net/tg3.c -+++ b/drivers/net/tg3.c -@@ -7653,21 +7653,23 @@ static int tg3_get_settings(struct net_d - cmd->supported |= (SUPPORTED_1000baseT_Half | - SUPPORTED_1000baseT_Full); - -- if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES)) -+ if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES)) { - cmd->supported |= (SUPPORTED_100baseT_Half | - SUPPORTED_100baseT_Full | - SUPPORTED_10baseT_Half | - SUPPORTED_10baseT_Full | - SUPPORTED_MII); -- else -+ cmd->port = PORT_TP; -+ } else { - cmd->supported |= SUPPORTED_FIBRE; -+ cmd->port = PORT_FIBRE; -+ } - - cmd->advertising = tp->link_config.advertising; - if (netif_running(dev)) { - cmd->speed = tp->link_config.active_speed; - cmd->duplex = tp->link_config.active_duplex; - } -- cmd->port = 0; - cmd->phy_address = PHY_ADDR; - cmd->transceiver = 0; - cmd->autoneg = tp->link_config.autoneg; - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/fs-locks.c-Fix-sys_flock-race.patch new/patches.fixes/fs-locks.c-Fix-sys_flock-race.patch --- old/patches.fixes/fs-locks.c-Fix-sys_flock-race.patch 2006-05-07 00:45:17.000000000 +0200 +++ new/patches.fixes/fs-locks.c-Fix-sys_flock-race.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,116 +0,0 @@ -From nobody Mon Sep 17 00:00:00 2001 -From: Trond Myklebust <Trond.Myklebust(a)netapp.com> -Date: Fri, 31 Mar 2006 02:30:55 -0800 -Subject: [PATCH] fs/locks.c: Fix sys_flock() race -References: 173001 -Patch-mainline: 2.6.17-rc1 - -sys_flock() currently has a race which can result in a double free in the -multi-thread case. - -Thread 1 Thread 2 - -sys_flock(file, LOCK_EX) - sys_flock(file, LOCK_UN) - -If Thread 2 removes the lock from inode->i_lock before Thread 1 tests for -list_empty(&lock->fl_link) at the end of sys_flock, then both threads will -end up calling locks_free_lock for the same lock. - -Fix is to make flock_lock_file() do the same as posix_lock_file(), namely -to make a copy of the request, so that the caller can always free the lock. - -This also has the side-effect of fixing up a reference problem in the -lockd handling of flock. - -Signed-off-by: Trond Myklebust <Trond.Myklebust(a)netapp.com> -Signed-off-by: Andrew Morton <akpm(a)osdl.org> -Signed-off-by: Linus Torvalds <torvalds(a)osdl.org> -Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> - ---- - fs/locks.c | 30 ++++++++++++++++-------------- - 1 file changed, 16 insertions(+), 14 deletions(-) - ---- linux-2.6.16.13.orig/fs/locks.c -+++ linux-2.6.16.13/fs/locks.c -@@ -712,8 +712,9 @@ EXPORT_SYMBOL(posix_locks_deadlock); - * at the head of the list, but that's secret knowledge known only to - * flock_lock_file and posix_lock_file. - */ --static int flock_lock_file(struct file *filp, struct file_lock *new_fl) -+static int flock_lock_file(struct file *filp, struct file_lock *request) - { -+ struct file_lock *new_fl = NULL; - struct file_lock **before; - struct inode * inode = filp->f_dentry->d_inode; - int error = 0; -@@ -728,17 +729,19 @@ static int flock_lock_file(struct file * - continue; - if (filp != fl->fl_file) - continue; -- if (new_fl->fl_type == fl->fl_type) -+ if (request->fl_type == fl->fl_type) - goto out; - found = 1; - locks_delete_lock(before); - break; - } -- unlock_kernel(); - -- if (new_fl->fl_type == F_UNLCK) -- return 0; -+ if (request->fl_type == F_UNLCK) -+ goto out; - -+ new_fl = locks_alloc_lock(); -+ if (new_fl == NULL) -+ goto out; - /* - * If a higher-priority process was blocked on the old file lock, - * give it the opportunity to lock the file. -@@ -746,26 +749,27 @@ static int flock_lock_file(struct file * - if (found) - cond_resched(); - -- lock_kernel(); - for_each_lock(inode, before) { - struct file_lock *fl = *before; - if (IS_POSIX(fl)) - break; - if (IS_LEASE(fl)) - continue; -- if (!flock_locks_conflict(new_fl, fl)) -+ if (!flock_locks_conflict(request, fl)) - continue; - error = -EAGAIN; -- if (new_fl->fl_flags & FL_SLEEP) { -- locks_insert_block(fl, new_fl); -- } -+ if (request->fl_flags & FL_SLEEP) -+ locks_insert_block(fl, request); - goto out; - } -+ locks_copy_lock(new_fl, request); - locks_insert_lock(&inode->i_flock, new_fl); -- error = 0; -+ new_fl = NULL; - - out: - unlock_kernel(); -+ if (new_fl) -+ locks_free_lock(new_fl); - return error; - } - -@@ -1529,9 +1533,7 @@ asmlinkage long sys_flock(unsigned int f - error = flock_lock_file_wait(filp, lock); - - out_free: -- if (list_empty(&lock->fl_link)) { -- locks_free_lock(lock); -- } -+ locks_free_lock(lock); - - out_putf: - fput(filp); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/fusion-fix-kdump-drvinit new/patches.fixes/fusion-fix-kdump-drvinit --- old/patches.fixes/fusion-fix-kdump-drvinit 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/fusion-fix-kdump-drvinit 2006-05-22 15:20:01.000000000 +0200 @@ -0,0 +1,154 @@ +From: Vivek Goyal <vgoyal(a)in.ibm.com> +Subject: System hung while trying to boot to the second kernel after + triggering a dump +References: #173275 - LTC23573 +Patch-Mainline: 2.6.17-mm + +MPT fusion driver initialization fails while second kernel is booting, +after a system crash (if kdump kernel is configured). Oops message is +pasted below. I have attached a patch to fix the issue. Your suggestions +are welcome. + + +Signed-off-by: Vivek Goyal <vgoyal(a)in.ibm.com> +Cc: "Moore, Eric Dean" <Eric.Moore(a)lsil.com> +Signed-off-by: Andrew Morton <akpm(a)osdl.org> +Signed-off-by: Maneesh Soni <maneesh(a)in.ibm.com> +Signed-off-by: Eric Moore <emoore(a)lsil.com> +Signed-off-by: Hannes Reinecke <hare(a)suse.de> +--- + +diff -urNp linux-2.6.16.13-20060504150636/drivers/message/fusion/mptbase.c linux-2.6.16.13-20060504150636-23573/drivers/message/fusion/mptbase.c +--- linux-2.6.16.13-20060504150636/drivers/message/fusion/mptbase.c 2006-05-05 16:41:57.000000000 +0530 ++++ linux-2.6.16.13-20060504150636-23573/drivers/message/fusion/mptbase.c 2006-05-05 16:49:24.000000000 +0530 +@@ -1386,39 +1386,6 @@ mpt_attach(struct pci_dev *pdev, const s + /* Set lookup ptr. */ + list_add_tail(&ioc->list, &ioc_list); + +- ioc->pci_irq = -1; +- if (pdev->irq) { +- if (mpt_msi_enable && !pci_enable_msi(pdev)) +- printk(MYIOC_s_INFO_FMT "PCI-MSI enabled\n", ioc->name); +- +- r = request_irq(pdev->irq, mpt_interrupt, SA_SHIRQ, ioc->name, ioc); +- +- if (r < 0) { +-#ifndef __sparc__ +- printk(MYIOC_s_ERR_FMT "Unable to allocate interrupt %d!\n", +- ioc->name, pdev->irq); +-#else +- printk(MYIOC_s_ERR_FMT "Unable to allocate interrupt %s!\n", +- ioc->name, __irq_itoa(pdev->irq)); +-#endif +- list_del(&ioc->list); +- iounmap(mem); +- kfree(ioc); +- return -EBUSY; +- } +- +- ioc->pci_irq = pdev->irq; +- +- pci_set_master(pdev); /* ?? */ +- pci_set_drvdata(pdev, ioc); +- +-#ifndef __sparc__ +- dprintk((KERN_INFO MYNAM ": %s installed at interrupt %d\n", ioc->name, pdev->irq)); +-#else +- dprintk((KERN_INFO MYNAM ": %s installed at interrupt %s\n", ioc->name, __irq_itoa(pdev->irq))); +-#endif +- } +- + /* Check for "bound ports" (929, 929X, 1030, 1035) to reduce redundant resets. + */ + mpt_detect_bound_ports(ioc, pdev); +@@ -1428,11 +1395,7 @@ mpt_attach(struct pci_dev *pdev, const s + printk(KERN_WARNING MYNAM + ": WARNING - %s did not initialize properly! (%d)\n", + ioc->name, r); +- + list_del(&ioc->list); +- free_irq(ioc->pci_irq, ioc); +- if (mpt_msi_enable) +- pci_disable_msi(pdev); + if (ioc->alt_ioc) + ioc->alt_ioc->alt_ioc = NULL; + iounmap(mem); +@@ -1636,6 +1599,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u3 + int handlers; + int ret = 0; + int reset_alt_ioc_active = 0; ++ int irq_allocated = 0; + + printk(KERN_INFO MYNAM ": Initiating %s %s\n", + ioc->name, reason==MPT_HOSTEVENT_IOC_BRINGUP ? "bringup" : "recovery"); +@@ -1719,6 +1683,48 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u3 + } + } + ++ /* ++ * Device is reset now. It must have de-asserted the interrupt line ++ * (if it was asserted) and it should be safe to register for the ++ * interrupt now. ++ */ ++ if ((ret == 0) && (reason == MPT_HOSTEVENT_IOC_BRINGUP)) { ++ ioc->pci_irq = -1; ++ if (ioc->pcidev->irq) { ++ if (mpt_msi_enable && !pci_enable_msi(ioc->pcidev)) ++ printk(MYIOC_s_INFO_FMT "PCI-MSI enabled\n", ++ ioc->name); ++ rc = request_irq(ioc->pcidev->irq, mpt_interrupt, ++ SA_SHIRQ, ioc->name, ioc); ++ if (rc < 0) { ++#ifndef __sparc__ ++ printk(MYIOC_s_ERR_FMT "Unable to allocate " ++ "interrupt %d!\n", ioc->name, ++ ioc->pcidev->irq); ++#else ++ printk(MYIOC_s_ERR_FMT "Unable to allocate " ++ "interrupt %s!\n", ioc->name, ++ __irq_itoa(ioc->pcidev->irq)); ++#endif ++ if (mpt_msi_enable) ++ pci_disable_msi(ioc->pcidev); ++ return -EBUSY; ++ } ++ irq_allocated = 1; ++ ioc->pci_irq = ioc->pcidev->irq; ++ pci_set_master(ioc->pcidev); /* ?? */ ++ pci_set_drvdata(ioc->pcidev, ioc); ++#ifndef __sparc__ ++ dprintk((KERN_INFO MYNAM ": %s installed at interrupt " ++ "%d\n", ioc->name, ioc->pcidev->irq)); ++#else ++ dprintk((KERN_INFO MYNAM ": %s installed at interrupt " ++ "%s\n", ioc->name, ++ __irq_itoa(ioc->pcidev->irq))); ++#endif ++ } ++ } ++ + /* Prime reply & request queues! + * (mucho alloc's) Must be done prior to + * init as upper addresses are needed for init. +@@ -1818,7 +1824,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u3 + ret = mptbase_sas_persist_operation(ioc, + MPI_SAS_OP_CLEAR_NOT_PRESENT); + if(ret != 0) +- return -1; ++ goto out; + } + + /* Find IM volumes +@@ -1899,6 +1905,12 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u3 + /* FIXME? Examine results here? */ + } + ++out: ++ if ((ret != 0) && irq_allocated) { ++ free_irq(ioc->pci_irq, ioc); ++ if (mpt_msi_enable) ++ pci_disable_msi(ioc->pcidev); ++ } + return ret; + } + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/iosapic-move-irq new/patches.fixes/iosapic-move-irq --- old/patches.fixes/iosapic-move-irq 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/iosapic-move-irq 2006-05-23 17:39:33.000000000 +0200 @@ -0,0 +1,44 @@ +From: Ken Chen <kenneth.w.chen(a)intel.com> +Subject: [IA64] fix broken irq affinity +References: 176697 +Acked-by: schwab(a)suse.de +Patch-mainline: yes + +When CONFIG_PCI_MSI is set, move_irq() is an empty function, causing +grief when sys admin tries to bind interrupt to CPU. + +Signed-off-by: Ken Chen <kenneth.w.chen(a)intel.com> +Signed-off-by: Tony Luck <tony.luck(a)intel.com> + +--- +commit 41503def5d83bada6a2fd792e636ccc28a285f38 +tree 4f2c602db9cf66232001baa3be9f5952b8a50266 +parent 1101ece44e00cfe31a2fd9d3222d05f927b00ef8 +author Chen, Kenneth W <kenneth.w.chen(a)intel.com> Tue, 16 May 2006 16:29:00 -0700 +committer Tony Luck <tony.luck(a)intel.com> Wed, 17 May 2006 06:20:23 -0700 + + arch/ia64/kernel/iosapic.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c +index 7956eb9..d58c1c5 100644 +--- a/arch/ia64/kernel/iosapic.c ++++ b/arch/ia64/kernel/iosapic.c +@@ -416,7 +416,7 @@ iosapic_end_level_irq (unsigned int irq) + ia64_vector vec = irq_to_vector(irq); + struct iosapic_rte_info *rte; + +- move_irq(irq); ++ move_native_irq(irq); + list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, rte_list) + iosapic_eoi(rte->addr, vec); + } +@@ -458,7 +458,7 @@ iosapic_ack_edge_irq (unsigned int irq) + { + irq_desc_t *idesc = irq_descp(irq); + +- move_irq(irq); ++ move_native_irq(irq); + /* + * Once we have recorded IRQ_PENDING already, we can mask the + * interrupt for real. This prevents IRQ storms from unhandled diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch new/patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch --- old/patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch 2006-05-23 18:05:31.000000000 +0200 @@ -0,0 +1,47 @@ +From: Thomas Renninger <trenn(a)suse.de> +Subject: Fix for apic initialization bug using kdump +Patch-mainline: not yet +References: 177741 + +o Kdump second kernel boot fails after a system crash if second kernel + is UP and acpi=off and if crash occurred on a non-boot cpu. + +o Issue here is that MP tables report boot cpu lapic id as 0 but second + kernel is booting on a different processor and MP table data is stale + in this context. Hence apic_id_registered() check fails in setup_local_APIC() + when called from APIC_init_uniprocessor(). + +o Problem is not seen if ACPI is enabled as in that case + boot_cpu_physical_apicid is read from the LAPIC. + +o Problem is not seen with SMP kernels as well because in this case also + boot_cpu_physical_apicid is read from LAPIC. (smp_boot_cpus()). + +o The problem is fixed by reading boot_cpu_physical_apicid from LAPIC + if it is a UP kernel and CRASH_DUMP is enabled. + +Signed-off-by: Vivek Goyal <vgoyal(a)in.ibm.com> +--- + + arch/i386/kernel/apic.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff -puN arch/i386/kernel/apic.c~kdump-i386-boot-cpu-physical-apicid-fix-take2 arch/i386/kernel/apic.c +--- linux-2.6.17-rc4-16M/arch/i386/kernel/apic.c~kdump-i386-boot-cpu-physical-apicid-fix-take2 2006-05-18 11:26:45.000000000 -0400 ++++ linux-2.6.17-rc4-16M-root/arch/i386/kernel/apic.c 2006-05-18 11:26:45.000000000 -0400 +@@ -1341,6 +1341,14 @@ int __init APIC_init_uniprocessor (void) + + connect_bsp_APIC(); + ++ /* ++ * Hack: In case of kdump, after a crash, kernel might be booting ++ * on a cpu with non-zero lapic id. But boot_cpu_physical_apicid ++ * might be zero if read from MP tables. Get it from LAPIC. ++ */ ++#ifdef CONFIG_CRASH_DUMP ++ boot_cpu_physical_apicid = GET_APIC_ID(apic_read(APIC_ID)); ++#endif + phys_cpu_present_map = physid_mask_of_physid(boot_cpu_physical_apicid); + + setup_local_APIC(); +_ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/pci-correctly-allocate-return-buffers-for-osc-calls.patch new/patches.fixes/pci-correctly-allocate-return-buffers-for-osc-calls.patch --- old/patches.fixes/pci-correctly-allocate-return-buffers-for-osc-calls.patch 2006-05-18 20:34:49.000000000 +0200 +++ new/patches.fixes/pci-correctly-allocate-return-buffers-for-osc-calls.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,146 +0,0 @@ -From owner-linux-pci(a)atrey.karlin.mff.cuni.cz Wed May 17 11:04:37 2006 -Subject: PCI: correctly allocate return buffers for osc calls -From: Kristen Accardi <kristen.c.accardi(a)intel.com> -To: linux-pci(a)atrey.karlin.mff.cuni.cz -Cc: linux-kernel(a)vger.kernel.org, greg(a)kroah.com -Date: Wed, 17 May 2006 11:13:37 -0700 -Message-Id: <1147889618.8472.6.camel@whizzy> -Patch-mainline: 2.6.16.18 -References: 171362 - -The OSC set and query functions do not allocate enough space for return values, -and set the output buffer length to a false, too large value. This causes the -acpi-ca code to assume that the output buffer is larger than it actually is, -and overwrite memory when copying acpi return buffers into this caller provided -buffer. In some cases this can cause kernel oops if the memory that is -overwritten is a pointer. This patch will change these calls to use a -dynamically allocated output buffer, thus allowing the acpi-ca code to decide -how much space is needed. - -Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi(a)intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> - ---- - drivers/pci/pci-acpi.c | 60 ++++++++++++++++++++++++++++--------------------- - 1 file changed, 35 insertions(+), 25 deletions(-) - ---- gregkh-2.6.orig/drivers/pci/pci-acpi.c -+++ gregkh-2.6/drivers/pci/pci-acpi.c -@@ -33,13 +33,10 @@ acpi_query_osc ( - acpi_status status; - struct acpi_object_list input; - union acpi_object in_params[4]; -- struct acpi_buffer output; -- union acpi_object out_obj; -+ struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL}; -+ union acpi_object *out_obj; - u32 osc_dw0; - -- /* Setting up output buffer */ -- output.length = sizeof(out_obj) + 3*sizeof(u32); -- output.pointer = &out_obj; - - /* Setting up input parameters */ - input.count = 4; -@@ -61,12 +58,15 @@ acpi_query_osc ( - "Evaluate _OSC Set fails. Status = 0x%04x\n", status); - return status; - } -- if (out_obj.type != ACPI_TYPE_BUFFER) { -+ out_obj = output.pointer; -+ -+ if (out_obj->type != ACPI_TYPE_BUFFER) { - printk(KERN_DEBUG - "Evaluate _OSC returns wrong type\n"); -- return AE_TYPE; -+ status = AE_TYPE; -+ goto query_osc_out; - } -- osc_dw0 = *((u32 *) out_obj.buffer.pointer); -+ osc_dw0 = *((u32 *) out_obj->buffer.pointer); - if (osc_dw0) { - if (osc_dw0 & OSC_REQUEST_ERROR) - printk(KERN_DEBUG "_OSC request fails\n"); -@@ -76,15 +76,21 @@ acpi_query_osc ( - printk(KERN_DEBUG "_OSC invalid revision\n"); - if (osc_dw0 & OSC_CAPABILITIES_MASK_ERROR) { - /* Update Global Control Set */ -- global_ctrlsets = *((u32 *)(out_obj.buffer.pointer+8)); -- return AE_OK; -+ global_ctrlsets = *((u32 *)(out_obj->buffer.pointer+8)); -+ status = AE_OK; -+ goto query_osc_out; - } -- return AE_ERROR; -+ status = AE_ERROR; -+ goto query_osc_out; - } - - /* Update Global Control Set */ -- global_ctrlsets = *((u32 *)(out_obj.buffer.pointer + 8)); -- return AE_OK; -+ global_ctrlsets = *((u32 *)(out_obj->buffer.pointer + 8)); -+ status = AE_OK; -+ -+query_osc_out: -+ kfree(output.pointer); -+ return status; - } - - -@@ -96,14 +102,10 @@ acpi_run_osc ( - acpi_status status; - struct acpi_object_list input; - union acpi_object in_params[4]; -- struct acpi_buffer output; -- union acpi_object out_obj; -+ struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL}; -+ union acpi_object *out_obj; - u32 osc_dw0; - -- /* Setting up output buffer */ -- output.length = sizeof(out_obj) + 3*sizeof(u32); -- output.pointer = &out_obj; -- - /* Setting up input parameters */ - input.count = 4; - input.pointer = in_params; -@@ -124,12 +126,14 @@ acpi_run_osc ( - "Evaluate _OSC Set fails. Status = 0x%04x\n", status); - return status; - } -- if (out_obj.type != ACPI_TYPE_BUFFER) { -+ out_obj = output.pointer; -+ if (out_obj->type != ACPI_TYPE_BUFFER) { - printk(KERN_DEBUG - "Evaluate _OSC returns wrong type\n"); -- return AE_TYPE; -+ status = AE_TYPE; -+ goto run_osc_out; - } -- osc_dw0 = *((u32 *) out_obj.buffer.pointer); -+ osc_dw0 = *((u32 *) out_obj->buffer.pointer); - if (osc_dw0) { - if (osc_dw0 & OSC_REQUEST_ERROR) - printk(KERN_DEBUG "_OSC request fails\n"); -@@ -139,11 +143,17 @@ acpi_run_osc ( - printk(KERN_DEBUG "_OSC invalid revision\n"); - if (osc_dw0 & OSC_CAPABILITIES_MASK_ERROR) { - printk(KERN_DEBUG "_OSC FW not grant req. control\n"); -- return AE_SUPPORT; -+ status = AE_SUPPORT; -+ goto run_osc_out; - } -- return AE_ERROR; -+ status = AE_ERROR; -+ goto run_osc_out; - } -- return AE_OK; -+ status = AE_OK; -+ -+run_osc_out: -+ kfree(output.pointer); -+ return status; - } - - /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/sd-fix-unknown-size new/patches.fixes/sd-fix-unknown-size --- old/patches.fixes/sd-fix-unknown-size 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/sd-fix-unknown-size 2006-05-22 16:37:02.000000000 +0200 @@ -0,0 +1,23 @@ +From: Mike Anderson <andmike(a)us.ibm.com> +Subject: Wrong size information for device with disabled read access +References: #176780 - LTC23895 + +When accessing a device with disabled read access the capacity is set +randomly to 1GB. This makes it impossible to userspace tools to detect +invalid device capacities. + +Signed-off-by: Mike Anderson <andmike(a)us.ibm.com> +Acked-by: Chris Mason <mason(a)suse.com> +Signed-off-by: Hannes Reinecke <hare(a)suse.de> + +--- linux-2.6.16/drivers/scsi/sd.c.orig 2006-03-20 06:53:29.000000000 +0100 ++++ linux-2.6.16/drivers/scsi/sd.c 2006-05-22 16:24:09.531915172 +0200 +@@ -1107,7 +1107,7 @@ repeat: + /* Either no media are present but the drive didn't tell us, + or they are present but the read capacity command fails */ + /* sdkp->media_present = 0; -- not always correct */ +- sdkp->capacity = 0x200000; /* 1 GB - random */ ++ sdkp->capacity = 0; /* unknown mapped to zero - as usual */ + + return; + } else if (the_result && longrc) { ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 11432 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/rtnetlink-atomic2.patch new/patches.suse/rtnetlink-atomic2.patch --- old/patches.suse/rtnetlink-atomic2.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/rtnetlink-atomic2.patch 2006-05-23 17:46:51.000000000 +0200 @@ -0,0 +1,30 @@ +From: Jaroslav Kysela <perex.suse.cz> +Subject: Fix debug traces for bonding (might_sleep) +References: 174843 + +The network bonding module might call rtmsg_ifinfo in the atomic context. +It is not ideal solution - ideally, the bonding module will use a workqueue. + +Signed-off-by: Jaroslav Kysela <perex(a)suse.cz> +Acked-by: Olaf Kirch <okir(a)suse.de> + +--- linux-2.6.16.orig/net/core/rtnetlink.c 2006-03-20 06:53:29.000000000 +0100 ++++ linux-2.6.16/net/core/rtnetlink.c 2006-05-23 17:25:00.000000000 +0200 +@@ -451,7 +451,7 @@ void rtmsg_ifinfo(int type, struct net_d + sizeof(struct rtnl_link_ifmap) + + sizeof(struct rtnl_link_stats) + 128); + +- skb = alloc_skb(size, GFP_KERNEL); ++ skb = alloc_skb(size, in_atomic() ? GFP_ATOMIC : GFP_KERNEL); + if (!skb) + return; + +@@ -460,7 +460,7 @@ void rtmsg_ifinfo(int type, struct net_d + return; + } + NETLINK_CB(skb).dst_group = RTNLGRP_LINK; +- netlink_broadcast(rtnl, skb, 0, RTNLGRP_LINK, GFP_KERNEL); ++ netlink_broadcast(rtnl, skb, 0, RTNLGRP_LINK, in_atomic() ? GFP_ATOMIC : GFP_KERNEL); + } + + /* Protected by RTNL sempahore. */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/tcp-proc-listen new/patches.suse/tcp-proc-listen --- old/patches.suse/tcp-proc-listen 2006-05-19 13:01:33.000000000 +0200 +++ new/patches.suse/tcp-proc-listen 2006-05-22 13:32:01.000000000 +0200 @@ -7,33 +7,6 @@ In SLES9 we had /proc/net/tcp_listen to make this cheaper. This is a forward port. -Index: linux-2.6.16/include/net/tcp.h -=================================================================== ---- linux-2.6.16.orig/include/net/tcp.h -+++ linux-2.6.16/include/net/tcp.h -@@ -1054,7 +1054,10 @@ struct tcp_seq_afinfo { - struct module *owner; - char *name; - sa_family_t family; -+ void * (*seq_start)(struct seq_file *seq, loff_t *pos); - int (*seq_show) (struct seq_file *m, void *v); -+ void * (*seq_next)(struct seq_file *seq, void *v, loff_t *pos); -+ - struct file_operations *seq_fops; - }; - -@@ -1069,6 +1072,11 @@ struct tcp_iter_state { - extern int tcp_proc_register(struct tcp_seq_afinfo *afinfo); - extern void tcp_proc_unregister(struct tcp_seq_afinfo *afinfo); - -+extern void *tcp_seq_start(struct seq_file *seq, loff_t *pos); -+extern void *tcp_listen_seq_start(struct seq_file *seq, loff_t *pos); -+extern void *tcp_seq_next(struct seq_file *seq, void *v, loff_t *pos); -+extern void *tcp_listen_seq_next(struct seq_file *seq, void *v, loff_t *pos); -+ - extern struct request_sock_ops tcp_request_sock_ops; - - extern int tcp_v4_destroy_sock(struct sock *sk); Index: linux-2.6.16/net/ipv4/tcp_ipv4.c =================================================================== --- linux-2.6.16.orig/net/ipv4/tcp_ipv4.c @@ -85,7 +58,7 @@ --*pos; } return rc; -@@ -1524,17 +1530,22 @@ static void *established_get_idx(struct +@@ -1524,16 +1530,18 @@ static void *established_get_idx(struct return rc; } @@ -100,18 +73,13 @@ - rc = listening_get_idx(seq, &pos); + rc = listening_get_idx(seq, &pos, listenonly); -- if (!rc) { -+ if (!rc) + if (!rc) { ++ if (listenonly) ++ return rc; inet_listen_unlock(&tcp_hashinfo); -+ -+ if (listenonly) -+ return rc; -+ -+ if (!rc) { local_bh_disable(); st->state = TCP_SEQ_STATE_ESTABLISHED; - rc = established_get_idx(seq, pos); -@@ -1543,21 +1554,34 @@ static void *tcp_get_idx(struct seq_file +@@ -1543,21 +1551,34 @@ static void *tcp_get_idx(struct seq_file return rc; } @@ -128,14 +96,14 @@ +void *tcp_seq_start(struct seq_file *seq, loff_t *pos) +{ + return __tcp_seq_start(seq, pos, 0); -+} -+ -+void *tcp_listen_seq_start(struct seq_file *seq, loff_t *pos) -+{ -+ return __tcp_seq_start(seq, pos, 1); } -static void *tcp_seq_next(struct seq_file *seq, void *v, loff_t *pos) ++void *tcp_listen_seq_start(struct seq_file *seq, loff_t *pos) ++{ ++ return __tcp_seq_start(seq, pos, 1); ++} ++ +EXPORT_SYMBOL_GPL(tcp_seq_start); +EXPORT_SYMBOL_GPL(tcp_listen_seq_start); + @@ -150,7 +118,7 @@ goto out; } st = seq->private; -@@ -1565,7 +1589,7 @@ static void *tcp_seq_next(struct seq_fil +@@ -1565,7 +1586,7 @@ static void *tcp_seq_next(struct seq_fil switch (st->state) { case TCP_SEQ_STATE_OPENREQ: case TCP_SEQ_STATE_LISTENING: @@ -159,7 +127,7 @@ if (!rc) { inet_listen_unlock(&tcp_hashinfo); local_bh_disable(); -@@ -1582,6 +1606,17 @@ out: +@@ -1582,6 +1603,17 @@ out: ++*pos; return rc; } @@ -177,7 +145,7 @@ static void tcp_seq_stop(struct seq_file *seq, void *v) { -@@ -1621,8 +1656,8 @@ static int tcp_seq_open(struct inode *in +@@ -1621,8 +1653,8 @@ static int tcp_seq_open(struct inode *in return -ENOMEM; memset(s, 0, sizeof(*s)); s->family = afinfo->family; @@ -188,7 +156,7 @@ s->seq_ops.show = afinfo->seq_show; s->seq_ops.stop = tcp_seq_stop; -@@ -1795,18 +1830,36 @@ static struct tcp_seq_afinfo tcp4_seq_af +@@ -1795,18 +1827,36 @@ static struct tcp_seq_afinfo tcp4_seq_af .owner = THIS_MODULE, .name = "tcp", .family = AF_INET, @@ -267,3 +235,30 @@ } #endif +Index: linux-2.6.16/include/net/tcp.h +=================================================================== +--- linux-2.6.16.orig/include/net/tcp.h ++++ linux-2.6.16/include/net/tcp.h +@@ -1054,7 +1054,10 @@ struct tcp_seq_afinfo { + struct module *owner; + char *name; + sa_family_t family; ++ void * (*seq_start)(struct seq_file *seq, loff_t *pos); + int (*seq_show) (struct seq_file *m, void *v); ++ void * (*seq_next)(struct seq_file *seq, void *v, loff_t *pos); ++ + struct file_operations *seq_fops; + }; + +@@ -1069,6 +1072,11 @@ struct tcp_iter_state { + extern int tcp_proc_register(struct tcp_seq_afinfo *afinfo); + extern void tcp_proc_unregister(struct tcp_seq_afinfo *afinfo); + ++extern void *tcp_seq_start(struct seq_file *seq, loff_t *pos); ++extern void *tcp_listen_seq_start(struct seq_file *seq, loff_t *pos); ++extern void *tcp_seq_next(struct seq_file *seq, void *v, loff_t *pos); ++extern void *tcp_listen_seq_next(struct seq_file *seq, void *v, loff_t *pos); ++ + extern struct request_sock_ops tcp_request_sock_ops; + + extern int tcp_v4_destroy_sock(struct sock *sk); ++++++ series.conf ++++++ --- kernel-source/series.conf 2006-05-19 17:51:28.000000000 +0200 +++ kernel-source/series.conf 2006-05-24 18:53:59.000000000 +0200 @@ -21,8 +21,7 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... - patches.kernel.org/patch-2.6.16.16 - patches.fixes/compat_sys_ppoll-typo.patch + patches.kernel.org/patch-2.6.16.18 patches.fixes/setuid-dumpable-wrongdir patches.fixes/git-kbuild.patch @@ -118,6 +117,7 @@ patches.arch/x86_64-nommu-warning patches.arch/x86_64-hotadd-fixes patches.arch/x86_64-empty-node0 + patches.arch/x86_64-bad-addr-boundary # for i386/x86-64 patches.arch/tune-generic @@ -275,6 +275,7 @@ patches.arch/acpi_ibm_notify.patch patches.fixes/acpi-nolapic + patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch patches.arch/acpi_processor_exit_acpi_off @@ -287,6 +288,9 @@ patches.fixes/powernow-fix-3 patches.fixes/cpufreq_sysfs_max_override.patch + # EC fixes + patches.fixes/acpi_ec_dummy.patch + # Fix IA64 unalignment issue patches.arch/ia64_acpi_unalignments.patch @@ -427,8 +431,11 @@ patches.drivers/lpfc-8.1.6-update patches.drivers/snsc-powerdown-events patches.drivers/sgi-ioc4-detect-variant.patch + patches.drivers/altix-correct-ioc3-port-order.patch + patches.drivers/altix-correct-ioc4-port-order.patch patches.drivers/ide-acpi-support patches.drivers/fix-b44-checks + patches.drivers/b44-fix_mac_address ######################################################## # Storage @@ -465,6 +472,7 @@ patches.fixes/tulip-quad-NIC-ifdown patches.suse/prism-defaultmac patches.suse/nameif-track-rename.patch + patches.suse/rtnetlink-atomic2.patch # fix a oops on unload still active isdn drivers # TODO: send upstream @@ -527,7 +535,10 @@ patches.drivers/pci-0041-Provide-a-boot-parameter-to-disable-MSI.patch patches.drivers/pci-hotplug-sn-fix-cleanup-on-hotplug-removal-of-ppb.patch patches.drivers/pci-delete-ACPI-hook-from-pci_set_power_state.patch - patches.fixes/pci-correctly-allocate-return-buffers-for-osc-calls.patch + + # new device ids for PCI devices + patches.drivers/ati-sb600-ahci-support.patch + patches.drivers/ati-sb600-ide-support.patch ######################################################## # sysfs / driver core @@ -750,6 +761,8 @@ patches.arch/s390-03-03-october2005.diff patches.arch/s390-03-04-october2005.diff + patches.arch/s390-zfcp-statistics.diff + patches.arch/s390-zfcp-statistic-disclaimer.diff patches.arch/s390-dasd-eer-october2005.diff patches.arch/s390-dasd-uid.diff patches.arch/s390-dasd-fba-uid.diff @@ -948,6 +961,7 @@ patches.drivers/aic79xx-avoid-renegotiation patches.drivers/aic79xx-target-hotplug-fixes patches.drivers/aic79xx-external-bus-reset + patches.drivers/aic79xx-remove-slave-alloc patches.fixes/altix-asic-workarounds patches.arch/ia64-sn2-tioce_provider @@ -1136,11 +1150,9 @@ patches.fixes/ondemand-workqueue patches.drivers/ibmvscsi-RAID-failure patches.drivers/mptfc_rolechg_sles10.patch - patches.fixes/blk-limit-recursion patches.fixes/memcpy-mck patches.fixes/i2o_exec_lct_modified-memoryleak-fix.patch patches.fixes/cfq-queueing-fixes - patches.fixes/fs-locks.c-Fix-sys_flock-race.patch patches.fixes/nfsd-path-release-fix patches.suse/reiserfs-periodic-flush-latency patches.fixes/nfsd-set-user-fix @@ -1159,13 +1171,19 @@ patches.fixes/scsi-fix-scan-offline.patch patches.fixes/scsi-add-2104-DU3-blist.patch patches.suse/lkcd-crash-with-invalid-DUMPDEV - patches.fixes/ethtool-always-report-port-is-TP-on-tg3 patches.drivers/qla2xxx-vpd-sysfs-attribute patches.fixes/fusion-fix-reset-handler patches.fixes/scheduler-wakeup-no-starvation patches.fixes/nf_bridge-header-size + patches.drivers/mptfc-sles10-update + patches.fixes/fusion-fix-kdump-drvinit + patches.fixes/sd-fix-unknown-size + + # bug #176697 + patches.fixes/iosapic-move-irq + # PLEASE KEEP THESE PATCHES AT THE END OF series.conf # (as all other arch specific patches should be kept at the end # for obvious reasons.) ++++++ supported.conf ++++++ --- kernel-source/supported.conf 2006-05-19 17:51:27.000000000 +0200 +++ kernel-source/supported.conf 2006-05-24 18:53:48.000000000 +0200 @@ -846,12 +846,12 @@ kernel/drivers/message/fusion/mptspi kernel/drivers/message/fusion/mptsas kernel/drivers/message/fusion/mptfc - kernel/drivers/message/i2o/i2o_block +- kernel/drivers/message/i2o/i2o_block # Unsupported - bug #176735 kernel/drivers/message/i2o/i2o_bus kernel/drivers/message/i2o/i2o_config kernel/drivers/message/i2o/i2o_core kernel/drivers/message/i2o/i2o_proc - kernel/drivers/message/i2o/i2o_scsi +- kernel/drivers/message/i2o/i2o_scsi # Unsupported - bug #176735 kernel/drivers/misc/ibmasm/ibmasm # IBM ASM Service Processor Driver kernel/drivers/mmc/mmc_block kernel/drivers/mmc/mmc_core ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kde3-i18n
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package kde3-i18n checked in at Thu May 25 00:58:52 CEST 2006. -------- --- KDE/kde3-i18n/kde3-i18n.changes 2006-03-19 11:55:19.000000000 +0100 +++ kde3-i18n/kde3-i18n.changes 2006-05-24 09:55:22.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 24 09:55:04 CEST 2006 - coolo(a)suse.de + +- update to KDE 3.5.3 + - adding vi, kk + - tons of updates + +------------------------------------------------------------------- Old: ---- kde-i18n-af-3.5.2.tar.bz2 kde-i18n-ar-3.5.2.tar.bz2 kde-i18n-az-3.5.2.tar.bz2 kde-i18n-bg-3.5.2.tar.bz2 kde-i18n-bn-3.5.2.tar.bz2 kde-i18n-br-3.5.2.tar.bz2 kde-i18n-bs-3.5.2.tar.bz2 kde-i18n-ca-3.5.2.tar.bz2 kde-i18n-cs-3.5.2.tar.bz2 kde-i18n-cy-3.5.2.tar.bz2 kde-i18n-da-3.5.2.tar.bz2 kde-i18n-de-3.5.2.tar.bz2 kde-i18n-el-3.5.2.tar.bz2 kde-i18n-en_GB-3.5.2.tar.bz2 kde-i18n-eo-3.5.2.tar.bz2 kde-i18n-es-3.5.2.tar.bz2 kde-i18n-et-3.5.2.tar.bz2 kde-i18n-eu-3.5.2.tar.bz2 kde-i18n-fa-3.5.2.tar.bz2 kde-i18n-fi-3.5.2.tar.bz2 kde-i18n-fr-3.5.2.tar.bz2 kde-i18n-fy-3.5.2.tar.bz2 kde-i18n-ga-3.5.2.tar.bz2 kde-i18n-gl-3.5.2.tar.bz2 kde-i18n-he-3.5.2.tar.bz2 kde-i18n-hi-3.5.2.tar.bz2 kde-i18n-hr-3.5.2.tar.bz2 kde-i18n-hu-3.5.2.tar.bz2 kde-i18n-is-3.5.2.tar.bz2 kde-i18n-it-3.5.2.tar.bz2 kde-i18n-ja-3.5.2.tar.bz2 kde-i18n-km-3.5.2.tar.bz2 kde-i18n-ko-3.5.2.tar.bz2 kde-i18n-lt-3.5.2.tar.bz2 kde-i18n-lv-3.5.2.tar.bz2 kde-i18n-mk-3.5.2.tar.bz2 kde-i18n-mn-3.5.2.tar.bz2 kde-i18n-ms-3.5.2.tar.bz2 kde-i18n-nb-3.5.2.tar.bz2 kde-i18n-nds-3.5.2.tar.bz2 kde-i18n-nl-3.5.2.tar.bz2 kde-i18n-nn-3.5.2.tar.bz2 kde-i18n-pa-3.5.2.tar.bz2 kde-i18n-pl-3.5.2.tar.bz2 kde-i18n-pt-3.5.2.tar.bz2 kde-i18n-pt_BR-3.5.2.tar.bz2 kde-i18n-ro-3.5.2.tar.bz2 kde-i18n-ru-3.5.2.tar.bz2 kde-i18n-rw-3.5.2.tar.bz2 kde-i18n-se-3.5.2.tar.bz2 kde-i18n-sk-3.5.2.tar.bz2 kde-i18n-sl-3.5.2.tar.bz2 kde-i18n-sr-3.5.2.tar.bz2 kde-i18n-sr(a)Latn-3.5.2.tar.bz2 kde-i18n-ss-3.5.2.tar.bz2 kde-i18n-sv-3.5.2.tar.bz2 kde-i18n-ta-3.5.2.tar.bz2 kde-i18n-tg-3.5.2.tar.bz2 kde-i18n-tr-3.5.2.tar.bz2 kde-i18n-uk-3.5.2.tar.bz2 kde-i18n-uz-3.5.2.tar.bz2 kde-i18n-zh_CN-3.5.2.tar.bz2 kde-i18n-zh_TW-3.5.2.tar.bz2 New: ---- kde-i18n-af-3.5.3.tar.bz2 kde-i18n-ar-3.5.3.tar.bz2 kde-i18n-az-3.5.3.tar.bz2 kde-i18n-bg-3.5.3.tar.bz2 kde-i18n-bn-3.5.3.tar.bz2 kde-i18n-br-3.5.3.tar.bz2 kde-i18n-bs-3.5.3.tar.bz2 kde-i18n-ca-3.5.3.tar.bz2 kde-i18n-cs-3.5.3.tar.bz2 kde-i18n-cy-3.5.3.tar.bz2 kde-i18n-da-3.5.3.tar.bz2 kde-i18n-de-3.5.3.tar.bz2 kde-i18n-el-3.5.3.tar.bz2 kde-i18n-en_GB-3.5.3.tar.bz2 kde-i18n-eo-3.5.3.tar.bz2 kde-i18n-es-3.5.3.tar.bz2 kde-i18n-et-3.5.3.tar.bz2 kde-i18n-eu-3.5.3.tar.bz2 kde-i18n-fa-3.5.3.tar.bz2 kde-i18n-fi-3.5.3.tar.bz2 kde-i18n-fr-3.5.3.tar.bz2 kde-i18n-fy-3.5.3.tar.bz2 kde-i18n-ga-3.5.3.tar.bz2 kde-i18n-gl-3.5.3.tar.bz2 kde-i18n-he-3.5.3.tar.bz2 kde-i18n-hi-3.5.3.tar.bz2 kde-i18n-hr-3.5.3.tar.bz2 kde-i18n-hu-3.5.3.tar.bz2 kde-i18n-is-3.5.3.tar.bz2 kde-i18n-it-3.5.3.tar.bz2 kde-i18n-ja-3.5.3.tar.bz2 kde-i18n-kk-3.5.3.tar.bz2 kde-i18n-km-3.5.3.tar.bz2 kde-i18n-ko-3.5.3.tar.bz2 kde-i18n-lt-3.5.3.tar.bz2 kde-i18n-lv-3.5.3.tar.bz2 kde-i18n-mk-3.5.3.tar.bz2 kde-i18n-mn-3.5.3.tar.bz2 kde-i18n-ms-3.5.3.tar.bz2 kde-i18n-nb-3.5.3.tar.bz2 kde-i18n-nds-3.5.3.tar.bz2 kde-i18n-nl-3.5.3.tar.bz2 kde-i18n-nn-3.5.3.tar.bz2 kde-i18n-pa-3.5.3.tar.bz2 kde-i18n-pl-3.5.3.tar.bz2 kde-i18n-pt-3.5.3.tar.bz2 kde-i18n-pt_BR-3.5.3.tar.bz2 kde-i18n-ro-3.5.3.tar.bz2 kde-i18n-ru-3.5.3.tar.bz2 kde-i18n-rw-3.5.3.tar.bz2 kde-i18n-se-3.5.3.tar.bz2 kde-i18n-sk-3.5.3.tar.bz2 kde-i18n-sl-3.5.3.tar.bz2 kde-i18n-sr-3.5.3.tar.bz2 kde-i18n-sr(a)Latn-3.5.3.tar.bz2 kde-i18n-ss-3.5.3.tar.bz2 kde-i18n-sv-3.5.3.tar.bz2 kde-i18n-ta-3.5.3.tar.bz2 kde-i18n-tg-3.5.3.tar.bz2 kde-i18n-tr-3.5.3.tar.bz2 kde-i18n-uk-3.5.3.tar.bz2 kde-i18n-uz-3.5.3.tar.bz2 kde-i18n-vi-3.5.3.tar.bz2 kde-i18n-zh_CN-3.5.3.tar.bz2 kde-i18n-zh_TW-3.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde3-i18n.spec ++++++ --- /var/tmp/diff_new_pack.tnxwPB/_old 2006-05-25 00:50:32.000000000 +0200 +++ /var/tmp/diff_new_pack.tnxwPB/_new 2006-05-25 00:50:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kde3-i18n (Version 3.5.2) +# spec file for package kde3-i18n (Version 3.5.3) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,8 +17,8 @@ License: LGPL Group: System/GUI/KDE Summary: English (UK) translations for KDE -Version: 3.5.2 -Release: 2 +Version: 3.5.3 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Source0: kde-i18n-af-%version.tar.bz2 @@ -52,40 +52,42 @@ Source28: kde-i18n-is-%version.tar.bz2 Source29: kde-i18n-it-%version.tar.bz2 Source30: kde-i18n-ja-%version.tar.bz2 -Source31: kde-i18n-km-%version.tar.bz2 -Source32: kde-i18n-ko-%version.tar.bz2 -Source33: kde-i18n-lt-%version.tar.bz2 -Source34: kde-i18n-lv-%version.tar.bz2 -Source35: kde-i18n-mk-%version.tar.bz2 -Source36: kde-i18n-mn-%version.tar.bz2 -Source37: kde-i18n-ms-%version.tar.bz2 -Source38: kde-i18n-nb-%version.tar.bz2 -Source39: kde-i18n-nds-%version.tar.bz2 -Source40: kde-i18n-nl-%version.tar.bz2 -Source41: kde-i18n-nn-%version.tar.bz2 -Source42: kde-i18n-pa-%version.tar.bz2 -Source43: kde-i18n-pl-%version.tar.bz2 -Source44: kde-i18n-pt-%version.tar.bz2 -Source45: kde-i18n-pt_BR-%version.tar.bz2 -Source46: kde-i18n-ro-%version.tar.bz2 -Source47: kde-i18n-ru-%version.tar.bz2 -Source48: kde-i18n-rw-%version.tar.bz2 -Source49: kde-i18n-se-%version.tar.bz2 -Source50: kde-i18n-sk-%version.tar.bz2 -Source51: kde-i18n-sl-%version.tar.bz2 -Source52: kde-i18n-sr-%version.tar.bz2 -Source53: kde-i18n-sr(a)Latn-%version.tar.bz2 -Source54: kde-i18n-ss-%version.tar.bz2 -Source55: kde-i18n-sv-%version.tar.bz2 -Source56: kde-i18n-ta-%version.tar.bz2 -Source57: kde-i18n-tg-%version.tar.bz2 -Source58: kde-i18n-tr-%version.tar.bz2 -Source59: kde-i18n-uk-%version.tar.bz2 -Source60: kde-i18n-uz-%version.tar.bz2 -Source61: kde-i18n-zh_CN-%version.tar.bz2 -Source62: kde-i18n-zh_TW-%version.tar.bz2 +Source31: kde-i18n-kk-%version.tar.bz2 +Source32: kde-i18n-km-%version.tar.bz2 +Source33: kde-i18n-ko-%version.tar.bz2 +Source34: kde-i18n-lt-%version.tar.bz2 +Source35: kde-i18n-lv-%version.tar.bz2 +Source36: kde-i18n-mk-%version.tar.bz2 +Source37: kde-i18n-mn-%version.tar.bz2 +Source38: kde-i18n-ms-%version.tar.bz2 +Source39: kde-i18n-nb-%version.tar.bz2 +Source40: kde-i18n-nds-%version.tar.bz2 +Source41: kde-i18n-nl-%version.tar.bz2 +Source42: kde-i18n-nn-%version.tar.bz2 +Source43: kde-i18n-pa-%version.tar.bz2 +Source44: kde-i18n-pl-%version.tar.bz2 +Source45: kde-i18n-pt-%version.tar.bz2 +Source46: kde-i18n-pt_BR-%version.tar.bz2 +Source47: kde-i18n-ro-%version.tar.bz2 +Source48: kde-i18n-ru-%version.tar.bz2 +Source49: kde-i18n-rw-%version.tar.bz2 +Source50: kde-i18n-se-%version.tar.bz2 +Source51: kde-i18n-sk-%version.tar.bz2 +Source52: kde-i18n-sl-%version.tar.bz2 +Source53: kde-i18n-sr-%version.tar.bz2 +Source54: kde-i18n-sr(a)Latn-%version.tar.bz2 +Source55: kde-i18n-ss-%version.tar.bz2 +Source56: kde-i18n-sv-%version.tar.bz2 +Source57: kde-i18n-ta-%version.tar.bz2 +Source58: kde-i18n-tg-%version.tar.bz2 +Source59: kde-i18n-tr-%version.tar.bz2 +Source60: kde-i18n-uk-%version.tar.bz2 +Source61: kde-i18n-uz-%version.tar.bz2 +Source62: kde-i18n-vi-%version.tar.bz2 +Source63: kde-i18n-zh_CN-%version.tar.bz2 +Source64: kde-i18n-zh_TW-%version.tar.bz2 #@SOURCES@ -%define build_languages af ar az bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta tg tr uk uz zh_CN zh_TW +%define build_languages af ar az bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta tg tr uk uz vi zh_CN zh_TW %description All the requirements for a desktop in British English. This package @@ -562,6 +564,21 @@ -------- The KDE Team <kde(a)kde.org> +%package kk +Summary: Kazakh Translations for KDE +Group: System/GUI/KDE +Provides: kde-i18n-kk locale(kdelibs3:kk) + +%description kk +All the requirements for a Kazakh Desktop. This package contains +application translations, help files, and screen shots. + + + +Authors: +-------- + The KDE Team <kde(a)kde.org> + %package km Summary: Khmer Translations for KDE Group: System/GUI/KDE @@ -1016,6 +1033,21 @@ -------- The KDE Team <kde(a)kde.org> +%package vi +Summary: Vietnamese translations for KDE +Group: System/GUI/KDE +Provides: kde-i18n-vi locale(kdelibs3:vi) + +%description vi +All the stuff for a Vietnamese desktop. This package contains +application translations, help files and screenshots. + + + +Authors: +-------- + The KDE Team <kde(a)kde.org> + %package zh_CN Summary: Simplified Chinese Translations for KDE Group: System/GUI/KDE @@ -1047,7 +1079,7 @@ The KDE Team <kde(a)kde.org> %prep -%setup -q -n kde-i18n-ar-%version -b 0 -b 1 -b 2 -b 3 -b 4 -b 5 -b 6 -b 7 -b 8 -b 9 -b 10 -b 11 -b 12 -b 13 -b 14 -b 15 -b 16 -b 17 -b 18 -b 19 -b 20 -b 21 -b 22 -b 23 -b 24 -b 25 -b 26 -b 27 -b 28 -b 29 -b 30 -b 31 -b 32 -b 33 -b 34 -b 35 -b 36 -b 37 -b 38 -b 39 -b 40 -b 41 -b 42 -b 43 -b 44 -b 45 -b 46 -b 47 -b 48 -b 49 -b 50 -b 51 -b 52 -b 53 -b 54 -b 55 -b 56 -b 57 -b 58 -b 59 -b 60 -b 61 -b 62 +%setup -q -n kde-i18n-ar-%version -b 0 -b 1 -b 2 -b 3 -b 4 -b 5 -b 6 -b 7 -b 8 -b 9 -b 10 -b 11 -b 12 -b 13 -b 14 -b 15 -b 16 -b 17 -b 18 -b 19 -b 20 -b 21 -b 22 -b 23 -b 24 -b 25 -b 26 -b 27 -b 28 -b 29 -b 30 -b 31 -b 32 -b 33 -b 34 -b 35 -b 36 -b 37 -b 38 -b 39 -b 40 -b 41 -b 42 -b 43 -b 44 -b 45 -b 46 -b 47 -b 48 -b 49 -b 50 -b 51 -b 52 -b 53 -b 54 -b 55 -b 56 -b 57 -b 58 -b 59 -b 60 -b 61 -b 62 -b 63 -b 64 . /etc/opt/kde3/common_options for i in %build_languages; do cd ../kde-i18n-$i-%version || exit 1 @@ -1240,6 +1272,8 @@ %files ja -f ../files.ja +%files kk -f ../files.kk + %files km -f ../files.km %files ko -f ../files.ko @@ -1300,12 +1334,18 @@ %files uz -f ../files.uz +%files vi -f ../files.vi + %files zh_CN -f ../files.zh_CN %files zh_TW -f ../files.zh_TW #@FILES@ %changelog -n kde3-i18n +* Wed May 24 2006 - coolo(a)suse.de +- update to KDE 3.5.3 +- adding vi, kk +- tons of updates * Sun Mar 19 2006 - coolo(a)suse.de - update to KDE 3.5.2 * Tue Feb 28 2006 - coolo(a)suse.de ++++++ kde-i18n-af-3.5.2.tar.bz2 -> kde-i18n-af-3.5.3.tar.bz2 ++++++ ++++ 28279 lines of diff (skipped) ++++++ kde-i18n-ar-3.5.2.tar.bz2 -> kde-i18n-ar-3.5.3.tar.bz2 ++++++ ++++ 28403 lines of diff (skipped) ++++++ kde-i18n-az-3.5.2.tar.bz2 -> kde-i18n-az-3.5.3.tar.bz2 ++++++ ++++ 29569 lines of diff (skipped) ++++++ kde-i18n-bg-3.5.2.tar.bz2 -> kde-i18n-bg-3.5.3.tar.bz2 ++++++ ++++ 28837 lines of diff (skipped) ++++++ kde-i18n-bn-3.5.2.tar.bz2 -> kde-i18n-bn-3.5.3.tar.bz2 ++++++ ++++ 52250 lines of diff (skipped) ++++++ kde-i18n-br-3.5.2.tar.bz2 -> kde-i18n-br-3.5.3.tar.bz2 ++++++ ++++ 38243 lines of diff (skipped) ++++++ kde-i18n-bs-3.5.2.tar.bz2 -> kde-i18n-bs-3.5.3.tar.bz2 ++++++ ++++ 127364 lines of diff (skipped) ++++++ kde-i18n-ca-3.5.2.tar.bz2 -> kde-i18n-ca-3.5.3.tar.bz2 ++++++ ++++ 95966 lines of diff (skipped) ++++++ kde-i18n-cs-3.5.2.tar.bz2 -> kde-i18n-cs-3.5.3.tar.bz2 ++++++ ++++ 35805 lines of diff (skipped) ++++++ kde-i18n-cy-3.5.2.tar.bz2 -> kde-i18n-cy-3.5.3.tar.bz2 ++++++ ++++ 34036 lines of diff (skipped) ++++++ kde-i18n-da-3.5.2.tar.bz2 -> kde-i18n-da-3.5.3.tar.bz2 ++++++ KDE/kde3-i18n/kde-i18n-da-3.5.2.tar.bz2 kde3-i18n/kde-i18n-da-3.5.3.tar.bz2 differ: char 11, line 1 ++++++ kde-i18n-de-3.5.2.tar.bz2 -> kde-i18n-de-3.5.3.tar.bz2 ++++++ KDE/kde3-i18n/kde-i18n-de-3.5.2.tar.bz2 kde3-i18n/kde-i18n-de-3.5.3.tar.bz2 differ: char 11, line 1 ++++++ kde-i18n-el-3.5.2.tar.bz2 -> kde-i18n-el-3.5.3.tar.bz2 ++++++ ++++ 50669 lines of diff (skipped) ++++++ kde-i18n-en_GB-3.5.2.tar.bz2 -> kde-i18n-en_GB-3.5.3.tar.bz2 ++++++ ++++ 34648 lines of diff (skipped) ++++++ kde-i18n-eo-3.5.2.tar.bz2 -> kde-i18n-eo-3.5.3.tar.bz2 ++++++ ++++ 22764 lines of diff (skipped) ++++++ kde-i18n-es-3.5.2.tar.bz2 -> kde-i18n-es-3.5.3.tar.bz2 ++++++ KDE/kde3-i18n/kde-i18n-es-3.5.2.tar.bz2 kde3-i18n/kde-i18n-es-3.5.3.tar.bz2 differ: char 11, line 1 ++++++ kde-i18n-et-3.5.2.tar.bz2 -> kde-i18n-et-3.5.3.tar.bz2 ++++++ KDE/kde3-i18n/kde-i18n-et-3.5.2.tar.bz2 kde3-i18n/kde-i18n-et-3.5.3.tar.bz2 differ: char 11, line 1 ++++++ kde-i18n-eu-3.5.2.tar.bz2 -> kde-i18n-eu-3.5.3.tar.bz2 ++++++ ++++ 34462 lines of diff (skipped) ++++++ kde-i18n-fa-3.5.2.tar.bz2 -> kde-i18n-fa-3.5.3.tar.bz2 ++++++ ++++ 9778 lines of diff (skipped) ++++++ kde-i18n-fi-3.5.2.tar.bz2 -> kde-i18n-fi-3.5.3.tar.bz2 ++++++ ++++ 49720 lines of diff (skipped) ++++++ kde-i18n-fr-3.5.2.tar.bz2 -> kde-i18n-fr-3.5.3.tar.bz2 ++++++ KDE/kde3-i18n/kde-i18n-fr-3.5.2.tar.bz2 kde3-i18n/kde-i18n-fr-3.5.3.tar.bz2 differ: char 11, line 1 ++++++ kde-i18n-fy-3.5.2.tar.bz2 -> kde-i18n-fy-3.5.3.tar.bz2 ++++++ ++++ 35566 lines of diff (skipped) ++++++ kde-i18n-ga-3.5.2.tar.bz2 -> kde-i18n-ga-3.5.3.tar.bz2 ++++++ ++++ 35499 lines of diff (skipped) ++++++ kde-i18n-gl-3.5.2.tar.bz2 -> kde-i18n-gl-3.5.3.tar.bz2 ++++++ ++++ 54623 lines of diff (skipped) ++++++ kde-i18n-he-3.5.2.tar.bz2 -> kde-i18n-he-3.5.3.tar.bz2 ++++++ ++++ 30127 lines of diff (skipped) ++++++ kde-i18n-hi-3.5.2.tar.bz2 -> kde-i18n-hi-3.5.3.tar.bz2 ++++++ ++++ 30243 lines of diff (skipped) ++++++ kde-i18n-hr-3.5.2.tar.bz2 -> kde-i18n-hr-3.5.3.tar.bz2 ++++++ ++++ 55852 lines of diff (skipped) ++++++ kde-i18n-hu-3.5.2.tar.bz2 -> kde-i18n-hu-3.5.3.tar.bz2 ++++++ ++++ 34505 lines of diff (skipped) ++++++ kde-i18n-is-3.5.2.tar.bz2 -> kde-i18n-is-3.5.3.tar.bz2 ++++++ ++++ 34433 lines of diff (skipped) ++++++ kde-i18n-it-3.5.2.tar.bz2 -> kde-i18n-it-3.5.3.tar.bz2 ++++++ KDE/kde3-i18n/kde-i18n-it-3.5.2.tar.bz2 kde3-i18n/kde-i18n-it-3.5.3.tar.bz2 differ: char 11, line 1 ++++++ kde-i18n-ja-3.5.2.tar.bz2 -> kde-i18n-ja-3.5.3.tar.bz2 ++++++ ++++ 80667 lines of diff (skipped) ++++++ kde-i18n-km-3.5.2.tar.bz2 -> kde-i18n-km-3.5.3.tar.bz2 ++++++ ++++ 79758 lines of diff (skipped) ++++++ kde-i18n-ko-3.5.2.tar.bz2 -> kde-i18n-ko-3.5.3.tar.bz2 ++++++ ++++ 18837 lines of diff (skipped) ++++++ kde-i18n-lt-3.5.2.tar.bz2 -> kde-i18n-lt-3.5.3.tar.bz2 ++++++ ++++ 36621 lines of diff (skipped) ++++++ kde-i18n-lv-3.5.2.tar.bz2 -> kde-i18n-lv-3.5.3.tar.bz2 ++++++ ++++ 26479 lines of diff (skipped) ++++++ kde-i18n-mk-3.5.2.tar.bz2 -> kde-i18n-mk-3.5.3.tar.bz2 ++++++ ++++ 92040 lines of diff (skipped) ++++++ kde-i18n-mn-3.5.2.tar.bz2 -> kde-i18n-mn-3.5.3.tar.bz2 ++++++ ++++ 12912 lines of diff (skipped) ++++++ kde-i18n-ms-3.5.2.tar.bz2 -> kde-i18n-ms-3.5.3.tar.bz2 ++++++ ++++ 68306 lines of diff (skipped) ++++++ kde-i18n-nb-3.5.2.tar.bz2 -> kde-i18n-nb-3.5.3.tar.bz2 ++++++ ++++ 33952 lines of diff (skipped) ++++++ kde-i18n-nds-3.5.2.tar.bz2 -> kde-i18n-nds-3.5.3.tar.bz2 ++++++ ++++ 62689 lines of diff (skipped) ++++++ kde-i18n-nl-3.5.2.tar.bz2 -> kde-i18n-nl-3.5.3.tar.bz2 ++++++ KDE/kde3-i18n/kde-i18n-nl-3.5.2.tar.bz2 kde3-i18n/kde-i18n-nl-3.5.3.tar.bz2 differ: char 11, line 1 ++++++ kde-i18n-nn-3.5.2.tar.bz2 -> kde-i18n-nn-3.5.3.tar.bz2 ++++++ ++++ 30398 lines of diff (skipped) ++++++ kde-i18n-pa-3.5.2.tar.bz2 -> kde-i18n-pa-3.5.3.tar.bz2 ++++++ ++++ 24128 lines of diff (skipped) ++++++ kde-i18n-pl-3.5.2.tar.bz2 -> kde-i18n-pl-3.5.3.tar.bz2 ++++++ KDE/kde3-i18n/kde-i18n-pl-3.5.2.tar.bz2 kde3-i18n/kde-i18n-pl-3.5.3.tar.bz2 differ: char 11, line 1 ++++++ kde-i18n-pt-3.5.2.tar.bz2 -> kde-i18n-pt-3.5.3.tar.bz2 ++++++ KDE/kde3-i18n/kde-i18n-pt-3.5.2.tar.bz2 kde3-i18n/kde-i18n-pt-3.5.3.tar.bz2 differ: char 11, line 1 ++++++ kde-i18n-pt_BR-3.5.2.tar.bz2 -> kde-i18n-pt_BR-3.5.3.tar.bz2 ++++++ KDE/kde3-i18n/kde-i18n-pt_BR-3.5.2.tar.bz2 kde3-i18n/kde-i18n-pt_BR-3.5.3.tar.bz2 differ: char 11, line 1 ++++++ kde-i18n-ro-3.5.2.tar.bz2 -> kde-i18n-ro-3.5.3.tar.bz2 ++++++ ++++ 33641 lines of diff (skipped) ++++++ kde-i18n-ru-3.5.2.tar.bz2 -> kde-i18n-ru-3.5.3.tar.bz2 ++++++ KDE/kde3-i18n/kde-i18n-ru-3.5.2.tar.bz2 kde3-i18n/kde-i18n-ru-3.5.3.tar.bz2 differ: char 11, line 1 ++++++ kde-i18n-rw-3.5.2.tar.bz2 -> kde-i18n-rw-3.5.3.tar.bz2 ++++++ ++++ 36441 lines of diff (skipped) ++++++ kde-i18n-se-3.5.2.tar.bz2 -> kde-i18n-se-3.5.3.tar.bz2 ++++++ ++++ 21985 lines of diff (skipped) ++++++ kde-i18n-sk-3.5.2.tar.bz2 -> kde-i18n-sk-3.5.3.tar.bz2 ++++++ ++++ 32946 lines of diff (skipped) ++++++ kde-i18n-sl-3.5.2.tar.bz2 -> kde-i18n-sl-3.5.3.tar.bz2 ++++++ ++++ 53818 lines of diff (skipped) ++++++ kde-i18n-sr-3.5.2.tar.bz2 -> kde-i18n-sr-3.5.3.tar.bz2 ++++++ ++++ 34943 lines of diff (skipped) ++++++ kde-i18n-sr(a)Latn-3.5.2.tar.bz2 -> kde-i18n-sr(a)Latn-3.5.3.tar.bz2 ++++++ ++++ 34949 lines of diff (skipped) ++++++ kde-i18n-ss-3.5.2.tar.bz2 -> kde-i18n-ss-3.5.3.tar.bz2 ++++++ ++++ 14539 lines of diff (skipped) ++++++ kde-i18n-sv-3.5.2.tar.bz2 -> kde-i18n-sv-3.5.3.tar.bz2 ++++++ KDE/kde3-i18n/kde-i18n-sv-3.5.2.tar.bz2 kde3-i18n/kde-i18n-sv-3.5.3.tar.bz2 differ: char 11, line 1 ++++++ kde-i18n-ta-3.5.2.tar.bz2 -> kde-i18n-ta-3.5.3.tar.bz2 ++++++ ++++ 34451 lines of diff (skipped) ++++++ kde-i18n-tg-3.5.2.tar.bz2 -> kde-i18n-tg-3.5.3.tar.bz2 ++++++ ++++ 59881 lines of diff (skipped) ++++++ kde-i18n-tr-3.5.2.tar.bz2 -> kde-i18n-tr-3.5.3.tar.bz2 ++++++ ++++ 34297 lines of diff (skipped) ++++++ kde-i18n-uk-3.5.2.tar.bz2 -> kde-i18n-uk-3.5.3.tar.bz2 ++++++ ++++ 39330 lines of diff (skipped) ++++++ kde-i18n-uz-3.5.2.tar.bz2 -> kde-i18n-uz-3.5.3.tar.bz2 ++++++ ++++ 31506 lines of diff (skipped) ++++++ kde-i18n-zh_CN-3.5.2.tar.bz2 -> kde-i18n-zh_CN-3.5.3.tar.bz2 ++++++ ++++ 42908 lines of diff (skipped) ++++++ kde-i18n-zh_TW-3.5.2.tar.bz2 -> kde-i18n-zh_TW-3.5.3.tar.bz2 ++++++ ++++ 26378 lines of diff (skipped) ++++++ kde3-i18n.spec.in ++++++ --- KDE/kde3-i18n/kde3-i18n.spec.in 2006-03-19 11:54:55.000000000 +0100 +++ kde3-i18n/kde3-i18n.spec.in 2006-05-24 07:05:43.000000000 +0200 @@ -18,7 +18,7 @@ License: LGPL Group: System/GUI/KDE Summary: English (UK) translations for KDE -Version: 3.5.2 +Version: 3.5.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-packager
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package yast2-packager checked in at Thu May 25 00:54:50 CEST 2006. -------- --- yast2-packager/yast2-packager.changes 2006-05-16 15:50:15.000000000 +0200 +++ yast2-packager/yast2-packager.changes 2006-05-24 13:39:03.000000000 +0200 @@ -1,0 +2,20 @@ +Wed May 24 12:54:33 CEST 2006 - jsrain(a)suse.cz + +- properly integrate YCP code for add-on product installation if + add-on product media booted (if YCP code present) (#178311) +- 2.13.119 + +------------------------------------------------------------------- +Fri May 19 10:35:24 CEST 2006 - jsrain(a)suse.cz + +- store ProductFeatures before starting package installation + (#176993) +- 2.13.118 + +------------------------------------------------------------------- +Wed May 17 10:53:12 CEST 2006 - jsrain(a)suse.cz + +- decode %2f from FTP path from install.inf (#169310) +- 2.13.117 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.116.tar.bz2 New: ---- yast2-packager-2.13.119.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.miL3eY/_old 2006-05-25 00:54:38.000000000 +0200 +++ /var/tmp/diff_new_pack.miL3eY/_new 2006-05-25 00:54:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.116) +# spec file for package yast2-packager (Version 2.13.119) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-packager -Version: 2.13.116 +Version: 2.13.119 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.116.tar.bz2 +Source0: yast2-packager-2.13.119.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml Requires: yast2 yast2-installation checkmedia yast2-country @@ -41,7 +41,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.13.116 +%setup -n yast2-packager-2.13.119 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +78,17 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Wed May 24 2006 - jsrain(a)suse.cz +- properly integrate YCP code for add-on product installation if + add-on product media booted (if YCP code present) (#178311) +- 2.13.119 +* Fri May 19 2006 - jsrain(a)suse.cz +- store ProductFeatures before starting package installation + (#176993) +- 2.13.118 +* Wed May 17 2006 - jsrain(a)suse.cz +- decode %%2f from FTP path from install.inf (#169310) +- 2.13.117 * Tue May 16 2006 - jsrain(a)suse.cz - don't use patterns required by product during autoinstallation (#159466) ++++++ yast2-packager-2.13.116.tar.bz2 -> yast2-packager-2.13.119.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.116/VERSION new/yast2-packager-2.13.119/VERSION --- old/yast2-packager-2.13.116/VERSION 2006-05-16 15:40:05.000000000 +0200 +++ new/yast2-packager-2.13.119/VERSION 2006-05-24 13:04:23.000000000 +0200 @@ -1 +1 @@ -2.13.116 +2.13.119 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.116/configure new/yast2-packager-2.13.119/configure --- old/yast2-packager-2.13.116/configure 2006-05-16 15:48:07.000000000 +0200 +++ new/yast2-packager-2.13.119/configure 2006-05-24 13:36:28.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.116. +# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.119. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.13.116' -PACKAGE_STRING='yast2-packager 2.13.116' +PACKAGE_VERSION='2.13.119' +PACKAGE_STRING='yast2-packager 2.13.119' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-packager 2.13.116 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.13.119 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.13.116:";; + short | recursive ) echo "Configuration of yast2-packager 2.13.119:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.13.116 +yast2-packager configure 2.13.119 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-packager $as_me 2.13.116, which was +It was created by yast2-packager $as_me 2.13.119, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.13.116' + VERSION='2.13.119' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.116" +VERSION="2.13.119" RPMNAME="yast2-packager" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -2695,7 +2695,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-packager $as_me 2.13.116, which was +This file was extended by yast2-packager $as_me 2.13.119, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2750,7 +2750,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-packager config.status 2.13.116 +yast2-packager config.status 2.13.119 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/yast2-packager-2.13.116/configure.in new/yast2-packager-2.13.119/configure.in --- old/yast2-packager-2.13.116/configure.in 2006-05-16 15:48:03.000000000 +0200 +++ new/yast2-packager-2.13.119/configure.in 2006-05-24 13:36:16.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.13.116, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.13.119, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.116" +VERSION="2.13.119" RPMNAME="yast2-packager" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.116/src/clients/inst_kickoff.ycp new/yast2-packager-2.13.119/src/clients/inst_kickoff.ycp --- old/yast2-packager-2.13.116/src/clients/inst_kickoff.ycp 2006-05-11 13:45:48.000000000 +0200 +++ new/yast2-packager-2.13.119/src/clients/inst_kickoff.ycp 2006-05-19 10:03:12.000000000 +0200 @@ -24,6 +24,7 @@ import "Kernel"; import "Arch"; import "FileUtils"; + import "ProductFeatures"; void AcpiToInitrd () { if (! (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ())) @@ -392,5 +393,14 @@ SCR::Execute (.target.bash, "/bin/echo \"/etc/nothing\" >/proc/sys/kernel/modprobe"); } + if (Stage::initial ()) + { + ProductFeatures::Save(); + WFM::Execute (.local.bash, sformat ( + "/bin/mkdir -p %1/etc/YaST2", Installation::destdir)); + WFM::Execute (.local.bash, sformat ( + "/bin/cp %1 %2/%1", "/etc/YaST2/ProductFeatures", Installation::destdir)); + } + return `next; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.116/src/modules/InstURL.ycp new/yast2-packager-2.13.119/src/modules/InstURL.ycp --- old/yast2-packager-2.13.116/src/modules/InstURL.ycp 2006-05-03 14:05:56.000000000 +0200 +++ new/yast2-packager-2.13.119/src/modules/InstURL.ycp 2006-05-17 10:53:46.000000000 +0200 @@ -6,7 +6,7 @@ * Purpose: Convert /etc/install.inf data to URL * * - * $Id: InstURL.ycp 29680 2006-04-04 17:34:37Z jsrain $ + * $Id: InstURL.ycp 30961 2006-05-17 08:53:41Z jsrain $ */ { @@ -233,6 +233,8 @@ // ftp://foo/bar is bar on foo (absolute) // ftp://foo//bar is /bar on foo (relative) // Note: %2f is added by URL.ycp if the path starts with / + if (substring (serverdir, 0, 3) == "%2f") + serverdir = "/" + substring (serverdir, 3); fs = serverdir; } else if (instmode == "smb" && (share != nil) && (share != "")) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.116/src/modules/Packages.ycp new/yast2-packager-2.13.119/src/modules/Packages.ycp --- old/yast2-packager-2.13.116/src/modules/Packages.ycp 2006-05-16 15:34:50.000000000 +0200 +++ new/yast2-packager-2.13.119/src/modules/Packages.ycp 2006-05-24 12:55:18.000000000 +0200 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Packages.ycp 30943 2006-05-16 13:34:43Z jsrain $ + * $Id: Packages.ycp 31125 2006-05-24 10:55:12Z jsrain $ */ { @@ -639,7 +639,12 @@ { AddOnProduct::WFIntegrate (spdir + "/installation.xml"); } + if ((integer)WFM::Read (.local.size, spdir + "/y2update.tgz") > 0) + { + AddOnProduct::UpdateInstSys (spdir + "/y2update.tgz"); + } string sp_url = "dir:" + spdir; + PackageCallbacksInit::InitPackageCallbacks (); integer sp_source = Pkg::SourceCreate (sp_url, ""); if (sp_source == -1) Report::Error (_("Failed to integrate service pack source.")); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yakuake
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package yakuake checked in at Thu May 25 00:54:31 CEST 2006. -------- --- KDE/yakuake/yakuake.changes 2006-03-27 13:52:53.000000000 +0200 +++ yakuake/yakuake.changes 2006-05-24 19:21:26.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 19:21:21 CEST 2006 - adrian(a)suse.de + +- fix build for < 10.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yakuake.spec ++++++ --- /var/tmp/diff_new_pack.FhDSVp/_old 2006-05-25 00:54:16.000000000 +0200 +++ /var/tmp/diff_new_pack.FhDSVp/_new 2006-05-25 00:54:16.000000000 +0200 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: yakuake is a terminal for KDE Version: 2.7.5 -Release: 1 +Release: 8 Source: %{name}-%{version}.tar.bz2 Source1: yakuake.desktop @@ -44,7 +44,11 @@ %install . /etc/opt/kde3/common_options make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET +%if %suse_version < 1010 +%suse_update_desktop_file %name System TerminalEmulator +%else %suse_update_desktop_file -G "Terminal Program" %name System TerminalEmulator +%endif %post %{run_ldconfig} @@ -65,6 +69,8 @@ /opt/kde3/share/locale/*/LC_MESSAGES/*.mo %changelog -n yakuake +* Wed May 24 2006 - adrian(a)suse.de +- fix build for < 10.1 * Mon Mar 27 2006 - dkukawka(a)suse.de - updated to new upstream version 2.7.5: - Further translations have been added. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit varmon
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package varmon checked in at Thu May 25 00:54:28 CEST 2006. -------- --- varmon/varmon.changes 2006-01-25 21:42:30.000000000 +0100 +++ varmon/varmon.changes 2006-05-24 23:10:09.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 24 23:09:58 CEST 2006 - schwab(a)suse.de + +- Use RPM_OPT_FLAGS. +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- makefile.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ varmon.spec ++++++ --- /var/tmp/diff_new_pack.MMDugI/_old 2006-05-25 00:54:14.000000000 +0200 +++ /var/tmp/diff_new_pack.MMDugI/_new 2006-05-25 00:54:14.000000000 +0200 @@ -1,26 +1,26 @@ # # spec file for package varmon (Version 1.0.2) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: varmon Summary: Mylex DAC960 RAID Controller Monitoring Tool - License: GPL Group: Hardware/Other Autoreqprov: on Version: 1.0.2 -Release: 575 +Release: 587 Source: varmon-1.0.2.tar.gz Patch: varmon-1.0.2.dif Patch1: gcc4.dif +Patch2: makefile.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -38,23 +38,27 @@ %setup -n varmon-1.0.2 %patch %patch1 +%patch2 rm -f varmon %build -make +make CFLAGS="$RPM_OPT_FLAGS" %install -test -n "$RPM_BUILD_ROOT" && rm -Rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/sbin install varmon $RPM_BUILD_ROOT/sbin/ %clean +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /sbin/varmon %changelog -n varmon +* Wed May 24 2006 - schwab(a)suse.de +- Use RPM_OPT_FLAGS. +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Sun Apr 24 2005 - aj(a)suse.de ++++++ makefile.diff ++++++ --- Makefile +++ Makefile @@ -3,10 +3,9 @@ # Author Dragan Stancevic <visitor(a)valinux.com> strip: varmon - strip varmon varmon: olddel - gcc -o varmon varmon.c -Wall -lncurses + gcc -o varmon varmon.c -Wall $(CFLAGS) -lncurses static: varmon_st strip varmon ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit smb4k
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package smb4k checked in at Thu May 25 00:53:56 CEST 2006. -------- --- KDE/smb4k/smb4k.changes 2006-05-16 12:07:37.000000000 +0200 +++ smb4k/smb4k.changes 2006-05-24 11:46:56.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 11:46:51 CEST 2006 - adrian(a)suse.de + +- fix build for < 10.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smb4k.spec ++++++ --- /var/tmp/diff_new_pack.kviUtm/_old 2006-05-25 00:53:21.000000000 +0200 +++ /var/tmp/diff_new_pack.kviUtm/_new 2006-05-25 00:53:21.000000000 +0200 @@ -12,11 +12,14 @@ Name: smb4k BuildRequires: kdebase3-devel +%if %suse_version < 1010 +BuildRequires: update-desktop-files +%endif License: GPL Group: Productivity/Networking/Samba Summary: extended SMB and CIFS share browser for KDE Version: 0.7.0 -Release: 2 +Release: 4 URL: http://smb4k.berlios.de/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 @@ -73,6 +76,8 @@ /opt/kde3/share/icons/* %changelog -n smb4k +* Wed May 24 2006 - adrian(a)suse.de +- fix build for < 10.1 * Tue May 02 2006 - stbinner(a)suse.de - 0.7 update * KonqSidebar_Smb4K: hang up the new alreadyMountedShare signal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit scarse
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package scarse checked in at Thu May 25 00:53:09 CEST 2006. -------- --- scarse/scarse.changes 2006-01-27 02:25:02.000000000 +0100 +++ scarse/scarse.changes 2006-05-24 22:01:15.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 22:01:09 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- scarse-strip.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scarse.spec ++++++ --- /var/tmp/diff_new_pack.lDNROc/_old 2006-05-25 00:53:00.000000000 +0200 +++ /var/tmp/diff_new_pack.lDNROc/_new 2006-05-25 00:53:00.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,7 +13,7 @@ Name: scarse BuildRequires: libtiff-devel Version: 0.4.alpha -Release: 3 +Release: 14 %define _version 0.4 %define __version 0.4-alpha URL: http://www.scarse.org/ @@ -24,6 +24,7 @@ Patch: scarse-0.4-alpha-gcc4.patch Patch1: scarse-icclib-fix.patch Patch2: scarse-0.4-alpha-integer.patch +Patch3: scarse-strip.patch Autoreqprov: on BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -43,6 +44,7 @@ %patch %patch1 %patch2 +%patch3 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -52,7 +54,6 @@ make %{?jobs:-j %jobs} %install -rm -rf $RPM_BUILD_ROOT make prefix=$RPM_BUILD_ROOT/usr install mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/icclib cp CHANGES COPYING CREDITS INSTALL README TODO $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} @@ -68,6 +69,8 @@ /usr/share/scarse %changelog -n scarse +* Wed May 24 2006 - schwab(a)suse.de +- Don't strip binaries. * Fri Jan 27 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Jan 24 2006 - mmarek(a)suse.cz ++++++ scarse-strip.patch ++++++ --- src/Makefile.in +++ src/Makefile.in @@ -64,7 +64,7 @@ install: $(bins) $(INSTALL) -d $(bindir) - $(INSTALL) -s $(bins) $(bindir) + $(INSTALL) $(bins) $(bindir) $(UXP) $(addprefix $(bindir)/, $(bins)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit ruby-ldap
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package ruby-ldap checked in at Thu May 25 00:53:05 CEST 2006. -------- --- ruby-ldap/ruby-ldap.changes 2006-01-25 21:41:15.000000000 +0100 +++ ruby-ldap/ruby-ldap.changes 2006-05-24 07:18:56.000000000 +0200 @@ -1,0 +2,37 @@ +Wed May 24 07:00:28 CEST 2006 - mrueckert(a)suse.de + +- Update to version 0.9.5 + o The software now builds and works out of the box on Windows. + + Changes from 0.9.4: + o Modify LDAP::Conn#search, LDAP::Conn#search2, + LDAP::Conn#search_ext and LDAP::Conn#search_ext2 to treat + LDAP_SIZELIMIT_EXCEEDED as success. After using any of these + four methods, the user should check whether + LDAP::Conn#err == LDAP::LDAP_SIZELIMIT_EXCEEDED. + If true, the results set has been truncated by the server. + Previously, LDAP_SIZELIMIT_EXCEEDED would raise an exception + and no results would be returned, which is not the correct + behaviour if the user has deliberately put a limit on the + number of results to be returned, in order to spare the + server. + o Duplicate code refactored. + o Missing RDoc documentation added for LDAP::Conn#err. + + Changes from 0.9.3 + o LDAP::Schema#names and LDAP::Schema#attr will now allow + names with hyphens and/or underscores. + o Silence a warning about @sasl_quiet when run in debug mode. + o Fix uninitialised data structures in LDAP::SSLConn#bind and + LDAP::SSLConn#simple_bind. + o Build properly with OpenLDAP 2.3. + o Build-time options --with-ldap-incdir and --with-ldap-libdir + have been replaced by --with-ldap-include and --with-ldap-lib. + This is a consequence of making extconf.rb more standard. + o Windows build has been improved, so that it should now at least + build without error. Whether it will work is another matter. + +- removed ruby-ldap-0.9.2_ldapapi.patch: + this patch is no longer needed + +------------------------------------------------------------------- Old: ---- ruby-ldap-0.9.2.tar.gz ruby-ldap-0.9.2_ldapapi.patch New: ---- ruby-ldap-0.9.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby-ldap.spec ++++++ --- /var/tmp/diff_new_pack.9UF5dN/_old 2006-05-25 00:52:47.000000000 +0200 +++ /var/tmp/diff_new_pack.9UF5dN/_new 2006-05-25 00:52:47.000000000 +0200 @@ -1,25 +1,28 @@ # -# spec file for package ruby-ldap (Version 0.9.2) +# spec file for package ruby-ldap (Version 0.9.5) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: ruby-ldap -BuildRequires: openldap2 openldap2-devel ruby-devel -Version: 0.9.2 +Version: 0.9.5 Release: 1 +# License: BSD Group: Development/Languages/Ruby +# BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: openldap2 openldap2-devel ruby-devel +# URL: http://sourceforge.net/projects/ruby-ldap/ -Source: http://rdownload.sourceforge.net/ruby-ldap/%{name}-%{version}.tar.gz -Patch: ruby-ldap-0.9.2_ldapapi.patch +Source: http://prdownloads.sourceforge.net/ruby-ldap/%{name}-%{version}.tar.gz +# Summary: A Ruby extension library for accessing the LDAP API %description @@ -38,7 +41,6 @@ %prep %setup -%patch %build ruby extconf.rb \ @@ -68,6 +70,37 @@ %doc example/ test/ rdoc/ %changelog -n ruby-ldap +* Wed May 24 2006 - mrueckert(a)suse.de +- Update to version 0.9.5 + o The software now builds and works out of the box on Windows. + Changes from 0.9.4: + o Modify LDAP::Conn#search, LDAP::Conn#search2, + LDAP::Conn#search_ext and LDAP::Conn#search_ext2 to treat + LDAP_SIZELIMIT_EXCEEDED as success. After using any of these + four methods, the user should check whether + LDAP::Conn#err == LDAP::LDAP_SIZELIMIT_EXCEEDED. + If true, the results set has been truncated by the server. + Previously, LDAP_SIZELIMIT_EXCEEDED would raise an exception + and no results would be returned, which is not the correct + behaviour if the user has deliberately put a limit on the + number of results to be returned, in order to spare the + server. + o Duplicate code refactored. + o Missing RDoc documentation added for LDAP::Conn#err. + Changes from 0.9.3 + o LDAP::Schema#names and LDAP::Schema#attr will now allow + names with hyphens and/or underscores. + o Silence a warning about @sasl_quiet when run in debug mode. + o Fix uninitialised data structures in LDAP::SSLConn#bind and + LDAP::SSLConn#simple_bind. + o Build properly with OpenLDAP 2.3. + o Build-time options --with-ldap-incdir and --with-ldap-libdir + have been replaced by --with-ldap-include and --with-ldap-lib. + This is a consequence of making extconf.rb more standard. + o Windows build has been improved, so that it should now at least + build without error. Whether it will work is another matter. +- removed ruby-ldap-0.9.2_ldapapi.patch: + this patch is no longer needed * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Nov 18 2005 - mrueckert(a)suse.de ++++++ ruby-ldap-0.9.2.tar.gz -> ruby-ldap-0.9.5.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/ChangeLog new/ruby-ldap-0.9.5/ChangeLog --- old/ruby-ldap-0.9.2/ChangeLog 2005-07-07 10:28:33.000000000 +0200 +++ new/ruby-ldap-0.9.5/ChangeLog 2006-04-20 18:47:42.000000000 +0200 @@ -1,3 +1,119 @@ +Thu Apr 20 16:47:00 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * Version 0.9.5. + +Thu Apr 20 16:39:46 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * conn.c (rb_ldap_conn_compare_ext_s): The call to ldap_compare_ext_s() + requires an extra argument on Windows platforms. + +Thu Apr 20 16:34:21 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * win/winldap.h: Change prototype for ldap_compare_ext_s() to include + extra parameter expected on Windows platforms. + +Wed Apr 19 22:13:26 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * sslconn.c (rb_ldap_sslconn_bind_f): Fix function definition to + silence compiler warning. + +Tue Apr 18 23:40:24 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * sslconn.c (rb_ldap_sslconn_bind_f): Function definition was missing + an argument. + * sslconn.c (rb_ldap_sslconn_bind_s): Erroneously called + rb_ldap_sslconn_bind_func() instead of rb_ldap_sslconn_bind_f(). + * sslconn.c (rb_ldap_sslconn_simple_bind_s): Erroneously called + rb_ldap_sslconn_bind_func() instead of rb_ldap_sslconn_bind_f(). + +Tue Mar 7 23:49:57 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * Version 0.9.4. + +Tue Mar 7 21:03:01 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * conn.c (rb_ldap_conn_search_ext_s): Modify LDAP::Conn#search_ext to + treat a return value of LDAP_SIZELIMIT_EXCEEDED from + rb_ldap_conn_search_ext_i() as success. + * conn.c (rb_ldap_conn_search_ext2_s): Ditto for + LDAP::Conn#search_ext2. + +Mon Mar 6 01:33:10 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * sslconn.c (rb_ldap_sslconn_bind_f): New function containing + identical code from rb_ldap_sslconn_bind_s() and + rb_ldap_sslconn_simple_bind_s(). The new function takes a function + pointer as its last parameter, to decide whether to call + rb_ldap_conn_bind_s() or rb_ldap_conn_simple_bind_s(), as previously + called by rb_ldap_sslconn_bind_s() and + rb_ldap_sslconn_simple_bind_s(), respectively. + * sslconn.c (rb_ldap_sslconn_bind_s): Code moved to + rb_ldap_sslconn_bind_f(). + * sslconn.c (rb_ldap_sslconn_simple_bind_s): Code moved to + rb_ldap_sslconn_bind_f(). + +Mon Mar 6 00:28:38 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * conn.c (rb_ldap_conn_search_i): Give a clearer exception message + when a call to either ldap_search_s(3) or ldap_search_st(3) returns + no pointer to a result. + +Thu Mar 2 12:12:58 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * conn.c (rb_ldap_conn_search_s): Modify LDAP::Conn#search to treat a + return value of LDAP_SIZELIMIT_EXCEEDED from rb_ldap_conn_search_i() + as success. + * conn.c (rb_ldap_conn_search2_s): Ditto for LDAP::Conn#search2. + * rbldap.h: Check_LDAP_Result macro modifed to treat + LDAP_SIZELIMIT_EXCEEDED as success. + +Thu Mar 2 11:54:22 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * conn.c: RDoc documentation was missing for LDAP::Conn#err. + +Sat Feb 18 09:37:14 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * Version 0.9.3 + +Thu Feb 16 01:15:59 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * extconf.rb: Build with -DLDAP_DEPRECATED to enable functions no + longer automatically defined by ldap.h in OpenLDAP 2.3. + +Mon Feb 13 17:20:32 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * conn.c (rb_ldap_conn_bind_s): Use RB_LDAP_DATA instead of struct + rb_ldap_data. + * conn.c (rb_ldap_conn_simple_bind_s): Ditto. + * conn.c (rb_ldap_conn_bound): Ditto. + * saslconn.c (rb_ldap_conn_sasl_bind): Ditto. + +Mon Feb 13 17:10:08 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * sslconn.c (rb_ldap_sslconn_bind_s): In LDAP::SSLConn#bind, ldapdata + was used uninitialised. + * sslconn.c (rb_ldap_sslconn_simple_bind_s): Ditto for + LDAP::SSLConn#simple_bind. + +Sun Feb 12 20:33:28 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * conn.c (rb_ldap_conn_s_allocate): Silence a warning about + @sasl_quiet when run in debug mode. + +Sun Feb 12 17:28:14 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * extconf.rb: Common directory scheme of mkmf.rb is now used. As a + side-effect, --with-ldap-incdir has been replaced by + --with-ldap-include and --with-ldap-libdir has been replaced by + --with-ldap-lib. Thanks to Usa Nakamura <usa(a)garbagecollect.jp>. + * extconf.rb: Display text was improved and grammatical errors were + corrected. + +Sun Feb 12 17:08:17 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * conn.c: Make inclusion of sys/time.h and unistd.h conditional on + macro defines. Thanks to Usa Nakamura <usa(a)garbagecollect.jp>. + * saslconn.c: Ditto. + * sslconn.c: Ditto. + +Sun Feb 12 16:59:06 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * win/winldap.h: Fix up various structs for Windows. Thanks to Usa + Nakamura <usa(a)garbagecollect.jp> for the patch. + +Thu Feb 8 23:15:17 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * lib/ldap/schema.rb: Allow LDAP::Schema#attr to find attribute names + that contain hyphens and/or underscores. + * lib/ldap/schema.rb: Fix LDAP::Schema#names to not allow all manner + of extra characters in names. That was introduced by the last change. + +Thu Feb 8 22:59:07 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * lib/ldap/schema.rb: Relax parsing in LDAP::Schema#names to allow + names with hyphens and/or underscores. This is apparently an issue + with the Sun LDAP server. Thanks to Tilo Sloboda <tilo(a)unixgods.org> + for pointing out the issue. + Tue Jul 5 19:14:38 UTC 2005 Ian Macdonald <ian(a)caliban.org> * Version 0.9.2 * conn.c (rb_ldap_conn_perror): str was not declared, but is needed @@ -26,7 +142,7 @@ rb_ldap_conn_initialize() for a Conn object or rb_ldap_sslconn_initialize() for an SSLConn object, passing in the original arguments. - * conn.c (rb_ldap_conn_bind_s): In LDAP::Conn#bind, all + * conn.c (rb_ldap_conn_bind_s): In LDAP::Conn#bind, allow rb_ldap_conn_rebind() to rebind a connection that has been unbound. * conn.c (rb_ldap_conn_simple_bind_s): Ditto for LDAP::Conn#simple_bind. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/FAQ new/ruby-ldap-0.9.5/FAQ --- old/ruby-ldap-0.9.2/FAQ 2005-02-08 02:55:09.000000000 +0100 +++ new/ruby-ldap-0.9.5/FAQ 2006-03-02 13:40:34.000000000 +0100 @@ -1,25 +1,49 @@ -FAQ -- +$Id: FAQ,v 1.5 2006/03/02 12:40:34 ianmacd Exp $ -[Q] How do I add/modify binary data? -[A] Create a LDAP::Mod object with the flag LDAP::LDAP_MOD_BVALUES as follows: - entry = [ - LDAP::mod(LDAP::LDAP_MOD_ADD|LDAP_MOD_BVALUES, 'jpegPhoto', [jpeg_img]), - LDAP::mod(LDAP::LDAP_MOD_ADD, 'cn', ['Takaaki Tateishi']), - ... - ] - conn.add("dc=localhost, dc=localdomain", entry) - - -[Q] Is there shortcut method for adding/modifying entries. -[A] Yes, there is. You can directly give LDAP::Conn#add/modify hash data as follows: - - entry = { - 'objectclass' => ['top', 'person'], - ... - } - conn.add("cn=foobar, dc=localhost, dc=localdomain", entry) - -[Q] Can I use SASL authentication? -[A] Yes, it works for me using Cyrus SASL and Kerberos V via GSSAPI. - Use LDAP::Conn#sasl_bind. +FAQ +--- + +Q. How do I add/modify binary data? +A. Create a LDAP::Mod object with the flag LDAP::LDAP_MOD_BVALUES as follows: + + entry = [ + LDAP::mod(LDAP::LDAP_MOD_ADD|LDAP_MOD_BVALUES, 'jpegPhoto', [jpeg_img]), + LDAP::mod(LDAP::LDAP_MOD_ADD, 'cn', ['Takaaki Tateishi']), + ... + ] + conn.add("dc=localhost, dc=localdomain", entry) + +Q. Is there shortcut method for adding/modifying entries. +A. Yes, there is. You can directly give LDAP::Conn#add/modify hash data as + follows: + + entry = { + 'objectclass' => [ 'top', 'person' ], + ... + } + conn.add( "cn=foobar, dc=localhost, dc=localdomain", entry ) + +Q. Can I use SASL authentication? +A. Yes, it works for me using Cyrus SASL and Kerberos V via GSSAPI. + Use LDAP::Conn#sasl_bind. Your mileage may vary. + +Q. Can I put a limit on the number of results returned by the server? +A. Yes, you can. Set the size limit using LDAP::Conn#set_option and then + check for LDAP::Conn#search or LDAP::Conn#search2 having exceeded this + limit, by using LDAP::Conn#err: + + conn = LDAP::Conn.new( 'localhost', 389 ) + # Limit the results set to a maximum of 10. + conn.set_option( LDAP::LDAP_OPT_SIZELIMIT, 10 ) + conn.search2( 'dc=localhost,dc=localdomain', + LDAP::LDAP_SCOPE_SUBTREE, '(objectClass=*)' ) + if conn.err == LDAP::LDAP_SIZELIMIT_EXCEEDED + # Results set was truncated by server. + end + + Note that LDAP::LDAP_SIZELIMIT_EXCEEDED may occur even when you have not + put an explicit limit on the number of results to be returned. The server + will likely have its own maximum configured, so it can be important to + check for this condition on all of your calls to LDAP::Conn#search and + LDAP::Conn#search2. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/MANIFEST new/ruby-ldap-0.9.5/MANIFEST --- old/ruby-ldap-0.9.2/MANIFEST 2005-02-08 02:48:56.000000000 +0100 +++ new/ruby-ldap-0.9.5/MANIFEST 2006-02-18 10:33:20.000000000 +0100 @@ -2,6 +2,7 @@ COPYING FAQ MANIFEST +NEWS README TODO conn.c @@ -10,7 +11,6 @@ example/cgi/search.html example/pr_ctl extconf.rb -install.rb ldap.c lib/ldap/control.rb lib/ldap/ldif.rb @@ -42,7 +42,12 @@ test/search2.rb test/search3.rb test/subschema.rb +test/tc_conn.rb +test/tc_ldif.rb +test/tc_schema.rb +test/tc_search.rb test/test.sh +test/ts_ldap.rb win/winlber.h win/winldap.h win/wldap32.def diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/NOTES new/ruby-ldap-0.9.5/NOTES --- old/ruby-ldap-0.9.2/NOTES 1970-01-01 01:00:00.000000000 +0100 +++ new/ruby-ldap-0.9.5/NOTES 2006-04-20 18:42:57.000000000 +0200 @@ -0,0 +1,48 @@ +0.9.5 +----- + +The Windows build is now believed to work out of the box. It has been tested +on Windows XP SP2, using SVC C++ 6.0 to build the software. Thanks to Chris +Scharf <scharfie(a)gmail.com> for his work in this area and willingness to work +with me on fixing the problems. + + +0.9.4 +----- + +LDAP::Conn#search, LDAP::Conn#search2, LDAP::Conn#search_ext and +LDAP::Conn#search_ext2 have been modified to treat LDAP_SIZELIMIT_EXCEEDED as +success. + +After using any of these four methods, the user should use LDAP::Conn#err to +check whether the error status of the Conn object is +LDAP::LDAP_SIZELIMIT_EXCEEDED. If true, the results set has been truncated by +the server. + +Previously, LDAP_SIZELIMIT_EXCEEDED would raise an exception and no results +would be returned, which is not the correct behaviour if the user has +deliberately put a limit on the number of results to be returned, as might be +done in order to spare the server. + + +0.9.3 +----- + +The usability of the library on Windows platforms is currently a case of 'suck +it and see'. Some people report the code working, others report immediate +segfaults; yet others say that it worked after they made some minor +alterations to the code in order to get it to build. + +Differences in Windows platform used, chosen compiler and version, plus the +variety of servers with which the code is used, conspire to result in the +exact facts of the matter not yet having been ascertained. + +Most people seemed to experience some difficulty in getting the code to build +on Windows, so some effort has gone into making this better for the 0.9.3 +release. This work is difficult, since I do not have a Windows build +environment at my disposal. + +If you are a Windows user and you found that the code did not work in its +original form, but you managed to get it to work after some alterations, I +would be very grateful if you wrote to me to let me know what changes were +needed. Please include precise details of your build platform. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/README new/ruby-ldap-0.9.5/README --- old/ruby-ldap-0.9.2/README 2005-03-08 11:20:19.000000000 +0100 +++ new/ruby-ldap-0.9.5/README 2006-04-20 00:21:14.000000000 +0200 @@ -1,7 +1,9 @@ Ruby/LDAP -- A Ruby extension library for LDAP - + +$Id: README,v 1.18 2006/04/19 22:21:14 ianmacd Exp $ + Copyright (C) 2000-2004 Takaaki Tateishi <ttate(a)users.sourceforge.net> -Copyright (C) 2005 Ian Macdonald <ian(a)caliban.org> +Copyright (C) 2005-2006 Ian Macdonald <ian(a)caliban.org> ------------------------------------------------------------------------------- DESCRIPTION @@ -13,7 +15,7 @@ REQUIREMENT * Ruby 1.8.x (at least 1.8.2 if you want to use ldap/control) - * OpenLDAP, NetscapeSDK, Windows2000 (or ADSI) + * OpenLDAP, Netscape SDK, Windows 2003 or Windows XP ------------------------------------------------------------------------------- @@ -26,20 +28,20 @@ BUILDING -extconf.rb will try to use OpenLDAP2 or NetscapeSDK libraries and guess paths -to some header files and libraries from the position of ldap.h. If you'd like -to see the available options for extconf.rb, run it with '--help' option. +extconf.rb will try to use the OpenLDAP 2 or Netscape SDK libraries and guess +paths to some header files and libraries from the position of ldap.h. If you'd +like to see the available options for extconf.rb, run it with '--help' option. $ ruby extconf.rb [--with-openldap1|--with-openldap2|--with-netscape|--with-wldap32] $ make -You will get ldap.so, which you can either manually copy into place or type: +This will create ldap.so, which you can either manually copy into place or +install with: $ make install -If you have a binary distribution, execute install.rb as follows: - - $ ruby install.rb +If you're building the software on Windows, you may need to use nmake instead +of make. ------------------------------------------------------------------------------- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/conn.c new/ruby-ldap-0.9.5/conn.c --- old/ruby-ldap-0.9.2/conn.c 2005-07-05 21:14:38.000000000 +0200 +++ new/ruby-ldap-0.9.5/conn.c 2006-04-20 18:39:46.000000000 +0200 @@ -1,12 +1,16 @@ /* * conn.c - * $Id: conn.c,v 1.40 2005/07/05 19:14:38 ianmacd Exp $ + * $Id: conn.c,v 1.49 2006/04/20 16:39:46 ianmacd Exp $ */ #include "ruby.h" #include "rbldap.h" -#include <sys/time.h> -#include <unistd.h> +#if defined(HAVE_SYS_TIME_H) +# include <sys/time.h> +#endif +#if defined(HAVE_UNISTD_H) +# include <unistd.h> +#endif /* RDoc needs the following bogus code to find the parent module: * @@ -68,6 +72,7 @@ LDAP *cldap; char *chost; int cport; + int was_verbose = Qfalse; RB_LDAP_DATA *ldapdata; VALUE host, port; @@ -103,8 +108,18 @@ ldapdata->ldap = cldap; rb_iv_set (self, "@args", rb_ary_new4 (argc, argv)); + + /* Silence warning that next rb_iv_get produces. */ + if (ruby_verbose == Qtrue) + { + was_verbose = Qtrue; + ruby_verbose = Qfalse; + } + if (rb_iv_get (self, "@sasl_quiet") != Qtrue) rb_iv_set (self, "@sasl_quiet", Qfalse); + if (was_verbose == Qtrue) + ruby_verbose = Qtrue; return Qnil; }; @@ -219,7 +234,7 @@ char *dn = NULL; char *passwd = NULL; - Data_Get_Struct (self, struct rb_ldap_data, ldapdata); + Data_Get_Struct (self, RB_LDAP_DATA, ldapdata); if (!ldapdata->ldap) { if (rb_iv_get (self, "@args") != Qnil) @@ -310,7 +325,7 @@ char *passwd = NULL; int method = LDAP_AUTH_SIMPLE; - Data_Get_Struct (self, struct rb_ldap_data, ldapdata); + Data_Get_Struct (self, RB_LDAP_DATA, ldapdata); if (!ldapdata->ldap) { if (rb_iv_get (self, "@args") != Qnil) @@ -395,7 +410,7 @@ { RB_LDAP_DATA *ldapdata; - Data_Get_Struct (self, struct rb_ldap_data, ldapdata); + Data_Get_Struct (self, RB_LDAP_DATA, ldapdata); return ldapdata->bind == 0 ? Qfalse : Qtrue; }; @@ -868,7 +883,7 @@ } if (!(cmsg && (*cmsg))) { - rb_raise (rb_eRuntimeError, "no message"); + rb_raise (rb_eRuntimeError, "no result returned by search"); } Check_LDAP_Result ((*ldapdata)->err); @@ -903,6 +918,31 @@ } static VALUE +rb_ldap_conn_search2_b (VALUE rdata) +{ + void **data = (void *) rdata; + LDAP *cldap = (LDAP *) data[0]; + LDAPMessage *cmsg = (LDAPMessage *) data[1]; + VALUE ary = (VALUE) data[2]; + LDAPMessage *e; + VALUE m; + VALUE hash; + + for (e = ldap_first_entry (cldap, cmsg); e != NULL; + e = ldap_next_entry (cldap, e)) + { + m = rb_ldap_entry_new (cldap, e); + hash = rb_ldap_entry_to_hash (m); + rb_ary_push (ary, hash); + if (rb_block_given_p ()) + { + rb_ensure (rb_yield, hash, rb_ldap_conn_invalidate_entry, m); + } + } + return Qnil; +} + +static VALUE rb_ldap_msgfree (VALUE data) { LDAPMessage *cmsg = (LDAPMessage *) data; @@ -970,6 +1010,12 @@ * If +s_attr+ is given, it specifies the attribute on which to sort the * entries returned by the server. If +s_proc+ is given, it specifies a Proc * object that will be used to sort the entries returned by the server. + * + * Note that not all results may be returned by this method. If a + * size limit has been set for the number of results to be returned and this + * limit is exceeded, the results set will be truncated. You can check for + * this by calling LDAP::Conn#err immediately after this method and comparing + * the result to LDAP::LDAP_SIZELIMIT_EXCEEDED. */ VALUE rb_ldap_conn_search_s (int argc, VALUE argv[], VALUE self) @@ -982,7 +1028,8 @@ rb_ldap_conn_search_i (argc, argv, self, &ldapdata, &cmsg); cldap = ldapdata->ldap; - if (ldapdata->err == LDAP_SUCCESS) + if (ldapdata->err == LDAP_SUCCESS + || ldapdata->err == LDAP_SIZELIMIT_EXCEEDED) { void *pass_data[] = { (void *) cldap, (void *) cmsg }; @@ -997,31 +1044,6 @@ return self; } -static VALUE -rb_ldap_conn_search2_b (VALUE rdata) -{ - void **data = (void *) rdata; - LDAP *cldap = (LDAP *) data[0]; - LDAPMessage *cmsg = (LDAPMessage *) data[1]; - VALUE ary = (VALUE) data[2]; - LDAPMessage *e; - VALUE m; - VALUE hash; - - for (e = ldap_first_entry (cldap, cmsg); e != NULL; - e = ldap_next_entry (cldap, e)) - { - m = rb_ldap_entry_new (cldap, e); - hash = rb_ldap_entry_to_hash (m); - rb_ary_push (ary, hash); - if (rb_block_given_p ()) - { - rb_ensure (rb_yield, hash, rb_ldap_conn_invalidate_entry, m); - } - } - return Qnil; -} - /* * call-seq: * conn.search2(base_dn, scope, filter, attrs=nil, attrsonly=false, @@ -1045,6 +1067,12 @@ * If +s_attr+ is given, it specifies the attribute on which to sort the * entries returned by the server. If +s_proc+ is given, it specifies a Proc * object that will be used to sort the entries returned by the server. + * + * Note that not all results may be returned by this method. If a + * size limit has been set for the number of results to be returned and this + * limit is exceeded, the results set will be truncated. You can check for + * this by calling LDAP::Conn#err immediately after this method and comparing + * the result to LDAP::LDAP_SIZELIMIT_EXCEEDED. */ VALUE rb_ldap_conn_search2_s (int argc, VALUE argv[], VALUE self) @@ -1059,7 +1087,8 @@ cldap = ldapdata->ldap; ary = rb_ary_new (); - if (ldapdata->err == LDAP_SUCCESS) + if (ldapdata->err == LDAP_SUCCESS + || ldapdata->err == LDAP_SIZELIMIT_EXCEEDED) { void *pass_data[] = { (void *) cldap, (void *) cmsg, (void *) ary }; @@ -1228,6 +1257,12 @@ * If +s_attr+ is given, it specifies the attribute on which to sort the * entries returned by the server. If +s_proc+ is given, it specifies a Proc * object that will be used to sort the entries returned by the server. + * + * Note that not all results may be returned by this method. If a + * size limit has been set for the number of results to be returned and this + * limit is exceeded, the results set will be truncated. You can check for + * this by calling LDAP::Conn#err immediately after this method and comparing + * the result to LDAP::LDAP_SIZELIMIT_EXCEEDED. */ VALUE rb_ldap_conn_search_ext_s (int argc, VALUE argv[], VALUE self) @@ -1239,7 +1274,8 @@ rb_ldap_conn_search_ext_i (argc, argv, self, &ldapdata, &cmsg); cldap = ldapdata->ldap; - if (ldapdata->err == LDAP_SUCCESS) + if (ldapdata->err == LDAP_SUCCESS + || ldapdata->err == LDAP_SIZELIMIT_EXCEEDED) { void *pass_data[] = { (void *) cldap, (void *) cmsg }; rb_ensure (rb_ldap_conn_search_b, (VALUE) pass_data, @@ -1277,6 +1313,12 @@ * If +s_attr+ is given, it specifies the attribute on which to sort the * entries returned by the server. If +s_proc+ is given, it specifies a Proc * object that will be used to sort the entries returned by the server. + * + * Note that not all results may be returned by this method. If a + * size limit has been set for the number of results to be returned and this + * limit is exceeded, the results set will be truncated. You can check for + * this by calling LDAP::Conn#err immediately after this method and comparing + * the result to LDAP::LDAP_SIZELIMIT_EXCEEDED. */ VALUE rb_ldap_conn_search_ext2_s (int argc, VALUE argv[], VALUE self) @@ -1290,7 +1332,8 @@ cldap = ldapdata->ldap; ary = rb_ary_new (); - if (ldapdata->err == LDAP_SUCCESS) + if (ldapdata->err == LDAP_SUCCESS + || ldapdata->err == LDAP_SIZELIMIT_EXCEEDED) { void *pass_data[] = { (void *) cldap, (void *) cmsg, (void *) ary }; rb_ensure (rb_ldap_conn_search2_b, (VALUE) pass_data, @@ -1647,19 +1690,28 @@ { RB_LDAP_DATA *ldapdata; char *c_dn, *c_attr; +#ifdef USE_WLDAP32 + char *c_val; +#endif struct berval bval; LDAPControl **sctrls, **cctrls; GET_LDAP_DATA (self, ldapdata); c_dn = StringValueCStr (dn); c_attr = StringValueCStr (attr); +#ifdef USE_WLDAP32 + c_val = StringValueCStr (val); +#endif bval.bv_val = StringValueCStr (val); bval.bv_len = RSTRING (val)->len; sctrls = rb_ldap_get_controls (serverctrls); cctrls = rb_ldap_get_controls (clientctrls); - ldapdata->err = ldap_compare_ext_s (ldapdata->ldap, - c_dn, c_attr, &bval, sctrls, cctrls); + ldapdata->err = ldap_compare_ext_s (ldapdata->ldap, c_dn, c_attr, +#ifdef USE_WLDAP32 + c_val, +#endif + &bval, sctrls, cctrls); if ((ldapdata->err) == LDAP_COMPARE_TRUE) return Qtrue; @@ -1675,6 +1727,12 @@ } #endif +/* + * call-seq: + * conn.err => Fixnum + * + * Return the error associated with the most recent LDAP operation. + */ VALUE rb_ldap_conn_err (VALUE self) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/example/pr_ctl new/ruby-ldap-0.9.5/example/pr_ctl --- old/ruby-ldap-0.9.2/example/pr_ctl 2005-03-09 20:07:32.000000000 +0100 +++ new/ruby-ldap-0.9.5/example/pr_ctl 2006-02-12 21:00:21.000000000 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/ruby -w # -# $Id: pr_ctl,v 1.3 2005/03/09 19:07:32 ianmacd Exp $ +# $Id: pr_ctl,v 1.4 2006/02/12 20:00:21 ianmacd Exp $ # # Program to demonstrate the use of the LDAPv3 PagedResults control. This # control is interesting, because it requires the passing of controls in @@ -43,7 +43,7 @@ critical ) conn.set_option( LDAP::LDAP_OPT_SERVER_CONTROLS, [control] ) - this_page = conn.search2( 'dc=localhost,dc=localdomain', + this_page = conn.search2( 'dc=google, dc=com', LDAP::LDAP_SCOPE_SUBTREE, '(objectclass=*)', ['cn'] ) @@ -57,12 +57,12 @@ # How many entries does the server estimate are left? # Also, get the cookie returned by the last search. returned_size, cookie = control.decode - puts "Returned size = #{returned_size}" if $DEBUG + puts "Returned size = #{returned_size.to_i}" if $DEBUG # According to RFC 2696, the server may not be able to estimate the number # of results outstanding. In that case, it will return zero, so we should # only use the new size if it is non-zero. - page_size = returned_size if returned_size > 0 + page_size = returned_size.to_i if returned_size.to_i > 0 puts "Returned cookie = #{cookie.inspect}" if $DEBUG diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/extconf.rb new/ruby-ldap-0.9.5/extconf.rb --- old/ruby-ldap-0.9.2/extconf.rb 2005-02-23 06:30:49.000000000 +0100 +++ new/ruby-ldap-0.9.5/extconf.rb 2006-04-19 01:49:56.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/env ruby-1.4 # # extconf.rb for ldap extension -# $Id: extconf.rb,v 1.4 2005/02/23 05:30:49 ianmacd Exp $ +# $Id: extconf.rb,v 1.7 2006/04/18 23:49:56 ianmacd Exp $ # require 'mkmf' @@ -10,15 +10,15 @@ if( ARGV.include?("--help") ) print <<EOF - --with-ldap-dir specify the ldap directory. - --with-ldap-incdir specify the directory which contains ldap.h and lber.h. - --with-ldap-libdir specify the directory which contains ldap libraries. - --with-netscape use this option, if you use Netscape SDK. - --with-openldap1 use this option, if you use OpenLDAP-1.x. - --with-openldap2 use this option, if you use OpenLDAP-2.x. - --with-wldap32 use this option, if you use Active Directory Client API. + --with-ldap-dir specify the LDAP directory. + --with-ldap-include specify the directory containing ldap.h and lber.h. + --with-ldap-lib specify the directory containing the LDAP libraries. + --with-netscape build with Netscape SDK. + --with-openldap1 build with OpenLDAP 1.x. + --with-openldap2 build with OpenLDAP 2.x. + --with-wldap32 Active Directory Client API. -The follows are library configuration options: +The following are library configuration options: --with-libcrypto=crypto, --without-libcrypto --with-libssl=ssl, --without-libssl --with-libnsl=nsl, --without-libnsl @@ -82,24 +82,13 @@ end end - -if( ! $CFLAGS ) -# $CFLAGS = "-D_REENTRANT" - $CFLAGS = "" -end - -if( ! $LDFLAGS ) - $LDFLAGS = "" -end - $use_netscape = ldap_with_config("netscape") $use_openldap1 = ldap_with_config("openldap1") $use_openldap2 = ldap_with_config("openldap2") $use_wldap32 = ldap_with_config("wldap32") +dir_config('ldap') $ldap_dir = ldap_with_config("ldap-dir") || ldap_with_config("ldap") -$ldap_incdir = ldap_with_config("ldap-incdir") -$ldap_libdir = ldap_with_config("ldap-libdir") $ldap_dir, $libldap, $ldap_h = find_files($ldap_dir) @@ -123,14 +112,14 @@ if( $use_netscape ) case $use_netscape when /^4/ - $CFLAGS += " -DUSE_NETSCAPE_SDK" + $defs << "-DUSE_NETSCAPE_SDK" #$libnsl = ldap_with_config("libnsl", "nsl") #$libpthread = ldap_with_config("libpthread", "pthread") $libresolv = ldap_with_config("libresolv", "resolv") $libldap = ldap_with_config("libldap", $libldap) $libns = ldap_with_config("libns", "nspr3,plc3,plds3").split(",") when /^5/ - $CFLAGS += " -DUSE_NETSCAPE_SDK" + $defs << "-DUSE_NETSCAPE_SDK" #$libnsl = ldap_with_config("libnsl", "nsl") #$libpthread = ldap_with_config("libpthread", "pthread") $libresolv = ldap_with_config("libresolv", "resolv") @@ -142,14 +131,19 @@ end if( $use_openldap1 ) - $CFLAGS += " -DUSE_OPENLDAP1 -DUSE_OPENLDAP" + $defs << "-DUSE_OPENLDAP1" + $defs << "-DUSE_OPENLDAP" $libresolv = ldap_with_config("libresolv", "resolv") $libldap = ldap_with_config("libldap", "ldap") $liblber = ldap_with_config("liblber", "lber") end if( $use_openldap2 ) - $CFLAGS += " -DUSE_OPENLDAP2 -DUSE_OPENLDAP" + $defs << "-DUSE_OPENLDAP2" + $defs << "-DUSE_OPENLDAP" + # OpenLDAP 2.3 finally deprecates a bunch of non-_ext functions. We need + # this to enable them. + $defs << "-DLDAP_DEPRECATED" $libresolv = ldap_with_config("libresolv", "resolv") $libcrypto = ldap_with_config("libcrypto", "crypto") $libssl = ldap_with_config("libssl", "ssl") @@ -165,27 +159,14 @@ if( !File.exist?("win") ) Dir.mkdir("win") end - `dlltool --dllname wldap32.dll --input-def #{srcdir}/win/wldap32.def --output-lib win/wldap32.lib` - $CFLAGS += " -DUSE_WLDAP32 -I#{srcdir}/win" - $LDFLAGS += " -L./win" + `lib /def:#{srcdir}/win/wldap32.def /out:#{srcdir}/win/wldap32.lib` + $defs << "-DUSE_WLDAP32" + dir_config("wldap32", "#{srcdir}/win", "./win") $libldap = ldap_with_config("libldap", "wldap32") end -if( $ldap_dir ) - $CFLAGS += " -I" + File.join($ldap_dir,"include") - $LDFLAGS += " -L" + File.join($ldap_dir,"lib") -end - -if( $ldap_incdir ) - $CFLAGS += " -I" + $ldap_incdir -end - -if( $ldap_libdir ) - $LDFLAGS += " -L" + $ldap_libdir -end - if( $libpthread ) - $CFLAGS += " -D_REENTRANT" + $defs << "-D_REENTRANT" end if( $use_wldap32 ) @@ -233,9 +214,6 @@ have_func("ldap_unbind_ext_s") have_func("ldap_sasl_interactive_bind_s") -print("CFLAGS = #{$CFLAGS}\n") -print("LDFLAGS = #{$LDFLAGS}\n") - create_makefile("ldap") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/install.rb new/ruby-ldap-0.9.5/install.rb --- old/ruby-ldap-0.9.2/install.rb 2003-01-14 10:14:30.000000000 +0100 +++ new/ruby-ldap-0.9.5/install.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -require 'mkmf' -require 'ftools' - -SO_LIBS = ["ldap.so"] - -$ruby_version = CONFIG['MAJOR'] + "." + CONFIG['MINOR'] -$prefix = CONFIG['prefix'] -$libdir = File.join($prefix,'lib') -$rubylibdir = File.join($libdir, 'ruby', $ruby_version) -$arch = CONFIG['arch'] -$archdir = File.join($rubylibdir, $arch) - -def find(dir, match = /./) - Dir.chdir(dir) - files = [] - Dir.new(".").each{|file| - if( file != "." && file != ".." ) - case File.ftype(file) - when "file" - if( file =~ match ) - files.push(File.join(dir,file)) - end - when "directory" - files += find(file, match).collect{|f| File.join(dir,f)} - end - end - } - Dir.chdir("..") - return files -end - -def install() - rb_files = find(File.join(".","lib"), /.rb$/) - - SO_LIBS.each{|f| - File.makedirs($rubylibdir, "#{$archdir}") - File.install(f, File.join($archdir,f), 0555, true) - } - - rb_files.each{|f| - origfile = f - instfile = File.join($rubylibdir, origfile.sub(%r{./lib/},"")) - instdir = File.dirname(instfile) - File.makedirs(instdir) - File.install(origfile, instfile, 0644, true) - } -end - -install() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/lib/ldap/schema.rb new/ruby-ldap-0.9.5/lib/ldap/schema.rb --- old/ruby-ldap-0.9.2/lib/ldap/schema.rb 2005-03-15 11:37:03.000000000 +0100 +++ new/ruby-ldap-0.9.5/lib/ldap/schema.rb 2006-02-09 00:15:17.000000000 +0100 @@ -1,7 +1,7 @@ # Manipulation of LDAP schema data. # #-- -# $Id: schema.rb,v 1.7 2005/03/15 10:37:03 ianmacd Exp $ +# $Id: schema.rb,v 1.9 2006/02/08 23:15:17 ianmacd Exp $ #++ # The LDAP module encapsulates the various LDAP-related classes in their own @@ -25,7 +25,7 @@ # +key+. See LDAP::Conn#schema for common values of +key+. # def names(key) - self[key].collect{|val| val =~ /NAME\s+'([\w\d]+)'/; $1} + self[key].collect{|val| val =~ /NAME\s+'([\w\d_-]+)'/; $1} end # Return the list of attributes in object class +oc+ that are of category @@ -35,9 +35,9 @@ self['objectClasses'].each{|s| if( s =~ /NAME\s+'#{oc}'/ ) case s - when /#{at}\s+$([\w\d\s\$]+)$/i + when /#{at}\s+$([\w\d_-\s\$]+)$/i return $1.split("$").collect{|attr| attr.strip} - when /#{at}\s+([\w\d]+)/i + when /#{at}\s+([\w\d_-]+)/i return $1.split("$").collect{|attr| attr.strip} end end diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/rbldap.h new/ruby-ldap-0.9.5/rbldap.h --- old/ruby-ldap-0.9.2/rbldap.h 2005-07-07 01:41:52.000000000 +0200 +++ new/ruby-ldap-0.9.5/rbldap.h 2006-04-20 18:47:00.000000000 +0200 @@ -1,6 +1,6 @@ /* * rbldap.h - * $Id: rbldap.h,v 1.11 2005/07/06 23:41:52 ianmacd Exp $ + * $Id: rbldap.h,v 1.15 2006/04/20 16:47:00 ianmacd Exp $ */ #ifndef RB_LDAP_H @@ -29,8 +29,8 @@ #define RB_LDAP_MAJOR_VERSION 0 #define RB_LDAP_MINOR_VERSION 9 -#define RB_LDAP_PATCH_VERSION 2 -#define RB_LDAP_VERSION "0.9.2" +#define RB_LDAP_PATCH_VERSION 5 +#define RB_LDAP_VERSION "0.9.5" #define LDAP_GET_OPT_MAX_BUFFER_SIZE (1024) /* >= sizeof(LDAPAPIInfo) */ @@ -142,7 +142,7 @@ }; #define Check_LDAP_Result(err) { \ - if( err != LDAP_SUCCESS ){ \ + if( err != LDAP_SUCCESS && err != LDAP_SIZELIMIT_EXCEEDED ){ \ rb_raise(rb_eLDAP_ResultError, ldap_err2string(err)); \ } \ } Binary files old/ruby-ldap-0.9.2/ruby-ldap-0.9.2.tar.gz and new/ruby-ldap-0.9.5/ruby-ldap-0.9.2.tar.gz differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/ruby-ldap.spec new/ruby-ldap-0.9.5/ruby-ldap.spec --- old/ruby-ldap-0.9.2/ruby-ldap.spec 2005-07-07 01:55:03.000000000 +0200 +++ new/ruby-ldap-0.9.5/ruby-ldap.spec 2006-04-20 18:50:50.000000000 +0200 @@ -1,11 +1,11 @@ -# $Id: ruby-ldap.spec,v 1.6 2005/07/06 23:55:03 ianmacd Exp $ +# $Id: ruby-ldap.spec,v 1.11 2006/04/20 16:50:50 ianmacd Exp $ %define openldap %( rpm -q --qf '%%{version}' openldap | ruby -e 'puts gets.sub(/\\d+$/,"0")' ) # Build documentation if we have rdoc on the build system. %define rdoc %( type rdoc > /dev/null && echo 1 || echo 0 ) Summary: LDAP API (RFC1823) library module for Ruby. Name: ruby-ldap -Version: 0.9.2 +Version: 0.9.5 Release: 1 License: Redistributable Group: Applications/Ruby @@ -37,14 +37,15 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %if %{rdoc} -rdocpath=`ruby -rrdoc/ri/ri_paths -e 'puts RI::Paths::PATH[1]'` -rdoc -r -o $RPM_BUILD_ROOT$rdocpath -x CVS *.c lib -rm $RPM_BUILD_ROOT$rdocpath/created.rid + rdocpath=`ruby -rrdoc/ri/ri_paths -e 'puts RI::Paths::PATH[1] || + RI::Paths::PATH[0]'` + rdoc -r -o $RPM_BUILD_ROOT$rdocpath -x CVS *.c lib + rm $RPM_BUILD_ROOT$rdocpath/created.rid %endif find $RPM_BUILD_ROOT -type f -print | \ ruby -pe 'sub(%r(^'$RPM_BUILD_ROOT'), "")' > %{name}-%{version}-filelist %if %{rdoc} -echo '%%docdir' $rdocpath >> %{name}-%{version}-filelist + echo '%%docdir' $rdocpath >> %{name}-%{version}-filelist %endif %files -f %{name}-%{version}-filelist @@ -53,12 +54,43 @@ %doc example/ test/ %changelog +* Thu Apr 20 2006 Ian Macdonald <ian(a)caliban.org> 0.9.5-1 +- 0.9.5 +- The software now builds and works out of the box on Windows. + +* Wed Mar 8 2006 Ian Macdonald <ian(a)caliban.org> 0.9.4-1 +- 0.9.4 +- Modify LDAP::Conn#search, LDAP::Conn#search2, LDAP::Conn#search_ext and + LDAP::Conn#search_ext2 to treat LDAP_SIZELIMIT_EXCEEDED as success. After + using any of these four methods, the user should check whether + LDAP::Conn#err == LDAP::LDAP_SIZELIMIT_EXCEEDED. If true, the results set + has been truncated by the server. Previously, LDAP_SIZELIMIT_EXCEEDED would + raise an exception and no results would be returned, which is not the + correct behaviour if the user has deliberately put a limit on the number of + results to be returned, in order to spare the server. +- Duplicate code refactored. +- Missing RDoc documentation added for LDAP::Conn#err. + +* Sat Feb 18 2006 Ian Macdonald <ian(a)caliban.org> 0.9.3-1 +- 0.9.3 +- LDAP::Schema#names and LDAP::Schema#attr will now allow names with hyphens + and/or underscores. +- Silence a warning about @sasl_quiet when run in debug mode. +- Fix uninitialised data structures in LDAP::SSLConn#bind and + LDAP::SSLConn#simple_bind. +- Build properly with OpenLDAP 2.3. +- Build-time options --with-ldap-incdir and --with-ldap-libdir have been + replaced by --with-ldap-include and --with-ldap-lib. This is a consequence of + making extconf.rb more standard. +- Windows build has been improved, so that it should now at least build without + error. Whether it will work is another matter. + * Wed Jul 6 2005 Ian Macdonald <ian(a)caliban.org> 0.9.2-1 - 0.9.2 - Minor build problem fixed for certain architectures. - For Conn#search, Conn#search2, Conn#search_ext and Conn#search_ext2, - allow attrs to be a string, in which case the parameter is treated as a - single-element array. + allow attrs to be a string, in which case it is treated as a single-element + array. * Tue Mar 15 2005 Ian Macdonald <ian(a)caliban.org> 0.9.1-1 - 0.9.1 @@ -78,11 +110,11 @@ already so. This is required for a SASL bind. - LDAP::Conn#sasl_bind did not detect attempts to bind more than once. This is now done. -- SSLConn#open now returns a NotImplementedError exception. Previously, it +- SSLConn#open now throws a NotImplementedError exception. Previously, it would call the same method in the superclass, which would not work. - Unused variables removed to silence gcc warnings. - More unit tests and documentation fixes. -- strip ldap.so. +- ldap.so is now stripped. * Wed Mar 2 2005 Ian Macdonald <ian(a)caliban.org> 0.9.0-1 - 0.9.0 @@ -136,13 +168,13 @@ - Patch incorrect library version. * Sun Dec 14 2003 Ian Macdonald <ian(a)caliban.org> 0.8.2-4 -- further refine saslconn.c patch +- Further refine saslconn.c patch * Thu Dec 11 2003 Ian Macdonald <ian(a)caliban.org> 0.8.2-3 -- further refine saslconn.c patch +- Further refine saslconn.c patch * Thu Dec 11 2003 Ian Macdonald <ian(a)caliban.org> 0.8.2-2 -- patch saslconn.c to allow GSSAPI via SASL +- Patch saslconn.c to allow GSSAPI via SASL * Sun Dec 7 2003 Ian Macdonald <ian(a)caliban.org> 0.8.2-1 - 0.8.2 @@ -160,16 +192,16 @@ - 0.7.1 * Tue Jul 2 2002 Ian Macdonald <ian(a)caliban.org> -- add BuildRequires for openssl-devel and openldap-devel +- Add BuildRequires for openssl-devel and openldap-devel * Sun Jun 2 2002 Ian Macdonald <ian(a)caliban.org> - 0.7.0 * Mon Apr 29 2002 Ian Macdonald <ian(a)caliban.org> -- simplified install section +- Simplified install section * Fri Apr 5 2002 Ian Macdonald <ian(a)caliban.org> -- added test directory to docs +- Added test directory to docs * Tue Apr 2 2002 Ian Macdonald <ian(a)caliban.org> - 0.6.1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/saslconn.c new/ruby-ldap-0.9.5/saslconn.c --- old/ruby-ldap-0.9.2/saslconn.c 2005-07-07 01:53:36.000000000 +0200 +++ new/ruby-ldap-0.9.5/saslconn.c 2006-02-13 18:20:32.000000000 +0100 @@ -1,12 +1,16 @@ /* * saslconn.c - * $Id: saslconn.c,v 1.22 2005/07/06 23:53:36 ianmacd Exp $ + * $Id: saslconn.c,v 1.25 2006/02/13 17:20:32 ianmacd Exp $ */ #include "ruby.h" #include "rbldap.h" -#include <sys/time.h> -#include <unistd.h> +#if defined(HAVE_SYS_TIME_H) +# include <sys/time.h> +#endif +#if defined(HAVE_UNISTD_H) +# include <unistd.h> +#endif extern VALUE rb_ldap_conn_initialize (int argc, VALUE argv[], VALUE self); extern VALUE rb_ldap_conn_rebind (VALUE self); @@ -25,7 +29,12 @@ * conn.sasl_bind(dn=nil, mech=nil, cred=nil, sctrls=nil, cctrls=nil) * { |conn| } => nil * - * Bind an LDAP connection, using the DN, +dn+, the credential, +password+, + * Bind an LDAP connection, using the DN, +dn+, the mechanism, +mech+, and the + * credential, +cred+. + * + * +sctrls+ is an array of server controls, whilst +cctrls+ is an array of + * client controls. + * * and the bind method, +method+. If a block is given, +self+ is yielded to * the block. */ @@ -53,7 +62,7 @@ unsigned sasl_flags = LDAP_SASL_AUTOMATIC; - Data_Get_Struct (self, struct rb_ldap_data, ldapdata); + Data_Get_Struct (self, RB_LDAP_DATA, ldapdata); if (!ldapdata->ldap) { if (rb_iv_get (self, "@args") != Qnil) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/sslconn.c new/ruby-ldap-0.9.5/sslconn.c --- old/ruby-ldap-0.9.2/sslconn.c 2005-03-15 11:45:53.000000000 +0100 +++ new/ruby-ldap-0.9.5/sslconn.c 2006-04-20 00:13:26.000000000 +0200 @@ -1,12 +1,16 @@ /* * sslconn.c - * $Id: sslconn.c,v 1.13 2005/03/14 23:52:58 ianmacd Exp $ + * $Id: sslconn.c,v 1.18 2006/04/19 22:13:26 ianmacd Exp $ */ #include "ruby.h" #include "rbldap.h" -#include <sys/time.h> -#include <unistd.h> +#if defined(HAVE_SYS_TIME_H) +# include <sys/time.h> +#endif +#if defined(HAVE_UNISTD_H) +# include <unistd.h> +#endif #if defined(HAVE_LDAP_START_TLS_S) # define USE_OPENLDAP_SSLCONN @@ -252,21 +256,14 @@ return Qnil; } -/* - * call-seq: - * conn.bind(dn=nil, password=nil, method=LDAP::LDAP_AUTH_SIMPLE) => self - * conn.bind(dn=nil, password=nil, method=LDAP::LDAP_AUTH_SIMPLE) - * { |conn| } => self - * - * Bind an LDAP connection, using the DN, +dn+, the credential, +password+, - * and the bind method, +method+. If a block is given, +self+ is yielded to - * the block. - */ VALUE -rb_ldap_sslconn_bind_s (int argc, VALUE argv[], VALUE self) +rb_ldap_sslconn_bind_f (int argc, VALUE argv[], VALUE self, + VALUE (*rb_ldap_sslconn_bind_func) (int, VALUE[], + VALUE)) { RB_LDAP_DATA *ldapdata; + Data_Get_Struct (self, RB_LDAP_DATA, ldapdata); if (!ldapdata->ldap) { if (rb_iv_get (self, "@args") != Qnil) @@ -284,7 +281,23 @@ ldapdata->err = ldap_connect (ldapdata->ldap, NULL); Check_LDAP_Result (ldapdata->err); - return rb_ldap_conn_bind_s (argc, argv, self); + return rb_ldap_sslconn_bind_func (argc, argv, self); +} + +/* + * call-seq: + * conn.bind(dn=nil, password=nil, method=LDAP::LDAP_AUTH_SIMPLE) => self + * conn.bind(dn=nil, password=nil, method=LDAP::LDAP_AUTH_SIMPLE) + * { |conn| } => self + * + * Bind an LDAP connection, using the DN, +dn+, the credential, +password+, + * and the bind method, +method+. If a block is given, +self+ is yielded to + * the block. + */ +VALUE +rb_ldap_sslconn_bind_s (int argc, VALUE argv[], VALUE self) +{ + return rb_ldap_sslconn_bind_f (argc, argv, self, rb_ldap_conn_bind_s); } /* @@ -298,26 +311,8 @@ VALUE rb_ldap_sslconn_simple_bind_s (int argc, VALUE argv[], VALUE self) { - RB_LDAP_DATA *ldapdata; - - if (!ldapdata->ldap) - { - if (rb_iv_get (self, "@args") != Qnil) - { - rb_ldap_conn_rebind (self); - GET_LDAP_DATA (self, ldapdata); - } - else - { - rb_raise (rb_eLDAP_InvalidDataError, - "The LDAP handler has already unbound."); - } - } - - ldapdata->err = ldap_connect (ldapdata->ldap, NULL); - Check_LDAP_Result (ldapdata->err); - - return rb_ldap_conn_simple_bind_s (argc, argv, self); + return rb_ldap_sslconn_bind_f (argc, argv, self, + rb_ldap_conn_simple_bind_s); } #endif /* USE_WLDAP32_SSLCONN */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/test/tc_search.rb new/ruby-ldap-0.9.5/test/tc_search.rb --- old/ruby-ldap-0.9.2/test/tc_search.rb 2005-03-23 11:01:09.000000000 +0100 +++ new/ruby-ldap-0.9.5/test/tc_search.rb 2006-02-12 20:55:59.000000000 +0100 @@ -1,4 +1,4 @@ -# $Id: tc_search.rb,v 1.3 2005/03/23 10:01:09 ianmacd Exp $ +# $Id: tc_search.rb,v 1.4 2006/02/12 19:55:59 ianmacd Exp $ # # A suite of unit tests for testing Ruby/LDAP search functionality. @@ -92,6 +92,7 @@ true ) @@conn.set_option( LDAP::LDAP_OPT_SERVER_CONTROLS, [ ctrl ] ) + this_page = nil assert_nothing_raised do begin this_page = @@conn.search2( @@naming_context, @@ -115,7 +116,7 @@ assert_equal( ctrl.oid, LDAP::LDAP_CONTROL_PAGEDRESULTS ) fetched_size, cookie = ctrl.decode - page_size = fetched_size if fetched_size > 0 + page_size = fetched_size if fetched_size.to_i > 0 break if cookie.empty? end diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/win/winldap.h new/ruby-ldap-0.9.5/win/winldap.h --- old/ruby-ldap-0.9.2/win/winldap.h 2002-11-18 09:22:31.000000000 +0100 +++ new/ruby-ldap-0.9.5/win/winldap.h 2006-04-20 18:34:21.000000000 +0200 @@ -1,7 +1,9 @@ -/* -*- C -*- - * $Id: winldap.h,v 1.3 2002/11/18 08:22:31 ttate Exp $ +/* + * $Id: winldap.h,v 1.5 2006/04/20 16:34:21 ianmacd Exp $ + * * Copyright (C) 2001 Takaaki Tateishi <ttate(a)kt.jaist.ac.jp> - * References: MSDN Library, OpenLDAP, Cygwin + * Copyright (C) 2006 Ian Macdonald <ian(a)caliban.org> + * */ #ifndef WINLDAP_H @@ -183,9 +185,7 @@ */ -struct ldap { - /* We don't know how the structure is defined. */ -}; +struct ldap; typedef struct ldap LDAP, *PLDAP; typedef struct ldapcontrol { @@ -194,9 +194,7 @@ BOOLEAN ldctl_iscritical; } LDAPControl, *PLDAPControl; -struct ldapmsg { - /* We don't know how the structure is defined. */ -}; +struct ldapmsg; typedef struct ldapmsg LDAPMessage, *PLDAPMessage; @@ -225,18 +223,11 @@ } LDAP_REFERRAL_CALLBACK, *PLDAP_REFERRAL_CALLBACK; */ -struct ldapsearch { - /* We don't know how the structure is defined. */ -}; +struct ldapsearch; typedef struct ldapsearch LDAPSearch, *PLDAPSearch; #if defined(HAVE_SYS_TIME_H) # include <sys/time.h> -#else -struct timeval { - long tv_sec; - long tv_usec; -}; #endif typedef struct timeval LDAP_TIMEVAL; typedef struct timeval *PLDAP_TIMEVAL; @@ -281,7 +272,8 @@ LDAPControl **sctls, LDAPControl **cctls); ULONG ldap_compare_s(LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value); ULONG ldap_compare_ext_s(LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value, - LDAPControl **sctls, LDAPControl **cctls); + struct berval *data, LDAPControl **sctls, + LDAPControl **cctls); ULONG ldap_count_entries(LDAP *ld, LDAPMessage *res); ULONG ldap_count_values(PCHAR *vals); ULONG ldap_delete_s(LDAP *ld, PCHAR dn); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/win/wldap32.def new/ruby-ldap-0.9.5/win/wldap32.def --- old/ruby-ldap-0.9.2/win/wldap32.def 2002-11-06 08:56:34.000000000 +0100 +++ new/ruby-ldap-0.9.5/win/wldap32.def 2006-04-19 21:33:00.000000000 +0200 @@ -1,39 +1,32 @@ -; -; wldap32.def +; wldap32.def ; -; Exports for WLDAP32 DLL +; $Id: wldap32.def,v 1.3 2006/04/19 19:33:00 ianmacd Exp $ ; -; Copyright (C) 1998 Free Software Foundation, Inc. -; Created by J.J. van der Heijden <J.J.vanderHeijden(a)student.utwente.nl> -; -; This file is part of the Windows32 API Library. -; Based on the November 1997 Platform SDK +; Exports for WLDAP32 DLL ; -; This library is free software; you can redistribute it and/or -; modify it under the terms of the GNU Library General Public -; License as published by the Free Software Foundation; either -; version 2 of the License, or (at your option) any later version. -; -; This library is distributed in the hope that it will be useful, -; but WITHOUT ANY WARRANTY; without even the implied warranty of -; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -; Library General Public License for more details. -; -; You should have received a copy of the GNU Library General Public -; License along with this library; see the file COPYING.LIB. -; If not, write to the Free Software Foundation, -; 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +; Created by Chris Scharf <scharfie(a)gmail.com> using instructions from: ; +; http://support.microsoft.com/kb/q131313/ + LIBRARY WLDAP32 EXPORTS -; ?ldap_get_optionW@@YAKPAUldap@@HPAX@Z -; ?ldap_set_optionW@@YAKPAUldap@@HPAX@Z -LdapDllInit@12 LdapGetLastError LdapMapErrorToWin32 LdapUTF8ToUnicode LdapUnicodeToUTF8 +ber_alloc_t +ber_bvdup +ber_bvecfree ber_bvfree +ber_first_element +ber_flatten +ber_free +ber_init +ber_next_element +ber_peek_tag +ber_printf +ber_scanf +ber_skip_tag cldap_open cldap_openA cldap_openW @@ -56,6 +49,8 @@ ldap_bind_s ldap_bind_sA ldap_bind_sW +ldap_check_filterA +ldap_check_filterW ldap_cleanup ldap_close_extended_op ldap_compare @@ -70,6 +65,7 @@ ldap_compare_s ldap_compare_sA ldap_compare_sW +ldap_conn_from_msg ldap_connect ldap_control_free ldap_control_freeA @@ -89,6 +85,8 @@ ldap_create_sort_control ldap_create_sort_controlA ldap_create_sort_controlW +ldap_create_vlv_controlA +ldap_create_vlv_controlW ldap_delete ldap_deleteA ldap_deleteW @@ -102,6 +100,7 @@ ldap_delete_sA ldap_delete_sW ldap_dn2ufn +ldap_dn2ufnA ldap_dn2ufnW ldap_encode_sort_controlA ldap_encode_sort_controlW @@ -117,6 +116,8 @@ ldap_extended_operation ldap_extended_operationA ldap_extended_operationW +ldap_extended_operation_sA +ldap_extended_operation_sW ldap_first_attribute ldap_first_attributeA ldap_first_attributeW @@ -132,6 +133,7 @@ ldap_get_next_page_s ldap_get_option ldap_get_optionA +ldap_get_optionW ldap_get_paged_count ldap_get_values ldap_get_valuesA @@ -178,6 +180,8 @@ ldap_open ldap_openA ldap_openW +ldap_parse_extended_resultA +ldap_parse_extended_resultW ldap_parse_page_control ldap_parse_page_controlA ldap_parse_page_controlW @@ -190,6 +194,8 @@ ldap_parse_sort_control ldap_parse_sort_controlA ldap_parse_sort_controlW +ldap_parse_vlv_controlA +ldap_parse_vlv_controlW ldap_perror ldap_rename_ext ldap_rename_extA @@ -199,6 +205,10 @@ ldap_rename_ext_sW ldap_result ldap_result2error +ldap_sasl_bindA +ldap_sasl_bindW +ldap_sasl_bind_sA +ldap_sasl_bind_sW ldap_search ldap_searchA ldap_searchW @@ -222,6 +232,7 @@ ldap_set_dbg_routine ldap_set_option ldap_set_optionA +ldap_set_optionW ldap_simple_bind ldap_simple_bindA ldap_simple_bindW @@ -231,7 +242,10 @@ ldap_sslinit ldap_sslinitA ldap_sslinitW +ldap_start_tls_sA +ldap_start_tls_sW ldap_startup +ldap_stop_tls_s ldap_ufn2dn ldap_ufn2dnA ldap_ufn2dnW ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit rsaref
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package rsaref checked in at Thu May 25 00:52:54 CEST 2006. -------- --- rsaref/rsaref.changes 2006-03-27 18:33:21.000000000 +0200 +++ rsaref/rsaref.changes 2006-05-24 22:10:07.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 22:09:59 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsaref.spec ++++++ --- /var/tmp/diff_new_pack.iM2Xym/_old 2006-05-25 00:52:44.000000000 +0200 +++ /var/tmp/diff_new_pack.iM2Xym/_new 2006-05-25 00:52:44.000000000 +0200 @@ -15,7 +15,7 @@ Provides: rsaref Autoreqprov: on Version: 2.0 -Release: 515 +Release: 521 Summary: RSA Reference Implementation Source: rsaref-2.0.tar.gz Patch0: rsaref-optflags.patch @@ -53,7 +53,6 @@ pushd local make XCFLAGS="%{optflags}" mv rsaref.a ../librsaref.a - strip librsaref.so mv librsaref.so ../ popd @@ -87,6 +86,8 @@ %{_bindir}/rdemo %changelog -n rsaref +* Wed May 24 2006 - schwab(a)suse.de +- Don't strip binaries. * Mon Mar 27 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Mar 27 2006 - pth(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit routed
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package routed checked in at Thu May 25 00:52:41 CEST 2006. -------- --- routed/routed.changes 2006-01-25 21:41:12.000000000 +0100 +++ routed/routed.changes 2006-05-24 22:08:30.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 22:08:24 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- netkit-routed-0.17-strip.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ routed.spec ++++++ --- /var/tmp/diff_new_pack.zyAmOi/_old 2006-05-25 00:52:37.000000000 +0200 +++ /var/tmp/diff_new_pack.zyAmOi/_new 2006-05-25 00:52:37.000000000 +0200 @@ -1,15 +1,14 @@ # # spec file for package routed (Version 0.17) # -# Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild -# usedforbuild aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv kbd less libacl libattr libgcc libselinux libstdc++ libxcrypt m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch permissions popt ps pwdutils rcs readline sed sendmail strace syslogd sysvinit tar texinfo timezone unzip util-linux vim zlib zlib-devel autoconf automake binutils gcc gdbm gettext libtool perl rpm Name: routed #!BuildIgnore: nkita nkitb nkitserv @@ -19,7 +18,7 @@ PreReq: %insserv_prereq %fillup_prereq Autoreqprov: on Version: 0.17 -Release: 469 +Release: 515 Summary: Routing Daemon which Maintains Routing Tables BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/ @@ -29,6 +28,7 @@ Patch1: netkit-routed-%{version}-noroot.patch Patch2: netkit-routed-%{version}-aliasing.patch Patch3: netkit-routed-%{version}-prototypes.patch +Patch4: netkit-routed-%{version}-strip.patch %description Routed handles incoming RIP traffic and broadcasts outgoing RIP traffic @@ -44,13 +44,13 @@ %patch1 %patch2 %patch3 +%patch4 %build CFLAGS="$RPM_OPT_FLAGS" ./configure make %{?jobs:-j%jobs} %install -rm -rf $RPM_BUILD_ROOT install -d -m 755 $RPM_BUILD_ROOT/etc/init.d install -d -m 755 $RPM_BUILD_ROOT/usr/sbin install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8 @@ -75,6 +75,8 @@ /usr/sbin/* %changelog -n routed +* Wed May 24 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Feb 03 2004 - mjancar(a)suse.cz ++++++ netkit-routed-0.17-strip.patch ++++++ --- routed/Makefile +++ routed/Makefile @@ -10,7 +10,7 @@ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ install: all - install -s -m$(DAEMONMODE) routed $(INSTALLROOT)$(SBINDIR) + install -m$(DAEMONMODE) routed $(INSTALLROOT)$(SBINDIR) install -m$(MANMODE) routed.8 $(INSTALLROOT)$(MANDIR)/man8 clean: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit qemacs
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package qemacs checked in at Thu May 25 00:52:10 CEST 2006. -------- --- qemacs/qemacs.changes 2006-01-25 21:40:58.000000000 +0100 +++ qemacs/qemacs.changes 2006-05-24 20:40:50.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 24 20:33:56 CEST 2006 - schwab(a)suse.de + +- Use RPM_OPT_FLAGS. +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- includes.patch initcall.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemacs.spec ++++++ --- /var/tmp/diff_new_pack.KT8vxX/_old 2006-05-25 00:52:00.000000000 +0200 +++ /var/tmp/diff_new_pack.KT8vxX/_new 2006-05-25 00:52:00.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package qemacs (Version 0.3.1) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -16,12 +16,14 @@ Group: Productivity/Editors/Other Autoreqprov: on Version: 0.3.1 -Release: 202 +Release: 214 URL: http://fabrice.bellard.free.fr/qemacs/ Source0: http://fabrice.bellard.free.fr/qemacs/qemacs-0.3.1.tar.bz2 Patch0: qemacs.patch Patch1: qemacs-lib64.patch Patch2: gcc4.patch +Patch3: includes.patch +Patch4: initcall.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Quick Emacs is a very small but powerful editor @@ -66,19 +68,18 @@ %patch0 -p1 %patch1 -p1 -b .lib64 %patch2 -p1 +%patch3 +%patch4 %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" -export CFLAGS="-g -O0" -export CXXFLAGS="-g -O0" ./configure \ --prefix=/usr \ %{_target_platform} -make +make STRIP=: %install -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; make -e DESTDIR=$RPM_BUILD_ROOT install chmod 644 $RPM_BUILD_ROOT/%{_mandir}/man1/* @@ -94,6 +95,9 @@ %doc %{_mandir}/man1/* %changelog -n qemacs +* Wed May 24 2006 - schwab(a)suse.de +- Use RPM_OPT_FLAGS. +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Nov 08 2005 - dmueller(a)suse.de ++++++ includes.patch ++++++ --- cutils.c +++ cutils.c @@ -20,6 +20,7 @@ #include <stdio.h> #include <stdarg.h> #include <ctype.h> +#include <string.h> #include "cutils.h" --- libfbf.c +++ libfbf.c @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <stdlib.h> +#include <string.h> #include "libfbf.h" ++++++ initcall.patch ++++++ --- qe.c +++ qe.c @@ -6174,14 +6174,14 @@ static inline void init_all_modules(void) { int (*initcall)(void); - void **ptr; + int (**ptr)(void); - ptr = (void **)&__initcall_first; + ptr = &__initcall_first; for(;;) { /* NOTE: if bound checking is on, a '\0' is inserted between each initialized 'void *' */ #if defined(__BOUNDS_CHECKING_ON) - ptr = (void **)((long)ptr + (2 * sizeof(void *))); + ptr += 2; #else ptr++; #endif --- qe.h +++ qe.h @@ -578,8 +578,8 @@ #undef __attribute__ /* same method as the linux kernel... */ -#define __init_call __attribute__ ((unused,__section__ (".initcall.init"))) -#define __exit_call __attribute__ ((unused,__section__ (".exitcall.exit"))) +#define __init_call __attribute__ ((used,__section__ (".initcall.init"))) +#define __exit_call __attribute__ ((used,__section__ (".exitcall.exit"))) #define qe_module_init(fn) \ static int (*__initcall_##fn)(void) __init_call = fn ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit pcmciautils
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package pcmciautils checked in at Thu May 25 00:51:09 CEST 2006. -------- --- pcmciautils/pcmciautils.changes 2006-03-30 15:58:15.000000000 +0200 +++ pcmciautils/pcmciautils.changes 2006-05-24 23:00:56.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 23:00:51 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcmciautils.spec ++++++ --- /var/tmp/diff_new_pack.MVwcae/_old 2006-05-25 00:51:04.000000000 +0200 +++ /var/tmp/diff_new_pack.MVwcae/_new 2006-05-25 00:51:04.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: sysfsutils URL: http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html Version: 012 -Release: 7 +Release: 13 Summary: Utilities for PC-Cards License: GPL Group: Hardware/Other @@ -55,7 +55,7 @@ %setup -n pcmciautils-%{version} -T -D -a 2 %build -make all DEF_CFLAGS="$RPM_OPT_FLAGS" +make all DEF_CFLAGS="$RPM_OPT_FLAGS" STRIPCMD=true # make debugtools %install @@ -103,6 +103,8 @@ # test -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT %changelog -n pcmciautils +* Wed May 24 2006 - schwab(a)suse.de +- Don't strip binaries. * Thu Mar 30 2006 - zoz(a)suse.de - added supplement modalias in specfile (Bug 161340) * Fri Jan 27 2006 - zoz(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0