December 2006 - openSUSE Commits - openSUSE Mailing Lists

commit smlnj
by root＠suse.de 08 Dec '06

08 Dec '06

Hello community, here is the log from the commit of package smlnj checked in at Fri Dec 8 16:28:02 CET 2006. -------- --- arch/i386/smlnj/smlnj.changes 2006-01-25 21:44:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/smlnj/smlnj.changes 2006-11-21 14:33:41.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 21 14:33:26 CET 2006 - schwab(a)suse.de + +- Update to version 110.60. + +------------------------------------------------------------------- Old: ---- minmem smlnj-110.54.tar.bz2 New: ---- smlnj-110.60.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smlnj.spec ++++++ --- /var/tmp/diff_new_pack.0GN0OW/_old 2006-12-08 16:27:21.000000000 +0100 +++ /var/tmp/diff_new_pack.0GN0OW/_new 2006-12-08 16:27:21.000000000 +0100 @@ -1,26 +1,27 @@ # -# spec file for package smlnj (Version 110.54) +# spec file for package smlnj (Version 110.60) # -# 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/ # Name: smlnj Summary: Standard ML of New Jersey -Version: 110.54 +Version: 110.60 Release: 1 Group: Development/Languages/Other -License: BSD, Other License(s), see package +License: BSD License and BSD-like, Other License(s), see package URL: http://www.smlnj.org/ Source: smlnj-%{version}.tar.bz2 Patch: config.diff Patch1: runtime.diff Patch2: MLRISC.diff ExclusiveArch: %ix86 ppc +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description SML/NJ is an interactive compiler for the Standard ML Programming @@ -34,8 +35,8 @@ cd config %patch cd .. -mkdir src -cd src +mkdir base +cd base tar -xzf ../runtime.tgz cd runtime %patch1 @@ -47,11 +48,13 @@ %build %install +mkdir -p $RPM_BUILD_ROOT%{_libdir}/smlnj rm -rf %{_libdir}/smlnj -mkdir %{_libdir}/smlnj +ln -s $RPM_BUILD_ROOT%{_libdir}/smlnj %{_libdir}/smlnj CFLAGS=$RPM_OPT_FLAGS INSTALLDIR=%{_libdir}/smlnj config/install.sh +mkdir -p $RPM_BUILD_ROOT%{_bindir} for f in %{_libdir}/smlnj/bin/*; do - ln -sf $f %{_bindir} + ln -sf $f $RPM_BUILD_ROOT%{_bindir} echo %{_bindir}/${f##*/} done > bin-files @@ -61,6 +64,8 @@ %{_libdir}/smlnj %changelog -n smlnj +* Tue Nov 21 2006 - schwab(a)suse.de +- Update to version 110.60. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Jul 01 2005 - schwab(a)suse.de ++++++ config.diff ++++++ --- /var/tmp/diff_new_pack.0GN0OW/_old 2006-12-08 16:27:21.000000000 +0100 +++ /var/tmp/diff_new_pack.0GN0OW/_new 2006-12-08 16:27:21.000000000 +0100 @@ -1,41 +1,49 @@ --- _arch-n-opsys +++ _arch-n-opsys -@@ -79,8 +79,8 @@ - case `uname -m` in - # As long as we do not natively support the amd64 architecture, - # we should fallback to the x86 compatibility mode. --Stef -- *86 | x86_64) ARCH=x86;; +@@ -93,8 +93,8 @@ + ;; + # As long as we do not natively support the amd64 architecture, + # we should fallback to the x86 compatibility mode. --Stef +- x86_64) ARCH=x86;; - ppc) -+ *86 | x86_64 | ia64) ARCH=x86;; -+ ppc | ppc64) ++ x86_64 | ia64) ARCH=x86;; ++ ppc|ppc64) ARCH=ppc case `uname -r` in *osfmach*) OPSYS=mklinux ;; +--- install.sh ++++ install.sh +@@ -318,7 +318,7 @@ + "$CONFIGDIR"/unpack "$ROOT" runtime + cd "$BASEDIR"/runtime/objs + echo $this: Compiling the run-time system. +- $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS ++ $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS CFLAGS="${CFLAGS:--O2}" + if [ -x run.$ARCH-$OPSYS ]; then + mv run.$ARCH-$OPSYS "$RUNDIR" + if [ -f runx.$ARCH-$OPSYS ]; then --- preloads +++ preloads -@@ -22,16 +22,16 @@ +@@ -22,13 +22,13 @@ ##################### ADDITIONAL LIBRARIES ############################ # The "Pretty-Printing" portion of the SML/NJ library --#autoload $/pp-lib.cm -+autoload $/pp-lib.cm - - # The "Regular Expression Matching" portion of the SML/NJ library - #autoload $/regexp-lib.cm +-#autoload $smlnj/smlnj-lib/pp-lib.cm ++autoload $smlnj/smlnj-lib/pp-lib.cm # The "Configurable Controls" portion of the SML/NJ library --#autoload $/controls-lib.cm -+autoload $/controls-lib.cm +-#autoload $smlnj/smlnj-lib/controls-lib.cm ++autoload $smlnj/smlnj-lib/controls-lib.cm # The "HTML" portion of the SML/NJ library --#autoload $/html-lib.cm -+autoload $/html-lib.cm +-#autoload $smlnj/smlnj-lib/html-lib.cm ++autoload $smlnj/smlnj-lib/html-lib.cm ################## FOR SML/NJ COMPILER HACKERS ######################## --- targets +++ targets -@@ -39,7 +39,7 @@ +@@ -50,7 +50,7 @@ # build ML-Burg # @@ -44,16 +52,16 @@ # pre-compile and install the remaining components of the SML/NJ library # (everything except smlnj-lib.cm, aka Util, itself) -@@ -48,7 +48,7 @@ +@@ -59,7 +59,7 @@ # pre-compile and install CM "portable graph" utility library # -#request pgraph-util +request pgraph-util - # pre-compile and install Concurrent ML, which is a library for message-passing - # concurrency. -@@ -63,7 +63,7 @@ + # pre-compile and install "Trace-Debug-Profile" utility library + # (provides simple back-trace- and coverage facilities) +@@ -79,7 +79,7 @@ # pre-compile and install eXene, which is a library for X-Windows programming. # EXene requires CML. # @@ -62,7 +70,7 @@ # pre-compile (certain) parts of MLRISC that are not already part of the SML/NJ # compiler itself -@@ -98,7 +98,7 @@ +@@ -114,7 +114,7 @@ # This library is for parsing and pretty printing SML code. # It's used by various MLRISC code generator generator. # @@ -71,7 +79,7 @@ # Build and install the 'nowhere' program translator. # This tool translates programs with conditional patterns (where clauses) -@@ -106,7 +106,7 @@ +@@ -122,7 +122,7 @@ # (bad) documentation. # (Requires the mlrisc-tools library!) # ++++++ runtime.diff ++++++ --- /var/tmp/diff_new_pack.0GN0OW/_old 2006-12-08 16:27:21.000000000 +0100 +++ /var/tmp/diff_new_pack.0GN0OW/_new 2006-12-08 16:27:21.000000000 +0100 @@ -1,5 +1,55 @@ +--- c-libs/smlnj-runtime/gc-ctl.c ++++ c-libs/smlnj-runtime/gc-ctl.c +@@ -5,6 +5,7 @@ + * General interface for GC control functions. + */ + ++#include <string.h> + #include "ml-base.h" + #include "ml-values.h" + #include "ml-state.h" +--- gc/c-globals-tbl.c ++++ gc/c-globals-tbl.c +@@ -6,6 +6,7 @@ + * in the ML heap (e.g., references to C functions). + */ + ++#include <string.h> + #include "ml-base.h" + #include "tags.h" + #include "ml-values.h" +--- gc/heap-in-util.c ++++ gc/heap-in-util.c +@@ -75,6 +75,7 @@ + if (fseek (bp->file, offset, SEEK_SET) != 0) + Die ("unable to seek on heap image\n"); + bp->nbytes = 0; /* just in case? */ ++ return SUCCESS; + } + + } /* end of HeapIO_Seek */ +--- gc/heap-out-util.c ++++ gc/heap-out-util.c +@@ -5,6 +5,7 @@ + * Utility routines to export (or blast) an ML heap image. + */ + ++#include <string.h> + #include "ml-base.h" + #include "heap.h" + #include "ml-values.h" +--- gc/mem-writer.c ++++ gc/mem-writer.c +@@ -5,6 +5,7 @@ + * An implementation of the abstract writers on top of memory regions. + */ + ++#include <string.h> + #include "ml-base.h" + #include "writer.h" + --- include/asm-base.h -+++ include/asm-base.h 2003/08/07 16:23:48 ++++ include/asm-base.h @@ -90,7 +90,7 @@ #elif (defined(HOST_RS6000) || defined(HOST_PPC)) @@ -20,8 +70,39 @@ # define ALIGN4 .align 2 # define WORD(W) .word W # define TEXT .text +--- include/ml-base.h ++++ include/ml-base.h +@@ -149,8 +149,16 @@ + extern void Say (char *fmt, ...); + extern void SayDebug (char *fmt, ...); + extern void Error (char *, ...); +-extern void Exit (int code); +-extern void Die (char *, ...); ++extern void Exit (int code) ++#ifdef __GNUC__ ++ __attribute__((noreturn)) ++#endif ++; ++extern void Die (char *, ...) ++#ifdef __GNUC__ ++ __attribute__((noreturn)) ++#endif ++; + + /* heap_params is an abstract type, whose representation depends on the + * particular GC being used. +--- kernel/main.c ++++ kernel/main.c +@@ -6,6 +6,7 @@ + */ + + #include <stdio.h> ++#include <string.h> + #include <ctype.h> + #include "ml-base.h" + #include "ml-options.h" --- mach-dep/assyntax.h -+++ mach-dep/assyntax.h 2003/08/07 17:08:03 ++++ mach-dep/assyntax.h @@ -312,8 +312,8 @@ /* Addressing Modes */ ++++++ smlnj-110.54.tar.bz2 -> smlnj-110.60.tar.bz2 ++++++ arch/i386/smlnj/smlnj-110.54.tar.bz2 /mounts/work_src_done/STABLE/smlnj/smlnj-110.60.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libhugetlbfs
by root＠suse.de 08 Dec '06

08 Dec '06

