August 2007 - openSUSE Commits - openSUSE Mailing Lists

commit file
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package file checked in at Fri Aug 31 18:40:51 CEST 2007. -------- --- file/file.changes 2007-08-29 19:02:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file.changes 2007-08-31 17:33:51.673897000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 31 17:32:04 CEST 2007 - werner(a)suse.de + +- Make regex for awk more robust to avoid conflict with PostScript, + thanks goes to Werner Lemberg for the report + +------------------------------------------------------------------- New: ---- file-4.21-awk.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.n10635/_old 2007-08-31 18:40:38.000000000 +0200 +++ /var/tmp/diff_new_pack.n10635/_new 2007-08-31 18:40:38.000000000 +0200 @@ -17,7 +17,7 @@ Group: Productivity/File utilities Autoreqprov: on Version: 4.21 -Release: 1 +Release: 3 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Patch: file-%{version}.dif @@ -34,6 +34,7 @@ Patch11: file-4.21-reg_dos.dif Patch12: file-4.21-option.dif Patch13: file-4.21-scribus.dif +Patch14: file-4.21-awk.dif Patch20: file-4.16-mips.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -83,6 +84,7 @@ %patch11 -p0 -b .reg %patch12 -p0 -b .opt %patch13 -p0 -b .scri +%patch14 -p0 -b .awk %ifarch mips %patch20 -p0 -b .mips %endif @@ -145,6 +147,9 @@ %attr(644,root,root) %{_mandir}/man3/libmagic.3.gz %changelog +* Fri Aug 31 2007 - werner(a)suse.de +- Make regex for awk more robust to avoid conflict with PostScript, + thanks goes to Werner Lemberg for the report * Wed Aug 29 2007 - werner(a)suse.de - Add Scribus to local magic (bug #298009) * Wed Jun 06 2007 - werner(a)suse.de ++++++ file-4.21-awk.dif ++++++ --- magic/Magdir/commands +++ magic/Magdir/commands 2007-08-31 17:24:19.872921232 +0200 @@ -29,7 +29,7 @@ 0 string/b #!\ /bin/awk awk script text 0 string/b #!\ /usr/bin/awk awk script text # update to distinguish from *.vcf files -0 regex BEGIN[[:space:]]*[{] awk script text +0 regex =^\\s*BEGIN\\s*[{] awk script text # AT&T Bell Labs' Plan 9 shell 0 string/b #!\ /bin/rc Plan 9 rc shell script text ++++++ file-4.21.dif ++++++ --- /var/tmp/diff_new_pack.n10635/_old 2007-08-31 18:40:39.000000000 +0200 +++ /var/tmp/diff_new_pack.n10635/_new 2007-08-31 18:40:39.000000000 +0200 @@ -1,6 +1,6 @@ --- .pkgextract +++ .pkgextract 2006-03-27 13:29:19.000000000 +0200 -@@ -0,0 +1,13 @@ +@@ -0,0 +1,14 @@ +patch -p0 -s --suffix=.misc < ../file-4.18-misc.dif +patch -p0 -s --suffix=.pcp < ../file-4.12-pcp.dif +patch -p0 -s --suffix=.exec < ../file-4.20-exec.dif @@ -14,6 +14,7 @@ +patch -p0 -s --suffix=.reg < ../file-4.21-reg_dos.dif +patch -p0 -s --suffix=.opt < ../file-4.21-option.dif +patch -p0 -s --suffix=.scri < ../file-4.21-scribus.dif ++patch -p0 -s --suffix=.awk < ../file-4.21-awk.dif --- magic/Header +++ magic/Header 2006-03-27 13:29:19.000000000 +0200 @@ -1,5 +1,7 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 fetchmail
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package fetchmail checked in at Fri Aug 31 18:40:28 CEST 2007. -------- --- fetchmail/fetchmail.changes 2007-07-02 21:49:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/fetchmail/fetchmail.changes 2007-08-31 18:14:40.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 31 18:09:04 CEST 2007 - pcerny(a)suse.cz + +- librsaref2 => librsaref2-devel [#302599] +- removed %suseversion > 800 check (insserv) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fetchmail.spec ++++++ --- /var/tmp/diff_new_pack.RO3401/_old 2007-08-31 18:40:21.000000000 +0200 +++ /var/tmp/diff_new_pack.RO3401/_new 2007-08-31 18:40:21.000000000 +0200 @@ -11,20 +11,18 @@ # norootforbuild Name: fetchmail -BuildRequires: dante-devel ed krb5-devel librsaref2 openssl-devel opie postfix procmail pwdutils python-devel +BuildRequires: dante-devel ed krb5-devel librsaref2-devel openssl-devel opie postfix procmail pwdutils python-devel License: GPL v2 or later, Other uncritical OpenSource License, GPL, InnerNet Version 2 license (with the advertising clause removed for GPL compatibility), public-domain Group: Productivity/Networking/Email/Utilities Autoreqprov: on Version: 6.3.8 -Release: 27 +Release: 45 Source: %{name}-%{version}.tar.bz2 Source1: %{name}.init Source2: %{name}.logrotate Source3: sysconfig.%{name} -%if %suse_version > 800 PreReq: %insserv_prereq %fillup_prereq coreutils -%endif -URL: http://fetchmail.berlios.de/ +URL: http://www.fetchmail.info/ Icon: fetchmail.xpm Requires: smtp_daemon Provides: pop:/usr/bin/fetchmail @@ -158,6 +156,9 @@ %{py_sitedir}/fetchmailconf.* %changelog +* Fri Aug 31 2007 - pcerny(a)suse.cz +- librsaref2 => librsaref2-devel [#302599] +- removed %%suseversion > 800 check (insserv) * Mon Jul 02 2007 - lrupp(a)suse.de - rsaref => librsaref2 * Thu Apr 19 2007 - 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 kernel-source
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package kernel-source checked in at Fri Aug 31 16:55:08 CEST 2007. -------- --- kernel-source/kernel-bigsmp.changes 2007-08-31 15:26:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-bigsmp.changes 2007-08-31 16:09:37.021219000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 31 16:05:20 CEST 2007 - jeffm(a)suse.de + +- Applied rest of fix for not dirtying inode after changing i_mode + with no old ACL on reiserfs (306621). + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-dummy.changes: same change kernel-kdump.changes: same change kernel-ppc64.changes: same change kernel-rt.changes: same change kernel-rt_debug.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change kernel-xenpae.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-bigsmp.spec ++++++ --- /var/tmp/diff_new_pack.a16508/_old 2007-08-31 16:53:22.000000000 +0200 +++ /var/tmp/diff_new_pack.a16508/_new 2007-08-31 16:53:22.000000000 +0200 @@ -39,7 +39,7 @@ %endif Summary: Kernel with PAE Support Version: 2.6.22.5 -Release: 6 +Release: 7 License: GPL v2 or later Group: System/Kernel Autoreqprov: on @@ -170,7 +170,7 @@ -Source Timestamp: 2007/08/31 06:42:36 UTC +Source Timestamp: 2007/08/31 14:06:44 UTC %prep if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then @@ -561,6 +561,9 @@ %files -f kernel.files %changelog +* Fri Aug 31 2007 - jeffm(a)suse.de +- Applied rest of fix for not dirtying inode after changing i_mode + with no old ACL on reiserfs (306621). * Fri Aug 31 2007 - jblunck(a)suse.de - rpm/post.sh: don't execute mkinitrd and update-bootloader when mkinitrd isn't installed (like for kernel-syms in the buildservice) kernel-debug.spec: same change kernel-default.spec: same change ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.a16508/_old 2007-08-31 16:53:23.000000000 +0200 +++ /var/tmp/diff_new_pack.a16508/_new 2007-08-31 16:53:23.000000000 +0200 @@ -15,7 +15,7 @@ URL: http://www.kernel.org/ Summary: Internal dummy package for synchronizing release numbers Version: 2.6.22.5 -Release: 6 +Release: 7 License: GPL v2 or later Group: System/Kernel Autoreqprov: off @@ -28,7 +28,7 @@ -------- Andreas Gruenbacher <agruen(a)suse.de> -Source Timestamp: 2007/08/31 06:42:36 UTC +Source Timestamp: 2007/08/31 14:06:44 UTC %install @@ -41,6 +41,9 @@ /etc/dummy %changelog +* Fri Aug 31 2007 - jeffm(a)suse.de +- Applied rest of fix for not dirtying inode after changing i_mode + with no old ACL on reiserfs (306621). * Fri Aug 31 2007 - jblunck(a)suse.de - rpm/post.sh: don't execute mkinitrd and update-bootloader when mkinitrd isn't installed (like for kernel-syms in the buildservice) ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.a16508/_old 2007-08-31 16:53:23.000000000 +0200 +++ /var/tmp/diff_new_pack.a16508/_new 2007-08-31 16:53:23.000000000 +0200 @@ -39,7 +39,7 @@ %endif Summary: kernel for kdump Version: 2.6.22.5 -Release: 6 +Release: 7 License: GPL v2 or later Group: System/Kernel Autoreqprov: on @@ -174,7 +174,7 @@ -Source Timestamp: 2007/08/31 06:42:36 UTC +Source Timestamp: 2007/08/31 14:06:44 UTC %prep if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then @@ -565,6 +565,9 @@ %files -f kernel.files %changelog +* Fri Aug 31 2007 - jeffm(a)suse.de +- Applied rest of fix for not dirtying inode after changing i_mode + with no old ACL on reiserfs (306621). * Fri Aug 31 2007 - jblunck(a)suse.de - rpm/post.sh: don't execute mkinitrd and update-bootloader when mkinitrd isn't installed (like for kernel-syms in the buildservice) ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.a16508/_old 2007-08-31 16:53:23.000000000 +0200 +++ /var/tmp/diff_new_pack.a16508/_new 2007-08-31 16:53:23.000000000 +0200 @@ -38,7 +38,7 @@ %endif Summary: Kernel for ppc64 Systems Version: 2.6.22.5 -Release: 6 +Release: 7 License: GPL v2 or later, LGPL v2 or later Group: System/Kernel Autoreqprov: on @@ -186,7 +186,7 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/08/31 06:42:36 UTC +Source Timestamp: 2007/08/31 14:06:44 UTC %prep if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then @@ -577,6 +577,9 @@ %files -f kernel.files %changelog +* Fri Aug 31 2007 - jeffm(a)suse.de +- Applied rest of fix for not dirtying inode after changing i_mode + with no old ACL on reiserfs (306621). * Fri Aug 31 2007 - jblunck(a)suse.de - rpm/post.sh: don't execute mkinitrd and update-bootloader when mkinitrd isn't installed (like for kernel-syms in the buildservice) ++++++ kernel-rt_debug.spec ++++++ --- /var/tmp/diff_new_pack.a16508/_old 2007-08-31 16:53:23.000000000 +0200 +++ /var/tmp/diff_new_pack.a16508/_new 2007-08-31 16:53:23.000000000 +0200 @@ -39,7 +39,7 @@ %endif Summary: A Debug Version of the Kernel Version: 2.6.22.5 -Release: 6 +Release: 7 License: GPL v2 or later Group: System/Kernel Autoreqprov: on @@ -172,7 +172,7 @@ -Source Timestamp: 2007/08/31 06:42:36 UTC +Source Timestamp: 2007/08/31 14:06:44 UTC %prep if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then @@ -563,6 +563,9 @@ %files -f kernel.files %changelog +* Fri Aug 31 2007 - jeffm(a)suse.de +- Applied rest of fix for not dirtying inode after changing i_mode + with no old ACL on reiserfs (306621). * Fri Aug 31 2007 - jblunck(a)suse.de - rpm/post.sh: don't execute mkinitrd and update-bootloader when mkinitrd isn't installed (like for kernel-syms in the buildservice) ++++++ kernel-rt.spec ++++++ --- /var/tmp/diff_new_pack.a16508/_old 2007-08-31 16:53:24.000000000 +0200 +++ /var/tmp/diff_new_pack.a16508/_new 2007-08-31 16:53:24.000000000 +0200 @@ -39,7 +39,7 @@ %endif Summary: The Realtime Linux Kernel Version: 2.6.22.5 -Release: 6 +Release: 7 License: GPL v2 or later Group: System/Kernel Autoreqprov: on @@ -188,7 +188,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/08/31 06:42:36 UTC +Source Timestamp: 2007/08/31 14:06:44 UTC %prep if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then @@ -579,6 +579,9 @@ %files -f kernel.files %changelog +* Fri Aug 31 2007 - jeffm(a)suse.de +- Applied rest of fix for not dirtying inode after changing i_mode + with no old ACL on reiserfs (306621). * Fri Aug 31 2007 - jblunck(a)suse.de - rpm/post.sh: don't execute mkinitrd and update-bootloader when mkinitrd isn't installed (like for kernel-syms in the buildservice) ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.a16508/_old 2007-08-31 16:53:24.000000000 +0200 +++ /var/tmp/diff_new_pack.a16508/_new 2007-08-31 16:53:24.000000000 +0200 @@ -39,7 +39,7 @@ %endif Summary: The Standard Kernel Version: 2.6.22.5 -Release: 4 +Release: 5 License: GPL v2 or later Group: System/Kernel Autoreqprov: on @@ -168,7 +168,7 @@ -Source Timestamp: 2007/08/31 06:42:36 UTC +Source Timestamp: 2007/08/31 14:06:44 UTC %prep if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then @@ -559,6 +559,9 @@ %files -f kernel.files %changelog +* Fri Aug 31 2007 - jeffm(a)suse.de +- Applied rest of fix for not dirtying inode after changing i_mode + with no old ACL on reiserfs (306621). * Fri Aug 31 2007 - jblunck(a)suse.de - rpm/post.sh: don't execute mkinitrd and update-bootloader when mkinitrd isn't installed (like for kernel-syms in the buildservice) ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.a16508/_old 2007-08-31 16:53:24.000000000 +0200 +++ /var/tmp/diff_new_pack.a16508/_new 2007-08-31 16:53:24.000000000 +0200 @@ -22,7 +22,7 @@ %endif Summary: The Linux Kernel Sources Version: 2.6.22.5 -Release: 6 +Release: 7 License: GPL v2 or later Group: Development/Sources Autoreqprov: off @@ -106,7 +106,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/08/31 06:42:36 UTC +Source Timestamp: 2007/08/31 14:06:44 UTC %prep if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then @@ -281,6 +281,9 @@ %files -f kernel-source.files %changelog +* Fri Aug 31 2007 - jeffm(a)suse.de +- Applied rest of fix for not dirtying inode after changing i_mode + with no old ACL on reiserfs (306621). * Fri Aug 31 2007 - jblunck(a)suse.de - rpm/post.sh: don't execute mkinitrd and update-bootloader when mkinitrd isn't installed (like for kernel-syms in the buildservice) ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.a16508/_old 2007-08-31 16:53:24.000000000 +0200 +++ /var/tmp/diff_new_pack.a16508/_new 2007-08-31 16:53:24.000000000 +0200 @@ -21,7 +21,7 @@ %endif Summary: Kernel Symbol Versions (modversions) Version: 2.6.22.5 -Release: 6 +Release: 7 License: GPL v2 or later Group: Development/Sources Autoreqprov: off @@ -96,7 +96,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/08/31 06:42:36 UTC +Source Timestamp: 2007/08/31 14:06:44 UTC %prep echo "Architecture symbol(s):" %symbols @@ -150,6 +150,9 @@ /lib/modules/*/* %changelog +* Fri Aug 31 2007 - jeffm(a)suse.de +- Applied rest of fix for not dirtying inode after changing i_mode + with no old ACL on reiserfs (306621). * Fri Aug 31 2007 - jblunck(a)suse.de - rpm/post.sh: don't execute mkinitrd and update-bootloader when mkinitrd isn't installed (like for kernel-syms in the buildservice) ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.a16508/_old 2007-08-31 16:53:24.000000000 +0200 +++ /var/tmp/diff_new_pack.a16508/_new 2007-08-31 16:53:24.000000000 +0200 @@ -39,7 +39,7 @@ %endif Summary: The Standard Kernel - without any SUSE patches Version: 2.6.22.5 -Release: 6 +Release: 7 License: GPL v2 or later Group: System/Kernel Autoreqprov: on @@ -188,7 +188,7 @@ -Source Timestamp: 2007/08/31 06:42:36 UTC +Source Timestamp: 2007/08/31 14:06:44 UTC %prep if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then @@ -579,6 +579,9 @@ %files -f kernel.files %changelog +* Fri Aug 31 2007 - jeffm(a)suse.de +- Applied rest of fix for not dirtying inode after changing i_mode + with no old ACL on reiserfs (306621). * Fri Aug 31 2007 - jblunck(a)suse.de - rpm/post.sh: don't execute mkinitrd and update-bootloader when mkinitrd isn't installed (like for kernel-syms in the buildservice) kernel-xenpae.spec: same change kernel-xen.spec: same change ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2007-08-31 15:26:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2007-08-31 16:09:30.942301000 +0200 @@ -1 +1 @@ -2007/08/31 06:42:36 UTC +2007/08/31 14:06:44 UTC ++++++ config.tar.bz2 ++++++ ++++++ kabi.tar.bz2 ++++++ ++++++ needed_space_in_mb ++++++ --- kernel-source/needed_space_in_mb 2007-08-31 15:58:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/needed_space_in_mb 2007-08-31 16:10:01.031180000 +0200 @@ -1 +1 @@ -6000 +6144 ++++++ novell-kmp.tar.bz2 ++++++ ++++++ patches.apparmor.tar.bz2 ++++++ ++++++ patches.arch.tar.bz2 ++++++ ++++++ patches.drivers.tar.bz2 ++++++ ++++++ patches.fixes.tar.bz2 ++++++ ++++++ patches.kernel.org.tar.bz2 ++++++ ++++++ patches.rpmify.tar.bz2 ++++++ ++++++ patches.rt.tar.bz2 ++++++ ++++++ patches.suse.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiserfs-journaled-xattrs.diff new/patches.suse/reiserfs-journaled-xattrs.diff --- old/patches.suse/reiserfs-journaled-xattrs.diff 2007-08-30 17:04:44.000000000 +0200 +++ new/patches.suse/reiserfs-journaled-xattrs.diff 2007-08-31 16:08:23.000000000 +0200 @@ -20,15 +20,15 @@ -- fs/reiserfs/inode.c | 3 - fs/reiserfs/namei.c | 14 +---- - fs/reiserfs/xattr.c | 52 +++++++++++++++++++- + fs/reiserfs/xattr.c | 56 ++++++++++++++++++---- fs/reiserfs/xattr_acl.c | 104 +++++++++++++++++++++++++++++++---------- include/linux/reiserfs_acl.h | 3 - include/linux/reiserfs_fs.h | 4 + - include/linux/reiserfs_xattr.h | 28 +++++++++++ - 7 files changed, 168 insertions(+), 40 deletions(-) + include/linux/reiserfs_xattr.h | 29 +++++++++++ + 7 files changed, 165 insertions(+), 48 deletions(-) ---- a/fs/reiserfs/inode.c 2007-08-30 10:15:24.000000000 -0400 -+++ b/fs/reiserfs/inode.c 2007-08-30 10:15:28.000000000 -0400 +--- a/fs/reiserfs/inode.c 2007-08-31 09:41:03.000000000 -0400 ++++ b/fs/reiserfs/inode.c 2007-08-31 09:47:02.000000000 -0400 @@ -1920,9 +1920,8 @@ int reiserfs_new_inode(struct reiserfs_t goto out_inserted_sd; } @@ -40,8 +40,8 @@ if (retval) { err = retval; reiserfs_check_path(&path_to_key); ---- a/fs/reiserfs/namei.c 2007-08-30 10:14:55.000000000 -0400 -+++ b/fs/reiserfs/namei.c 2007-08-30 10:15:28.000000000 -0400 +--- a/fs/reiserfs/namei.c 2007-08-31 09:34:01.000000000 -0400 ++++ b/fs/reiserfs/namei.c 2007-08-31 09:47:02.000000000 -0400 @@ -606,15 +606,13 @@ static int reiserfs_create(struct inode 2 * (REISERFS_QUOTA_INIT_BLOCKS(dir->i_sb) + REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb)); @@ -104,28 +104,35 @@ retval = journal_begin(&th, parent_dir->i_sb, jbegin_count); if (retval) { drop_new_inode(inode); ---- a/fs/reiserfs/xattr.c 2007-08-30 10:15:24.000000000 -0400 -+++ b/fs/reiserfs/xattr.c 2007-08-30 10:15:30.000000000 -0400 +--- a/fs/reiserfs/xattr.c 2007-08-31 09:41:03.000000000 -0400 ++++ b/fs/reiserfs/xattr.c 2007-08-31 09:47:02.000000000 -0400 @@ -416,8 +416,9 @@ static inline __u32 xattr_hash(const cha * inode->i_mutex: down */ int --reiserfs_xattr_set(struct inode *inode, const char *name, const void *buffer, -- size_t buffer_size, int flags) +-__reiserfs_xattr_set(struct inode *inode, const char *name, const void *buffer, +- size_t buffer_size, int flags) +reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *th, + struct inode *inode, const char *name, + const void *buffer, size_t buffer_size, int flags) { int err = 0; struct file *fp; -@@ -542,6 +543,36 @@ reiserfs_xattr_set(struct inode *inode, +@@ -540,14 +541,34 @@ __reiserfs_xattr_set(struct inode *inode return err; } +-int +-reiserfs_xattr_set(struct inode *inode, const char *name, const void *buffer, +- size_t buffer_size, int flags) +/* We need to start a transaction to maintain lock ordering */ +int reiserfs_xattr_set(struct inode *inode, const char *name, + const void *buffer, size_t buffer_size, int flags) -+{ + { +- int err = __reiserfs_xattr_set(inode, name, buffer, buffer_size, flags); +- if (err == -ENODATA) +- err = 0; +- return err; + + struct reiserfs_transaction_handle th; + int error, error2; @@ -150,12 +157,10 @@ + reiserfs_write_unlock(inode->i_sb); + + return error; -+} -+ + } + /* - * inode->i_mutex: down - */ -@@ -723,11 +754,28 @@ int reiserfs_delete_xattrs(struct inode +@@ -731,11 +752,28 @@ int reiserfs_delete_xattrs(struct inode /* Leftovers besides . and .. -- that's not good. */ if (dir->d_inode->i_nlink <= 2) { @@ -184,8 +189,8 @@ } else { reiserfs_warning(inode->i_sb, "jdm-20004", "Couldn't remove all entries in directory"); ---- a/fs/reiserfs/xattr_acl.c 2007-08-30 10:14:55.000000000 -0400 -+++ b/fs/reiserfs/xattr_acl.c 2007-08-30 10:15:24.000000000 -0400 +--- a/fs/reiserfs/xattr_acl.c 2007-08-31 09:40:48.000000000 -0400 ++++ b/fs/reiserfs/xattr_acl.c 2007-08-31 09:42:02.000000000 -0400 @@ -10,15 +10,17 @@ #include <linux/reiserfs_acl.h> #include <asm/uaccess.h> @@ -244,7 +249,7 @@ return (int)PTR_ERR(value); } -- error = reiserfs_xattr_set(inode, name, value, size, 0); +- error = __reiserfs_xattr_set(inode, name, value, size, 0); + error = reiserfs_xattr_set_handle(th, inode, name, value, size, 0); /* @@ -363,8 +368,8 @@ posix_acl_release(clone); return error; } ---- a/include/linux/reiserfs_acl.h 2007-08-30 10:14:55.000000000 -0400 -+++ b/include/linux/reiserfs_acl.h 2007-08-30 10:15:24.000000000 -0400 +--- a/include/linux/reiserfs_acl.h 2007-08-31 09:34:01.000000000 -0400 ++++ b/include/linux/reiserfs_acl.h 2007-08-31 09:41:34.000000000 -0400 @@ -49,7 +49,8 @@ static inline int reiserfs_acl_count(siz #ifdef CONFIG_REISERFS_FS_POSIX_ACL struct posix_acl *reiserfs_get_acl(struct inode *inode, int type); @@ -375,8 +380,8 @@ struct inode *inode); int reiserfs_cache_default_acl(struct inode *dir); extern struct xattr_handler reiserfs_posix_acl_default_handler; ---- a/include/linux/reiserfs_fs.h 2007-08-30 10:15:24.000000000 -0400 -+++ b/include/linux/reiserfs_fs.h 2007-08-30 10:15:28.000000000 -0400 +--- a/include/linux/reiserfs_fs.h 2007-08-31 09:41:03.000000000 -0400 ++++ b/include/linux/reiserfs_fs.h 2007-08-31 09:47:02.000000000 -0400 @@ -1600,6 +1600,10 @@ struct reiserfs_journal_header { #define JOURNAL_MAX_COMMIT_AGE 30 #define JOURNAL_MAX_TRANS_AGE 30 @@ -388,17 +393,19 @@ #ifdef CONFIG_QUOTA /* We need to update data and inode (atime) */ #define REISERFS_QUOTA_TRANS_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & (1<<REISERFS_QUOTA) ? 2 : 0) ---- a/include/linux/reiserfs_xattr.h 2007-08-30 10:14:55.000000000 -0400 -+++ b/include/linux/reiserfs_xattr.h 2007-08-30 10:15:28.000000000 -0400 -@@ -45,6 +45,7 @@ int reiserfs_permission(struct inode *in +--- a/include/linux/reiserfs_xattr.h 2007-08-31 09:40:32.000000000 -0400 ++++ b/include/linux/reiserfs_xattr.h 2007-08-31 09:47:18.000000000 -0400 +@@ -44,8 +44,8 @@ int reiserfs_xattr_init(struct super_blo + int reiserfs_permission(struct inode *inode, int mask, struct nameidata *nd); int reiserfs_xattr_get(struct inode *, const char *, void *, size_t); +-int __reiserfs_xattr_set(struct inode *, const char *, const void *, size_t, int); int reiserfs_xattr_set(struct inode *, const char *, const void *, size_t, int); +int reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *,struct inode *, const char *, const void *, size_t, int); extern struct xattr_handler reiserfs_xattr_user_handler; extern struct xattr_handler reiserfs_xattr_trusted_handler; -@@ -56,6 +57,33 @@ static inline void reiserfs_mark_inode_p +@@ -57,6 +57,33 @@ static inline void reiserfs_mark_inode_p inode->i_flags |= S_PRIVATE; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiserfs-use-generic-xattr-handlers.diff new/patches.suse/reiserfs-use-generic-xattr-handlers.diff --- old/patches.suse/reiserfs-use-generic-xattr-handlers.diff 2007-08-30 17:04:44.000000000 +0200 +++ new/patches.suse/reiserfs-use-generic-xattr-handlers.diff 2007-08-31 16:08:23.000000000 +0200 @@ -20,18 +20,18 @@ --- fs/reiserfs/super.c | 7 - fs/reiserfs/xattr.c | 413 ++++++++++++++++------------------------- + fs/reiserfs/xattr.c | 423 ++++++++++++++++------------------------- fs/reiserfs/xattr_acl.c | 79 +++---- fs/reiserfs/xattr_security.c | 26 -- fs/reiserfs/xattr_trusted.c | 45 +--- - fs/reiserfs/xattr_user.c | 30 -- + fs/reiserfs/xattr_user.c | 31 --- include/linux/reiserfs_acl.h | 16 - include/linux/reiserfs_fs_sb.h | 3 - include/linux/reiserfs_xattr.h | 29 -- - 9 files changed, 227 insertions(+), 421 deletions(-) + include/linux/reiserfs_xattr.h | 30 -- + 9 files changed, 237 insertions(+), 423 deletions(-) ---- a/fs/reiserfs/super.c 2007-08-30 10:13:26.000000000 -0400 -+++ b/fs/reiserfs/super.c 2007-08-30 10:13:58.000000000 -0400 +--- a/fs/reiserfs/super.c 2007-08-31 09:34:01.000000000 -0400 ++++ b/fs/reiserfs/super.c 2007-08-31 09:34:01.000000000 -0400 @@ -2150,9 +2150,6 @@ static int __init init_reiserfs_fs(void) return ret; } @@ -60,8 +60,8 @@ reiserfs_proc_unregister_global("version"); reiserfs_proc_info_global_done(); unregister_filesystem(&reiserfs_fs_type); ---- a/fs/reiserfs/xattr.c 2007-08-30 10:13:26.000000000 -0400 -+++ b/fs/reiserfs/xattr.c 2007-08-30 10:15:45.000000000 -0400 +--- a/fs/reiserfs/xattr.c 2007-08-31 09:34:01.000000000 -0400 ++++ b/fs/reiserfs/xattr.c 2007-08-31 09:40:02.000000000 -0400 @@ -53,8 +53,49 @@ #define PRIVROOT_NAME ".reiserfs_priv" #define XAROOT_NAME "xattrs" @@ -145,7 +145,18 @@ } /* -@@ -381,8 +433,26 @@ reiserfs_xattr_set(struct inode *inode, +@@ -364,8 +416,8 @@ static inline __u32 xattr_hash(const cha + * inode->i_mutex: down + */ + int +-reiserfs_xattr_set(struct inode *inode, const char *name, const void *buffer, +- size_t buffer_size, int flags) ++__reiserfs_xattr_set(struct inode *inode, const char *name, const void *buffer, ++ size_t buffer_size, int flags) + { + int err = 0; + struct file *fp; +@@ -381,8 +433,24 @@ reiserfs_xattr_set(struct inode *inode, if (get_inode_sd_version(inode) == STAT_DATA_V1) return -EOPNOTSUPP; @@ -158,8 +169,6 @@ + dentry = xattr_lookup(inode, name, XATTR_REPLACE); + if (IS_ERR(dentry)) { + err = PTR_ERR(dentry); -+ if (err == -ENODATA) -+ err = 0; + return err; + } + @@ -174,7 +183,7 @@ fp = open_xattr_file(inode, name, flags); if (IS_ERR(fp)) { -@@ -449,6 +519,12 @@ reiserfs_xattr_set(struct inode *inode, +@@ -449,6 +517,12 @@ reiserfs_xattr_set(struct inode *inode, break; } @@ -187,19 +196,28 @@ /* We can't mark the inode dirty if it's not hashed. This is the case * when we're inheriting the default ACL. If we dirty it, the inode * gets marked dirty, but won't (ever) make it onto the dirty list until -@@ -458,11 +534,6 @@ reiserfs_xattr_set(struct inode *inode, +@@ -458,11 +532,16 @@ reiserfs_xattr_set(struct inode *inode, mark_inode_dirty(inode); } - out_filp: - mutex_unlock(&xinode->i_mutex); - fput(fp); -- ++ return err; ++} + - out: ++int ++reiserfs_xattr_set(struct inode *inode, const char *name, const void *buffer, ++ size_t buffer_size, int flags) ++{ ++ int err = __reiserfs_xattr_set(inode, name, buffer, buffer_size, flags); ++ if (err == -ENODATA) ++ err = 0; return err; } -@@ -470,7 +541,7 @@ reiserfs_xattr_set(struct inode *inode, +@@ -470,7 +549,7 @@ reiserfs_xattr_set(struct inode *inode, * inode->i_mutex: down */ int @@ -208,7 +226,7 @@ size_t buffer_size) { ssize_t err = 0; -@@ -573,13 +644,17 @@ reiserfs_xattr_get(const struct inode *i +@@ -573,13 +652,17 @@ reiserfs_xattr_get(const struct inode *i return err; } @@ -229,7 +247,7 @@ dentry = lookup_one_len(name, xadir, namelen); if (IS_ERR(dentry)) { -@@ -594,27 +669,6 @@ __reiserfs_xattr_del(struct dentry *xadi +@@ -594,27 +677,6 @@ __reiserfs_xattr_del(struct dentry *xadi if (S_ISDIR(dentry->d_inode->i_mode)) goto out_file; @@ -257,7 +275,7 @@ err = vfs_unlink(xadir->d_inode, dentry); out_file: -@@ -624,45 +678,6 @@ __reiserfs_xattr_del(struct dentry *xadi +@@ -624,45 +686,6 @@ __reiserfs_xattr_del(struct dentry *xadi return err; } @@ -303,7 +321,7 @@ /* This is called w/ inode->i_mutex downed */ int reiserfs_delete_xattrs(struct inode *inode) { -@@ -817,15 +832,15 @@ ssize_t +@@ -817,15 +840,15 @@ ssize_t reiserfs_getxattr(struct dentry * dentry, const char *name, void *buffer, size_t size) { @@ -325,7 +343,7 @@ } /* -@@ -837,15 +852,15 @@ int +@@ -837,15 +860,15 @@ int reiserfs_setxattr(struct dentry *dentry, const char *name, const void *value, size_t size, int flags) { @@ -347,7 +365,7 @@ } /* -@@ -855,73 +870,66 @@ reiserfs_setxattr(struct dentry *dentry, +@@ -855,73 +878,66 @@ reiserfs_setxattr(struct dentry *dentry, */ int reiserfs_removexattr(struct dentry *dentry, const char *name) { @@ -460,7 +478,7 @@ if (!dentry->d_inode) return -EINVAL; -@@ -934,30 +942,22 @@ ssize_t reiserfs_listxattr(struct dentry +@@ -934,30 +950,22 @@ ssize_t reiserfs_listxattr(struct dentry if (IS_ERR(dir)) { err = PTR_ERR(dir); if (err == -ENODATA) @@ -495,7 +513,7 @@ out_dir: fput(fp); -@@ -966,95 +966,6 @@ ssize_t reiserfs_listxattr(struct dentry +@@ -966,95 +974,6 @@ ssize_t reiserfs_listxattr(struct dentry return err; } @@ -591,7 +609,7 @@ /* This will catch lookups from the fs root to .reiserfs_priv */ static int xattr_lookup_poison(struct dentry *dentry, struct qstr *q1, struct qstr *name) -@@ -1083,24 +994,21 @@ int reiserfs_xattr_init(struct super_blo +@@ -1083,24 +1002,21 @@ int reiserfs_xattr_init(struct super_blo /* We need generation numbers to ensure that the oid mapping is correct * v3.5 filesystems don't have them. */ @@ -628,7 +646,7 @@ struct dentry *dentry; dentry = lookup_one_len(PRIVROOT_NAME, s->s_root, strlen(PRIVROOT_NAME)); -@@ -1141,14 +1049,17 @@ int reiserfs_xattr_init(struct super_blo +@@ -1141,14 +1057,17 @@ int reiserfs_xattr_init(struct super_blo "find/create .reiserfs_priv. " "Failing mount."); err = -EOPNOTSUPP; @@ -647,8 +665,8 @@ clear_bit(REISERFS_XATTRS_USER, &(REISERFS_SB(s)->s_mount_opt)); clear_bit(REISERFS_POSIXACL, &(REISERFS_SB(s)->s_mount_opt)); } ---- a/fs/reiserfs/xattr_acl.c 2007-08-30 10:13:26.000000000 -0400 -+++ b/fs/reiserfs/xattr_acl.c 2007-08-30 10:15:43.000000000 -0400 +--- a/fs/reiserfs/xattr_acl.c 2007-08-31 09:34:01.000000000 -0400 ++++ b/fs/reiserfs/xattr_acl.c 2007-08-31 09:40:48.000000000 -0400 @@ -271,7 +271,7 @@ reiserfs_set_acl(struct inode *inode, in char *name; void *value = NULL; @@ -672,7 +690,7 @@ - */ + } + -+ error = reiserfs_xattr_set(inode, name, value, size, 0); ++ error = __reiserfs_xattr_set(inode, name, value, size, 0); + + /* + * Ensure that the inode gets dirtied if we're only using @@ -772,8 +790,8 @@ - .del = posix_acl_default_del, .list = posix_acl_default_list, }; ---- a/fs/reiserfs/xattr_security.c 2007-08-30 10:13:26.000000000 -0400 -+++ b/fs/reiserfs/xattr_security.c 2007-08-30 10:15:28.000000000 -0400 +--- a/fs/reiserfs/xattr_security.c 2007-08-27 14:03:32.000000000 -0400 ++++ b/fs/reiserfs/xattr_security.c 2007-08-31 09:34:01.000000000 -0400 @@ -33,35 +33,25 @@ security_set(struct inode *inode, const return reiserfs_xattr_set(inode, name, buffer, size, flags); } @@ -818,8 +836,8 @@ - .del = security_del, .list = security_list, }; ---- a/fs/reiserfs/xattr_trusted.c 2007-08-30 10:13:26.000000000 -0400 -+++ b/fs/reiserfs/xattr_trusted.c 2007-08-30 10:13:58.000000000 -0400 +--- a/fs/reiserfs/xattr_trusted.c 2007-08-27 14:03:32.000000000 -0400 ++++ b/fs/reiserfs/xattr_trusted.c 2007-08-31 09:34:01.000000000 -0400 @@ -15,10 +15,7 @@ trusted_get(struct inode *inode, const c if (strlen(name) < sizeof(XATTR_TRUSTED_PREFIX)) return -EINVAL; @@ -893,8 +911,8 @@ - .del = trusted_del, .list = trusted_list, }; ---- a/fs/reiserfs/xattr_user.c 2007-08-30 10:13:26.000000000 -0400 -+++ b/fs/reiserfs/xattr_user.c 2007-08-30 10:13:58.000000000 -0400 +--- a/fs/reiserfs/xattr_user.c 2007-08-27 14:03:32.000000000 -0400 ++++ b/fs/reiserfs/xattr_user.c 2007-08-31 09:39:17.000000000 -0400 @@ -6,10 +6,6 @@ #include <linux/reiserfs_xattr.h> #include <asm/uaccess.h> @@ -906,7 +924,15 @@ #define XATTR_USER_PREFIX "user." static int -@@ -36,33 +32,23 @@ user_set(struct inode *inode, const char +@@ -27,7 +23,6 @@ static int + user_set(struct inode *inode, const char *name, const void *buffer, + size_t size, int flags) + { +- + if (strlen(name) < sizeof(XATTR_USER_PREFIX)) + return -EINVAL; + +@@ -36,33 +31,23 @@ user_set(struct inode *inode, const char return reiserfs_xattr_set(inode, name, buffer, size, flags); } @@ -916,18 +942,18 @@ { - if (strlen(name) < sizeof(XATTR_USER_PREFIX)) - return -EINVAL; -+ const size_t len = name_len + 1; - - if (!reiserfs_xattrs_user(inode->i_sb)) +- +- if (!reiserfs_xattrs_user(inode->i_sb)) - return -EOPNOTSUPP; - return 0; -} -- ++ const size_t len = name_len + 1; + -static int -user_list(struct inode *inode, const char *name, int namelen, char *out) -{ - int len = namelen; -- if (!reiserfs_xattrs_user(inode->i_sb)) + if (!reiserfs_xattrs_user(inode->i_sb)) return 0; - - if (out) @@ -948,8 +974,8 @@ - .del = user_del, .list = user_list, }; ---- a/include/linux/reiserfs_acl.h 2007-08-30 10:13:26.000000000 -0400 -+++ b/include/linux/reiserfs_acl.h 2007-08-30 10:15:43.000000000 -0400 +--- a/include/linux/reiserfs_acl.h 2007-08-27 14:03:32.000000000 -0400 ++++ b/include/linux/reiserfs_acl.h 2007-08-31 09:34:01.000000000 -0400 @@ -52,10 +52,8 @@ int reiserfs_acl_chmod(struct inode *ino int reiserfs_inherit_default_acl(struct inode *dir, struct dentry *dentry, struct inode *inode); @@ -980,8 +1006,8 @@ static inline int reiserfs_acl_chmod(struct inode *inode) { return 0; ---- a/include/linux/reiserfs_fs_sb.h 2007-08-30 10:13:26.000000000 -0400 -+++ b/include/linux/reiserfs_fs_sb.h 2007-08-30 10:13:58.000000000 -0400 +--- a/include/linux/reiserfs_fs_sb.h 2007-08-31 09:34:01.000000000 -0400 ++++ b/include/linux/reiserfs_fs_sb.h 2007-08-31 09:34:01.000000000 -0400 @@ -453,7 +453,6 @@ enum reiserfs_mount_options { REISERFS_NO_UNHASHED_RELOCATION, REISERFS_HASHED_RELOCATION, @@ -999,8 +1025,8 @@ #define reiserfs_xattrs_user(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_XATTRS_USER)) #define reiserfs_posixacl(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_POSIXACL)) #define reiserfs_xattrs_optional(s) (reiserfs_xattrs_user(s) || reiserfs_posixacl(s)) ---- a/include/linux/reiserfs_xattr.h 2007-08-30 10:13:26.000000000 -0400 -+++ b/include/linux/reiserfs_xattr.h 2007-08-30 10:15:43.000000000 -0400 +--- a/include/linux/reiserfs_xattr.h 2007-08-31 09:34:01.000000000 -0400 ++++ b/include/linux/reiserfs_xattr.h 2007-08-31 09:40:32.000000000 -0400 @@ -29,20 +29,6 @@ struct iattr; struct super_block; struct nameidata; @@ -1022,13 +1048,14 @@ #ifdef CONFIG_REISERFS_FS_XATTR #define is_reiserfs_priv_object(inode) IS_PRIVATE(inode) #define has_xattr_dir(inode) (REISERFS_I(inode)->i_flags & i_has_xattr_dir) -@@ -57,16 +43,12 @@ int reiserfs_chown_xattrs(struct inode * +@@ -57,16 +43,13 @@ int reiserfs_chown_xattrs(struct inode * int reiserfs_xattr_init(struct super_block *sb, int mount_flags); int reiserfs_permission(struct inode *inode, int mask, struct nameidata *nd); -int reiserfs_xattr_del(struct inode *, const char *); -int reiserfs_xattr_get(const struct inode *, const char *, void *, size_t); +int reiserfs_xattr_get(struct inode *, const char *, void *, size_t); ++int __reiserfs_xattr_set(struct inode *, const char *, const void *, size_t, int); int reiserfs_xattr_set(struct inode *, const char *, const void *, size_t, int); -extern struct reiserfs_xattr_handler user_handler; @@ -1043,7 +1070,7 @@ static inline void reiserfs_mark_inode_private(struct inode *inode) -@@ -85,9 +67,6 @@ static inline void reiserfs_mark_inode_p +@@ -85,9 +68,6 @@ static inline void reiserfs_mark_inode_p #define reiserfs_permission NULL ++++++ patches.uml.tar.bz2 ++++++ ++++++ patches.xen.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 opensuse-updater-kde
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package opensuse-updater-kde checked in at Fri Aug 31 16:52:08 CEST 2007. -------- --- KDE/opensuse-updater-kde/opensuse-updater-kde.changes 2007-08-30 13:31:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/opensuse-updater-kde/opensuse-updater-kde.changes 2007-08-31 16:05:31.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 31 09:38:46 CEST 2007 - tgoettlicher(a)suse.de + +- improved error handling +- r7046 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-updater-kde.spec ++++++ --- /var/tmp/diff_new_pack.c10120/_old 2007-08-31 16:52:02.000000000 +0200 +++ /var/tmp/diff_new_pack.c10120/_new 2007-08-31 16:52:02.000000000 +0200 @@ -17,7 +17,7 @@ Group: System/Management Summary: KDE updater applet for OpenSUSE Version: 0.6 -Release: 3 +Release: 4 URL: http://en.opensuse.org/KDE_Updater_Applet BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 @@ -85,6 +85,9 @@ /opt/kde3/share/locale %changelog +* Fri Aug 31 2007 - tgoettlicher(a)suse.de +- improved error handling +- r7046 * Thu Aug 30 2007 - tgoettlicher(a)suse.de - fixed opensuse kde steal focus (#305522) - r7001 ++++++ opensuse-updater-kde-0.6.tar.bz2 ++++++ KDE/opensuse-updater-kde/opensuse-updater-kde-0.6.tar.bz2 /mounts/work_src_done/STABLE/opensuse-updater-kde/opensuse-updater-kde-0.6.tar.bz2 differ: byte 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 linuxrc
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package linuxrc checked in at Fri Aug 31 16:51:55 CEST 2007. -------- --- linuxrc/linuxrc.changes 2007-08-30 17:54:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2007-08-31 16:30:55.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 31 16:30:51 CEST 2007 - snwint(a)suse.de + +- get nisdomain via dhcp (#303844) +- store wlan config in install.inf (#223570) + +------------------------------------------------------------------- Old: ---- linuxrc-3.0.12.tar.bz2 New: ---- linuxrc-3.0.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.Mg9168/_old 2007-08-31 16:51:32.000000000 +0200 +++ /var/tmp/diff_new_pack.Mg9168/_new 2007-08-31 16:51:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.0.12) +# spec file for package linuxrc (Version 3.0.13) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,9 +16,9 @@ Group: System/Boot Autoreqprov: on Summary: SUSE Installation Program -Version: 3.0.12 +Version: 3.0.13 Release: 1 -Source: linuxrc-3.0.12.tar.bz2 +Source: linuxrc-3.0.13.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,6 +53,9 @@ %doc linuxrc.html %changelog +* Fri Aug 31 2007 - snwint(a)suse.de +- get nisdomain via dhcp (#303844) +- store wlan config in install.inf (#223570) * Thu Aug 30 2007 - snwint(a)suse.de - fix rescue system loading - finished driver update loading (#304827) ++++++ linuxrc-3.0.12.tar.bz2 -> linuxrc-3.0.13.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.12/Changelog new/linuxrc-3.0.13/Changelog --- old/linuxrc-3.0.12/Changelog 2007-08-30 17:47:09.000000000 +0200 +++ new/linuxrc-3.0.13/Changelog 2007-08-31 16:30:31.000000000 +0200 @@ -1,3 +1,7 @@ +31/8/2007: v3.0.13 + - get nisdomain via dhcp (#303844) + - store wlan config in install.inf (#223570) + 30/8/2007: v3.0.12 - finished driver update loading (#304827) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.12/file.c new/linuxrc-3.0.13/file.c --- old/linuxrc-3.0.12/file.c 2007-08-29 15:14:41.000000000 +0200 +++ new/linuxrc-3.0.13/file.c 2007-08-31 16:22:30.000000000 +0200 @@ -267,6 +267,7 @@ { key_sha1, "HASH", kf_cfg + kf_cont }, { key_insecure, "Insecure", kf_cfg + kf_cmd + kf_cmd_early }, { key_kexec, "kexec", kf_cfg + kf_cmd }, + { key_nisdomain, "NISDomain", kf_dhcp }, }; static struct { @@ -320,7 +321,7 @@ { "open", wa_open }, { "wep", wa_wep_open }, { "wep_o", wa_wep_open }, - { "wep_r", wa_wep_resticted }, + { "wep_r", wa_wep_restricted }, { "wpa", wa_wpa }, }; @@ -1325,6 +1326,10 @@ if(f->is.numeric) config.kexec = f->nvalue; break; + case key_nisdomain: + str_copy(&config.net.nisdomain, f->value); + break; + default: break; } @@ -1558,6 +1563,35 @@ file_write_inet_str(f, s, &config.net.nameserver[i]); } file_write_str(f, key_domain, config.net.domain); + file_write_str(f, key_nisdomain, config.net.nisdomain); + + file_write_str(f, key_wlan_essid, config.net.wlan.essid); + switch(config.net.wlan.auth) { + case wa_open: + s = "open"; + break; + case wa_wep_open: + s = "wep_open"; + break; + case wa_wep_restricted: + s = "wep_restricted"; + break; + case wa_wpa: + s = "wpa"; + break; + default: + s = NULL; + break; + } + file_write_str(f, key_wlan_auth, s); + if(config.net.wlan.key) { + fprintf(f, "WlanKey: %s\n", config.net.wlan.key); + fprintf(f, "WlanKeyType: %s\n", + config.net.wlan.key_type == kt_pass ? "password" : config.net.wlan.key_type == kt_hex ? "hex" : "ascii" + ); + if(config.net.wlan.key_len) file_write_num(f, key_wlan_key_len, config.net.wlan.key_len); + } + } if(config.url.proxy) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.12/file.h new/linuxrc-3.0.13/file.h --- old/linuxrc-3.0.12/file.h 2007-08-16 17:34:39.000000000 +0200 +++ new/linuxrc-3.0.13/file.h 2007-08-31 15:21:46.000000000 +0200 @@ -46,7 +46,7 @@ key_wlan_key_hex, key_wlan_key_pass, key_wlan_key_len, key_netcardname, key_ibft_hwaddr, key_ibft_ipaddr, key_ibft_netmask, key_ibft_gateway, key_ibft_dns, key_net_retry, key_bootif, key_swap_size, key_ntfs_3g, - key_sha1, key_insecure, key_kexec + key_sha1, key_insecure, key_kexec, key_nisdomain } file_key_t; typedef enum { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.12/global.h new/linuxrc-3.0.13/global.h --- old/linuxrc-3.0.12/global.h 2007-08-27 17:52:22.000000000 +0200 +++ new/linuxrc-3.0.13/global.h 2007-08-31 16:02:22.000000000 +0200 @@ -203,7 +203,7 @@ typedef enum { - wa_none, wa_open, wa_wep_open, wa_wep_resticted, wa_wpa + wa_none, wa_open, wa_wep_open, wa_wep_restricted, wa_wpa } wlan_auth_t; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.12/net.c new/linuxrc-3.0.13/net.c --- old/linuxrc-3.0.12/net.c 2007-08-16 17:34:19.000000000 +0200 +++ new/linuxrc-3.0.13/net.c 2007-08-31 16:02:33.000000000 +0200 @@ -1599,6 +1599,7 @@ * config.net.broadcast * config.net.gateway * config.net.domain + * config.net.nisdomain * config.net.nameserver * config.net.server */ @@ -1673,10 +1674,7 @@ break; case key_domain: - if(*f->value) { - if(config.net.domain) free(config.net.domain); - config.net.domain = strdup(f->value); - } + if(*f->value) str_copy(&config.net.domain, f->value); break; case key_dhcpsiaddr: @@ -1701,6 +1699,10 @@ slist_free(sl0); break; + case key_nisdomain: + if(*f->value) str_copy(&config.net.nisdomain, f->value); + break; + default: break; } @@ -2393,7 +2395,7 @@ di = di_wlan_wep_o; break; - case wa_wep_resticted: + case wa_wep_restricted: di = di_wlan_wep_r; break; @@ -2475,7 +2477,7 @@ wep_mode = 1; case di_wlan_wep_r: - config.net.wlan.auth = wep_mode ? wa_wep_open : wa_wep_resticted; + config.net.wlan.auth = wep_mode ? wa_wep_open : wa_wep_restricted; if(config.manual || !config.net.wlan.essid) { if(dia_input2("ESSID", &config.net.wlan.essid, 30, 0)) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.12/VERSION new/linuxrc-3.0.13/VERSION --- old/linuxrc-3.0.12/VERSION 2007-08-30 16:12:21.000000000 +0200 +++ new/linuxrc-3.0.13/VERSION 2007-08-31 15:25:47.000000000 +0200 @@ -1 +1 @@ -3.0.12 +3.0.13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 installation-images
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package installation-images checked in at Fri Aug 31 16:51:24 CEST 2007. -------- --- installation-images/installation-images.changes 2007-08-27 18:25:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2007-08-31 16:33:35.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 31 16:33:32 CEST 2007 - snwint(a)suse.de + +- sdparm is back (#304967) +- kpartx: add activate_dm_linear (#305095) + +------------------------------------------------------------------- Old: ---- installation-images-9.105.tar.bz2 New: ---- installation-images-9.106.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.AD7002/_old 2007-08-31 16:51:14.000000000 +0200 +++ /var/tmp/diff_new_pack.AD7002/_new 2007-08-31 16:51:14.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 9.105) +# spec file for package installation-images (Version 9.106) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -68,9 +68,9 @@ Obsoletes: y2image Autoreqprov: off Summary: Installation Image Files -Version: 9.105 +Version: 9.106 Release: 1 -Source: installation-images-9.105.tar.bz2 +Source: installation-images-9.106.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -348,6 +348,9 @@ /CD1 %changelog +* Fri Aug 31 2007 - snwint(a)suse.de +- sdparm is back (#304967) +- kpartx: add activate_dm_linear (#305095) * Mon Aug 27 2007 - snwint(a)suse.de - add PS3 sys-manager module to allow reboot, remove old ps3_storage - moved some files from firmware image to initrd ++++++ installation-images-9.105.tar.bz2 -> installation-images-9.106.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.105/Changelog new/installation-images-9.106/Changelog --- old/installation-images-9.105/Changelog 2007-08-27 18:24:50.000000000 +0200 +++ new/installation-images-9.106/Changelog 2007-08-31 11:48:49.000000000 +0200 @@ -1,3 +1,7 @@ +31/8/2007: v9.106 + - sdparm is back (#304967) + - kpartx: add activate_dm_linear (#305095) + 27/8/2007: v9.105 - add drivers/cdrom/viocd.ko to search path - remove unused ppc_iseries64 code diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.105/data/initrd/initrd_base.file_list new/installation-images-9.106/data/initrd/initrd_base.file_list --- old/installation-images-9.105/data/initrd/initrd_base.file_list 2007-08-17 15:06:30.000000000 +0200 +++ new/installation-images-9.106/data/initrd/initrd_base.file_list 2007-08-30 16:20:52.000000000 +0200 @@ -562,7 +562,6 @@ ntfs-3g: /sbin /bin - /lib*/libntfs-3g.so.* if 0 fuse: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.105/data/rescue/rescue.file_list new/installation-images-9.106/data/rescue/rescue.file_list --- old/installation-images-9.105/data/rescue/rescue.file_list 2007-08-13 15:32:12.000000000 +0200 +++ new/installation-images-9.106/data/rescue/rescue.file_list 2007-08-31 11:03:10.000000000 +0200 @@ -93,7 +93,6 @@ ntfs-3g: /sbin /bin - /lib* libfuse2: /lib* @@ -226,10 +225,9 @@ endif scsi: - /bin - /usr/bin - /usr/sbin - /usr/lib*/libsgutils.so* + / + r /usr/include + r /usr/share if arch eq 'ia32' || arch eq 'x86_64' grub: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.105/data/root/root.file_list new/installation-images-9.106/data/root/root.file_list --- old/installation-images-9.105/data/root/root.file_list 2007-08-22 12:22:17.000000000 +0200 +++ new/installation-images-9.106/data/root/root.file_list 2007-08-31 16:13:47.000000000 +0200 @@ -874,15 +874,14 @@ kpartx: /etc/udev /sbin/kpartx* + /sbin/activate_dm_linear cryptsetup: /sbin /lib*/libcryptsetup.so.* xntp: - /etc/ntp.conf /usr/sbin/ntpdate - /usr/sbin/ntpd libcap: /lib*/libcap.so.* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.105/etc/module.config new/installation-images-9.106/etc/module.config --- old/installation-images-9.105/etc/module.config 2007-08-27 16:42:30.000000000 +0200 +++ new/installation-images-9.106/etc/module.config 2007-08-31 11:51:42.000000000 +0200 @@ -440,7 +440,8 @@ eepro100,"Intel EtherExpress Pro 100",,,,,0 eepro,"Intel EtherExpressPro","io=0x260",,,,0 e100,"Intel PRO/100 / EtherExpr. PRO/100" -e1000,"Intel PRO/1000" +e1000,"Intel PRO/1000 Gigabit" +e1000e,"Intel PRO/1000 PCI-E Gigabit" ixgb,"Intel(R) PRO/10GbE" abyss,"Madge Smart 16/4 PCI Mk2 Token Ring" sky2,"Marvell Yukon 2 Gigabit Ethernet" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.105/VERSION new/installation-images-9.106/VERSION --- old/installation-images-9.105/VERSION 2007-08-27 16:42:45.000000000 +0200 +++ new/installation-images-9.106/VERSION 2007-08-31 11:03:41.000000000 +0200 @@ -1 +1 @@ -9.105 +9.106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 insserv
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package insserv checked in at Fri Aug 31 16:51:09 CEST 2007. -------- --- insserv/insserv.changes 2007-07-13 17:22:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/insserv/insserv.changes 2007-08-31 16:23:20.157401000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 31 16:08:47 CEST 2007 - werner(a)suse.de + +- Scan all scripts for Start-Before even if already known (#297214) +- Do not add disabled scripts to the depend files + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ insserv.spec ++++++ --- /var/tmp/diff_new_pack.fb3413/_old 2007-08-31 16:50:38.000000000 +0200 +++ /var/tmp/diff_new_pack.fb3413/_new 2007-08-31 16:50:38.000000000 +0200 @@ -16,7 +16,7 @@ Provides: aaa_base:/sbin/insserv Autoreqprov: on Version: 1.09.0 -Release: 31 +Release: 42 Summary: A Program to Arrange Initialization Scripts Source0: insserv-%{version}.tar.bz2 Source1: insserv.conf @@ -54,6 +54,9 @@ %{_mandir}/man8/insserv.8.gz %changelog +* Fri Aug 31 2007 - werner(a)suse.de +- Scan all scripts for Start-Before even if already known (#297214) +- Do not add disabled scripts to the depend files * Fri Jul 13 2007 - werner(a)suse.de - Remove hotplug and pcmcia from insserv.conf because they are dropped (bug #291417) ++++++ insserv-1.09.0.dif ++++++ --- /var/tmp/diff_new_pack.fb3413/_old 2007-08-31 16:50:38.000000000 +0200 +++ /var/tmp/diff_new_pack.fb3413/_new 2007-08-31 16:50:39.000000000 +0200 @@ -1,6 +1,15 @@ --- insserv.c -+++ insserv.c 2007-06-19 19:04:29.486363129 +0200 -@@ -57,12 +57,16 @@ static const int map_runlevel_to_seek(co ++++ insserv.c 2007-08-31 16:21:55.212290749 +0200 +@@ -13,6 +13,8 @@ + * (at your option) any later version. + */ + ++#define MINIMAL_MAKE 1 /* Remove disabled scripts from .depend.boot, ++ * .depend.start and .depend.stop */ + #include <pwd.h> + #include <string.h> + #include <unistd.h> +@@ -57,12 +59,16 @@ static const int map_runlevel_to_seek(co /* The main regular search expressions */ #define PROVIDES COMM "provides" VALUE #define REQUIRED COMM "required" @@ -18,7 +27,7 @@ #define DEFAULT_START DEFAULT START VALUE #define DEFAULT_STOP DEFAULT STOP VALUE #define DESCRIPTION COMM "description" VALUE -@@ -74,6 +78,9 @@ static const int map_runlevel_to_seek(co +@@ -74,6 +80,9 @@ static const int map_runlevel_to_seek(co #define SUBCONF 2 #define SUBCONFNUM 4 @@ -28,7 +37,7 @@ /* The main line buffer if unique */ static char buf[LINE_MAX]; -@@ -90,6 +97,8 @@ typedef struct lsb_struct { +@@ -90,6 +99,8 @@ typedef struct lsb_struct { char *required_stop; char *should_start; char *should_stop; @@ -37,7 +46,7 @@ char *default_start; char *default_stop; char *description; -@@ -102,6 +111,8 @@ typedef struct reg_struct { +@@ -102,6 +113,8 @@ typedef struct reg_struct { regex_t req_stop; regex_t shl_start; regex_t shl_stop; @@ -46,7 +55,7 @@ regex_t def_start; regex_t def_stop; regex_t desc; -@@ -283,7 +294,7 @@ out: +@@ -283,7 +296,7 @@ out: /* * Remember requests for required or should services and expand `$' token */ @@ -55,7 +64,7 @@ { char * token, * tmp = strdupa(required); list_t * ptr; -@@ -297,8 +308,12 @@ static void rememberreq(serv_t *serv, un +@@ -297,8 +310,12 @@ static void rememberreq(serv_t *serv, un continue; bit = old; @@ -69,7 +78,7 @@ default: list_for_each(ptr, &(serv->sort.req)) { if (!strcmp(getreq(ptr)->serv, token)) { -@@ -332,12 +347,6 @@ again: +@@ -332,12 +349,6 @@ again: } } break; @@ -82,7 +91,7 @@ } } -@@ -349,6 +358,39 @@ again: +@@ -349,6 +360,39 @@ again: } } @@ -122,7 +131,53 @@ /* * Check required services for name */ -@@ -675,7 +717,7 @@ static inline void makedep(void) +@@ -652,14 +696,26 @@ static inline void makedep(void) + + name = NULL; + fprintf(boot, "TARGETS ="); +- while (listscripts(&name, LVL_BOOT)) ++ while (listscripts(&name, LVL_BOOT)) { ++#if defined(MINIMAL_MAKE) && (MINIMAL_MAKE != 0) ++ const serv_t *serv = findserv(getprovides(name)); ++ if (!serv || !(serv->opts & SERV_ENABLED)) ++ continue; ++#endif + fprintf(boot, " %s", name); ++ } + putc('\n', boot); + + name = NULL; + fprintf(start, "TARGETS ="); +- while (listscripts(&name, LVL_ALL)) /* LVL_ALL: nearly all but not BOOT */ ++ while (listscripts(&name, LVL_ALL)) { /* LVL_ALL: nearly all but not BOOT */ ++#if defined(MINIMAL_MAKE) && (MINIMAL_MAKE != 0) ++ const serv_t *serv = findserv(getprovides(name)); ++ if (!serv || !(serv->opts & SERV_ENABLED)) ++ continue; ++#endif + fprintf(start, " %s", name); ++ } + putc('\n', start); + + fprintf(boot, "INTERACTIVE ="); +@@ -667,7 +723,15 @@ static inline void makedep(void) + list_for_each(srv, serv_start) { + serv_t * cur = getserv(srv); + +- if (!cur || list_empty(&(cur->sort.req))) ++#if defined(MINIMAL_MAKE) && (MINIMAL_MAKE != 0) ++ if (!cur || !(cur->opts & SERV_ENABLED)) ++ continue; ++#else ++ if (!cur) ++ continue; ++#endif ++ ++ if (list_empty(&(cur->sort.req))) + continue; + + if (cur->lvls & LVL_BOOT) +@@ -675,7 +739,7 @@ static inline void makedep(void) else out = start; @@ -131,7 +186,24 @@ name = cur->name; if (cur->opts & SERV_DUPLET) -@@ -699,7 +741,7 @@ static inline void makedep(void) +@@ -691,7 +755,15 @@ static inline void makedep(void) + serv_t * cur = getserv(srv); + list_t * pos; + +- if (!cur || list_empty(&(cur->sort.req))) ++#if defined(MINIMAL_MAKE) && (MINIMAL_MAKE != 0) ++ if (!cur || !(cur->opts & SERV_ENABLED)) ++ continue; ++#else ++ if (!cur) ++ continue; ++#endif ++ ++ if (list_empty(&(cur->sort.req))) + continue; + + if (cur->lvls & LVL_BOOT) +@@ -699,7 +771,7 @@ static inline void makedep(void) else out = start; @@ -140,7 +212,53 @@ name = cur->name; if (cur->opts & SERV_DUPLET) -@@ -950,6 +992,8 @@ static inline void scan_script_regalloc( +@@ -721,7 +793,13 @@ static inline void makedep(void) + * Skip not existing services even if they are used + * otherwise the make call will skip all dependencies + */ +- if (!dep) continue; ++#if defined(MINIMAL_MAKE) && (MINIMAL_MAKE != 0) ++ if (!dep || !(dep->opts & SERV_ENABLED)) ++ continue; ++#else ++ if (!dep) ++ continue; ++#endif + + if ((dep->opts & SERV_DUPLET) && dep->main) + dep = dep->main; /* Duplet */ +@@ -749,7 +827,13 @@ static inline void makedep(void) + * Skip not existing services even if they are used + * otherwise the make call will skip all dependencies + */ +- if (!dep) continue; ++#if defined(MINIMAL_MAKE) && (MINIMAL_MAKE != 0) ++ if (!dep || !(dep->opts & SERV_ENABLED)) ++ continue; ++#else ++ if (!dep) ++ continue; ++#endif + + if ((dep->opts & SERV_DUPLET) && dep->main) + dep = dep->main; /* Duplet */ +@@ -775,8 +859,14 @@ static inline void makedep(void) + + name = NULL; + fprintf(stop, "TARGETS ="); +- while (listscripts(&name, LVL_NORM)) /* LVL_NORM: nearly all but not BOOT and not SINGLE */ ++ while (listscripts(&name, LVL_NORM)) { /* LVL_NORM: nearly all but not BOOT and not SINGLE */ ++#if defined(MINIMAL_MAKE) && (MINIMAL_MAKE != 0) ++ const serv_t *serv = findserv(getprovides(name)); ++ if (!serv || !(serv->opts & SERV_ENABLED)) ++ continue; ++#endif + fprintf(stop, " %s", name); ++ } + putc('\n', stop); + + list_for_each(srv, serv_start) { +@@ -950,6 +1040,8 @@ static inline void scan_script_regalloc( regcompiler(&reg.req_stop, REQUIRED_STOP, REG_EXTENDED|REG_ICASE|REG_NEWLINE); regcompiler(&reg.shl_start, SHOULD_START, REG_EXTENDED|REG_ICASE|REG_NEWLINE); regcompiler(&reg.shl_stop, SHOULD_STOP, REG_EXTENDED|REG_ICASE|REG_NEWLINE); @@ -149,7 +267,7 @@ regcompiler(&reg.def_start, DEFAULT_START, REG_EXTENDED|REG_ICASE|REG_NEWLINE); regcompiler(&reg.def_stop, DEFAULT_STOP, REG_EXTENDED|REG_ICASE|REG_NEWLINE); regcompiler(&reg.desc, DESCRIPTION, REG_EXTENDED|REG_ICASE|REG_NEWLINE); -@@ -968,6 +1012,8 @@ static boolean scan_script_defaults(cons +@@ -968,6 +1060,8 @@ static boolean scan_script_defaults(cons #define required_stop script_inf.required_stop #define should_start script_inf.should_start #define should_stop script_inf.should_stop @@ -158,7 +276,7 @@ #define default_start script_inf.default_start #define default_stop script_inf.default_stop #define description script_inf.description -@@ -983,6 +1029,8 @@ static boolean scan_script_defaults(cons +@@ -983,6 +1077,8 @@ static boolean scan_script_defaults(cons xreset(required_stop); xreset(should_start); xreset(should_stop); @@ -167,7 +285,7 @@ xreset(default_start); xreset(default_stop); xreset(description); -@@ -1034,6 +1082,22 @@ static boolean scan_script_defaults(cons +@@ -1034,6 +1130,22 @@ static boolean scan_script_defaults(cons should_stop = empty; } #endif /* not SUSE */ @@ -190,7 +308,7 @@ if (!default_start && regexecutor(&reg.def_start, COMMON_ARGS) == true) { if (val->rm_so < val->rm_eo) { *(pbuf+val->rm_eo) = '\0'; -@@ -1101,6 +1165,8 @@ static boolean scan_script_defaults(cons +@@ -1101,6 +1213,8 @@ static boolean scan_script_defaults(cons #undef required_stop #undef should_start #undef should_stop @@ -199,7 +317,7 @@ #undef default_start #undef default_stop #undef description -@@ -1115,6 +1181,8 @@ static inline void scan_script_regfree() +@@ -1115,6 +1229,8 @@ static inline void scan_script_regfree() regfree(&reg.req_stop); regfree(&reg.shl_start); regfree(&reg.shl_stop); @@ -208,7 +326,7 @@ regfree(&reg.def_start); regfree(&reg.def_stop); regfree(&reg.desc); -@@ -1234,6 +1302,9 @@ static void scan_script_locations(const +@@ -1234,6 +1350,9 @@ static void scan_script_locations(const rememberreq(service, REQ_SHLD, script_inf.should_start); requiresv(token, script_inf.should_start); } @@ -218,7 +336,7 @@ #ifndef SUSE /* * required_stop and should_stop arn't used in SuSE Linux. -@@ -1248,6 +1319,9 @@ static void scan_script_locations(const +@@ -1248,6 +1367,9 @@ static void scan_script_locations(const rememberreq(service, REQ_SHLD, script_inf.should_stop); requiresv(token, script_inf.should_stop); } @@ -228,7 +346,7 @@ #endif /* not SUSE */ } script_inf.provides = begin; -@@ -1257,6 +1331,8 @@ static void scan_script_locations(const +@@ -1257,6 +1379,8 @@ static void scan_script_locations(const xreset(script_inf.required_stop); xreset(script_inf.should_start); xreset(script_inf.should_stop); @@ -237,7 +355,7 @@ xreset(script_inf.default_start); xreset(script_inf.default_stop); xreset(script_inf.description); -@@ -1389,29 +1465,56 @@ static int cfgfile_filter(const struct d +@@ -1389,29 +1513,56 @@ static int cfgfile_filter(const struct d return 0; } } @@ -263,10 +381,10 @@ + n = snprintf(&path[0], sizeof(path), "%s%s", root ? root : "", INSCONF); + if (n >= sizeof(path) || n < 0) + error("snprintf(): %s\n", strerror(errno)); ++ ++ scan_conf_file(path); - n = scandir(dir, &namelist, cfgfile_filter, alphasort); -+ scan_conf_file(path); -+ + n = snprintf(&path[0], sizeof(path), "%s%s.d", root ? root : "", INSCONF); + if (n >= sizeof(path) || n < 0) + error("snprintf(): %s\n", strerror(errno)); @@ -301,7 +419,7 @@ } /* -@@ -1596,6 +1699,17 @@ int main (int argc, char *argv[]) +@@ -1596,6 +1747,17 @@ int main (int argc, char *argv[]) } } @@ -319,27 +437,22 @@ c = argc; while (c--) { char * base; -@@ -1897,6 +2011,9 @@ int main (int argc, char *argv[]) - rememberreq(service, REQ_SHLD, script_inf.should_start); - requiresv(token, script_inf.should_start); +@@ -1913,6 +2075,14 @@ int main (int argc, char *argv[]) } -+ if (script_inf.start_before && script_inf.start_before != empty) { -+ reversereq(service, token, script_inf.start_before); -+ } - #ifndef SUSE - /* - * required_stop and should_stop arn't used in SuSE Linux. -@@ -1911,6 +2028,9 @@ int main (int argc, char *argv[]) - rememberreq(service, REQ_SHLD, script_inf.should_stop); - requiresv(token, script_inf.should_stop); - } -+ if (script_inf.stop_after && script_inf.stop_after != empty) { -+ reversereq(service, token, script_inf.stop_after); -+ } #endif /* not SUSE */ } ++ if (script_inf.start_before && script_inf.start_before != empty) { ++ reversereq(service, token, script_inf.start_before); ++ } ++#ifndef SUSE ++ if (script_inf.stop_after && script_inf.stop_after != empty) { ++ reversereq(service, token, script_inf.stop_after); ++ } ++#endif /* not SUSE */ /* -@@ -2082,6 +2202,8 @@ int main (int argc, char *argv[]) + * Use information from symbolic link structure to + * check if all services are around for this script. +@@ -2082,6 +2252,8 @@ int main (int argc, char *argv[]) xreset(script_inf.required_stop); xreset(script_inf.should_start); xreset(script_inf.should_stop); @@ -348,3 +461,61 @@ xreset(script_inf.default_start); xreset(script_inf.default_stop); xreset(script_inf.description); +@@ -2202,6 +2374,7 @@ int main (int argc, char *argv[]) + + while (foreach(&script, &order, runlevel)) { + const boolean this = chkfor(script, argv, argc); ++ serv_t *serv = findserv(getprovides(script)); + boolean found, slink; + char * clink; + +@@ -2222,8 +2395,10 @@ int main (int argc, char *argv[]) + if (this && !del) + xsymlink(olink, nlink); /* Restore, with correct order */ + } else { +- if (del && this) ++ if (del && this) { + xremove(clink); /* Found it, remove link */ ++ if (serv) serv->opts &= ~SERV_ENABLED; ++ } + } + } + +@@ -2234,6 +2409,7 @@ int main (int argc, char *argv[]) + */ + if (!del && !found) { + xsymlink(olink, nlink); ++ if (serv) serv->opts |= SERV_ENABLED; + found = true; + } + } +@@ -2350,8 +2526,8 @@ int main (int argc, char *argv[]) + while (listscripts(&script, seek)) { + const boolean stop = notincluded(script, runlevel); + const boolean this = chkfor(script, argv, argc); +- const serv_t *serv = findserv(getprovides(script)); + const char mode = (stop ? 'K' : 'S'); ++ serv_t *serv = findserv(getprovides(script)); + int order = getorder(script); + boolean found; + char * clink; +@@ -2388,8 +2564,10 @@ int main (int argc, char *argv[]) + if (this && !del) + xsymlink(olink, nlink); /* Restore, with correct order */ + } else { +- if (del && this) ++ if (del && this) { + xremove(clink); /* Found it, remove link */ ++ if (serv) serv->opts &= ~SERV_ENABLED; ++ } + } + } + +@@ -2400,6 +2578,7 @@ int main (int argc, char *argv[]) + */ + if (!del && !found) { + xsymlink(olink, nlink); ++ if (serv) serv->opts |= SERV_ENABLED; + found = true; + } + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 zypper
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package zypper checked in at Fri Aug 31 16:18:43 CEST 2007. -------- --- zypper/zypper.changes 2007-08-30 20:33:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2007-08-31 16:08:44.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Aug 31 14:35:01 CEST 2007 - jkupec(a)suse.cz + +- fixed error message of zypper ar -r (#306667) +- r7055 + +------------------------------------------------------------------- +Fri Aug 31 14:07:11 CEST 2007 - kkaempf(a)suse.de + +- dont prompt for solutions if none are available. +- dont duplicate dependency problems in output. +- indent details by 2 blanks, resolver indents further details + by 4 blanks. +- provide additional details for problems (#306240) +- don't prompt user for every dependency (#304325) +- don't clutter the log with pool lists. +- r 7054 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.Gl2378/_old 2007-08-31 16:18:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Gl2378/_new 2007-08-31 16:18:28.000000000 +0200 @@ -21,7 +21,7 @@ PreReq: permissions Summary: Command Line Package Management Using Libzypp Version: 0.8.18 -Release: 1 +Release: 2 Source: zypper-0.8.18.tar.bz2 Prefix: /usr URL: http://en.opensuse.org/Zypper @@ -97,6 +97,18 @@ %ghost %config(noreplace) %{_var}/log/zypper.log %changelog +* Fri Aug 31 2007 - jkupec(a)suse.cz +- fixed error message of zypper ar -r (#306667) +- r7055 +* Fri Aug 31 2007 - kkaempf(a)suse.de +- dont prompt for solutions if none are available. +- dont duplicate dependency problems in output. +- indent details by 2 blanks, resolver indents further details + by 4 blanks. +- provide additional details for problems (#306240) +- don't prompt user for every dependency (#304325) +- don't clutter the log with pool lists. +- r 7054 * Thu Aug 30 2007 - jkupec(a)suse.cz - suppressing excessive output of media errors - prompting for media change only for changeable media ++++++ zypper-0.8.18.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.18/package/zypper.changes new/zypper-0.8.18/package/zypper.changes --- old/zypper-0.8.18/package/zypper.changes 2007-08-30 20:33:57.000000000 +0200 +++ new/zypper-0.8.18/package/zypper.changes 2007-08-31 16:08:43.000000000 +0200 @@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Fri Aug 31 14:35:01 CEST 2007 - jkupec(a)suse.cz + +- fixed error message of zypper ar -r (#306667) +- r7055 + +------------------------------------------------------------------- +Fri Aug 31 14:07:11 CEST 2007 - kkaempf(a)suse.de + +- dont prompt for solutions if none are available. +- dont duplicate dependency problems in output. +- indent details by 2 blanks, resolver indents further details + by 4 blanks. +- provide additional details for problems (#306240) +- don't prompt user for every dependency (#304325) +- don't clutter the log with pool lists. +- r 7054 + +------------------------------------------------------------------- Thu Aug 30 20:32:56 CEST 2007 - jkupec(a)suse.cz - suppressing excessive output of media errors diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.18/po/zypper.pot new/zypper-0.8.18/po/zypper.pot --- old/zypper-0.8.18/po/zypper.pot 2007-08-30 20:33:57.000000000 +0200 +++ new/zypper-0.8.18/po/zypper.pot 2007-08-31 16:08:42.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-29 11:36+0200\n" +"POT-Creation-Date: 2007-08-31 15:19+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" @@ -130,11 +130,11 @@ msgstr "" #. TranslatorExplanation These are reasons for various failures. -#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:41 +#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42 msgid "Not found" msgstr "" -#: ../src/zypper-misc.cc:421 ../src/zypper-misc.cc:493 +#: ../src/zypper-misc.cc:421 msgid "Problem: " msgstr "" @@ -145,65 +145,65 @@ msgstr "" #. input prompt -#: ../src/zypper-misc.cc:446 +#: ../src/zypper-misc.cc:449 msgid "number, (r)etry or (c)ancel> " msgstr "" #. translators: corresponds to (r)etry -#: ../src/zypper-misc.cc:454 +#: ../src/zypper-misc.cc:457 msgid "r" msgstr "" #. translators: corresponds to (c)ancel -#: ../src/zypper-misc.cc:457 +#: ../src/zypper-misc.cc:460 msgid "c" msgstr "" -#: ../src/zypper-misc.cc:463 +#: ../src/zypper-misc.cc:466 #, c-format msgid "Applying solution %s" msgstr "" -#: ../src/zypper-misc.cc:486 +#: ../src/zypper-misc.cc:488 #, c-format msgid "%s Problems:" msgstr "" -#: ../src/zypper-misc.cc:489 +#: ../src/zypper-misc.cc:491 msgid "Specified capability not found" msgstr "" -#: ../src/zypper-misc.cc:622 ../src/zypper-misc.cc:624 +#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623 msgid "Nothing to do." msgstr "" -#: ../src/zypper-misc.cc:738 +#: ../src/zypper-misc.cc:737 #, c-format msgid "Overall download size: %s." msgstr "" #. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K -#: ../src/zypper-misc.cc:742 +#: ../src/zypper-misc.cc:741 #, c-format msgid "After the operation, additional %s will be used." msgstr "" #. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K -#: ../src/zypper-misc.cc:750 +#: ../src/zypper-misc.cc:749 #, c-format msgid "After the operation, %s will be freed." msgstr "" -#: ../src/zypper-misc.cc:797 +#: ../src/zypper-misc.cc:796 #, c-format msgid "%s items locked" msgstr "" -#: ../src/zypper-misc.cc:798 +#: ../src/zypper-misc.cc:797 msgid "Establishing status of aggregates" msgstr "" -#: ../src/zypper-misc.cc:806 +#: ../src/zypper-misc.cc:805 msgid "Resolving dependencies..." msgstr "" @@ -260,8 +260,8 @@ msgstr "" #: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998 -#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:311 -#: ../src/zypper-sources.cc:352 ../src/zypper-search.h:299 +#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316 +#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299 msgid "Name" msgstr "" @@ -276,7 +276,7 @@ msgstr "" #: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998 -#: ../src/zypper-sources.cc:311 +#: ../src/zypper-sources.cc:316 msgid "Status" msgstr "" @@ -321,7 +321,15 @@ msgid "committing" msgstr "" -#: ../src/zypper-misc.cc:1393 +#: ../src/zypper-misc.cc:1390 +msgid "Problem downloading the package file from the repository:" +msgstr "" + +#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89 +msgid "Please, see the above error message to for a hint." +msgstr "" + +#: ../src/zypper-misc.cc:1401 msgid "" "The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n" "\n" @@ -331,176 +339,173 @@ "- use another repository" msgstr "" -#: ../src/zypper-misc.cc:1413 +#: ../src/zypper-misc.cc:1421 msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible." msgstr "" -#: ../src/zypper-misc.cc:1416 +#: ../src/zypper-misc.cc:1424 msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible." msgstr "" -#: ../src/zypper-misc.cc:1422 +#: ../src/zypper-misc.cc:1430 msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations." msgstr "" -#: ../src/zypper-misc.cc:1448 +#: ../src/zypper-misc.cc:1456 #, c-format msgid "Automatically agreeing with %s %s license." msgstr "" -#: ../src/zypper-misc.cc:1459 +#: ../src/zypper-misc.cc:1467 #, c-format msgid "%s %s license:" msgstr "" -#: ../src/zypper-misc.cc:1463 +#: ../src/zypper-misc.cc:1471 msgid "In order to install this package, you must agree to terms of the above licencse. Continue?" msgstr "" -#: ../src/zypper-misc.cc:1474 +#: ../src/zypper-misc.cc:1482 msgid "Aborting installation due to the need for license(s) confirmation." msgstr "" #. TranslatorExplanation Don't translate the '--auto-agree-with-licenses', #. it is a command line option -#: ../src/zypper-misc.cc:1478 +#: ../src/zypper-misc.cc:1486 msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option." msgstr "" -#: ../src/zypper-misc.cc:1489 +#: ../src/zypper-misc.cc:1497 #, c-format msgid "Aborting installation due to user disagreement with %s %s license." msgstr "" -#: ../src/zypper-misc.cc:1559 +#: ../src/zypper-misc.cc:1567 #, c-format msgid "Installing source package %s-%s" msgstr "" -#: ../src/zypper-misc.cc:1567 +#: ../src/zypper-misc.cc:1575 #, c-format msgid "Source package %s-%s successfully installed." msgstr "" -#: ../src/zypper-misc.cc:1573 +#: ../src/zypper-misc.cc:1581 #, c-format msgid "Problem installing source package %s-%s:" msgstr "" -#: ../src/zypper-misc.cc:1581 +#: ../src/zypper-misc.cc:1589 #, c-format msgid "Source package '%s' not found." msgstr "" -#: ../src/zypper-sources.cc:48 +#: ../src/zypper-sources.cc:52 #, c-format msgid "Checking whether to refresh metadata for %s" msgstr "" -#: ../src/zypper-sources.cc:57 +#: ../src/zypper-sources.cc:61 #, c-format msgid "Refreshing '%s'" msgstr "" -#: ../src/zypper-sources.cc:59 +#: ../src/zypper-sources.cc:63 msgid "(forced)" msgstr "" -#: ../src/zypper-sources.cc:64 +#: ../src/zypper-sources.cc:68 #, c-format msgid "Repository '%s' is up to date." msgstr "" -#: ../src/zypper-sources.cc:76 +#: ../src/zypper-sources.cc:80 msgid "Forcing raw metadata refresh" msgstr "" -#: ../src/zypper-sources.cc:84 +#: ../src/zypper-sources.cc:88 #, c-format msgid "Problem downloading files from '%s'." msgstr "" -#: ../src/zypper-sources.cc:85 -msgid "Please, see the above error message to for a hint." -msgstr "" - -#: ../src/zypper-sources.cc:92 +#: ../src/zypper-sources.cc:96 #, c-format msgid "No URLs defined for '%s'." msgstr "" #. TranslatorExplanation the first %s is a .repo file path -#: ../src/zypper-sources.cc:96 +#: ../src/zypper-sources.cc:100 #, c-format msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'." msgstr "" -#: ../src/zypper-sources.cc:104 +#. ! \todo correct the message after 10.3 release +#: ../src/zypper-sources.cc:109 msgid "No alias defined this repository." msgstr "" -#: ../src/zypper-sources.cc:112 +#: ../src/zypper-sources.cc:117 #, c-format msgid "Repository '%s' is invalid." msgstr "" -#: ../src/zypper-sources.cc:113 +#: ../src/zypper-sources.cc:118 msgid "Please, check if the URLs defined for this repository are pointing to a valid repository." msgstr "" -#: ../src/zypper-sources.cc:121 +#: ../src/zypper-sources.cc:126 #, c-format msgid "Error downloading metadata for '%s':" msgstr "" -#: ../src/zypper-sources.cc:148 +#: ../src/zypper-sources.cc:153 msgid "Forcing building of repository cache" msgstr "" -#: ../src/zypper-sources.cc:161 +#: ../src/zypper-sources.cc:166 #, c-format msgid "Error parsing metadata for '%s':" msgstr "" #. TranslatorExplanation Don't translate the URL unless it is translated, too -#: ../src/zypper-sources.cc:163 +#: ../src/zypper-sources.cc:168 msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting" msgstr "" -#: ../src/zypper-sources.cc:177 +#: ../src/zypper-sources.cc:182 #, c-format msgid "Repository metadata for '%s' not found in local cache." msgstr "" -#: ../src/zypper-sources.cc:185 +#: ../src/zypper-sources.cc:190 msgid "Error building the cache database:" msgstr "" -#: ../src/zypper-sources.cc:217 +#: ../src/zypper-sources.cc:222 #, c-format msgid "Repository '%s' not found." msgstr "" -#: ../src/zypper-sources.cc:223 +#: ../src/zypper-sources.cc:228 #, c-format msgid "Error reading repository description file for '%s'." msgstr "" -#: ../src/zypper-sources.cc:225 +#: ../src/zypper-sources.cc:230 msgid "Reason: " msgstr "" -#: ../src/zypper-sources.cc:252 +#: ../src/zypper-sources.cc:257 #, c-format msgid "Disabling repository '%s' because of the above error." msgstr "" -#: ../src/zypper-sources.cc:270 +#: ../src/zypper-sources.cc:275 #, c-format msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it." msgstr "" -#: ../src/zypper-sources.cc:311 ../src/zypper-sources.cc:352 +#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357 #: ../src/zypper-search.h:297 msgid "Type" msgstr "" @@ -508,235 +513,257 @@ #. status #. rug's status (active, pending => active, disabled <= enabled, disabled) #. this is probably the closest possible compatibility arrangement -#: ../src/zypper-sources.cc:328 +#: ../src/zypper-sources.cc:333 msgid "Active" msgstr "" -#: ../src/zypper-sources.cc:328 +#: ../src/zypper-sources.cc:333 msgid "Disabled" msgstr "" #. TranslatorExplanation used as e.g. "Enabled: Yes" -#: ../src/zypper-sources.cc:352 ../src/zypper-sources.cc:722 +#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730 msgid "Enabled" msgstr "" -#: ../src/zypper-sources.cc:352 +#: ../src/zypper-sources.cc:357 msgid "Refresh" msgstr "" -#: ../src/zypper-sources.cc:352 +#: ../src/zypper-sources.cc:357 msgid "Alias" msgstr "" #. enabled? #. autorefresh? -#: ../src/zypper-sources.cc:368 ../src/zypper-sources.cc:370 -#: ../src/zypper-sources.cc:722 ../src/zypper-sources.cc:724 +#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375 +#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732 #: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166 #: ../src/zypper-info.cc:168 msgid "Yes" msgstr "" -#: ../src/zypper-sources.cc:368 ../src/zypper-sources.cc:370 -#: ../src/zypper-sources.cc:722 ../src/zypper-sources.cc:724 +#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375 +#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732 #: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166 #: ../src/zypper-info.cc:168 msgid "No" msgstr "" -#: ../src/zypper-sources.cc:386 +#: ../src/zypper-sources.cc:391 msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories." msgstr "" -#: ../src/zypper-sources.cc:419 ../src/zypper-sources.cc:490 +#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495 msgid "Error reading repositories:" msgstr "" -#: ../src/zypper-sources.cc:441 +#: ../src/zypper-sources.cc:446 #, c-format msgid "Can't open %s for writing. Maybe you don't have write permissions?" msgstr "" -#: ../src/zypper-sources.cc:449 +#: ../src/zypper-sources.cc:454 #, c-format msgid "Repositories have been successfully exported to %s." msgstr "" -#: ../src/zypper-sources.cc:546 +#: ../src/zypper-sources.cc:551 #, c-format msgid "Skipping disabled repository '%s'" msgstr "" -#: ../src/zypper-sources.cc:582 +#: ../src/zypper-sources.cc:587 #, c-format msgid "Skipping repository '%s' because of the above error." msgstr "" -#: ../src/zypper-sources.cc:595 +#: ../src/zypper-sources.cc:600 #, c-format msgid "Repository '%s' not found by its alias or number." msgstr "" -#: ../src/zypper-sources.cc:600 +#: ../src/zypper-sources.cc:605 msgid "Use 'zypper repos' to get the list of defined repositories." msgstr "" -#: ../src/zypper-sources.cc:607 +#: ../src/zypper-sources.cc:612 msgid "Specified repositories are not enabled or defined." msgstr "" -#: ../src/zypper-sources.cc:609 +#: ../src/zypper-sources.cc:614 msgid "There are no enabled repositories defined." msgstr "" -#: ../src/zypper-sources.cc:612 +#: ../src/zypper-sources.cc:617 msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories." msgstr "" -#: ../src/zypper-sources.cc:616 +#: ../src/zypper-sources.cc:621 msgid "Could not refresh the repositories because of errors." msgstr "" -#: ../src/zypper-sources.cc:618 +#: ../src/zypper-sources.cc:623 msgid "Some of the repositories have not been refreshed because of an error." msgstr "" -#: ../src/zypper-sources.cc:620 +#: ../src/zypper-sources.cc:625 msgid "Specified repositories have been refreshed." msgstr "" -#: ../src/zypper-sources.cc:622 +#: ../src/zypper-sources.cc:627 msgid "All repositories have been refreshed." msgstr "" -#: ../src/zypper-sources.cc:664 +#: ../src/zypper-sources.cc:667 msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh." msgstr "" -#: ../src/zypper-sources.cc:677 +#: ../src/zypper-sources.cc:685 #, c-format msgid "Repository named '%s' already exists. Please, use another alias." msgstr "" -#: ../src/zypper-sources.cc:685 +#: ../src/zypper-sources.cc:693 msgid "Can't find a valid repository at given location:" msgstr "" -#: ../src/zypper-sources.cc:686 +#: ../src/zypper-sources.cc:694 msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:" msgstr "" -#: ../src/zypper-sources.cc:697 +#: ../src/zypper-sources.cc:705 msgid "Problem transferring repository data from specified URL:" msgstr "" -#: ../src/zypper-sources.cc:698 +#: ../src/zypper-sources.cc:706 msgid "Please, check whether the specified URL is accessible." msgstr "" -#: ../src/zypper-sources.cc:705 +#: ../src/zypper-sources.cc:713 msgid "Unknown problem when adding repository:" msgstr "" -#: ../src/zypper-sources.cc:709 +#: ../src/zypper-sources.cc:717 #, c-format msgid "Repository '%s' successfully added" msgstr "" #. TranslatorExplanation used as e.g. "Autorefresh: Yes" -#: ../src/zypper-sources.cc:724 +#: ../src/zypper-sources.cc:732 msgid "Autorefresh" msgstr "" -#: ../src/zypper-sources.cc:732 +#: ../src/zypper-sources.cc:740 #, c-format msgid "Reading data from '%s' media" msgstr "" -#: ../src/zypper-sources.cc:738 +#: ../src/zypper-sources.cc:746 #, c-format msgid "Problem reading data from '%s' media" msgstr "" -#: ../src/zypper-sources.cc:739 +#: ../src/zypper-sources.cc:747 msgid "Please, check if your installation media is valid and readable." msgstr "" -#: ../src/zypper-sources.cc:833 +#: ../src/zypper-sources.cc:795 +msgid "Problem accessing the file at the specified URL" +msgstr "" + +#: ../src/zypper-sources.cc:796 +msgid "Please check if the URL is valid and accessible." +msgstr "" + +#: ../src/zypper-sources.cc:803 +msgid "Problem parsing the file at the specified URL" +msgstr "" + +#. TranslatorExplanation don't translate the URL if the URL itself is not translated. +#. Also don't translate the '.repo' string. +#: ../src/zypper-sources.cc:806 +msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details." +msgstr "" + +#: ../src/zypper-sources.cc:813 +msgid "Problem encountered while trying to read the file at the specified URL" +msgstr "" + +#: ../src/zypper-sources.cc:870 #, c-format msgid "Repository %s has been removed." msgstr "" -#: ../src/zypper-sources.cc:885 +#: ../src/zypper-sources.cc:922 #, c-format msgid "Repository %s renamed to %s" msgstr "" -#: ../src/zypper-sources.cc:890 ../src/zypper-sources.cc:967 +#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004 #, c-format msgid "Repository %s not found." msgstr "" -#: ../src/zypper-sources.cc:895 ../src/zypper-sources.cc:972 +#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009 msgid "Error while modifying the repository:" msgstr "" -#: ../src/zypper-sources.cc:897 ../src/zypper-sources.cc:974 +#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011 #, c-format msgid "Leaving repository %s unchanged." msgstr "" -#: ../src/zypper-sources.cc:911 +#: ../src/zypper-sources.cc:948 #, c-format msgid "%s used together with %s, which contradict each other. This property will be left unchanged." msgstr "" -#: ../src/zypper-sources.cc:962 +#: ../src/zypper-sources.cc:999 #, c-format msgid "Repository %s has been sucessfully modified." msgstr "" -#: ../src/zypper-sources.cc:1010 +#: ../src/zypper-sources.cc:1047 #, c-format msgid "Retrieving repository '%s' data..." msgstr "" -#: ../src/zypper-sources.cc:1017 +#: ../src/zypper-sources.cc:1054 #, c-format msgid "Repository '%s' not cached. Caching..." msgstr "" -#: ../src/zypper-sources.cc:1024 ../src/zypper-sources.cc:1043 +#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080 #, c-format msgid "Problem loading data from '%s'" msgstr "" -#: ../src/zypper-sources.cc:1025 ../src/zypper-sources.cc:1045 +#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082 #, c-format msgid "Resolvables from '%s' not loaded because of error." msgstr "" -#: ../src/zypper-sources.cc:1032 +#: ../src/zypper-sources.cc:1069 #, c-format msgid "(%d resolvables found)" msgstr "" -#: ../src/zypper-sources.cc:1044 +#: ../src/zypper-sources.cc:1081 msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so." msgstr "" -#: ../src/zypper-sources.cc:1056 +#: ../src/zypper-sources.cc:1093 msgid "Reading RPM database..." msgstr "" -#: ../src/zypper-sources.cc:1063 +#: ../src/zypper-sources.cc:1100 #, c-format msgid "(%s resolvables)" msgstr "" #. list name, exact match -#: ../src/zypper-sources.cc:1151 +#: ../src/zypper-sources.cc:1188 msgid "" "ZENworks Management Daemon is running.\n" "WARNING: this command will not synchronize changes.\n" @@ -1310,13 +1337,13 @@ msgid "You already are running zypper's shell." msgstr "" -#: ../src/zypper-utils.cc:44 +#: ../src/zypper-utils.cc:47 msgid "Please file a bug report about this." msgstr "" #. TranslatorExplanation remember not to translate the URL #. unless you translate the actual page :) -#: ../src/zypper-utils.cc:47 +#: ../src/zypper-utils.cc:50 msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions." msgstr "" @@ -1325,20 +1352,24 @@ msgid "Unknown command '%s'" msgstr "" -#: ../src/zypper-callbacks.h:41 +#: ../src/zypper-callbacks.h:42 msgid "I/O error" msgstr "" -#: ../src/zypper-callbacks.h:41 +#: ../src/zypper-callbacks.h:42 msgid "Invalid object" msgstr "" -#: ../src/zypper-media-callbacks.h:47 +#: ../src/zypper-callbacks.h:50 +msgid "Error" +msgstr "" + +#: ../src/zypper-media-callbacks.h:56 #, c-format msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation." msgstr "" -#: ../src/zypper-media-callbacks.h:63 ../src/zypper-media-callbacks.h:69 +#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82 msgid "Downloading: " msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.18/src/zypper-misc.cc new/zypper-0.8.18/src/zypper-misc.cc --- old/zypper-0.8.18/src/zypper-misc.cc 2007-08-30 20:33:57.000000000 +0200 +++ new/zypper-0.8.18/src/zypper-misc.cc 2007-08-31 16:08:42.000000000 +0200 @@ -13,7 +13,6 @@ #include <zypp/RepoManager.h> #include <zypp/RepoInfo.h> -#include <zypp/repo/RepoException.h> #include <zypp/CapFactory.h> @@ -422,7 +421,7 @@ stm << _("Problem: ") << prob.description () << endl; det = prob.details (); if (!det.empty ()) - stm << " " << det << endl; + stm << " " << det << endl; int n; ProblemSolutionList solutions = prob.solutions (); @@ -443,6 +442,9 @@ int reply; do { + // without solutions, its useless to prompt + if (solutions.empty()) + return false; // input prompt cerr << _("number, (r)etry or (c)ancel> ") << flush; string reply_s = str::getline (cin, zypp::str::TRIM); @@ -482,17 +484,21 @@ e = rproblems.end (), i; ProblemSolutionList todo; - bool no_problem = b == e; - if (!no_problem) { + if (!rproblems.empty()) { stm << format (_("%s Problems:")) % rproblems.size() << endl; } else { stm << _("Specified capability not found") << endl; return false; } - for (i = b; i != e; ++i) { - stm << _("Problem: ") << (*i)->description () << endl; + // for many problems, list them shortly first + if (rproblems.size() > 1) + { + for (i = b; i != e; ++i) { + stm << _("Problem: ") << (*i)->description () << endl; + } } + // now list all problems with solution proposals for (i = b; i != e; ++i) { stm << endl; tribool stopnow = show_problem (*(*i), todo); @@ -805,6 +811,7 @@ { establish (); cout_v << _("Resolving dependencies...") << endl; + God->resolver()->setForceResolve( true ); return God->resolver()->resolvePool(); } @@ -861,7 +868,7 @@ || it->status().transacts() // or transacts || !it->status().isUndetermined()) // or established status { - _DEBUG( count << ": " << *it ); + _XDEBUG( count << ": " << *it ); } } _XDEBUG( "---------------------------------------" ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.18/src/zypper-sources.cc new/zypper-0.8.18/src/zypper-sources.cc --- old/zypper-0.8.18/src/zypper-sources.cc 2007-08-30 20:33:57.000000000 +0200 +++ new/zypper-0.8.18/src/zypper-sources.cc 2007-08-31 16:08:42.000000000 +0200 @@ -784,8 +784,37 @@ //! \todo handle local .repo files, validate the URL Url url(repo_file_url); RepoManager manager; - list<RepoInfo> repos = readRepoFile(url); + list<RepoInfo> repos; + // read the repo file + try { repos = readRepoFile(url); } + catch (const media::MediaException & e) + { + ZYPP_CAUGHT(e); + report_problem(e, + _("Problem accessing the file at the specified URL") + string(":"), + _("Please check if the URL is valid and accessible.")); + return ZYPPER_EXIT_ERR_ZYPP; + } + catch (const parser::ParseException & e) + { + ZYPP_CAUGHT(e); + report_problem(e, + _("Problem parsing the file at the specified URL") + string(":"), + // TranslatorExplanation don't translate the URL if the URL itself is not translated. + // Also don't translate the '.repo' string. + _("Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details.")); + return ZYPPER_EXIT_ERR_ZYPP; + } + catch (const Exception & e) + { + ZYPP_CAUGHT(e); + report_problem(e, + _("Problem encountered while trying to read the file at the specified URL") + string(":")); + return ZYPPER_EXIT_ERR_ZYPP; + } + + // add repos for (list<RepoInfo>::const_iterator it = repos.begin(); it != repos.end(); ++it) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-network
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package yast2-network checked in at Fri Aug 31 16:18:11 CEST 2007. -------- --- yast2-network/yast2-network.changes 2007-08-28 15:22:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-08-31 15:34:50.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Aug 31 15:38:31 CEST 2007 - mzugec(a)suse.cz + +- autoyast support for udev rules and backport compatibility with + old-style network devices names (#303916) +- 2.15.71 + +------------------------------------------------------------------- Old: ---- yast2-network-2.15.70.tar.bz2 New: ---- yast2-network-2.15.71.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.A28907/_old 2007-08-31 16:17:47.000000000 +0200 +++ /var/tmp/diff_new_pack.A28907/_new 2007-08-31 16:17:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.15.70) +# spec file for package yast2-network (Version 2.15.71) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-network -Version: 2.15.70 +Version: 2.15.71 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.15.70.tar.bz2 +Source0: yast2-network-2.15.71.tar.bz2 prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm @@ -43,12 +43,12 @@ Conflicts: yast2-core < 2.10.6 Summary: YaST2 - Network Configuration %package devel-doc -Version: 2.15.70 +Version: 2.15.71 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.15.70.tar.bz2 +Source0: yast2-network-2.15.71.tar.bz2 prefix: /usr Requires: yast2-network >= 2.15.53 Summary: YaST2 - Developer documentation for yast2-network @@ -73,7 +73,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-network-2.15.70 +%setup -n yast2-network-2.15.71 %build %{prefix}/bin/y2tool y2autoconf @@ -141,6 +141,10 @@ %exclude %{prefix}/share/doc/packages/yast2-network/README %changelog +* Fri Aug 31 2007 - mzugec(a)suse.cz +- autoyast support for udev rules and backport compatibility with + old-style network devices names (#303916) +- 2.15.71 * Tue Aug 28 2007 - mzugec(a)suse.cz - write NAME in propose - (#301977) - 2.15.70 ++++++ yast2-network-2.15.70.tar.bz2 -> yast2-network-2.15.71.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.70/agents/ag_udev_persistent new/yast2-network-2.15.71/agents/ag_udev_persistent --- old/yast2-network-2.15.70/agents/ag_udev_persistent 2007-08-27 11:15:57.000000000 +0200 +++ new/yast2-network-2.15.71/agents/ag_udev_persistent 2007-08-31 15:25:50.000000000 +0200 @@ -14,6 +14,12 @@ my @net_comment = (); my @drivers_comment = (); +sub set_rules_comment(){ + my $class = shift; + my $pointer = \@_; + @net_comment = @{$$pointer[0]}; +} + sub parse_net_rules { my $class = shift; my %hash_table = (); @@ -101,6 +107,22 @@ } +sub write_net_rules(){ + my $class = shift; + my $param = \@_; + + my @output = (); + foreach my $row (@net_comment, @{$$param[0]}){ + push (@output, $row."\n"); + } + + if( open( FILE, "> $net_file" ) ) { + print FILE @output; + } else { + return $class->SetError(summary => sprintf( _("saving %s failed: %s"),$net_file, $!), + code => "OPEN_FAILED"); + } +} sub Execute { my $class = shift; @@ -125,8 +147,13 @@ my $class = shift; my ($path, @args) = @_; if ($path eq '.drivers'){ - my $hash_pointer = $args[0]; - return $class->write_drivers_rules($hash_pointer); + return $class->write_drivers_rules($args[0]); + } + if ($path eq '.rules'){ + return $class->write_net_rules($args[0]); + } + if ($path eq '.rules_comment'){ + return $class->set_rules_comment($args[0]); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.70/configure new/yast2-network-2.15.71/configure --- old/yast2-network-2.15.70/configure 2007-08-28 14:58:48.000000000 +0200 +++ new/yast2-network-2.15.71/configure 2007-08-31 15:27:10.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-network 2.15.69. +# Generated by GNU Autoconf 2.61 for yast2-network 2.15.70. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-network' PACKAGE_TARNAME='yast2-network' -PACKAGE_VERSION='2.15.69' -PACKAGE_STRING='yast2-network 2.15.69' +PACKAGE_VERSION='2.15.70' +PACKAGE_STRING='yast2-network 2.15.70' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,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-network 2.15.69 to adapt to many kinds of systems. +\`configure' configures yast2-network 2.15.70 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-network 2.15.69:";; + short | recursive ) echo "Configuration of yast2-network 2.15.70:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-network configure 2.15.69 +yast2-network configure 2.15.70 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,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-network $as_me 2.15.69, which was +It was created by yast2-network $as_me 2.15.70, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-network' - VERSION='2.15.69' + VERSION='2.15.70' cat >>confdefs.h <<_ACEOF @@ -2408,7 +2408,7 @@ -VERSION="2.15.69" +VERSION="2.15.70" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -3303,7 +3303,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-network $as_me 2.15.69, which was +This file was extended by yast2-network $as_me 2.15.70, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3346,7 +3346,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-network config.status 2.15.69 +yast2-network config.status 2.15.70 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.70/configure.in new/yast2-network-2.15.71/configure.in --- old/yast2-network-2.15.70/configure.in 2007-08-28 14:58:43.000000000 +0200 +++ new/yast2-network-2.15.71/configure.in 2007-08-31 15:27:05.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.15.69, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.15.70, http://bugs.opensuse.org/, yast2-network) 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.15.69" +VERSION="2.15.70" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.70/src/clients/save_network.ycp new/yast2-network-2.15.71/src/clients/save_network.ycp --- old/yast2-network-2.15.70/src/clients/save_network.ycp 2007-08-27 11:12:53.000000000 +0200 +++ new/yast2-network-2.15.71/src/clients/save_network.ycp 2007-08-31 15:00:04.000000000 +0200 @@ -20,6 +20,7 @@ import "NetworkStorage"; import "Installation"; import "String"; +import "Mode"; include "network/routines.ycp"; include "network/complex.ycp"; @@ -205,11 +206,10 @@ string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); string hw_name = BuildDescription(NetworkDevices::device_type(ifcfg), NetworkDevices::device_num(ifcfg), $["dev_name":InstallInf["netdevice"]:""], hardware); -y2internal("name %1", hw_name); if (size(hw_name)>0) network_configuration = sformat("%1NAME='%2'\n", network_configuration, hw_name); - y2internal("Network Configuration:\n%1\nifcfg file: %2", network_configuration, ifcfg); + y2milestone("Network Configuration:\n%1\nifcfg file: %2", network_configuration, ifcfg); // write only if file doesn't exists string dev_file=sformat("/etc/sysconfig/network/%1", ifcfg); @@ -300,6 +300,12 @@ WFM::SCRClose (new_SCR); WFM::SCRSetDefault (old_SCR); + if (Mode::autoinst()){ + import "LanUdevAuto"; + LanUdevAuto::Write(); + } + + if(ReadInstallInf()){ // string hwcfgname = CreateHardwareFile(); // string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.70/src/modules/LanUdevAuto.ycp new/yast2-network-2.15.71/src/modules/LanUdevAuto.ycp --- old/yast2-network-2.15.70/src/modules/LanUdevAuto.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-2.15.71/src/modules/LanUdevAuto.ycp 2007-08-31 14:22:55.000000000 +0200 @@ -0,0 +1,85 @@ +/** + * File: modules/LanUdevAuto.ycp + * Package: Network configuration + * Summary: Udev rules for autoinstallation + * Authors: Michal Zugec <mzugec(a)suse.cz> + * + * $Id: Lan.ycp 40537 2007-08-28 13:22:01Z mzugec $ + * + * Representation of the configuration of network cards. + */ + +{ + module "LanUdevAuto"; + textdomain "network"; + + list<map> udev_rules=[]; + +/** + * internal function: + * check if old-style (ifcfg-eth-id-..., ifcfg-eth-bus-... is used) or new-style (ifcfg-eth0) + */ + boolean oldStyle(map ay){ + boolean old_style_found = false; + foreach(map interface, ay["interfaces"]:[], { + if (issubstring(interface["device"]:"", "-id-")) old_style_found=true; + if (issubstring(interface["device"]:"", "-bus-")) old_style_found=true; + }); + y2milestone("old-style found:%1", old_style_found); + return old_style_found; + } + +/** + * internal function: + * for old-slyle create udev rules and rename interface names to new-style + */ + list<map> createUdevFromIfaceName(list<map> interfaces){ + y2milestone("old-style names for interfaces found - convert into new-style"); + y2internal("interfaces %1", interfaces); + integer pos=0; + list<map> tmp_interfaces=[]; + foreach(map interface, interfaces, { + if (issubstring(interface["device"]:"", "-id-")||issubstring(interface["device"]:"", "-bus-")){ + string value = splitstring(interface["device"]:"", "-")[2]:""; + string rule="ATTR{address}"; + if (splitstring(interface["device"]:"", "-")[1]:"" == "bus") rule = "KERNELS"; + interface["device"]=sformat("eth%1", pos); + udev_rules = add(udev_rules, + $[ + "rule" : rule, + "value" : value, + "name" : interface["device"]:"" + ]); + tmp_interfaces=add(tmp_interfaces, interface); + } + pos=pos+1; + }); + y2milestone("converted interfaces: %1", tmp_interfaces); + return tmp_interfaces; + } + + global define boolean Import(map settings) { + if (oldStyle(settings)) settings["interfaces"] = createUdevFromIfaceName(settings["interfaces"]:[]); + else udev_rules = settings["net-udev"]:[]; + y2internal("interfaces: %1", settings["interfaces"]:[]); + y2internal("udev rules:%1", udev_rules); + return true; + } + + global define boolean Write(){ + list<string> comment = ["# Generated by autoyast", + "# program run by the persistent-net-generator.rules rules file.", + "#", + "# You can modify it, as long as you keep each rule on a single line." ]; + list<string> rules = []; + foreach(map rule, udev_rules, { + rules = add(rules, sformat("SUBSYSTEM==\"net\", DRIVERS==\"?*\", %1==\"%2\", NAME=\"%3\"", + rule["rule"]:"", rule["value"]:"", rule["name"]:"")); + }); + SCR::Write(.udev_persistent.rules_comment, comment); + SCR::Write(.udev_persistent.rules, rules); + return true; + } + + +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.70/VERSION new/yast2-network-2.15.71/VERSION --- old/yast2-network-2.15.70/VERSION 2007-08-28 14:59:35.000000000 +0200 +++ new/yast2-network-2.15.71/VERSION 2007-08-31 15:38:25.000000000 +0200 @@ -1 +1 @@ -2.15.70 +2.15.71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mysql
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package mysql checked in at Fri Aug 31 16:17:40 CEST 2007. -------- --- mysql/mysql.changes 2007-08-30 10:44:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/mysql/mysql.changes 2007-08-31 13:48:06.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 31 13:46:48 CEST 2007 - mmarek(a)suse.cz + +- make sure mysql-shared is replaced by libmysqlclient15 when + updating from 10.1 or 10.2 [#306556] + +------------------------------------------------------------------- Old: ---- minmem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql.spec ++++++ --- /var/tmp/diff_new_pack.i27687/_old 2007-08-31 16:17:06.000000000 +0200 +++ /var/tmp/diff_new_pack.i27687/_new 2007-08-31 16:17:06.000000000 +0200 @@ -15,7 +15,7 @@ License: GPL v2 only, individual distribution permission before version 3.23.xx Group: Productivity/Databases/Servers Version: 5.0.45 -Release: 13 +Release: 14 # required by rcmysql Requires: mysql-client = %{version} Autoreqprov: on @@ -137,6 +137,12 @@ License: GPL v2 or later URL: http://www.mysql.com Group: Development/Libraries/Other +# make sure libmysqlclient15 replaces the 5.0.x versions of mysql-shared, +# but can coexist with 4.x versions of mysql-shared +# libmysqlclient_r15 will then be pulled in when needed +# *** this has to be removed when the package name changes *** +Provides: mysql-shared = %version +Obsoletes: mysql-shared >= 5.0 Autoreqprov: on %description -n libmysqlclient15 @@ -555,6 +561,9 @@ %files tools -f mysql-tools.files %changelog +* Fri Aug 31 2007 - mmarek(a)suse.cz +- make sure mysql-shared is replaced by libmysqlclient15 when + updating from 10.1 or 10.2 [#306556] * Wed Aug 29 2007 - mmarek(a)suse.cz - fix for http://bugs.mysql.com/30069 (thanks to Richard Guenther) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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