Hello community, here is the log from the commit of package libhugetlbfs checked in at Fri Dec 8 16:27:16 CET 2006. -------- --- libhugetlbfs/libhugetlbfs.changes 2006-10-29 11:26:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/libhugetlbfs/libhugetlbfs.changes 2006-12-08 16:20:46.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Dec 8 16:20:25 CET 2006 - olh(a)suse.de + +- package testsuite, fix make check + +------------------------------------------------------------------- +Tue Dec 5 14:48:13 CET 2006 - olh(a)suse.de + +- add the hugetlbd (214426) + +------------------------------------------------------------------- Old: ---- libhugetlbfs.install.patch libhugetlbfs.ldscript-path.patch New: ---- get_release_number.sh libhugetlbfs.ABI-tag.patch libhugetlbfs.LOGFILE.patch libhugetlbfs.make_check.patch libhugetlbfs.rchugetlbd libhugetlbfs.sysconfig.hugetlbd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libhugetlbfs.spec ++++++ --- /var/tmp/diff_new_pack.JCbrJH/_old 2006-12-08 16:25:44.000000000 +0100 +++ /var/tmp/diff_new_pack.JCbrJH/_new 2006-12-08 16:25:44.000000000 +0100 @@ -16,12 +16,16 @@ Group: Development/Libraries/Other Summary: hugetlbfs helper library Version: 1.0.1 -Release: 1 +Release: 200612081525 URL: http://libhugetlbfs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build +PreReq: %insserv_prereq %fillup_prereq Source0: libhugetlbfs-%{version}.tar.gz -Patch0: libhugetlbfs.install.patch -Patch1: libhugetlbfs.ldscript-path.patch +Source1: libhugetlbfs.sysconfig.hugetlbd +Source2: libhugetlbfs.rchugetlbd +Patch1: libhugetlbfs.LOGFILE.patch +Patch2: libhugetlbfs.ABI-tag.patch +Patch3: libhugetlbfs.make_check.patch %description libhugetlbfs interacts with the Linux hugetlbfs to make large pages @@ -36,44 +40,46 @@ %prep %setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build -make V=1 CFLAGS="$RPM_OPT_FLAGS -fPIC" CC32=gcc CC64= PREFIX=/usr libs +make V=1 CFLAGS="$RPM_OPT_FLAGS -fPIC" CC32=gcc CC64= PREFIX=/usr LIBDIR32=%{_libdir} %install +make V=1 CFLAGS="$RPM_OPT_FLAGS -fPIC" CC32=gcc CC64= PREFIX=/usr LIBDIR32=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install install-tests +mkdir -p $RPM_BUILD_ROOT/etc/init.d mkdir -p $RPM_BUILD_ROOT/usr/include -mkdir -p $RPM_BUILD_ROOT/usr/bin -mkdir -p $RPM_BUILD_ROOT%{_libdir} -%ifarch ppc ppc64 %ix86 x86_64 -mkdir -p $RPM_BUILD_ROOT%{_libdir}/libhugetlbfs -%endif -%ifarch ppc -cp -avL ldscripts/*32ppc* $RPM_BUILD_ROOT%{_libdir}/libhugetlbfs -%endif -%ifarch ppc64 -cp -avL ldscripts/*64ppc* $RPM_BUILD_ROOT%{_libdir}/libhugetlbfs -%endif -%ifarch %ix86 -cp -avL ldscripts/*i386* $RPM_BUILD_ROOT%{_libdir}/libhugetlbfs -%endif -%ifarch x86_64 -cp -avL ldscripts/*x86_64* $RPM_BUILD_ROOT%{_libdir}/libhugetlbfs -%endif -cp -avL */libhugetlbfs.so */libhugetlbfs.a $RPM_BUILD_ROOT%{_libdir} +mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates cp -avL hugetlbfs.h $RPM_BUILD_ROOT/usr/include -cp -avL ld.hugetlbfs $RPM_BUILD_ROOT/usr/bin/ +cp -avL %{S:1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.hugetlbd +chmod 644 $RPM_BUILD_ROOT/var/adm/fillup-templates/* +cp -avL %{S:2} $RPM_BUILD_ROOT/etc/init.d/hugetlbd +ln -sfvbn ../../etc/init.d/hugetlbd $RPM_BUILD_ROOT/usr/sbin/rchugetlbd %clean rm -rf $RPM_BUILD_ROOT +%post +%{fillup_and_insserv -n hugetlbd} +echo "Do not forget to configure /proc/sys/vm/nr_hugepages" + %files %defattr(-, root, root) %doc LGPL-2.1 HOWTO README NEWS +/usr/share/libhugetlbfs /usr/include/* -%attr(755,root,root) /usr/bin/* +%attr(755,root,root) /etc/init.d/hugetlbd +%attr(755,root,root) /usr/sbin/* %{_libdir}/lib* +%attr(644,root,root) /var/adm/fillup-templates/sysconfig.hugetlbd %changelog -n libhugetlbfs +* Fri Dec 08 2006 - olh(a)suse.de +- package testsuite, fix make check +* Tue Dec 05 2006 - olh(a)suse.de +- add the hugetlbd (214426) * Sun Oct 29 2006 - olh(a)suse.de - update to bugfix release 1.0.1 (214426) * Always install linker scripts for all targets ++++++ libhugetlbfs.ABI-tag.patch ++++++ ldscripts: Fix .note.SuSE and .note.ABI-tag sections Since we are explicitly placing things into output segments, we must include placement information for .note.SuSE and .note.ABI-tag sections. Otherwise, they can be incorrectly placed in the .interp segment, which makes an un-runnable binary. tests: Fix zero_filesize_segment testcase This testcase is implemented as a linker script which can be "compiled" like a program. As such, the caveats with .note.ABI-tag and .note.SuSE in our other linker scripts apply here as well. Add explicit placement of these sections so ld's implicit guessing doesn't get it wrong. Signed-off-by: Steve Fox <drfickle(a)us.ibm.com> --- ldscripts/elf32ppclinux.xB | 2 +- ldscripts/elf32ppclinux.xBDT | 2 +- ldscripts/elf64ppc.xB | 2 +- ldscripts/elf64ppc.xBDT | 2 +- ldscripts/elf_x86_64.xB | 2 ++ ldscripts/elf_x86_64.xBDT | 2 ++ tests/zero_filesize_segment.ld | 2 ++ 7 files changed, 10 insertions(+), 4 deletions(-) Index: libhugetlbfs-1.0.1/ldscripts/elf32ppclinux.xB =================================================================== --- libhugetlbfs-1.0.1.orig/ldscripts/elf32ppclinux.xB +++ libhugetlbfs-1.0.1/ldscripts/elf32ppclinux.xB @@ -21,7 +21,7 @@ SECTIONS /* Read-only sections, merged into text segment: */ __executable_start = 0x10000000; . = 0x10000000 + SIZEOF_HEADERS; .interp : { *(.interp) } :text :interp - .note.SuSE : { *(.note.ABI-tag) } :text :note + .note.SuSE : { *(.note.SuSE) } :text :note .note.ABI-tag : { *(.note.ABI-tag) } :text :note .hash : { *(.hash) } :text .dynsym : { *(.dynsym) } :text Index: libhugetlbfs-1.0.1/ldscripts/elf32ppclinux.xBDT =================================================================== --- libhugetlbfs-1.0.1.orig/ldscripts/elf32ppclinux.xBDT +++ libhugetlbfs-1.0.1/ldscripts/elf32ppclinux.xBDT @@ -20,7 +20,7 @@ SECTIONS /* Read-only sections, merged into text segment: */ __executable_start = 0x10000000; . = 0x10000000 + SIZEOF_HEADERS; .interp : { *(.interp) } :htext :interp - .note.SuSE : { *(.note.ABI-tag) } :htext :note + .note.SuSE : { *(.note.SuSE) } :htext :note .note.ABI-tag : { *(.note.ABI-tag) } :htext :note .hash : { *(.hash) } :htext .dynsym : { *(.dynsym) } :htext Index: libhugetlbfs-1.0.1/ldscripts/elf64ppc.xB =================================================================== --- libhugetlbfs-1.0.1.orig/ldscripts/elf64ppc.xB +++ libhugetlbfs-1.0.1/ldscripts/elf64ppc.xB @@ -20,7 +20,7 @@ SECTIONS /* Read-only sections, merged into text segment: */ __executable_start = 0x10000000; . = 0x10000000 + SIZEOF_HEADERS; .interp : { *(.interp) } :text :interp - .note.SuSE : { *(.note.ABI-tag) } :text :note + .note.SuSE : { *(.note.SuSE) } :text :note .note.ABI-tag : { *(.note.ABI-tag) } :text :note .hash : { *(.hash) } :text .dynsym : { *(.dynsym) } Index: libhugetlbfs-1.0.1/ldscripts/elf64ppc.xBDT =================================================================== --- libhugetlbfs-1.0.1.orig/ldscripts/elf64ppc.xBDT +++ libhugetlbfs-1.0.1/ldscripts/elf64ppc.xBDT @@ -19,7 +19,7 @@ SECTIONS /* Read-only sections, merged into text segment: */ __executable_start = 0x10000000; . = 0x10000000 + SIZEOF_HEADERS; .interp : { *(.interp) } :interp :htext - .note.SuSE : { *(.note.ABI-tag) } :htext :note + .note.SuSE : { *(.note.SuSE) } :htext :note .note.ABI-tag : { *(.note.ABI-tag) } :htext :note .hash : { *(.hash) } :htext .dynsym : { *(.dynsym) } :htext Index: libhugetlbfs-1.0.1/ldscripts/elf_x86_64.xB =================================================================== --- libhugetlbfs-1.0.1.orig/ldscripts/elf_x86_64.xB +++ libhugetlbfs-1.0.1/ldscripts/elf_x86_64.xB @@ -23,6 +23,8 @@ SECTIONS /* Read-only sections, merged into text segment: */ __executable_start = 0x400000; . = 0x400000 + SIZEOF_HEADERS; .interp : { *(.interp) } :text :interp + .note.SuSE : { *(.note.SuSE) } :text :note + .note.ABI-tag : { *(.note.ABI-tag) } :text :note .hash : { *(.hash) } :text .dynsym : { *(.dynsym) } :text .dynstr : { *(.dynstr) } :text Index: libhugetlbfs-1.0.1/ldscripts/elf_x86_64.xBDT =================================================================== --- libhugetlbfs-1.0.1.orig/ldscripts/elf_x86_64.xBDT +++ libhugetlbfs-1.0.1/ldscripts/elf_x86_64.xBDT @@ -25,6 +25,8 @@ SECTIONS __executable_start = 0x1000000; . = 0x1000000 + SIZEOF_HEADERS; .interp : { *(.interp) } :interp :text .hash : { *(.hash) } :text + .note.SuSE : { *(.note.SuSE) } :text :note + .note.ABI-tag : { *(.note.ABI-tag) } :text :note .dynsym : { *(.dynsym) } :text .dynstr : { *(.dynstr) } :text .gnu.version : { *(.gnu.version) } :text Index: libhugetlbfs-1.0.1/tests/zero_filesize_segment.ld =================================================================== --- libhugetlbfs-1.0.1.orig/tests/zero_filesize_segment.ld +++ libhugetlbfs-1.0.1/tests/zero_filesize_segment.ld @@ -12,6 +12,8 @@ PHDRS SECTIONS { .interp : { } :interp :text + .note.ABI-tag : { *(.note.ABI-tag) } :text + .note.SuSE : { *(.note.SuSE) } :text .hash : { } :text .tdata : { } :data .dynamic : { } :dynamic :data ++++++ libhugetlbfs.LOGFILE.patch ++++++ --- HOWTO | 2 +- hugetlbd.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: libhugetlbfs-1.0.1/hugetlbd.h =================================================================== --- libhugetlbfs-1.0.1.orig/hugetlbd.h +++ libhugetlbfs-1.0.1/hugetlbd.h @@ -25,7 +25,7 @@ #endif /* __LIBHUGETLBFS__ */ #define ID_KEY 0x56 -#define LOGFILE "/tmp/hugetlbd.log" +#define LOGFILE "/var/log/hugetlbd.log" #define SOCKFILE "/var/run/libhugetlbfs-sock" /* Index: libhugetlbfs-1.0.1/HOWTO =================================================================== --- libhugetlbfs-1.0.1.orig/HOWTO +++ libhugetlbfs-1.0.1/HOWTO @@ -332,7 +332,7 @@ First, a system-wide daemon must be star (which will be installed into $PREFIX/sbin by make install) should be run as root and will automatically spawn a child process to wait for segment sharing into the background. The process will log any output -requested to /tmp/hugetlbd.log. The complete usage for hugetlbd is: +requested to /ver/log/hugetlbd.log. The complete usage for hugetlbd is: hugetlbd [-v] [-V verbosity] [-p timeout1] [-s timeout2] -v: display this help and exit ++++++ libhugetlbfs.make_check.patch ++++++ --- tests/Makefile | 4 ++++ tests/run_tests.sh | 11 ++--------- 2 files changed, 6 insertions(+), 9 deletions(-) Index: libhugetlbfs-1.0.1/tests/Makefile =================================================================== --- libhugetlbfs-1.0.1.orig/tests/Makefile +++ libhugetlbfs-1.0.1/tests/Makefile @@ -141,6 +141,7 @@ obj32/install: $(INSTALL) -d $(DESTDIR)$(INST_TESTSDIR32)/obj32 $(INSTALL) -m 755 $(TESTS:%=obj32/%) $(DESTDIR)$(INST_TESTSDIR32)/obj32 $(INSTALL) -m 755 run_tests.sh $(DESTDIR)$(INST_TESTSDIR32) + sed -i -e 's@^#CD@cd $(INST_TESTSDIR32) ; pwd@' $(DESTDIR)$(INST_TESTSDIR32)/run_tests.sh obj64/install: @$(VECHO) INSTALL64 $(INST_TESTSDIR64) @@ -149,5 +150,8 @@ obj64/install: $(INSTALL) -m 755 $(TESTS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 $(INSTALL) -m 755 $(TESTS_64:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 $(INSTALL) -m 755 run_tests.sh $(DESTDIR)$(INST_TESTSDIR64) + sed -i -e 's@^#CD@cd $(INST_TESTSDIR64) ; pwd@' $(DESTDIR)$(INST_TESTSDIR64)/run_tests.sh install: $(OBJDIRS:%=%/install) + rm -fv $(DESTDIR)$(INST_TESTSDIR32)/obj32/zero_filesize_segment + rm -fv $(DESTDIR)$(INST_TESTSDIR64)/obj64/zero_filesize_segment Index: libhugetlbfs-1.0.1/tests/run_tests.sh =================================================================== --- libhugetlbfs-1.0.1.orig/tests/run_tests.sh +++ libhugetlbfs-1.0.1/tests/run_tests.sh @@ -1,5 +1,7 @@ #! /bin/sh +#CD + export QUIET_TEST=1 export HUGETLB_VERBOSE=2 unset HUGETLB_ELF @@ -129,16 +131,7 @@ functional_tests () { elflink_test linkhuge # Sharing tests - # stop all running instances for clean testing - killall -INT hugetlbd - # start the daemon in the bg - PATH=../obj32:../obj64:$PATH hugetlbd - # XXX: Wait for daemon to start - sleep 5 elfshare_test linkshare - # stop our instance of the daemon - killall -INT hugetlbd - # Accounting bug tests # reset free hpages because sharing will have held some # alternatively, use ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lilo
by root＠suse.de 08 Dec '06

08 Dec '06

Hello community, here is the log from the commit of package lilo checked in at Fri Dec 8 16:25:36 CET 2006. -------- --- arch/ppc/lilo/lilo.changes 2006-11-28 00:59:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2006-12-08 15:22:21.000000000 +0100 @@ -1,0 +2,21 @@ +Fri Dec 8 15:21:28 CET 2006 - olh(a)suse.de + +- recognize iscsi boots in yaboot (218773 - LTC28334) + +------------------------------------------------------------------- +Fri Dec 8 15:04:07 CET 2006 - olh(a)suse.de + +- recognize iscsi volumes with static ipv4 settings in show_of_path.sh + (218773 - LTC28334) + +------------------------------------------------------------------- +Tue Dec 5 12:50:11 CET 2006 - olh(a)suse.de + +- remove empty /etc/yaboot.conf (170338) + +------------------------------------------------------------------- +Mon Dec 4 19:52:51 CET 2006 - olh(a)suse.de + +- add prom_getproplen_chosen to yaboot + +------------------------------------------------------------------- Old: ---- lilo-10.1.21.tar.bz2 yaboot-10.1.21-r910.tar.bz2 New: ---- lilo-10.1.22.tar.bz2 yaboot-10.1.22-r918.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.nA4BKG/_old 2006-12-08 16:25:23.000000000 +0100 +++ /var/tmp/diff_new_pack.nA4BKG/_new 2006-12-08 16:25:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package lilo (Version 10.1.21) +# spec file for package lilo (Version 10.1.22) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # norootforbuild Name: lilo -%define yaboot_vers 10.1.21-r910 +%define yaboot_vers 10.1.22-r918 Group: System/Boot License: BSD License and BSD-like, Other License(s), see package Summary: The Linux Loader, a Boot Menu @@ -23,8 +23,8 @@ Requires: powerpc-utils Requires: binutils Requires: parted -Version: 10.1.21 -Release: 10 +Version: 10.1.22 +Release: 1 Source0: lilo-%{version}.tar.bz2 Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2 # $Id: lilo.spec 870 2006-11-07 12:31:45Z olh $ @@ -157,6 +157,15 @@ %doc %{_mandir}/*/* %changelog -n lilo +* Fri Dec 08 2006 - olh(a)suse.de +- recognize iscsi boots in yaboot (218773 - LTC28334) +* Fri Dec 08 2006 - olh(a)suse.de +- recognize iscsi volumes with static ipv4 settings in show_of_path.sh + (218773 - LTC28334) +* Tue Dec 05 2006 - olh(a)suse.de +- remove empty /etc/yaboot.conf (170338) +* Mon Dec 04 2006 - olh(a)suse.de +- add prom_getproplen_chosen to yaboot * Tue Nov 28 2006 - olh(a)suse.de - reject Cell SLOF firmware, its not ready for primetime. * Mon Nov 27 2006 - olh(a)suse.de ++++++ lilo-10.1.21.tar.bz2 -> lilo-10.1.22.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.21/lilo-chrp.lib new/lilo-10.1.22/lilo-chrp.lib --- old/lilo-10.1.21/lilo-chrp.lib 2006-11-14 17:11:42.000000000 +0100 +++ new/lilo-10.1.22/lilo-chrp.lib 2006-12-05 12:51:27.000000000 +0100 @@ -1,5 +1,5 @@ #! /bin/bash -# $Id: lilo-chrp.lib 897 2006-11-14 16:11:42Z jplack $ +# $Id: lilo-chrp.lib 916 2006-12-05 11:51:27Z olh $ # vim: syntax=sh # # library for CHRP routines @@ -706,6 +706,9 @@ echo "Converted /etc/lilo.conf to /etc/yaboot.conf" fi + # remove empty yaboot.conf, created by get_of_path check above + if [ ! -s /etc/yaboot.conf ] ; then rm -v /etc/yaboot.conf ; fi + # TODO check whether this is neccessary if [[ ${p_flags[$boot_partnr]} != *boot* ]]; then parted_call $boot_device set $boot_partnr boot on >& $TEMP/parted.log || error 11 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.21/lilo.new new/lilo-10.1.22/lilo.new --- old/lilo-10.1.21/lilo.new 2006-11-28 00:59:03.000000000 +0100 +++ new/lilo-10.1.22/lilo.new 2006-11-28 00:59:03.000000000 +0100 @@ -66,7 +66,7 @@ function Usage() { cat <<EOHELP -lilo for PowerPC 10.1.21 +lilo for PowerPC 10.1.22 configures the Linux Loader on a few different PowerPC board types, based on the configuration file /etc/lilo.conf. This includes IBM RS/6000 and pSeries models, IBM legacy iSeries, @@ -463,7 +463,7 @@ get_arch=1 ;; --version|-v) - echo "lilo for PowerPC 10.1.21" + echo "lilo for PowerPC 10.1.22" exit 0 ;; --help) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.21/show_of_path.sh new/lilo-10.1.22/show_of_path.sh --- old/lilo-10.1.21/show_of_path.sh 2006-11-13 14:30:55.000000000 +0100 +++ new/lilo-10.1.22/show_of_path.sh 2006-12-08 15:06:28.000000000 +0100 @@ -2,7 +2,7 @@ # vim: syntax=off # set -ex # -# $Id: show_of_path.sh 894 2006-11-13 13:30:55Z olh $ +# $Id: show_of_path.sh 917 2006-12-08 14:06:28Z olh $ # find a OF bootpath on Apple PowerMacintosh Newworld machines # Copyright (C) 2000, 2004 Olaf Hering <olh(a)suse.de>, # 2005 Joachim Plack <jplack(a)suse.de> @@ -62,7 +62,7 @@ shopt -s extglob -read d myversion d <<< "$Date: 2006-11-13 13:30:55 +0000 (Mon, 13 Nov 2006) $" +read d myversion d <<< "$Date: 2006-12-08 14:06:28 +0000 (Fri, 08 Dec 2006) $" function error() { @@ -292,6 +292,15 @@ dbg_show of_disk_scsi_host of_disk_scsi_chan of_disk_scsi_id of_disk_scsi_lun cd ../../../.. ;; + */host+([0-9])/session+([0-9])/target+([0-9:])/+([0-9]):+([0-9]):+([0-9]):+([0-9])) + # iscsi 2.6.16.21 sles10 ga + declare spec="${file_full_sysfs_path##*/host+([0-9])\/session+([-0-9:])\/target+([0-9:])/}" + + dbg_show spec + read of_disk_scsi_host of_disk_scsi_chan of_disk_scsi_id of_disk_scsi_lun <<< ${spec//:/ } + dbg_show of_disk_scsi_host of_disk_scsi_chan of_disk_scsi_id of_disk_scsi_lun + cd ../.. + ;; *) # TODO check the rest of the (hardware) world : file_full_sysfs_path $file_full_sysfs_path @@ -300,6 +309,7 @@ # ieee1394_id fi +# iscsi has no devspec pointer into the OF device tree if [ -f devspec ] ; then read file_of_hw_devtype < devspec file_of_hw_devtype=/proc/device-tree${file_of_hw_devtype} @@ -524,6 +534,36 @@ ;; esac else # no 'devspec' found + case "$file_full_sysfs_path" in + */host+([0-9])/session+([0-9])/*) + iscsi_session="${file_full_sysfs_path%/*}" + iscsi_session="${iscsi_session%/*}" + iscsi_session="${iscsi_session##*/}" + iscsi_connection="${iscsi_session#session*}" + # FIXME + iscsi_network_interface="` ip -o link show up | awk ' BEGIN { FS=":" ; foo="" } ; /link\/ether/ { if (foo == "") { foo=$2 } } ; END { print foo } ' `" + set -- $iscsi_network_interface + iscsi_network_interface=$1 + iscsi_network_card="` cat /sys/class/net/$iscsi_network_interface/device/devspec `" + iscsi_itname="` awk ' BEGIN { FS="=" ; foo="" } ; /^InitiatorName=/{ if (foo == "") { foo=$2 } } ; END { print foo } ' /etc/initiatorname.iscsi `" + iscsi_ciaddr="` ip addr show dev $iscsi_network_interface | awk ' BEGIN { foo="" } ; / inet /{ if (foo == "") { foo=$2 } } ; END { print foo } ' `" + iscsi_giaddr="` ip route show dev $iscsi_network_interface | awk ' BEGIN { foo="" } ; /default via /{ if (foo == "") { foo=$3 } } ; END { print foo } ' `" + # FIXME + case "$iscsi_ciaddr" in + */8) iscsi_subnet_mask=255.0.0.0 ;; + */16) iscsi_subnet_mask=255.255.0.0 ;; + */24) iscsi_subnet_mask=255.255.255.0 ;; + *) iscsi_subnet_mask=0.0.0.0 ;; + esac + iscsi_ciaddr="${iscsi_ciaddr%/*}" + iscsi_siaddr="` cat connection$iscsi_connection:0/iscsi_connection:connection$iscsi_connection:0/persistent_address `" + iscsi_iname="` cat iscsi_session:$iscsi_session/targetname `" + iscsi_iport="` cat connection$iscsi_connection:0/iscsi_connection:connection$iscsi_connection:0/persistent_port `" + #FIXME + iscsi_ilun=0 + file_of_hw_path="$iscsi_network_card:iscsi,itname=$iscsi_itname,ciaddr=$iscsi_ciaddr,giaddr=$iscsi_giaddr,subnet-mask=$iscsi_subnet_mask,siaddr=$iscsi_siaddr,iname=$iscsi_iname,iport=$iscsi_iport,ilun=$iscsi_ilun" + ;; + *) echo >&2 "WARNING: No devspec file found for $file_full_sysfs_path" dbg_show file_full_sysfs_path @@ -624,7 +664,9 @@ file_of_hw_path=$(printf "%s/${dir}@%016x,%016x" "${of_device_path##/proc/device-tree}" $of_disk_scsi_id $of_disk_scsi_lun) ;; esac + ;; # no "devspec" available + esac fi # ++++++ yaboot-10.1.21-r910.tar.bz2 -> yaboot-10.1.22-r918.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.21-r910/Changelog.SuSE new/yaboot-10.1.22-r918/Changelog.SuSE --- old/yaboot-10.1.21-r910/Changelog.SuSE 2006-11-28 01:00:33.000000000 +0100 +++ new/yaboot-10.1.22-r918/Changelog.SuSE 2006-12-08 15:23:38.000000000 +0100 @@ -1,4 +1,35 @@ ------------------------------------------------------------------------ +r918 | olh | 2006-12-08 14:22:21 +0000 (Fri, 08 Dec 2006) | 2 lines +Changed paths: + M /trunk/lilo.changes + M /trunk/yaboot/second/parse_device_path.c + ++- recognize iscsi boots in yaboot (218773 - LTC28334) + +------------------------------------------------------------------------ +r915 | olh | 2006-12-04 19:27:10 +0000 (Mon, 04 Dec 2006) | 1 line +Changed paths: + M /trunk/yaboot/second/yaboot.c + +switch to prom_getproplen_chosen for bootpath and bootargs +------------------------------------------------------------------------ +r914 | olh | 2006-12-04 18:53:08 +0000 (Mon, 04 Dec 2006) | 2 lines +Changed paths: + M /trunk/lilo.changes + M /trunk/yaboot/include/prom.h + M /trunk/yaboot/second/prom.c + ++- add prom_getproplen_chosen to yaboot + +------------------------------------------------------------------------ +r913 | olh | 2006-12-04 18:27:42 +0000 (Mon, 04 Dec 2006) | 1 line +Changed paths: + M /trunk/yaboot/include/cmdline.h + M /trunk/yaboot/second/cmdline.c + M /trunk/yaboot/second/yaboot.c + +remove newline handling from print_boot, only one user +------------------------------------------------------------------------ r910 | olh | 2006-11-27 22:57:16 +0000 (Mon, 27 Nov 2006) | 2 lines Changed paths: M /trunk/lilo.changes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.21-r910/Makefile new/yaboot-10.1.22-r918/Makefile --- old/yaboot-10.1.21-r910/Makefile 2006-11-28 01:00:33.000000000 +0100 +++ new/yaboot-10.1.22-r918/Makefile 2006-12-08 15:23:38.000000000 +0100 @@ -6,7 +6,7 @@ include Config -VERSION = 10.1.21-r910 +VERSION = 10.1.22-r918 # Debug mode (spam/verbose) DEBUG = 0 # make install vars diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.21-r910/include/cmdline.h new/yaboot-10.1.22-r918/include/cmdline.h --- old/yaboot-10.1.21-r910/include/cmdline.h 2006-11-13 13:24:01.000000000 +0100 +++ new/yaboot-10.1.22-r918/include/cmdline.h 2006-12-04 19:27:42.000000000 +0100 @@ -26,7 +26,7 @@ #include <types.h> extern char *cmdlineinit(void); -extern char *cmdlineedit(char *buf, void (*func) (const char *p, const int nl)); +extern char *cmdlineedit(char *buf, void (*func) (const char *p)); extern char *passwdinit(void); extern char *passwordedit(char *buf); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.21-r910/include/prom.h new/yaboot-10.1.22-r918/include/prom.h --- old/yaboot-10.1.21-r910/include/prom.h 2006-11-14 14:25:21.000000000 +0100 +++ new/yaboot-10.1.22-r918/include/prom.h 2006-12-04 19:53:08.000000000 +0100 @@ -104,6 +104,7 @@ int prom_interpret(const char *forth); +int prom_getproplen_chosen(const char *name); int prom_get_chosen(const char *name, void *mem, int len); int prom_set_chosen(const char *name, const void *mem, int len); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.21-r910/second/cmdline.c new/yaboot-10.1.22-r918/second/cmdline.c --- old/yaboot-10.1.21-r910/second/cmdline.c 2006-11-14 21:50:57.000000000 +0100 +++ new/yaboot-10.1.22-r918/second/cmdline.c 2006-12-04 19:27:42.000000000 +0100 @@ -54,12 +54,12 @@ return cmdbuff; } -static int tabfunc(char *buf, const int len, void (*func) (const char *p, const int nl)) +static int tabfunc(char *buf, const int len, void (*func) (const char *p)) { int label_len, print_label, c; - int ret_len, pb, nl; + int ret_len, pb; char *p; - ret_len = nl = 0; + ret_len = 0; pb = 1; if (len > 0) { print_label = 0; @@ -81,15 +81,15 @@ if (ret_len && buf[len + ret_len - 1] == ' ') pb = 0; } else - nl = 1; + prom_printf("\n"); } else cfg_print_images(NULL, 0, 0); if (pb) - (*func) (buf, nl); + (*func) (buf); return ret_len + len; } -static char *buffer_edit(char *buf, void (*func) (const char *p, const int nl)) +static char *buffer_edit(char *buf, void (*func) (const char *p)) { int len, c; len = strlen(buf); @@ -137,7 +137,7 @@ return buffer_edit(buf, NULL); } -char *cmdlineedit(char *buf, void (*func) (const char *p, const int nl)) +char *cmdlineedit(char *buf, void (*func) (const char *p)) { return buffer_edit(buf, func); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.21-r910/second/parse_device_path.c new/yaboot-10.1.22-r918/second/parse_device_path.c --- old/yaboot-10.1.21-r910/second/parse_device_path.c 2006-11-27 23:57:16.000000000 +0100 +++ new/yaboot-10.1.22-r918/second/parse_device_path.c 2006-12-08 15:22:21.000000000 +0100 @@ -1,4 +1,4 @@ -/* $Id: parse_device_path.c 910 2006-11-27 22:57:16Z olh $ */ +/* $Id: parse_device_path.c 918 2006-12-08 14:22:21Z olh $ */ #ifndef DEVPATH_TEST #include <errors.h> #include <file.h> @@ -109,12 +109,38 @@ return; } +/** + * reset_bootdevice_to_iscsi + * When the bootpath contains the string "iscsi", the + * firmware needs to be passed the contents of the + * "nas-bootdevice" property. + */ +static int reset_bootdevice_to_iscsi(const char *imagepath, struct path_description *result) +{ + int size = prom_getproplen_chosen("nas-bootdevice"); + + if (size > 0) { + result->device = malloc(size + 2); + if (result->device) { + prom_get_chosen("nas-bootdevice", result->device, size); + DEBUG_F("nas-bootdevice: <%s>\n", result->device); + return 1; + } + } + return 0; +} + int parse_device_path(const char *imagepath, struct path_description *result) { DEBUG_F("imagepath '%s'\n", imagepath); if (!imagepath) return 0; + /* FIXME */ + if (strstr(imagepath, "iscsi")) { + if (!reset_bootdevice_to_iscsi(imagepath, result)) + return 0; + } else { result->device = malloc(strlen(imagepath) + 2); if (!result->device) return 0; @@ -122,6 +148,7 @@ result->u.d.s1 = strchr(result->device, ':'); if (result->u.d.s1) *result->u.d.s1++ = '\0'; + } result->type = prom_get_devtype(result->device); switch (result->type) { case TYPE_BLOCK: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.21-r910/second/prom.c new/yaboot-10.1.22-r918/second/prom.c --- old/yaboot-10.1.21-r910/second/prom.c 2006-11-14 14:25:21.000000000 +0100 +++ new/yaboot-10.1.22-r918/second/prom.c 2006-12-04 19:53:08.000000000 +0100 @@ -194,6 +194,11 @@ walk_dev_tree(root, type, nodes); } +int prom_getproplen_chosen(const char *name) +{ + return prom_getproplen(prom_chosen, name); +} + int prom_get_chosen(const char *name, void *mem, int len) { return prom_getprop(prom_chosen, name, mem, len); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.21-r910/second/yaboot.c new/yaboot-10.1.22-r918/second/yaboot.c --- old/yaboot-10.1.21-r910/second/yaboot.c 2006-11-27 23:49:53.000000000 +0100 +++ new/yaboot-10.1.22-r918/second/yaboot.c 2006-12-04 20:27:10.000000000 +0100 @@ -54,19 +54,19 @@ #include <elf.h> #include <debug.h> -#if 0 -static void hard_coded_bootpath(char *buf) +static char *hard_coded_bootpath(char *bootpath) { - prom_printf("original bootpath: '%s'\n using hardcoded bootpath: ", buf); - sprintf(buf, "/pci@8000000f8000000/ide@4,1/disk@0"); - prom_printf("'%s'\n", buf); -} -#else -#define hard_coded_bootpath(p) do { } while(0) +#if 0 + const char path[] = "/pci@8000000f8000000/ide@4,1/disk@0"; + prom_printf("original bootpath: '%s'\n using hardcoded bootpath: '%s'\n", bootpath, path); + bootpath = malloc(strlen(path) + 1); + if (bootpath) + sprintf(bootpath, path); #endif + return bootpath; +} #define CONFIG_FILE_MAX 0x8000 /* 32k */ -#define BOOTPATH_LEN 1024 #ifdef USE_MD5_PASSWORDS #include <md5.h> @@ -774,16 +774,16 @@ prom_interpret("reset-all"); } -static void print_boot(const char *p, const int nl) +static void print_boot(const char *p) { - prom_printf("%sboot: %s", nl ? "\n" : "", p ? p : ""); + prom_printf("boot: %s", p ? p : ""); } static void print_all_labels(void) { if (useconf) { cfg_print_images(NULL, 0, 0); - print_boot(NULL, 0); + print_boot(NULL); } } enum get_params_result { @@ -808,7 +808,7 @@ memset(params, 0, sizeof(*params)); params->args = ""; - print_boot(NULL, 0); + print_boot(NULL); if (gpr == GET_PARAMS_OK && useconf && (p = cfg_get_strg(NULL, "timeout")) && *p) { timeout = simple_strtol(p, NULL, 0); @@ -1114,19 +1114,27 @@ static void yaboot_main(void) { - char *bootpath, *bootargs; + char *bootpath = NULL, *bootargs = NULL; char *conf_file_buf, *configfile = NULL; + int bootpath_len, bootargs_len; int sz; if (prom_getprop(call_prom("instance-to-package", 1, 1, prom_stdout), "iso6429-1983-colors", NULL, 0) >= 0) { stdout_is_screen = 1; setup_display(); } - bootpath = malloc(BOOTPATH_LEN); + bootpath_len = prom_getproplen_chosen("bootpath"); + bootargs_len = prom_getproplen_chosen("bootargs"); + + if (bootpath_len > 0) + bootpath = malloc(bootpath_len + 1); + if (bootargs_len > 0) + bootargs = malloc(bootargs_len + 1); + if (bootpath) { - memset(bootpath, 0, BOOTPATH_LEN); - prom_get_chosen("bootpath", bootpath, BOOTPATH_LEN - 1); - hard_coded_bootpath(bootpath); + memset(bootpath, 0, bootpath_len + 1); + prom_get_chosen("bootpath", bootpath, bootpath_len); + bootpath = hard_coded_bootpath(bootpath); DEBUG_F("/chosen/bootpath = %s\n", bootpath); if (bootpath[0] == 0) { prom_printf("Couldn't determine boot device\n"); @@ -1140,13 +1148,12 @@ prom_set_chosen("yaboot,bootpath", bootpath, strlen(bootpath) + 1); } - bootargs = malloc(BOOTPATH_LEN); if (bootargs) { - memset(bootargs, 0, BOOTPATH_LEN); - prom_get_chosen("bootargs", bootargs, BOOTPATH_LEN - 1); + memset(bootargs, 0, bootargs_len + 1); + prom_get_chosen("bootargs", bootargs, bootargs_len); DEBUG_F("/chosen/bootargs = '%s'\n", bootargs); if (bootargs[0]) { - prom_set_chosen("yaboot,bootargs", bootargs, strlen(bootargs) + 1); + prom_set_chosen("yaboot,bootargs", bootargs, bootargs_len + 1); configfile = check_manual_config_filepath(bootargs); if (!imagepath_to_path_description(configfile, &default_device, &default_device)) configfile = NULL; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit beagle
by root＠suse.de 08 Dec '06

08 Dec '06

Hello community, here is the log from the commit of package beagle checked in at Fri Dec 8 16:24:37 CET 2006. -------- libbeagle.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ beagle.spec ++++++ --- /var/tmp/diff_new_pack.dHz8o7/_old 2006-12-08 16:24:05.000000000 +0100 +++ /var/tmp/diff_new_pack.dHz8o7/_new 2006-12-08 16:24:05.000000000 +0100 @@ -18,7 +18,7 @@ Group: Productivity/Other Autoreqprov: on Version: 0.2.12 -Release: 25 +Release: 28 Summary: Desktop Search Application URL: http://www.gnome.org/projects/beagle/ Source: %{name}-%{version}.tar.gz ++++++ libbeagle.spec ++++++ --- /var/tmp/diff_new_pack.dHz8o7/_old 2006-12-08 16:24:05.000000000 +0100 +++ /var/tmp/diff_new_pack.dHz8o7/_new 2006-12-08 16:24:05.000000000 +0100 @@ -12,7 +12,7 @@ Name: libbeagle BuildRequires: glib2-devel glibc-devel intltool libxml2-devel mono-data-sqlite mono-devel python-devel -%if %suse_version >1010 +%if %suse_version > 1010 || 0%{?opensuse_bs} BuildRequires: python-gtk-devel %else BuildRequires: python-gtk @@ -23,7 +23,7 @@ Group: Development/Libraries/GNOME Autoreqprov: on Version: 0.2.12 -Release: 20 +Release: 23 Summary: Beagle C interface Url: http://www.gnome.org/projects/beagle/ Source: beagle-%{version}.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sane
by root＠suse.de 08 Dec '06

08 Dec '06

Hello community, here is the log from the commit of package sane checked in at Fri Dec 8 16:23:45 CET 2006. -------- --- sane/sane.changes 2006-10-27 12:59:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/sane/sane.changes 2006-12-08 13:57:50.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Dec 8 13:54:43 CET 2006 - jsmeix(a)suse.de + +- fix-ambiguous-post-pre-increment.patch fixes an ambiguous + post-increment in canon-sane.c for big-endian architectures + (e.g. PowerPC). + +------------------------------------------------------------------- New: ---- fix-ambiguous-post-pre-increment.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sane.spec ++++++ --- /var/tmp/diff_new_pack.p62Fdi/_old 2006-12-08 16:23:30.000000000 +0100 +++ /var/tmp/diff_new_pack.p62Fdi/_new 2006-12-08 16:23:30.000000000 +0100 @@ -12,12 +12,12 @@ Name: sane BuildRequires: libgphoto2-devel libieee1284 libjpeg-devel libpng net-snmp-devel pkgconfig te_ams te_latex -License: GNU General Public License (GPL) - all versions, Other License(s), see package +License: GNU General Public License (GPL), Other License(s), see package Group: Hardware/Scanner Autoreqprov: on Summary: SANE (Scanner Access Now Easy), the Scan Solution Version: 1.0.18 -Release: 23 +Release: 34 URL: http://www.sane-project.org/ # URL for Source0: http://alioth.debian.org/download.php/1669/sane-backends-1.0.18.tar.gz Source0: sane-backends-%{version}.tar.bz2 @@ -66,6 +66,8 @@ Patch4: fujitsu-disable-hw_ink_remain.patch # Patch5 fixes an uninitialized variable in teco2.c: Patch5: fix-uninitialized-variables.patch +# Patch6 fixes an ambiguous post/pre increment in canon-sane.c: +Patch6: fix-ambiguous-post-pre-increment.patch # Patch100... is SUSE specific stuff: # Patch100 lets the "canon" backend do scanner auto-recognition: Patch100: canon-backend-autoprobing.patch @@ -135,7 +137,7 @@ Gerhard Jaeger <gerhard(a)gjaeger.de> Giuseppe Sacco <eppesuig(a)debian.org> Glenn Ramsey <glenn(a)componic.com> - Gordon Matzigkeit <gord(a)gnu.ai.mit.edu> + Gordon Matzigkeit <gord(a)gnu.org> Guido Muesch <odiug(a)faho.rwth-aachen.de> Helmut Koeberle <helmut.koeberle(a)bytec.de> Henning Meier-Geinitz <henning(a)meier-geinitz.de> @@ -206,6 +208,8 @@ %patch4 # Patch5 fixes an uninitialized variable in teco2.c: %patch5 +# Patch6 fixes an ambiguous post/pre increment in canon-sane.c: +%patch6 # Patch100... is SUSE specific stuff: # Patch100 lets the "canon" backend do scanner auto-recognition: %patch100 @@ -324,7 +328,6 @@ %{_bindir}/sane-find-scanner %{_bindir}/gamma4scanimage %{_datadir}/locale/*/LC_MESSAGES/sane-backends.mo -%dir %{_datadir}/sane %{_datadir}/sane/ %{_libdir}/libsane* %{_libdir}/sane/ @@ -341,6 +344,10 @@ %doc %{_mandir}/man8/saned.8.gz %changelog -n sane +* Fri Dec 08 2006 - jsmeix(a)suse.de +- fix-ambiguous-post-pre-increment.patch fixes an ambiguous + post-increment in canon-sane.c for big-endian architectures + (e.g. PowerPC). * Fri Oct 27 2006 - jsmeix(a)suse.de - Updated hpaio.desc from the current HPLIP version 1.6.10 - Updated epkowa.desc from the current Iscan version 2.3.0.1. ++++++ fix-ambiguous-post-pre-increment.patch ++++++ --- backend/canon-sane.c.orig 2006-12-08 12:05:25.000000000 +0100 +++ backend/canon-sane.c 2006-12-08 13:13:33.000000000 +0100 @@ -1797,7 +1797,8 @@ read_fs2710 (SANE_Handle handle, SANE_By for (p = buf; p < buf + nread; p++) { b = *p; - *p++ = *(p + 1); + *p = *(p + 1); + p++; *p = b; } #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit resmgr
by root＠suse.de 08 Dec '06

08 Dec '06

Hello community, here is the log from the commit of package resmgr checked in at Fri Dec 8 16:23:23 CET 2006. -------- --- resmgr/resmgr.changes 2006-11-30 13:17:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/resmgr/resmgr.changes 2006-12-08 14:58:13.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Dec 8 14:55:41 CET 2006 - lnussel(a)suse.de + +- fix build with newer automake by upgrading to current svn +- don't provide 32bit compatability provides in 64bit package + (#224596) +- run ldconfig before restarting the daemon in %postun (#224555) + +------------------------------------------------------------------- Old: ---- resmgr-1.1.0_SVNr123.tar.bz2 resmgr-r128.diff New: ---- resmgr-1.1.0_SVNr128.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ resmgr.spec ++++++ --- /var/tmp/diff_new_pack.kEudqc/_old 2006-12-08 16:23:07.000000000 +0100 +++ /var/tmp/diff_new_pack.kEudqc/_new 2006-12-08 16:23:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package resmgr (Version 1.1.0_SVNr123) +# spec file for package resmgr (Version 1.1.0_SVNr128) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,21 +14,21 @@ BuildRequires: pam-devel License: GNU General Public License (GPL) Group: System/Daemons -Version: 1.1.0_SVNr123 -Release: 9 +Version: 1.1.0_SVNr128 +Release: 1 Summary: A program to track when users log in and out Source: resmgr-%{version}.tar.bz2 Source1: resmgr.init Source2: resmgr-doc.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: libresmgr.so.0.9.8 # if you know a better way for that provides feel free to fix it %ifarch x86_64 ia64 s390x ppc64 Provides: libresmgr.so.0.9.8()(64bit) +%else +Provides: libresmgr.so.0.9.8 %endif URL: http://forge.novell.com/modules/xfmod/project/?resmgr PreReq: %insserv_prereq %fillup_prereq -Patch: resmgr-r128.diff %description resmgr tracks when users log in and out via PAM module. It then @@ -43,7 +43,6 @@ %prep %setup -%patch %build CFLAGS="%{optflags}" \ @@ -91,8 +90,8 @@ %{fillup_and_insserv -y resmgr} %postun -%restart_on_update resmgr %run_ldconfig +%restart_on_update resmgr %{insserv_cleanup} %files @@ -116,6 +115,11 @@ %dir /var/run/resmgr/classes %changelog -n resmgr +* Fri Dec 08 2006 - lnussel(a)suse.de +- fix build with newer automake by upgrading to current svn +- don't provide 32bit compatability provides in 64bit package + (#224596) +- run ldconfig before restarting the daemon in %%postun (#224555) * Thu Nov 30 2006 - lnussel(a)suse.de - also fix quoting in pam module * Wed Nov 29 2006 - lnussel(a)suse.de ++++++ resmgr-1.1.0_SVNr123.tar.bz2 -> resmgr-1.1.0_SVNr128.tar.bz2 ++++++ ++++ 6660 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/resmgr-1.1.0_SVNr123/src/Makefile.am new/resmgr-1.1.0_SVNr128/src/Makefile.am --- old/resmgr-1.1.0_SVNr123/src/Makefile.am 2006-09-12 18:32:56.000000000 +0200 +++ new/resmgr-1.1.0_SVNr128/src/Makefile.am 2006-11-30 13:07:36.000000000 +0100 @@ -14,7 +14,7 @@ endif resmgr_DEPENDENCIES = libresmgr.so -resmgr_SOURCES = resmgr.c +resmgr_SOURCES = resmgr.c utils.c resmgr_LDADD = -L$(top_builddir)/src -lresmgr resmgr_LDFLAGS = -Wl,--as-needed @@ -59,10 +59,10 @@ if BUILD_LIB pam_resmgr_so_DEPENDENCIES = libresmgr.so endif -pam_resmgr_so_SOURCES = pam_resmgr.c +pam_resmgr_so_SOURCES = pam_resmgr.c utils.c pam_resmgr_so_LDFLAGS = -shared -Wl,-soname,pam_resmgr.so -Wl,--as-needed pam_resmgr_so_CFLAGS = -fPIC -DPIC -pam_resmgr_so_LDADD = -L$(top_builddir)/src -lresmgr +pam_resmgr_so_LDADD = -L$(top_builddir)/src -lresmgr -lpam EXTRA_DIST = libresmgr.map diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/resmgr-1.1.0_SVNr123/src/client.c new/resmgr-1.1.0_SVNr128/src/client.c --- old/resmgr-1.1.0_SVNr123/src/client.c 2006-09-12 18:43:27.000000000 +0200 +++ new/resmgr-1.1.0_SVNr128/src/client.c 2006-11-29 11:53:06.000000000 +0100 @@ -202,12 +202,15 @@ int rsm_login(const char *user, const char *tty) { - if (!sane_user(user) || !sane(tty)) { + char buf[PATH_MAX]; + + if (!sane_user(user) || !sane(tty) + || res_quote_dblquote_backslash(buf, user, sizeof(buf)) == -1) { errno = EINVAL; return -1; } - return rsm_command(NULL, "login \"%s\" %s", user, tty); + return rsm_command(NULL, "login \"%s\" %s", buf, tty); } int @@ -224,25 +227,31 @@ int rsm_grant(const char *user, const char *classname) { - if (!sane(user) || !sane(classname)) { + char buf[PATH_MAX]; + + if (!sane(user) || !sane(classname) + || res_quote_dblquote_backslash(buf, user, sizeof(buf)) == -1) { errno = EINVAL; return -1; } - return rsm_command(NULL, "grant %s %s", user, classname); + return rsm_command(NULL, "grant \"%s\" %s", buf, classname); } int rsm_revoke(const char *user, const char *classname) { - if (!sane_user(user) || (classname && !sane(classname))) { + char buf[PATH_MAX]; + + if (!sane_user(user) || (classname && !sane(classname)) + || res_quote_dblquote_backslash(buf, user, sizeof(buf)) == -1) { errno = EINVAL; return -1; } if (classname) - return rsm_command(NULL, "revoke \"%s\" %s", user, classname); - return rsm_command(NULL, "revoke %s", user); + return rsm_command(NULL, "revoke \"%s\" %s", buf, classname); + return rsm_command(NULL, "revoke \"%s\"", buf); } int @@ -317,16 +326,20 @@ char ** rsm_list_classes(const char* user) { + char buf[PATH_MAX]; char **result = NULL; struct conn *conn; + if(user && res_quote_dblquote_backslash(buf, user, sizeof(buf)) == -1) + goto out; + if (!(conn = the_connection) && !(conn = rsm_connect_to(_PATH_RESMGR_SOCKET))) { syslog(LOG_NOTICE, "resmgr: unable to connect to resmgrd: %m"); goto out; } - if(rsm_printf(conn, "classes %s", user?user:"") >= 0) { + if(rsm_printf(conn, "classes \"%s\"", user?user:"") >= 0) { result = rsm_recv_multiline(conn, NULL, NULL); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/resmgr-1.1.0_SVNr123/src/pam_resmgr.c new/resmgr-1.1.0_SVNr128/src/pam_resmgr.c --- old/resmgr-1.1.0_SVNr123/src/pam_resmgr.c 2006-10-23 15:16:59.000000000 +0200 +++ new/resmgr-1.1.0_SVNr128/src/pam_resmgr.c 2006-11-30 13:07:44.000000000 +0100 @@ -14,6 +14,7 @@ #include <security/pam_modules.h> #include "protocol.h" +#include "utils.h" #define warn(fmt, args...) \ syslog(LOG_WARNING, "pam_resmgr: " fmt, ##args) @@ -56,6 +57,7 @@ int pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) { + char userbuf[PATH_MAX]; char namebuf[64]; char *tty, *user; char *rhost, *service; @@ -145,10 +147,11 @@ } } - if(!sane_user(user)) { + if(!sane_user(user) || res_quote_dblquote_backslash(userbuf, user, sizeof(userbuf)) == -1) { warn("user name contains invalid characters"); return PAM_SUCCESS; } + if(!sane(tty)) { warn("tty contains invalid characters"); return PAM_SUCCESS; @@ -165,7 +168,7 @@ } if(rsm_command(NULL, "login \"%s\" %s service=%s%s%s", - user, + userbuf, tty, service, rhost?" rhost=":"", rhost?rhost:"") < 0) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/resmgr-1.1.0_SVNr123/src/resmgr.c new/resmgr-1.1.0_SVNr128/src/resmgr.c --- old/resmgr-1.1.0_SVNr123/src/resmgr.c 2006-08-29 11:39:13.000000000 +0200 +++ new/resmgr-1.1.0_SVNr128/src/resmgr.c 2006-11-29 12:05:29.000000000 +0100 @@ -13,6 +13,7 @@ #include <pwd.h> #include <grp.h> #include "protocol.h" +#include "utils.h" static int opt_terse = 0; @@ -128,8 +129,8 @@ while (optind < argc) { int want; - /* 3 == ' ' plus '\n' plus '\0' */ - want = strlen(argv[optind]) + 3; + /* 5 == ' ' plus '\n' plus '\0' + '"' */ + want = strlen(argv[optind]) + 4; if (slen + want >= sizeof(buffer)) { fprintf(stderr, "Argument string too long\n"); return 1; @@ -137,7 +138,13 @@ if (buffer[0]) strcat(buffer, " "); - strcat(buffer, argv[optind++]); + strcat(buffer, "\""); + // -1 due to next strcat + if(res_quote_dblquote_backslash(buffer+strlen(buffer), argv[optind++], sizeof(buffer)-strlen(buffer) - 1) == -1) { + fprintf(stderr, "Argument string too long\n"); + return 1; + } + strcat(buffer, "\""); slen = strlen(buffer); } strcat(buffer, "\n"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/resmgr-1.1.0_SVNr123/src/utils.c new/resmgr-1.1.0_SVNr128/src/utils.c --- old/resmgr-1.1.0_SVNr123/src/utils.c 2006-09-12 18:19:49.000000000 +0200 +++ new/resmgr-1.1.0_SVNr128/src/utils.c 2006-11-29 11:54:39.000000000 +0100 @@ -496,3 +496,55 @@ return p-dst; } + +int res_quote_dblquote_backslash(char* dst, const char* src, size_t dstlen) +{ + const char* s; + char* p; + size_t len = 0; + int needquote = 0; + + for(s = src; *s; ++s) + { + switch(*s) + { + case '"': + case '\\': + len += 2; + needquote = 1; + break; + default: + ++len; + break; + } + } + + if(len >= dstlen) + return -1; + + if(!needquote) + { + memcpy(dst, src, len+1); + return 0; + } + + for(s = src, p = dst; *s; ++s) + { + switch(*s) + { + case '"': + case '\\': + p[0] = '\\'; + p[1] = *s; + p += 2; + break; + default: + *p++ = *s; + break; + } + } + + *p = 0; + + return p-dst; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/resmgr-1.1.0_SVNr123/src/utils.h new/resmgr-1.1.0_SVNr128/src/utils.h --- old/resmgr-1.1.0_SVNr123/src/utils.h 2006-09-12 18:20:01.000000000 +0200 +++ new/resmgr-1.1.0_SVNr128/src/utils.h 2006-11-29 11:42:40.000000000 +0100 @@ -29,4 +29,7 @@ /** quote non-ascii, / and % characters url style with %<HEX VALUE> */ extern int res_quote(char* dst, const char* src, size_t dstlen); +/** quote \ and " with \ */ +extern int res_quote_dblquote_backslash(char* dst, const char* src, size_t dstlen); + #endif /* UTILS_H */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Bootloader
by root＠suse.de 08 Dec '06

08 Dec '06

Hello community, here is the log from the commit of package perl-Bootloader checked in at Fri Dec 8 16:22:26 CET 2006. -------- --- perl-Bootloader/perl-Bootloader.changes 2006-12-07 13:54:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2006-12-08 14:48:55.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Dec 8 13:04:55 CET 2006 - jplack(a)suse.de + +- fixed comment handling for ZIPL +- basic implementation for generic bootloader widgets for ZIPL + (Fate#300732) +- basic implementation for generic bootloader widgets for ELILO + (Fate#300732) +- version bump 0.4.7 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.4.6.tar.bz2 New: ---- perl-Bootloader-0.4.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.pF7Rpy/_old 2006-12-08 16:22:10.000000000 +0100 +++ /var/tmp/diff_new_pack.pF7Rpy/_new 2006-12-08 16:22:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.4.6) +# spec file for package perl-Bootloader (Version 0.4.7) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # norootforbuild Name: perl-Bootloader -Version: 0.4.6 +Version: 0.4.7 Release: 1 Requires: perl >= %{perl_version} Requires: perl-gettext @@ -64,6 +64,13 @@ /usr/lib/bootloader %changelog -n perl-Bootloader +* Fri Dec 08 2006 - jplack(a)suse.de +- fixed comment handling for ZIPL +- basic implementation for generic bootloader widgets for ZIPL + (Fate#300732) +- basic implementation for generic bootloader widgets for ELILO + (Fate#300732) +- version bump 0.4.7 * Thu Dec 07 2006 - aosthof(a)suse.de - fixed identation (correct usage of tabs) - fixed remove_entry() that it removes xen entries correctly ++++++ perl-Bootloader-0.4.6.tar.bz2 -> perl-Bootloader-0.4.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.6/lib/Bootloader/Core/ELILO.pm new/perl-Bootloader-0.4.7/lib/Bootloader/Core/ELILO.pm --- old/perl-Bootloader-0.4.6/lib/Bootloader/Core/ELILO.pm 2006-04-03 17:36:14.000000000 +0200 +++ new/perl-Bootloader-0.4.7/lib/Bootloader/Core/ELILO.pm 2006-12-08 12:21:05.000000000 +0100 @@ -44,6 +44,116 @@ #module interface + +sub GetMetaData() { + my $loader = shift; + + # possible global entries + # + # default=value Name the default image to boot. If not defined ELILO + # will boot the first defined image. + # timeout=number The number of 10th of seconds to wait while in + # interactive mode before auto booting default kernel. + # Default is infinity. + # delay=number The number of 10th of seconds to wait before + # auto booting when not in interactive mode. + # Default is 0. + # prompt Force interactive mode + # verbose=number Set level of verbosity [0-5]. Default 0 (no verbose) + # root=filename Set global root filesystem for Linux/ia64 + # read-only Force root filesystem to be mounted read-only + # append=string Append a string of options to kernel command line + # initrd=filename Name of initrd file + # image=filename Define a new image + # chooser=name Specify kernel chooser to use: 'simple' or 'textmenu'. + # message=filename a message that is printed on the main screen if supported by + # the chooser. + # fX=filename Some choosers may take advantage of this option to + # display the content of a file when a certain function + # key X is pressed. X can vary from 1-12 to cover + # function keys F1 to F12. + # noedd30 do not force the EDD30 EFI variable to TRUE when FALSE. In other + # words, don't force the EDD30 mode if not set. + # + # + # possible section types: + # image + # + # image section options: + # root=filename Set root filesystem for kernel + # read-only Force root filesystem to be mounted read-only + # append=string Append a string of options to kernel command line + # initrd=filename Name of initrd file + # label=string Logical name of image (used in interactive mode) + # description=string One line text description of the image. + + + my %exports; + + my @bootpart; + my @partinfo = @{$loader->{"partitions"} || []}; + + # boot from any partition (really?) + @bootpart = map { + my ($device, $disk, $nr, $fsid, $fstype, $part_type, $start_cyl, $size_cyl) = @$_; + $device; + } @partinfo; + + my $boot_partitions = join(":", @bootpart); + + my $root_devices = join(":", + map { + my ($device, $disk, $nr, $fsid, $fstype, $part_type, $start_cyl, $size_cyl) = @$_; + # FIXME: weed out non-root partitions + } @ partinfo, + keys %{$loader->{"md_arrays"} || {}} + ); + + # FIXME: is "arch" export necessary? + + $exports{"global_options"} = { + # maps to either deafult or default_menu + default => "string:Default Boot Section/Menu:linux", + #default_menu => "string:Default Boot Menu:", + #timeout => "int:Timeout in Seconds:5:0:60", + #prompt => "bool:Show boot menu", + #target => "path:Target directory for configuration/menu section:/boot/zipl", + }; + + my $go = $exports{"global_options"}; + + $exports{"section_options"} = { + type_image => "bool:Image Section", + type_dump => "bool:Dump Section (obsolete)", + type_menu => "bool:Menu Section", + # section type image; omitting implicit "label" + image_target => "path:Target Directory for Configuration Section:/boot/zipl", + image_image => "path:Kernel Image:/boot/image", + image_ramdisk => "path:Initial RAM Disk:/boot/initrd", + image_parameters => "string:Optional Kernel Parameters", + image_parmfile => "path:Optional Parameter File", + # section type image; omitting implicit "label" + dump_target => "path:Target Directory for Dump Section:/boot/zipl", + dump_dumpto => "path:Dump Device:/dev/dasd", + dump_dumptofs => "path:SCSI Dump Device:/dev/zfcp", + # section type image; omitting implicit "label" + menu_menuname => "string:Menu name:usermenu", + menu_target => "path:Target Directory for Menu Section:/boot/zipl", + menu_list => "string:List of Menu Entries:linux:", + # menu_list => "list:List of Menu Entries:linux:", + menu_default => "int:Number of Default Entry:1:1:10", + menu_timeout => "int:Timeout in seconds:5:0:60", + menu_prompt => "bool:Show boot menu", + # FIXME: dump section has a target, too + }; + + my $so = $exports{"section_options"}; + + $loader->{"exports"}=\%exports; + return \%exports; +} + + =item C<< $obj_ref = Bootloader::Core::ELILO->new (); >> @@ -62,6 +172,8 @@ { "key" => "relocatable", "value" => "" }, ]; bless ($loader); + + $loader->GetMetaData(); $loader->l_milestone ("ELILO::new: Created ELILO instance"); return $loader; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.6/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.4.7/lib/Bootloader/Core/GRUB.pm --- old/perl-Bootloader-0.4.6/lib/Bootloader/Core/GRUB.pm 2006-11-30 15:44:51.000000000 +0100 +++ new/perl-Bootloader-0.4.7/lib/Bootloader/Core/GRUB.pm 2006-12-08 12:31:55.000000000 +0100 @@ -113,7 +113,7 @@ # gfxmenu # * password:: Set a password for the menu interface - # * bootp:: --with-configfile Initialize a network device via BOOTP + # * bootp:: --with-configfile Initialize a network device via BOOTP # * color:: Color the menu interface # * dhcp:: Initialize a network device via DHCP # * ifconfig:: Configure a network device manually @@ -225,7 +225,7 @@ my $go = $exports{"global_options"}; $exports{"section_options"} = { - type_image => "bool:Kernel section", + type_image => "bool:Image section", # image_name => "string:Name of section", # implicit image_image => "path:Kernel image:/boot/vmlinux", image_root => "selectdevice:Root device::" . $root_devices, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.6/lib/Bootloader/Core/ZIPL.pm new/perl-Bootloader-0.4.7/lib/Bootloader/Core/ZIPL.pm --- old/perl-Bootloader-0.4.6/lib/Bootloader/Core/ZIPL.pm 2006-05-29 17:24:57.000000000 +0200 +++ new/perl-Bootloader-0.4.7/lib/Bootloader/Core/ZIPL.pm 2006-12-08 14:58:31.000000000 +0100 @@ -59,7 +59,7 @@ #module interface -sub getExports() { +sub GetMetaData() { my $loader = shift; # possible global entries @@ -69,6 +69,11 @@ # prompt # target # + # possible section types: + # image + # dump + # menu + # # per section entries # # label @@ -105,33 +110,45 @@ # FIXME: is "arch" export necessary? $exports{"global_options"} = { - default => "string:Default boot section:linux", - timeout => "int:Timeout in seconds:0:60:5", - prompt => "bool:Show boot menu", - target => "path:Target directory for configuration/menu section:/boot/zipl", + # maps to either deafult or default_menu + default => "string:Default Boot Section/Menu:linux", + #default_menu => "string:Default Boot Menu:", + #timeout => "int:Timeout in Seconds:5:0:60", + #prompt => "bool:Show boot menu", + #target => "path:Target directory for configuration/menu section:/boot/zipl", }; my $go = $exports{"global_options"}; $exports{"section_options"} = { - type_image => "bool:Kernel section", - type_dump => "bool:Dump section (obsolete)", - type_menu => "bool:Menu section", - # omitting implicit "label" - menu_menuname => "string:Menu name:usermenu", - image_image => "path:Kernel image:/boot/image", - image_ramdisk => "path:Initial RAM disk:/boot/initrd", - dump_dumpto => "path:Dump device:/dev/dasd", - image_target => "path:Target directory for configuration/menu section:/boot/zipl", - # FIXME: dump section has a target, too - image_parameters => "string:Optional kernel parameters", - image_parmfile => "path:Optional parameter file", - dump_dumptofs => "path:SCSI dump device:/dev/zfcp", + type_image => "bool:Image Section", + image_target => "path:Target Directory for Image Section:/boot/zipl", + image_image => "path:Kernel Image:/boot/image", + # converted from ramdisk => initrd + image_initrd => "path:Initial RAM Disk:/boot/initrd", + # converted from parameters => append, root + image_append => "string:Optional Kernel Parameters", + image_root => "selectdevice:Root device::" . $root_devices, + image_parmfile => "path:Optional Parameter File", + + type_dump => "bool:Dump Section (obsolete)", + dump_target => "path:Target Directory for Dump Section:/boot/zipl", + dump_dumpto => "path:Dump Device:/dev/dasd", + dump_dumptofs => "path:SCSI Dump Device:/dev/zfcp", + + type_menu => "bool:Menu Section", + menu_target => "path:Target Directory for Menu Section:/boot/zipl", + menu_list => "string:List of Menu Entries:linux:", + # menu_list => "list:List of Menu Entries:linux:", + menu_default => "int:Number of Default Entry:1:1:10", + menu_timeout => "int:Timeout in seconds:5:0:60", + menu_prompt => "bool:Show boot menu", }; my $so = $exports{"section_options"}; $loader->{"exports"}=\%exports; + return \%exports; } @@ -148,10 +165,10 @@ my $old = shift; my $loader = $self->SUPER::new ($old); - $loader->{"default_global_lines"} = [ - ]; - + $loader->{"default_global_lines"} = [ ]; bless ($loader); + + $loader->GetMetaData(); $loader->l_milestone ("ZIPL::new: Created ZIPL instance"); return $loader; } @@ -167,7 +184,6 @@ # map<string,any> GetSettings () sub GetSettings { my $self = shift; - $self->getExports(); return $self->SUPER::GetSettings(); } @@ -331,10 +347,9 @@ # $line_ref->{"key"}="[".$line_ref->{"value"}."]"; # $line_ref->{"value"}=""; } - elsif ($key eq "image" || $key eq "ramdisk") + elsif ($key eq "ramdisk") { - $key = "kernel" if ($key eq "image"); - $key = "initrd" if ($key eq "ramdisk"); + $key = "initrd"; $line_ref->{"value"} = $sectinfo{$key}; delete ($sectinfo{$key}); } @@ -344,70 +359,71 @@ delete ($sectinfo{"root"}); delete ($sectinfo{"append"}); } - elsif ($key eq "dumpto" || $key eq "target") + elsif ($key eq "image" || $key eq "dumpto" || $key eq "target") { $line_ref->{"value"} = $sectinfo{$key}; delete ($sectinfo{$key}); } elsif ($key eq "menuname") { - $line_ref->{"key"}="menuname"; - $line_ref->{"value"}=""; + # $line_ref->{"key"}="menuname"; + $line_ref->{"value"}=delete $sectinfo{"name"}; } - elsif (!exists $so->{$type . "_" . $key}) + elsif (not exists $so->{$type . "_" . $key}) { # print $type . "_" . $key . " unknown!\n"; - next; # only accept known section options CAVEAT! + $line_ref = undef; # only accept known section options CAVEAT! } else { - next unless defined ($sectinfo{$key}); - - $line_ref->{"value"} = $sectinfo{$key}; - delete ($sectinfo{$key}); + if (defined ($sectinfo{$key})) { + $line_ref->{"value"} = $sectinfo{$key}; + delete ($sectinfo{$key}); + } + else { + $line_ref = undef; + } } - $line_ref; - } @lines; - - @lines = grep { - defined $_; + defined $line_ref ? $line_ref : (); } @lines; my $parameters = ""; while ((my $key, my $value) = each (%sectinfo)) { - if ($key eq "name") - { - my $line_ref = $self->UpdateSectionNameLine ($sectinfo{"name"}, {}, $sectinfo{"original_name"}); - $line_ref->{"key"} = "label"; -# $line_ref->{"key"}="[".$line_ref->{"value"}."]"; -# $line_ref->{"value"}=""; - push @lines, $line_ref; - } - elsif ($key eq "kernel" || $key eq "initrd" || $key eq "dumpto" || $key eq "target") - { - $key = "image" if ($key eq "kernel"); + if ($key eq "name") { + if ($type eq "image" || $type eq "dump") { + my $line_ref = $self->UpdateSectionNameLine($sectinfo{"name"}, {}, + $sectinfo{"original_name"}); + $line_ref->{"key"} = "label"; + # $line_ref->{"key"}="[".$line_ref->{"value"}."]"; + # $line_ref->{"value"}=""; + push @lines, $line_ref; + } + elsif ($type eq "menu") { + push @lines, { + "key" => "menuname", + "value" => $value, + }; + } # else ignore for unknown section type + } + elsif ($key eq "initrd" || $key eq "dumpto" || $key eq "target") { $key = "ramdisk" if ($key eq "initrd"); push @lines, { "key" => $key, "value" => $value, }; } - elsif ($key eq "root") - { + elsif ($key eq "root") { $parameters = "root=" . $value . " " . $parameters; } - elsif ($key eq "append") - { + elsif ($key eq "append") { $parameters = $parameters . $value; } - elsif (! exists ($so->{$type . "_" . $key})) - { + elsif (not exists ($so->{$type . "_" . $key})) { # print $type . "_" . $key . " unknown!\n"; next; # only accept known section options CAVEAT! } - else - { + else { my ($stype) = split /:/, $so->{$type . "_" . $key}; # bool values appear in a config file or not if ($stype eq "bool") { @@ -422,8 +438,8 @@ } } - if($parameters) - { + + if ($parameters) { push @lines, { "key" => "parameters", "value" => "" . $parameters . "" @@ -431,7 +447,7 @@ } my $ret = $self->FixSectionLineOrder (\@lines, - ["label","menuname"]); + [ "label", "menuname" ]); return $ret; } @@ -453,15 +469,14 @@ foreach my $line_ref (@lines) { my $key = $line_ref->{"key"}; - if ($key eq "label") - { + if ($key eq "label") { $ret{"name"} = $line_ref->{"value"}; my $on = $self->Comment2OriginalName ($line_ref->{"comment_before"}); $ret{"original_name"} = $on if ($on ne ""); } elsif ($key eq "image") { - $ret{"kernel"} = $line_ref->{"value"}; + $ret{$key} = $line_ref->{"value"}; $ret{"type"} = "image"; } elsif ($key eq "ramdisk" || $key eq "dumpto" || $key eq "default" || @@ -487,14 +502,19 @@ } elsif ($key eq "menuname") { - $ret{"menuname"} = $line_ref->{"value"}; + $ret{"name"} = $line_ref->{"value"} || "menu"; $ret{"type"} = "menu"; - $ret{"target"} = "/boot/zipl" unless $ret{"target"}; - $ret{"menuname"} = "menu" unless $ret{"menuname"}; - $ret{"prompt"} = "1" unless $ret{"prompt"}; - $ret{"timeout"} = "10" unless $ret{"timeout"}; } } + + + # Fill menu with default values + if ($ret{"type"} eq "menu") { + $ret{"target"} = "/boot/zipl" unless $ret{"target"}; + $ret{"prompt"} = "1" unless $ret{"prompt"}; + $ret{"timeout"} = "10" unless $ret{"timeout"}; + } + $ret{"__lines"} = \@lines; return \%ret; } @@ -718,7 +738,10 @@ # print "mangling section " . $sections->[$i]->{"name"} . ", type " . $sections->[$i]->{"type"} . "\n"; # menu to mangle -> global section - if (defined ($sections->[$i]->{"type"}) && $sections->[$i]->{"type"} eq "menu" && !$automangled_menu) + if (0 && + defined ($sections->[$i]->{"type"}) && + $sections->[$i]->{"type"} eq "menu" && + !$automangled_menu) { push @$global_ref, { "key" => "menuname", @@ -779,20 +802,13 @@ # defaultboot -> global section elsif ($sec->{"name"} eq "defaultboot") { - push @$global_ref, { - "key" => "default", - "value" => $sec->{"default"} - }; - if($sec->{"defaultmenu"}) - { - push @$global_ref, { - "key" => "defaultmenu", - "value" => $sec->{"defaultmenu"} - }; - } - # delete it - splice(@$sections,$i,1); - $i--; + push @$global_ref, { + "key" => "default", + "value" => $sec->{"default"} || $sec->{"defaultmenu"} + }; + # delete it + splice(@$sections,$i,1); + $i--; } } @@ -818,7 +834,7 @@ =cut # (list<map<string,string>>, list<string> comment_before) ProcessSingleMenuFileLine -# (string line, string comment_before, string separator) +# (string line, array ref comment_before, string separator) sub ProcessSingleMenuFileLine($$$) { my $self = shift; my $line = shift; @@ -839,7 +855,7 @@ "comment_before" => $comment_before, "comment_after" => "" ); - return ( [\%val], ""); + return ( [\%val], []); } elsif ($line =~ /^[ \t]*\:(.+)$/) { @@ -849,7 +865,7 @@ "comment_before" => $comment_before, "comment_after" => "" ); - return ( [\%val], ""); + return ( [\%val], []); } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.6/lib/Bootloader/Core.pm new/perl-Bootloader-0.4.7/lib/Bootloader/Core.pm --- old/perl-Bootloader-0.4.6/lib/Bootloader/Core.pm 2006-11-21 18:13:46.000000000 +0100 +++ new/perl-Bootloader-0.4.7/lib/Bootloader/Core.pm 2006-12-08 13:01:45.000000000 +0100 @@ -656,7 +656,7 @@ =cut # (list<map<string,string>>, list<string> comment_before) ProcessSingleMenuFileLine -# (string line, string comment_before, string separator) +# (string line, array ref comment_before, string separator) sub ProcessSingleMenuFileLine($$$) { my $self = shift; my $line = shift; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit totem
by root＠suse.de 08 Dec '06

08 Dec '06

Hello community, here is the log from the commit of package totem checked in at Fri Dec 8 12:49:39 CET 2006. -------- --- GNOME/totem/totem.changes 2006-11-30 19:37:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/totem/totem.changes 2006-12-08 12:13:38.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 8 12:13:07 CET 2006 - sbrabec(a)suse.cz + +- Do not require xulrunner by runtime (#226945). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ totem.spec ++++++ --- /var/tmp/diff_new_pack.oHilGw/_old 2006-12-08 12:49:28.000000000 +0100 +++ /var/tmp/diff_new_pack.oHilGw/_new 2006-12-08 12:49:28.000000000 +0100 @@ -21,7 +21,7 @@ Autoreqprov: on PreReq: filesystem gconf2 Version: 2.17.0 -Release: 30 +Release: 31 Source0: %{name}-%{version}.tar.bz2 Patch1: totem-dbus060.patch Patch2: totem-1.2.1-desktop.sh.patch @@ -30,15 +30,8 @@ Requires: gstreamer010 gstreamer010-plugins-base gstreamer010-plugins-good gnome-icon-theme iso-codes %if %suse_version > 1010 || 0%{?opensuse_bs} BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel -Requires: mozilla-xulrunner%{xulrunner_version} %else -%if %suse_version > 1000 && %suse_version <= 1010 BuildRequires: gecko-sdk -Requires: mozilla-xulrunner -%else -BuildRequires: gecko-sdk -Requires: mozilla -%endif %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -205,6 +198,8 @@ %endif %changelog -n totem +* Fri Dec 08 2006 - sbrabec(a)suse.cz +- Do not require xulrunner by runtime (#226945). * Thu Nov 30 2006 - sbrabec(a)suse.cz - Fixed xulrunner dependencies for older products. * Tue Nov 21 2006 - sbrabec(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozilla-bonobo
by root＠suse.de 08 Dec '06

08 Dec '06

Hello community, here is the log from the commit of package mozilla-bonobo checked in at Fri Dec 8 12:49:14 CET 2006. -------- --- GNOME/mozilla-bonobo/mozilla-bonobo.changes 2006-11-30 19:37:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/mozilla-bonobo/mozilla-bonobo.changes 2006-12-08 12:15:27.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 8 12:15:22 CET 2006 - sbrabec(a)suse.cz + +- Do not require xulrunner by runtime (#226945). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-bonobo.spec ++++++ --- /var/tmp/diff_new_pack.0RyeZE/_old 2006-12-08 12:29:55.000000000 +0100 +++ /var/tmp/diff_new_pack.0RyeZE/_new 2006-12-08 12:29:55.000000000 +0100 @@ -19,22 +19,15 @@ Group: System/GUI/GNOME Autoreqprov: on Version: 0.4.2.1 -Release: 51 +Release: 52 Summary: Mozilla Plug-In for Using Bonobo Components Source: %{name}-%{version}.tar.bz2 Patch: %{name}-xulrunner.patch URL: http://www.nongnu.org/moz-bonobo/ %if %suse_version > 1010 || 0%{?opensuse_bs} BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel -Requires: mozilla-xulrunner%{xulrunner_version} %else -%if %suse_version > 1000 && %suse_version <= 1010 BuildRequires: gecko-sdk -Requires: mozilla-xulrunner -%else -BuildRequires: gecko-sdk -Requires: mozilla -%endif %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: gconf2 @@ -96,6 +89,8 @@ /usr/%_lib/browser-plugins/libmozilla_bonobo.so %changelog -n mozilla-bonobo +* Fri Dec 08 2006 - sbrabec(a)suse.cz +- Do not require xulrunner by runtime (#226945). * Thu Nov 30 2006 - sbrabec(a)suse.cz - Fixed xulrunner dependencies for older products. * Mon Nov 13 2006 - sbrabec(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aaa_base
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package aaa_base checked in at Thu Dec 7 21:49:07 CET 2006. -------- --- aaa_base/aaa_base.changes 2006-12-04 15:35:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2006-12-07 15:25:46.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 7 15:06:39 CET 2006 - olh(a)suse.de + +- add also runlevel 4 to the disabled /sbin/smart_agetty entry (223983) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.FP5VXO/_old 2006-12-07 21:48:53.000000000 +0100 +++ /var/tmp/diff_new_pack.FP5VXO/_new 2006-12-07 21:48:53.000000000 +0100 @@ -19,7 +19,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools Autoreqprov: on Version: 10.2 -Release: 38 +Release: 39 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -145,6 +145,8 @@ %defattr(-,root,root) %changelog -n aaa_base +* Thu Dec 07 2006 - olh(a)suse.de +- add also runlevel 4 to the disabled /sbin/smart_agetty entry (223983) * Mon Dec 04 2006 - werner(a)suse.de - Escape not only braces but all COMP_WORDBREAKS (#225284) * Wed Nov 29 2006 - ro(a)suse.de ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/inittab new/aaa_base/etc/inittab --- old/aaa_base/etc/inittab 2006-01-30 18:06:06.000000000 +0100 +++ new/aaa_base/etc/inittab 2006-12-07 15:24:00.000000000 +0100 @@ -72,7 +72,7 @@ 6:2345:respawn:/sbin/mingetty tty6 # #S0:12345:respawn:/sbin/agetty -L 9600 ttyS0 vt102 -#cons:1235:respawn:/sbin/smart_agetty -L 38400 console +#cons:12345:respawn:/sbin/smart_agetty -L 38400 console # # Note: Do not use tty7 in runlevel 3, this virtual line ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0