June 2007 - openSUSE Commits - openSUSE Mailing Lists

commit module-init-tools
by root＠Hilbert.suse.de 29 Jun '07

29 Jun '07

Hello community, here is the log from the commit of package module-init-tools checked in at Fri Jun 29 14:15:33 CEST 2007. -------- --- module-init-tools/module-init-tools.changes 2007-06-21 11:35:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/module-init-tools/module-init-tools.changes 2007-06-29 12:42:56.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 29 12:42:37 CEST 2007 - mmarek(a)suse.cz + +- fixed a segfault in insmod [#287493] + +------------------------------------------------------------------- New: ---- insmod-segfault.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ module-init-tools.spec ++++++ --- /var/tmp/diff_new_pack.o16447/_old 2007-06-29 14:15:19.000000000 +0200 +++ /var/tmp/diff_new_pack.o16447/_new 2007-06-29 14:15:19.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: zlib-devel # it's 3.3-pre11 actually Version: 3.2.99.pre11 -Release: 1 +Release: 3 %define ver 3.3-pre11 License: GNU General Public License (GPL) Group: System/Kernel @@ -46,6 +46,7 @@ Patch12: module-init-tools-skip-unsupported.diff Patch13: module-init-tools-blacklist-warn.diff Patch15: module-init-tools-options-priority.diff +Patch16: insmod-segfault.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -75,6 +76,7 @@ %patch12 %patch13 %patch15 +%patch16 %build autoreconf --force --install @@ -126,6 +128,8 @@ /etc/modprobe.d %changelog +* Fri Jun 29 2007 - mmarek(a)suse.cz +- fixed a segfault in insmod [#287493] * Thu Jun 21 2007 - mmarek(a)suse.cz - updated to 3.3-pre11 * /etc/depmod.conf support (obsoletes depmod*.diff) ++++++ insmod-segfault.diff ++++++ --- insmod.c.orig +++ insmod.c @@ -116,7 +116,10 @@ int main(int argc, char *argv[]) exit(1); } - (p = strrchr(argv[0], '/')) ? p++ : argv[0]; + if ((p = strrchr(argv[0], '/'))) + p++; + else + p = argv[0]; if (strstr(p, "insmod.static")) try_old_version("insmod.static", argv); else ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gcc42
by root＠Hilbert.suse.de 29 Jun '07

29 Jun '07

Hello community, here is the log from the commit of package gcc42 checked in at Fri Jun 29 14:14:59 CEST 2007. -------- --- gcc42/cross-alpha-gcc-icecream-backend.changes 2007-06-28 18:49:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc42/cross-alpha-gcc-icecream-backend.changes 2007-06-28 22:52:02.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 28 20:08:42 CEST 2007 - rguenther(a)suse.de + +- Update to suse-gcc-4_2-branch head (r126079). + +------------------------------------------------------------------- cross-arm-gcc-icecream-backend.changes: same change cross-avr-gcc42.changes: same change cross-hppa-gcc-icecream-backend.changes: same change cross-i386-gcc-icecream-backend.changes: same change cross-ia64-gcc-icecream-backend.changes: same change cross-ppc64-gcc-icecream-backend.changes: same change cross-ppc-gcc-icecream-backend.changes: same change cross-s390-gcc-icecream-backend.changes: same change cross-s390x-gcc-icecream-backend.changes: same change cross-x86_64-gcc-icecream-backend.changes: same change gcc42.changes: same change libgcj42.changes: same change Old: ---- gcc-4.2.1-20070604.tar.bz2 New: ---- gcc-4.2.1-20070628.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-alpha-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.Ir6728/_old 2007-06-29 14:13:57.000000000 +0200 +++ /var/tmp/diff_new_pack.Ir6728/_new 2007-06-29 14:13:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package cross-alpha-gcc-icecream-backend (Version 4.2.1_20070604) +# spec file for package cross-alpha-gcc-icecream-backend (Version 4.2.1_20070628) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -29,8 +29,8 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc URL: http://gcc.gnu.org/ License: BSD License and BSD-like, GNU General Public License (GPL) -Version: 4.2.1_20070604 -Release: 5 +Version: 4.2.1_20070628 +Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.2 @@ -332,6 +332,8 @@ /usr/share/icecream-envs %changelog +* Thu Jun 28 2007 - rguenther(a)suse.de +- Update to suse-gcc-4_2-branch head (r126079). * Thu Jun 28 2007 - matz(a)suse.de - Add AMDFAM10h patches and fix for PR31307. * Fri Jun 22 2007 - rguenther(a)suse.de cross-arm-gcc-icecream-backend.spec: same change ++++++ cross-avr-gcc42.spec ++++++ --- /var/tmp/diff_new_pack.Ir6728/_old 2007-06-29 14:13:57.000000000 +0200 +++ /var/tmp/diff_new_pack.Ir6728/_new 2007-06-29 14:13:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package cross-avr-gcc42 (Version 4.2.1_20070604) +# spec file for package cross-avr-gcc42 (Version 4.2.1_20070628) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -26,8 +26,8 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc URL: http://gcc.gnu.org/ License: BSD License and BSD-like, GNU General Public License (GPL) -Version: 4.2.1_20070604 -Release: 10 +Version: 4.2.1_20070628 +Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.2 @@ -295,6 +295,8 @@ %{_prefix} %changelog +* Thu Jun 28 2007 - rguenther(a)suse.de +- Update to suse-gcc-4_2-branch head (r126079). * Thu Jun 28 2007 - matz(a)suse.de - Add AMDFAM10h patches and fix for PR31307. * Fri Jun 22 2007 - rguenther(a)suse.de ++++++ cross-hppa-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.Ir6728/_old 2007-06-29 14:13:57.000000000 +0200 +++ /var/tmp/diff_new_pack.Ir6728/_new 2007-06-29 14:13:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package cross-hppa-gcc-icecream-backend (Version 4.2.1_20070604) +# spec file for package cross-hppa-gcc-icecream-backend (Version 4.2.1_20070628) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -29,8 +29,8 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc URL: http://gcc.gnu.org/ License: BSD License and BSD-like, GNU General Public License (GPL) -Version: 4.2.1_20070604 -Release: 5 +Version: 4.2.1_20070628 +Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.2 @@ -332,6 +332,8 @@ /usr/share/icecream-envs %changelog +* Thu Jun 28 2007 - rguenther(a)suse.de +- Update to suse-gcc-4_2-branch head (r126079). * Thu Jun 28 2007 - matz(a)suse.de - Add AMDFAM10h patches and fix for PR31307. * Fri Jun 22 2007 - rguenther(a)suse.de cross-i386-gcc-icecream-backend.spec: same change cross-ia64-gcc-icecream-backend.spec: same change cross-ppc64-gcc-icecream-backend.spec: same change cross-ppc-gcc-icecream-backend.spec: same change cross-s390-gcc-icecream-backend.spec: same change cross-s390x-gcc-icecream-backend.spec: same change cross-x86_64-gcc-icecream-backend.spec: same change ++++++ gcc42.spec ++++++ --- /var/tmp/diff_new_pack.Ir6728/_old 2007-06-29 14:13:57.000000000 +0200 +++ /var/tmp/diff_new_pack.Ir6728/_new 2007-06-29 14:13:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gcc42 (Version 4.2.1_20070604) +# spec file for package gcc42 (Version 4.2.1_20070628) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -102,8 +102,8 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc URL: http://gcc.gnu.org/ License: GNU General Public License (GPL) -Version: 4.2.1_20070604 -Release: 10 +Version: 4.2.1_20070628 +Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.2 @@ -2164,6 +2164,8 @@ %endif %changelog +* Thu Jun 28 2007 - rguenther(a)suse.de +- Update to suse-gcc-4_2-branch head (r126079). * Thu Jun 28 2007 - matz(a)suse.de - Add AMDFAM10h patches and fix for PR31307. * Fri Jun 22 2007 - rguenther(a)suse.de ++++++ libgcj42.spec ++++++ --- /var/tmp/diff_new_pack.Ir6728/_old 2007-06-29 14:13:57.000000000 +0200 +++ /var/tmp/diff_new_pack.Ir6728/_new 2007-06-29 14:13:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libgcj42 (Version 4.2.1_20070604) +# spec file for package libgcj42 (Version 4.2.1_20070628) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -114,8 +114,8 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) -Version: 4.2.1_20070604 -Release: 11 +Version: 4.2.1_20070628 +Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.2 @@ -963,6 +963,8 @@ %endif %changelog +* Thu Jun 28 2007 - rguenther(a)suse.de +- Update to suse-gcc-4_2-branch head (r126079). * Thu Jun 28 2007 - matz(a)suse.de - Add AMDFAM10h patches and fix for PR31307. * Fri Jun 22 2007 - rguenther(a)suse.de ++++++ gcc-4.2.1-20070604.tar.bz2 -> gcc-4.2.1-20070628.tar.bz2 ++++++ gcc42/gcc-4.2.1-20070604.tar.bz2 /mounts/work_src_done/STABLE/gcc42/gcc-4.2.1-20070628.tar.bz2 differ: byte 11, line 1 ++++++ gcc.spec.in ++++++ --- gcc42/gcc.spec.in 2007-06-28 18:48:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc42/gcc.spec.in 2007-06-28 22:51:22.000000000 +0200 @@ -117,7 +117,7 @@ URL: http://gcc.gnu.org/ License: GPL -Version: 4.2.1_20070604 +Version: 4.2.1_20070628 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 patterns-openSUSE
by root＠Hilbert.suse.de 29 Jun '07

29 Jun '07

Hello community, here is the log from the commit of package patterns-openSUSE checked in at Fri Jun 29 10:53:27 CEST 2007. -------- --- patterns-openSUSE/patterns-openSUSE.changes 2007-06-28 09:17:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/patterns-openSUSE/patterns-openSUSE.changes 2007-06-29 08:47:04.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 29 08:44:44 CEST 2007 - aj(a)suse.de + +- Add xournal to GNOME-LAPTOP (#288160). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.Etl466/_old 2007-06-29 10:53:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Etl466/_new 2007-06-29 10:53:09.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: Patterns for Installation (full ftp tree) Version: 10.3 -Release: 66 +Release: 67 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-openSUSE-data.tar.bz2 Source1: preprocess @@ -185,6 +185,8 @@ /CD1/suse/setup/descr/non_oss*.pat %changelog +* Fri Jun 29 2007 - aj(a)suse.de +- Add xournal to GNOME-LAPTOP (#288160). * Thu Jun 28 2007 - aj(a)suse.de - Add vm-install and virt-manager to XEN pattern (#286987). - Require xkeyboard-config in X11 (#285001). ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-LAPTOP new/patterns-openSUSE-data/data/GNOME-LAPTOP --- old/patterns-openSUSE-data/data/GNOME-LAPTOP 2006-09-01 11:18:48.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-LAPTOP 2007-06-29 08:44:07.000000000 +0200 @@ -1,3 +1,3 @@ +Prc: -gnome-vfs2 +xournal -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/LAPTOP new/patterns-openSUSE-data/data/LAPTOP --- old/patterns-openSUSE-data/data/LAPTOP 2007-04-28 19:56:04.000000000 +0200 +++ new/patterns-openSUSE-data/data/LAPTOP 2007-06-29 08:43:52.000000000 +0200 @@ -1,15 +1,14 @@ +Prc: +dockutils hotkey-setup irda +jarnal pcmciautils scpm sumf suspend wpa_supplicant -jarnal -xournal +x11-input-wacom-tools xstroke xvkbd -x11-input-wacom-tools -dockutils -Prc: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package xorg-x11 checked in at Thu Jun 28 23:38:52 CEST 2007. -------- --- xorg-x11/xorg-x11.changes 2007-06-22 22:05:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2007-06-28 20:34:47.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 28 20:34:21 CEST 2007 - dmueller(a)suse.de + +- xauth: crash on removing non-existant entry + +------------------------------------------------------------------- New: ---- xauth-1.0.2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.l15479/_old 2007-06-28 23:37:52.000000000 +0200 +++ /var/tmp/diff_new_pack.l15479/_new 2007-06-28 23:37:52.000000000 +0200 @@ -15,7 +15,7 @@ BuildRequires: mcpp URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 87 +Release: 89 License: X11/MIT, xc/fonts/scaled/Type1/Copyright BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -143,6 +143,7 @@ Patch21: xvidtune.diff Patch22: beforelight.diff Patch23: xrandr_12_newmode.diff +Patch24: xauth-1.0.2.diff %description This package contains the X.Org core and sample applications. @@ -226,6 +227,9 @@ pushd twm-*/src %patch16 -p2 popd +pushd xauth-* +%patch24 +popd patch -d scripts-* -p0 -s < %PATCH19 patch -d xvidtune-* -p0 -s < %PATCH21 patch -d beforelight-* -p0 -s < %PATCH22 @@ -449,6 +453,8 @@ /var/lib/xdm/authdir/ %changelog +* Thu Jun 28 2007 - dmueller(a)suse.de +- xauth: crash on removing non-existant entry * Fri Jun 22 2007 - sndirsch(a)suse.de - xdm: no need to run SuSEconfig.xdm by kdm * Mon Jun 18 2007 - dmueller(a)suse.de ++++++ xauth-1.0.2.diff ++++++ --- process.c +++ process.c @@ -1285,8 +1285,11 @@ /* * unlink the auth we were asked to */ - while (!eq_auth((list = *listp)->auth, auth)) + while (!eq_auth((list = *listp)->auth, auth)) { listp = &list->next; + if (!*listp) + return 0; + } *listp = list->next; XauDisposeAuth (list->auth); /* free the auth */ free (list); /* free the link */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 osc
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package osc checked in at Thu Jun 28 23:37:41 CEST 2007. -------- --- osc/osc.changes 2007-06-26 15:22:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/osc/osc.changes 2007-06-28 16:20:05.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Jun 28 16:19:07 CEST 2007 - poeml(a)suse.de + +- update to r1792: + - linkpac: make this osc subcommand work again: sync metadata if + edit_meta() is called with change_is_required=False. + - log: fail gracefully if logfile can't be found + - handle empty prjresults (e.g. when no repositories are defined) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.b14317/_old 2007-06-28 23:37:33.000000000 +0200 +++ /var/tmp/diff_new_pack.b14317/_new 2007-06-28 23:37:33.000000000 +0200 @@ -13,7 +13,7 @@ Name: osc BuildRequires: python-devel Version: 0.96 -Release: 26 +Release: 27 Group: Development/Tools/Other License: GNU General Public License (GPL) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -73,6 +73,12 @@ %doc README TODO NEWS %changelog +* Thu Jun 28 2007 - poeml(a)suse.de +- update to r1792: + - linkpac: make this osc subcommand work again: sync metadata if + edit_meta() is called with change_is_required=False. + - log: fail gracefully if logfile can't be found + - handle empty prjresults (e.g. when no repositories are defined) * Tue Jun 26 2007 - poeml(a)suse.de - update to r1783: - build: don't stumble over an empty list of packages when trying to verify packages ++++++ debian.changelog ++++++ --- osc/debian.changelog 2007-06-26 15:23:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/osc/debian.changelog 2007-06-28 16:21:52.000000000 +0200 @@ -1,3 +1,13 @@ +osc (0.96-9) unstable; urgency=high + + * update to r1792: + - linkpac: make this osc subcommand work again: sync metadata if + edit_meta() is called with change_is_required=False. + - log: fail gracefully if logfile can't be found + - handle empty prjresults (e.g. when no repositories are defined) + + -- Peter Poeml <poeml(a)suse.de> Thu, 28 May 2007 00:00:00 +0200 + osc (0.96-8) unstable; urgency=high * update to r1783: ++++++ osc-0.96.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/osc-0.96/osc/commandline.py new/osc-0.96/osc/commandline.py --- old/osc-0.96/osc/commandline.py 2007-06-26 15:17:38.000000000 +0200 +++ new/osc-0.96/osc/commandline.py 2007-06-26 16:22:23.000000000 +0200 @@ -967,6 +967,11 @@ break offset += len(log_chunk) print log_chunk.strip() + + except urllib2.HTTPError, e: + print >>sys.stderr, 'Can\'t get logfile' + print >>sys.stderr, e + except KeyboardInterrupt: pass diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/osc-0.96/osc/core.py new/osc-0.96/osc/core.py --- old/osc-0.96/osc/core.py 2007-06-26 15:17:38.000000000 +0200 +++ new/osc-0.96/osc/core.py 2007-06-28 16:17:13.000000000 +0200 @@ -24,7 +24,7 @@ BUFSIZE = 1024*1024 store = '.osc' -exclude_stuff = [store, '.svn', 'CVS', '.git', '.gitignore', '.pc', '*~', '.*.swp'] +exclude_stuff = [store, '.svn', 'CVS', '.git', '.gitignore', '.pc', '*~', '.*.swp', '.swp'] new_project_templ = """\ @@ -943,6 +943,7 @@ else: break else: + f.sync() break @@ -996,7 +997,7 @@ if not os.path.isfile(specfile): print 'file \'%s\' is not a readable file' % specfile - return None + return (None, None, None) lines = open(specfile).readlines() @@ -1155,6 +1156,7 @@ tree = ET.parse(StringIO(''.join(src_meta))) root = tree.getroot() root.set('name', '%s') + root.set('project', dst_project) tree.find('person').set('userid', '%s') buf = StringIO() tree.write(buf) @@ -1315,6 +1317,8 @@ root = tree.getroot() pacs = [] + if not root.find('result'): + return [] for node in root.find('result'): pacs.append(node.get('package')) pacs.sort() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/osc-0.96/TODO new/osc-0.96/TODO --- old/osc-0.96/TODO 2007-06-22 16:04:47.000000000 +0200 +++ new/osc-0.96/TODO 2007-06-28 12:05:01.000000000 +0200 @@ -1,106 +1,69 @@ -- split functionality that needs prj/pac as commandline arguments into a seperate tool (oscremote? osc -r?) -- implmement (svn-like) switch command -- implement 'mv' command -- updatepacmetafromspec -- is that useful? - In which form would this be integrated best? -- use urllib.urlencode for parameter encoding -- _real_ SSL support, with certificate verification -- adjust zsh completion to work with cmdln.py implementation -- add option to disable gpg key checking? -- add support for adding tags to packages? -- write howto for plugin-izing subcommand implementation -- implement editing of project configuration (already works in api & backend) +MAJOR: + - new meta command, replacing usermeta, edituser, editprj, editmeta, ... [2] + (poeml has started to work on this one) + - See http://lists.opensuse.org/opensuse-buildservice/2007-05/msg00202.html + and the two followups. + - thereby, implement editing of project configuration (already works in api & backend) -checkin: - - handle error if PUT fails, so the change is not committed to - localmeta + - commit message handling, and source revision handling. This affects the commands + co, up, log, ci, diff. (Checking out or diffing against old revivions, + committing with commit messages, and reviewing the commit log) + - changelog handling (equivalent of Novell-internal 'vc' tool, I guess) + (should also work with multiple spec files <package-name>-<repository-name>.spec, and with <package-name>-<version>.spec) -- changelog handling - (should also work with multiple spec files <package-name>-<repository-name>.spec, and with <package-name>-<version>.spec) + - think about how to locally build "linked" packages + +NORMAL: + - add support for local build of packages which do not exist / have not been + created yet in the buildservice + - write howto for plugin-izing subcommand implementation + - split functionality that needs prj/pac as commandline arguments into a seperate tool (oscremote? osc -r?) + - status: implement -u option as in svn [3] + - implement (svn-like) switch command + - implement 'mv' command + - use urllib.urlencode for parameter encoding (or check if this is the case already?) + - _real_ SSL support, with certificate verification + - copypac: put the current release number into the spec file before sending it + - kill BUILD_ROOT/BUILD_DIST support (or make it configurable? It tends to + cause confusion if accidentally set. Only useful inside Novell anyway.) + - show request body of 400 responses (bad request) + - commit: check if errors during PUT are handled sensibly, so the change is + not committed to localmeta -implement a package search / indexing +MINOR: -> BTW: Can I upload a src.rpm instead of a tarball also? -no, because not all tools will be able to handle a src.rpm. And you will not -be able to build non rpm packages from it. -But someone could patch the commandline tool osc to import a src.rpm by -extracting it (hint hint ;) + - new command: osc listbinaries [<project>] [<package>] + listing the built package, either as URLs or just the filenames? [1] + - new command: osc getbinaries [<project>] [<package>] [<rpm>]+ [1] + - add option to disable gpg key checking? + - adjust zsh completion to work with cmdln.py implementation +OPTIONAL: + - add support for importing a src.rpm, extracting it and make it a package + Something similar can be done by + osc createpac foo-project foo123 + followed by + cd foo123; osc init foo-project foo123 + - add support for adding tags to packages? + - add support for package search -<darix> ich hab nen vorschlag fuer osc -<darix> sagen wir ich leg ein server:mail/foo123 an -<darix> dann waere es cool sowas zu koennen wie -<darix> osc importfromspec server:mail foo123 -This can actually be done by - osc createpac server:mail foo123 -followed by - cd foo123; osc init server:mail foo123 -bug: - % osc rm subversion.de.po.bz2 subversion.nb.po.bz2 -D subversion.de.po.bz2 -D subversion.nb.po.bz2 -poeml@aust ~/pac/opensuse/Subversion/subversion - % osc ci subversion.de.po.bz2 subversion.nb.po.bz2 -Sending subversion.changes -Deleting subversion.de.po.bz2 -Deleting subversion.nb.po.bz2 -Sending subversion.viewcvs.conf -Transmitting file data .. -15:47 < kesselborn> DuDE: beim osc local build: müssen die config vars gesetzt sein, wenn man env vars gesetzt hat? -15:48 < DuDE> kesselborn: hm, weiss ich gerade gar nicht -15:48 < kesselborn> ja, scheint so -15:48 < kesselborn> ok -15:48 < kesselborn> aber er nimmt dann die env vas -15:48 < kesselborn> vars -15:50 < DuDE> kesselborn: hm, das sollte ich aendern - - - - - -osc repos server:search:ui : - <repository name="SUSE_Linux_10.1"> - <path project="server:search" repository="SUSE_Linux_10.1" /> - <path project="KDE:KDE4" repository="SUSE_Linux_10.1" /> - <arch>x86_64</arch> - <arch>i586</arch> - </repository> - <repository name="SUSE_Factory"> - <path project="server:search" repository="SUSE_Factory" /> - <path project="KDE:KDE4" repository="SUSE_Factory" /> - <arch>x86_64</arch> - <arch>i586</arch> - </repository> - - - -# shorter forms of the packstatus... useful for anything? -#http://api.opensuse.org/result/KDE:KDE3/packstatus?summary -#http://api.opensuse.org/result/KDE:KDE3/packstatus?summaryonly - - - # osc build SUSE_Factory i586 xorg-x11-libX11.spec -> ['/usr/bin/osc', 'build', 'i38', 'i386', 'SUSE_Factory', 'i586', 'xorg-x11-libX11.spec'] -> Error: specfile 'SUSE_Factory' does not exist. -BUILD_DIST must *not* be set! Could you add this information to the -'osc help build' text? - -> possibly kill BUILD_ROOT/BUILD_DIST support altogether? or make its use configurable. +[1] http://api.opensuse.org/result/Apache/SUSE_Linux_10.0/apache2/result 15:06 <darix> kurz zeit ueber 1-2 osc feature request zu reden die ich grade bekommen habe? @@ -130,14 +93,9 @@ 15:09 <darix> man kann auf dem backend alle rpms listen lassen - % osc addremove -A .swp - -Right now, a package must exist in the bs so that it can be built -locally. But this is a bug in osc which I'm going to fix at some point -in time. +[2] editmeta: Ah, or rather osc _thought_ it was unmodified because it uses a simple @@ -150,41 +108,11 @@ Noted in the todo. -copypac: -put the current release number into the spec file before sending it -show request body of 400 responses (bad request) -a merge issues: -if I mark a file as "to be added" ("A"), and someone else alread adds (and -commits) the file in between, and I update -- will I get it marked as "D" after update?? -D apr_dbd_mysql.c -M libapr-util1.spec - - - -in the unusual event that a log file should be there (due to status "building"), but there is none, fail gracefully. - % osc log openSUSE_10.2 i586 -Error: can't get 'https://api.opensuse.org/result/X11:xfce/openSUSE_10.2/xfprint/i586/log?nos…' -HTTP Error 404: Not Found - - -with no repos defined: - % osc prjresults -Traceback (most recent call last): - File "/usr/bin/osc", line 7, in <module> - commandline.main() - File "/usr/lib/python2.5/site-packages/osc/commandline.py", line 1072, in main - cmd(args) - File "/usr/lib/python2.5/site-packages/osc/commandline.py", line 738, in prjresults - print '\n'.join(get_prj_results(project)) - File "/usr/lib/python2.5/site-packages/osc/core.py", line 1192, in get_prj_results - for node in root.find('packstatuslist'): -TypeError: 'NoneType' object is not iterable - - +[3] 19:08 < Beineri> DuDE: can you add an option to "up" which moves instead overwriting a file if it has changed in the repository? 19:08 < darix> Beineri: moves? @@ -243,9 +171,4 @@ [1] 11871 exit 1 osc up -21:05 <darix> ping -21:30 <DuDE_> pong -21:31 <darix> osc updatepac... sollte nicht fehlschlagen wenn das rpm anders heisst als das package verzeichnis -21:31 <darix> :p - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-storage
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package yast2-storage checked in at Thu Jun 28 19:51:26 CEST 2007. -------- --- yast2-storage/yast2-storage.changes 2007-06-18 12:48:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2007-06-27 11:35:50.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Jun 26 10:57:56 CEST 2007 - fehr(a)suse.de + +- add windows default mount points also in VM proposal (#262417) +- prevent win mount points on hotplug devices (#287252) +- version 2.15.17 + +------------------------------------------------------------------- +Mon Jun 25 17:41:27 CEST 2007 - fehr(a)suse.de + +- fixed problem mounting filesystem in inst-sys (#286686) +- prevent direct or indirect change of partitions used for swap or + as install source during installation (#274321,#262417) + +------------------------------------------------------------------- Old: ---- yast2-storage-2.15.16.tar.bz2 New: ---- yast2-storage-2.15.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.Z10558/_old 2007-06-28 19:46:45.000000000 +0200 +++ /var/tmp/diff_new_pack.Z10558/_new 2007-06-28 19:46:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.15.16) +# spec file for package yast2-storage (Version 2.15.17) # # 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-storage -Version: 2.15.16 +Version: 2.15.17 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.15.16.tar.bz2 +Source0: yast2-storage-2.15.17.tar.bz2 prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms evms-devel gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite # Required only in inst-sys @@ -44,7 +44,7 @@ %prep -%setup -n yast2-storage-2.15.16 +%setup -n yast2-storage-2.15.17 %build %{prefix}/bin/y2tool y2autoconf @@ -170,6 +170,14 @@ %doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description %changelog +* Tue Jun 26 2007 - fehr(a)suse.de +- add windows default mount points also in VM proposal (#262417) +- prevent win mount points on hotplug devices (#287252) +- version 2.15.17 +* Mon Jun 25 2007 - fehr(a)suse.de +- fixed problem mounting filesystem in inst-sys (#286686) +- prevent direct or indirect change of partitions used for swap or + as install source during installation (#274321,#262417) * Mon Jun 18 2007 - fehr(a)suse.de - add menu extry to call iSCSI client setup (#278554) - version 2.15.16 ++++++ yast2-storage-2.15.16.tar.bz2 -> yast2-storage-2.15.17.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.16/libstorage/src/Dm.cc new/yast2-storage-2.15.17/libstorage/src/Dm.cc --- old/yast2-storage-2.15.16/libstorage/src/Dm.cc 2007-05-23 12:45:15.000000000 +0200 +++ new/yast2-storage-2.15.17/libstorage/src/Dm.cc 2007-06-20 17:48:23.000000000 +0200 @@ -128,7 +128,9 @@ } else { - y2warning( "unknown target type \"%s\"", target.c_str() ); + if( find( known_types.begin(), known_types.end(), target ) == + known_types.end() ) + y2warning( "unknown target type \"%s\"", target.c_str() ); extractNthWord( 1, line ) >> le; y2mil( "le:" << le ); le /= 2; @@ -597,4 +599,6 @@ bool Dm::active = false; unsigned Dm::dm_major = 0; +static const char* elem[] = { "crypt" }; +list<string> Dm::known_types( elem, elem+lengthof(elem) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.16/libstorage/src/Dm.h new/yast2-storage-2.15.17/libstorage/src/Dm.h --- old/yast2-storage-2.15.16/libstorage/src/Dm.h 2007-05-23 12:45:15.000000000 +0200 +++ new/yast2-storage-2.15.17/libstorage/src/Dm.h 2007-06-20 17:33:49.000000000 +0200 @@ -76,6 +76,7 @@ std::map<string,unsigned long> pe_map; static bool active; static unsigned dm_major; + static std::list<string> known_types; mutable storage::DmInfo info; }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.16/libstorage/src/Storage.cc new/yast2-storage-2.15.17/libstorage/src/Storage.cc --- old/yast2-storage-2.15.16/libstorage/src/Storage.cc 2007-06-14 17:58:16.000000000 +0200 +++ new/yast2-storage-2.15.17/libstorage/src/Storage.cc 2007-06-21 11:42:29.000000000 +0200 @@ -829,8 +829,7 @@ { if( i->getUsedByType()==UB_NONE ) { - if( detectMounted ) - i->getMountData( Mounts ); + i->getMountData( Mounts, !detectMounted ); i->getFstabData( *fstab ); y2mil( "detect:" << *i ); if( i->getFs()==FSUNKNOWN && i->getEncryption()==ENC_NONE ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.16/libstorage/src/Volume.cc new/yast2-storage-2.15.17/libstorage/src/Volume.cc --- old/yast2-storage-2.15.16/libstorage/src/Volume.cc 2007-06-14 18:04:34.000000000 +0200 +++ new/yast2-storage-2.15.17/libstorage/src/Volume.cc 2007-06-25 17:43:56.000000000 +0200 @@ -268,10 +268,10 @@ } } -void Volume::getMountData( const ProcMounts& mountData ) +void Volume::getMountData( const ProcMounts& mountData, bool swap_only ) { y2mil( "this:" << *this ); - y2mil( "mountDevice:" << mountDevice() ); + y2mil( "swap_only:" << swap_only << " mountDevice:" << mountDevice() ); mp = mountData.getMount( mountDevice() ); if( mp.empty() ) { @@ -280,7 +280,13 @@ if( !mp.empty() ) { is_mounted = true; - y2milestone( "%s mounted on %s", device().c_str(), mp.c_str() ); + if( swap_only && mp!="swap" ) + { + is_mounted = false; + mp.clear(); + } + if( is_mounted ) + y2milestone( "%s mounted on %s", device().c_str(), mp.c_str() ); } orig_mp = mp; } @@ -2368,8 +2374,12 @@ ret = fstab->flush(); } } - if( ret==0 && !format && mp==orig_mp && mp!="swap" ) + if( ret==0 && !format && !cont->getStorage()->instsys() && + fstab_opt!=orig_fstab_opt && !orig_fstab_opt.empty() && + mp==orig_mp && mp!="swap" ) { + y2mil( "fstab_opt:" << fstab_opt << " fstab_opt_orig:" << orig_fstab_opt ); + y2mil( "remount:" << *this ); int r = umount( mp ); y2mil( "remount umount:" << r ); if( r==0 ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.16/libstorage/src/Volume.h new/yast2-storage-2.15.17/libstorage/src/Volume.h --- old/yast2-storage-2.15.16/libstorage/src/Volume.h 2007-05-23 12:45:15.000000000 +0200 +++ new/yast2-storage-2.15.17/libstorage/src/Volume.h 2007-06-21 11:38:33.000000000 +0200 @@ -199,7 +199,7 @@ bool allowedMountBy( storage::MountByType mby, const string& mp="" ); void getFsData( SystemCmd& blkidData ); void getLoopData( SystemCmd& loopData ); - void getMountData( const ProcMounts& mountData ); + void getMountData( const ProcMounts& mountData, bool swap_only=false ); void getFstabData( EtcFstab& fstabData ); void getStartData(); void getTestmodeData( const string& data ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.16/storage/src/include/auto_part_prepare.ycp new/yast2-storage-2.15.17/storage/src/include/auto_part_prepare.ycp --- old/yast2-storage-2.15.16/storage/src/include/auto_part_prepare.ycp 2007-05-23 12:45:16.000000000 +0200 +++ new/yast2-storage-2.15.17/storage/src/include/auto_part_prepare.ycp 2007-06-25 17:48:14.000000000 +0200 @@ -8,7 +8,7 @@ * cover the whole disk, including unpartitioned * areas as 'dummy' partitions. * - * $Id: auto_part_prepare.ycp 27076 2006-01-16 18:04:08Z fehr $ + * $Id: auto_part_prepare.ycp 39013 2007-06-25 15:48:13Z fehr $ * */ { @@ -161,7 +161,7 @@ p["ui_id"] = ui_id; if( p["type"]:`unknown == `free ) p["size_k"] = size_of_region( p["region"]:[0,0], bytes_per_unit )/1024; - if( haskey(p,"mount")) + if( haskey(p,"mount") && p["mount"]:""!="swap" && !p["inactive"]:false ) p = remove( p, "mount" ); return( p ); }); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.16/storage/src/include/custom_part_check_generated.ycp new/yast2-storage-2.15.17/storage/src/include/custom_part_check_generated.ycp --- old/yast2-storage-2.15.16/storage/src/include/custom_part_check_generated.ycp 2007-05-23 12:45:16.000000000 +0200 +++ new/yast2-storage-2.15.17/storage/src/include/custom_part_check_generated.ycp 2007-06-25 17:48:14.000000000 +0200 @@ -24,7 +24,7 @@ * ************************************************************* - $Id: custom_part_check_generated.ycp 35893 2007-02-06 11:25:45Z fehr $ + $Id: custom_part_check_generated.ycp 39013 2007-06-25 15:48:13Z fehr $ */ { @@ -825,11 +825,14 @@ Remove the volume before editing it. "), curr_part["used_by"]:"" )); } - return( used==`UB_NONE ); + boolean ret = used==`UB_NONE; + if( ret ) + ret = Storage::CanEdit( curr_part, true ); + return( ret ); } define boolean check_device_delete( map curr_part, boolean bsd_label, - boolean installation, list<map> pl ) + boolean installation, map disk ) ``{ string part_name = curr_part["device"]:""; @@ -930,10 +933,11 @@ } } } - if( curr_part["type"]:`unknown==`logical ) + if( !installation && curr_part["type"]:`unknown==`logical ) { boolean ok = true; - list<map> ppl = filter( map p, pl, ``(p["nr"]:0>curr_part["nr"]:0)); + list<map> ppl = filter( map p, disk["partitions"]:[], + ``(p["nr"]:0>curr_part["nr"]:0)); if( size(ppl)>0 && check_devices_used( ppl, true )!=`UB_NONE ) ok = false; if( ok && !installation && size(ppl)>0 ) @@ -956,7 +960,10 @@ return( false ); } } - return true; + boolean ret = used==`UB_NONE; + if( ret ) + ret = Storage::CanDelete( curr_part, disk, true ); + return ret; }; @@ -1057,7 +1064,15 @@ deleting the extended partition. ")); } - return( used==`UB_NONE ); + boolean ret = used==`UB_NONE; + if( ret ) + { + map extd = find( map p, partitions, + ``(p["type"]:`primary==`extended)); + if( extd!=nil && size(extd)>0 ) + ret = Storage::CanDelete( extd, curr_disk, true ); + } + return( ret ); }; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.16/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.15.17/storage/src/include/custom_part_lib.ycp --- old/yast2-storage-2.15.16/storage/src/include/custom_part_lib.ycp 2007-06-14 16:48:36.000000000 +0200 +++ new/yast2-storage-2.15.17/storage/src/include/custom_part_lib.ycp 2007-06-25 17:48:14.000000000 +0200 @@ -13,7 +13,7 @@ * ************************************************************* * - $Id: custom_part_lib.ycp 38463 2007-06-14 14:48:35Z fehr $ + $Id: custom_part_lib.ycp 39013 2007-06-25 15:48:13Z fehr $ * */ @@ -418,6 +418,8 @@ ret["ok"] = true; new["mount"] = UI::QueryWidget(`id(`mount_point), `Value); new["mount"] = deletechars( new["mount"]:"", " \t" ); + if( old["mount"]:"" != new["mount"]:"" ) + new["inactive"] = true; if( ret["ok"]:false && size(new["mount"]:"")>0 ) { boolean crypt_fs = false; @@ -643,7 +645,10 @@ { not_used_mp = selected_fs[`mountpoints]:[]; if( mount != "swap" && (new["type"]:`primary!=`lvm || mount!="")) + { new["mount"] = "swap"; + new["inactive"] = true; + } } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.16/storage/src/include/do_proposal_flexible.ycp new/yast2-storage-2.15.17/storage/src/include/do_proposal_flexible.ycp --- old/yast2-storage-2.15.16/storage/src/include/do_proposal_flexible.ycp 2007-05-23 12:45:16.000000000 +0200 +++ new/yast2-storage-2.15.17/storage/src/include/do_proposal_flexible.ycp 2007-06-26 10:58:49.000000000 +0200 @@ -14,7 +14,7 @@ * ************************************************************* - $Id: do_proposal_flexible.ycp 37859 2007-05-07 17:03:29Z fehr $ + $Id: do_proposal_flexible.ycp 39029 2007-06-26 08:58:49Z fehr $ */ { @@ -821,6 +821,8 @@ { y2milestone( "process_partition_data reuse part %1", p ); p["format"] = true; + if( p["mount"]:"" != mount ) + p["inactive"] = true; p["mount"] = mount; p["used_fs"] = solution["partitions",pindex,"fsys"]:Partitions::DefaultFs(); @@ -920,6 +922,7 @@ } part["size_k"] = part["region",1]:0 * disk["cyl_size"]:0 / 1024; part["mount"] = mount; + part["inactive"] = true; part["used_fs"] = solution["partitions",pindex,"fsys"]:Partitions::DefaultFs(); value = solution["partitions",pindex,"fstopt"]:""; @@ -1002,6 +1005,7 @@ part["type"] = `logical; } part["mount"] = mount; + part["inactive"] = true; part["used_fs"] = solution["partitions",pindex,"fsys"]:Partitions::DefaultFs(); value = solution["partitions",pindex,"fstopt"]:""; @@ -1633,7 +1637,8 @@ p["type"]:`primary != `extended && !contains( conf["keep_partition_num"]:[], p["nr"]:0 ) && !contains( conf["keep_partition_id"]:[], fsid ) && - !contains( conf["keep_partition_fsys"]:[], p["used_fs"]:`none )) + !contains( conf["keep_partition_fsys"]:[], p["used_fs"]:`none ) && + Storage::CanDelete( p, disk, false )) { p["delete"] = true; } @@ -2206,6 +2211,8 @@ if( !p["delete"]:false && p["device"]:""==swaps[0,"device"]:"" ) { + if( p["mount"]:"" != "swap" ) + p["inactive"] = true; p["mount"] = "swap"; if( haskey( p, "vg" )) { @@ -2278,8 +2285,9 @@ { ret = maplist( map p, partitions, ``{ - if( !p["delete"]:false && - p["device"]:""==boot["device"]:"" ) + if( !p["delete"]:false && + p["device"]:""==boot["device"]:"" && + Storage::CanEdit(p,false) ) { p["mount"] = Partitions::BootMount(); p["used_fs"] = Partitions::DefaultBootFs(); @@ -2312,7 +2320,8 @@ p["used_by_type"]:`UB_NONE == `UB_NONE && size(p["mount"]:"")==0 && p["size_k"]:0/1024 >= min && - (max==0 || p["size_k"]:0/1024 <= max))); + (max==0 || p["size_k"]:0/1024 <= max) && + Storage::CanEdit( p, false ))); y2milestone( "can_mp_reuse normal %1", pl ); if( size(pl)>0 ) { @@ -2563,11 +2572,12 @@ parts = maplist( map p, parts, ``{ - if( size(mp)==0 || contains( mp, p["mount"]:"") ) + if( (size(mp)==0 || contains( mp, p["mount"]:"")) && + !(p["mount"]:""=="swap" && !p["inactive"]:false) ) { foreach( string s, rems, ``{ - if( haskey( p, s )) + if( haskey( p, s ) ) p = remove( p, s ); }); } @@ -2576,8 +2586,9 @@ return( parts ); } -list<map> remove_one_partition( list<map> partitions ) +list<map> remove_one_partition( map disk ) { + list<map> partitions = disk["partitions"]:[]; list<map> pl = filter( map p, partitions, ``( p["linux"]:false && size(p["mount"]:"")==0 && !p["delete"]:false )); @@ -2594,7 +2605,8 @@ ``{ if( p["linux"]:false && !p["delete"]:false && size(p["mount"]:"")==0 && - p["device"]:""==pl[0,"device"]:"" ) + p["device"]:""==pl[0,"device"]:"" && + Storage::CanDelete( p, disk, false )) { p["delete"] = true; y2milestone( "remove_one_partition p %1", p ); @@ -2631,7 +2643,8 @@ ``{ if( p["linux"]:false && !p["delete"]:false && size(p["mount"]:"")==0 && - p["device"]:""==pl[0,"device"]:"" ) + p["device"]:""==pl[0,"device"]:"" && + Storage::CanDelete( p, disk, false )) { p["delete"] = true; nr = p["nr"]:0; @@ -2711,7 +2724,8 @@ maplist( map p, target[s,"partitions"]:[], ``{ if( !contains( Partitions::do_not_delete, - p["fsid"]:0 )) + p["fsid"]:0 ) && + Storage::CanDelete( p, target[s]:$[], false)) { if( usable_for_win_resize(p,false) ) p["dtxt"] = _("Resize impossible due to inconsistent fs. Try checking fs under Windows."); @@ -2744,7 +2758,7 @@ foreach( string s, filter( string d, ddev, ``(valid[d]:false)), ``{ target[s,"partitions"] = - remove_one_partition( target[s,"partitions"]:[] ); + remove_one_partition( target[s]:$[] ); }); } } @@ -3029,7 +3043,16 @@ { foreach( string s, map disk, target, ``{ - target[s,"partitions"] = remove_keys( target[s,"partitions"]:[], + target[s,"partitions"] = + maplist( map p, target[s,"partitions"]:[], + ``{ + if( haskey( p, "mount" ) && + search( p["mount"]:"", "/windows/" )!=0 && + search( p["mount"]:"", "/dos/" )!=0 ) + p = remove( p, "mount" ); + return( p ); + }); + remove_keys( target[s,"partitions"]:[], [ "mount" ] ); }); return( target ); @@ -3499,7 +3522,8 @@ maplist( map p, target[s,"partitions"]:[], ``{ if( !contains( Partitions::do_not_delete, - p["fsid"]:0 )) + p["fsid"]:0 ) && + Storage::CanDelete( p, target[s]:$[], false)) { if( usable_for_win_resize(p,false) ) p["dtxt"] = _("Resize impossible due to inconsistent fs. Try checking fs under Windows."); @@ -3771,6 +3795,7 @@ Storage::ActivateEvms(); target = Storage::GetTargetMap(); } + y2milestone( "target:%1", target ); ret = get_inst_prop_vm( target, vg ); } return( ret ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.16/storage/src/include/evms_lib.ycp new/yast2-storage-2.15.17/storage/src/include/evms_lib.ycp --- old/yast2-storage-2.15.16/storage/src/include/evms_lib.ycp 2007-05-23 12:45:16.000000000 +0200 +++ new/yast2-storage-2.15.17/storage/src/include/evms_lib.ycp 2007-06-25 17:48:14.000000000 +0200 @@ -11,7 +11,7 @@ * Thomas Fehr <fehr(a)suse.de> * * - * $Id: evms_lib.ycp 35921 2007-02-06 18:54:16Z fehr $ + * $Id: evms_lib.ycp 39013 2007-06-25 15:48:13Z fehr $ * */ @@ -1323,7 +1323,7 @@ %1 is not a logical volume produced by a container. "), device )); } - else if( check_device_delete( part, false, Mode::installation(), [] )) + else if( check_device_delete( part, false, Mode::installation(), $[] )) { string txt = sformat( _("Really delete %1?"), part["device"]:"" ); if( Popup::YesNo( txt ) ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.16/storage/src/include/signatures.ycp new/yast2-storage-2.15.17/storage/src/include/signatures.ycp --- old/yast2-storage-2.15.16/storage/src/include/signatures.ycp 2007-05-23 12:45:16.000000000 +0200 +++ new/yast2-storage-2.15.17/storage/src/include/signatures.ycp 2007-06-25 17:48:14.000000000 +0200 @@ -3,7 +3,7 @@ * ************************************************************* * - $Id: signatures.ycp 35893 2007-02-06 11:25:45Z fehr $ + $Id: signatures.ycp 39013 2007-06-25 15:48:13Z fehr $ * */ { @@ -11,7 +11,7 @@ boolean CheckFstabOptions( map part ); symbol check_devices_used( list<map> partitions, boolean not_cr ); boolean check_device_delete( map curr_part, boolean bsd_label, - boolean installation, list<map> pl ); + boolean installation, map disk ); list<map> get_possible_pvs( map<string,map> targetMap ); map DlgCreateVolumeGroup( list vgm_list ); void new_vg_list( list vg_list ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.16/storage/src/inst_custom_part.ycp new/yast2-storage-2.15.17/storage/src/inst_custom_part.ycp --- old/yast2-storage-2.15.16/storage/src/inst_custom_part.ycp 2007-06-18 12:48:58.000000000 +0200 +++ new/yast2-storage-2.15.17/storage/src/inst_custom_part.ycp 2007-06-25 17:48:14.000000000 +0200 @@ -26,7 +26,7 @@ * ************************************************************* - $Id: inst_custom_part.ycp 38499 2007-06-18 10:48:57Z fehr $ + $Id: inst_custom_part.ycp 39013 2007-06-25 15:48:13Z fehr $ */ { @@ -3154,7 +3154,7 @@ } else if( part["type"]:`unknown==`lvm ) { - if( !check_device_delete( part, false, Stage::initial(), [] )) + if( !check_device_delete( part, false, Stage::initial(), $[] )) { ret = `again; continue; @@ -3185,7 +3185,7 @@ } if( part["type"]:`primary != `extended && !check_device_delete( part, bsd_label, Stage::initial(), - disk["partitions"]:[] )) + disk )) { ret = `again; continue; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.16/storage/src/inst_lvm_lv.ycp new/yast2-storage-2.15.17/storage/src/inst_lvm_lv.ycp --- old/yast2-storage-2.15.16/storage/src/inst_lvm_lv.ycp 2007-05-23 12:45:16.000000000 +0200 +++ new/yast2-storage-2.15.17/storage/src/inst_lvm_lv.ycp 2007-06-25 17:48:14.000000000 +0200 @@ -10,7 +10,7 @@ * Authors: * mike <mike(a)suse.de> * - * $Id: inst_lvm_lv.ycp 35893 2007-02-06 11:25:45Z fehr $ + * $Id: inst_lvm_lv.ycp 39013 2007-06-25 15:48:13Z fehr $ * * *---------------------------------------------------- @@ -253,7 +253,7 @@ else { map Lv = Storage::GetPartition( targetMap, id ); - if( !check_device_delete( Lv, false, Stage::initial(), [])) + if( !check_device_delete( Lv, false, Stage::initial(), $[])) { ret = `again; continue; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.16/storage/src/inst_target_part.ycp new/yast2-storage-2.15.17/storage/src/inst_target_part.ycp --- old/yast2-storage-2.15.16/storage/src/inst_target_part.ycp 2007-05-23 12:45:16.000000000 +0200 +++ new/yast2-storage-2.15.17/storage/src/inst_target_part.ycp 2007-06-25 17:48:14.000000000 +0200 @@ -9,7 +9,7 @@ * -Ask the user which partition to use. * -Check the input and return error-messages. * - * $Id: inst_target_part.ycp 37390 2007-04-11 10:51:39Z fehr $ + * $Id: inst_target_part.ycp 39013 2007-06-25 15:48:13Z fehr $ */ { textdomain "storage"; @@ -207,6 +207,21 @@ if( target["label"]:""!="msdos" && !Storage::BootEvms() ) UI::ChangeWidget( `id(`evms), `Enabled, false ); } + boolean disable_full = false; + foreach( map p, partitions, + ``{ + y2milestone( "p:%1", p ); + if( p["type"]:`unknown!=`extended && !Storage::CanDelete( p, target, false )) + { + if( UI::WidgetExists( `id(p["ui_id"]:0) )) + { + UI::ChangeWidget( `id(p["ui_id"]:0), `Enabled, false ); + disable_full = true; + } + } + }); + if( disable_full && UI::WidgetExists( `id(`full) )) + UI::ChangeWidget( `id(`full), `Enabled, false ); // Event handling diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.16/storage/src/modules/Storage.ycp new/yast2-storage-2.15.17/storage/src/modules/Storage.ycp --- old/yast2-storage-2.15.16/storage/src/modules/Storage.ycp 2007-06-14 16:48:36.000000000 +0200 +++ new/yast2-storage-2.15.17/storage/src/modules/Storage.ycp 2007-06-27 11:36:02.000000000 +0200 @@ -19,7 +19,7 @@ * wurde versucht "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen n�her erkl�rt. * - * $Id: Storage.ycp 38463 2007-06-14 14:48:35Z fehr $ + * $Id: Storage.ycp 39043 2007-06-27 09:36:01Z fehr $ */ { @@ -167,6 +167,7 @@ boolean proposal_lvm = false; boolean proposal_home = false; map cfg_xml = $[]; +string part_insts = ""; /* @@ -2083,11 +2084,23 @@ StorageMap[targets_backup_key] = $[]; StorageMap[targets_backup_l_key] = $[]; StorageMap[targets_backup_m_key] = $[]; - if( Mode::normal () ) + if( Mode::normal() ) { Storage::SetPartMode( "CUSTOM" ); Storage::SetPartProposalActive( false ); } + if( Stage::initial() ) + { + string inst = (string) SCR::Read( .etc.install_inf.Partition ); + if( inst!=nil && size(inst)>0 ) + { + part_insts = "/dev/" + inst; + y2milestone( "Storage .etc.install_inf.Partition \"%1\" part_insts:%2", + inst, part_insts ); + } + Storage::SetPartMode( "CUSTOM" ); + Storage::SetPartProposalActive( false ); + } InstallCallbacks(); } @@ -3215,13 +3228,15 @@ foreach(string disk, map data, targets, ``{ - if( data["used_by_type"]:`UB_NONE == `UB_NONE ) + if( !data["hotpluggable"]:false && + data["used_by_type"]:`UB_NONE == `UB_NONE ) AddMountPointsForWinParts( data["partitions"]:[], true, data["max_primary"]:4, foreign_nr ); }); foreach(string disk, map data, targets, ``{ - if( data["used_by_type"]:`UB_NONE == `UB_NONE ) + if( !data["hotpluggable"]:false && + data["used_by_type"]:`UB_NONE == `UB_NONE ) AddMountPointsForWinParts( data["partitions"]:[], false, data["max_primary"]:4, foreign_nr ); }); @@ -3607,6 +3622,106 @@ return( ret ); } +global boolean CanEdit( map p, boolean verbose ) + { + boolean ret = true; + if( Stage::initial() ) + { + if( !p["created"]:false && !p["inactive"]:false && + p["mount"]:""=="swap" ) + { + ret = false; + y2milestone( "CanEdit p:%1", p ); + if( verbose ) + { + string txt = sformat( _(" +Device %1 cannot be modified because it contains activated swap +that is needed to run the installation. +"), p["device"]:"" ); + Popup::Message( txt ); + } + } + if( size(part_insts)>0 && p["device"]:""==part_insts ) + { + ret = false; + y2milestone( "CanEdit part_insts:%1 p:%2", part_insts, p ); + if( verbose ) + { + string txt = sformat( _(" +Device %1 cannot be modified because it contains the installation +data needed to perform the installation. +"), p["device"]:"" ); + Popup::Message( txt ); + } + } + } + y2milestone( "CanEdit dev:%1 verbose:%2 ret:%3", p["device"]:"", + verbose, ret ); + return( ret ); + } + +global boolean CanDelete( map p, map disk, boolean verbose ) + { + string txt = ""; + boolean ret = CanEdit( p, false ); + if( !ret && verbose ) + { + if( p["mount"]:""=="swap" ) + { + txt = sformat( _(" +Device %1 cannot be removed because it contains activated swap +that is needed to run the installation. +"), p["device"]:"" ); + } + else + { + txt = sformat( _(" +Device %1 cannot be removed because it contains the installation +data needed to perform the installation. +"), p["device"]:"" ); + } + Popup::Message( txt ); + } + if( ret && (p["type"]:`unknown == `logical|| + p["type"]:`unknown == `extended) ) + { + integer num = p["type"]:`unknown == `extended ? 4 : p["nr"]:4; + list<map> pl = filter( map q, disk["partitions"]:[], + ``( q["type"]:`unknown==`logical && + q["nr"]:0 > num )); + y2milestone( "CanDelete pl:%1", pl ); + integer pos = 0; + while( ret && pos<size(pl) ) + { + ret = CanEdit( pl[pos]:$[], false ); + if( ret ) + pos = pos+1; + } + if( !ret && verbose ) + { + if( p["mount"]:""=="swap" ) + { + txt = sformat( _(" +Device %1 cannot be removed because this would indirectly change +device %2 which contains activated swap that is needed to run +the installation. +"), p["device"]:"", pl[pos,"device"]:"" ); + } + else + { + txt = sformat( _(" +Device %1 cannot be removed because this would indirectly change +device %2 which contains data needed to perform the installation. +"), p["device"]:"", pl[pos,"device"]:"" ); + } + Popup::Message( txt ); + } + } + y2milestone( "CanDelete dev:%1 verbose:%2 ret:%3", p["device"]:"", + verbose, ret ); + return( ret ); + } + global list ReadFstab( string dir ) { list ret = []; @@ -6129,19 +6244,7 @@ no_propose_disks = []; if( Stage::initial() && SCR::Read( .target.size, "/etc/install.inf" )>0 ) { - string inst = (string) SCR::Read( .etc.install_inf.Partition ); - y2milestone( "NoProposeDisks .etc.install_inf.Partition \"%1\"", - inst ); - if( inst!=nil && size(inst)>0 ) - { - if( search( inst, "/dev/" )!=0 ) - inst = "/dev/" + inst; - map d = GetDiskPartition( inst ); - y2milestone( "NoProposeDisks inst:%1 disk:%2", inst, d ); - if( size(d["disk"]:"")>0 ) - no_propose_disks = add( no_propose_disks, d["disk"]:"" ); - } - inst = (string) SCR::Read( .etc.install_inf.Cdrom ); + string inst = (string) SCR::Read( .etc.install_inf.Cdrom ); y2milestone( "NoProposeDisks .etc.install_inf.Cdrom \"%1\"", inst ); if( inst!=nil && size(inst)>0 ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.16/VERSION new/yast2-storage-2.15.17/VERSION --- old/yast2-storage-2.15.16/VERSION 2007-06-18 12:48:20.000000000 +0200 +++ new/yast2-storage-2.15.17/VERSION 2007-06-25 17:48:31.000000000 +0200 @@ -1 +1 @@ -2.15.16 +2.15.17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yacas
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package yacas checked in at Thu Jun 28 19:46:37 CEST 2007. -------- --- yacas/yacas.changes 2007-06-13 00:52:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/yacas/yacas.changes 2007-06-26 20:29:16.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 26 20:28:36 CEST 2007 - lrupp(a)suse.de + +- changed desktop file entry (proteusworksheet => yacas) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yacas.spec ++++++ --- /var/tmp/diff_new_pack.tA7231/_old 2007-06-28 19:45:02.000000000 +0200 +++ /var/tmp/diff_new_pack.tA7231/_new 2007-06-28 19:45:02.000000000 +0200 @@ -34,7 +34,7 @@ Autoreqprov: on Summary: YACAS is an easy to use, general purpose Computer Algebra System Version: 1.0.63 -Release: 32 +Release: 36 Source: %{name}-%{version}.tar.bz2 Source2: yacaslogo.xpm Source3: yacas.desktop @@ -227,6 +227,8 @@ %exclude %{_defaultdocdir}/%{name}/documentation/manicon.html %changelog +* Tue Jun 26 2007 - lrupp(a)suse.de +- changed desktop file entry (proteusworksheet => yacas) * Tue Jun 05 2007 - lrupp(a)suse.de - split devel package - split doc package ++++++ yacas.desktop ++++++ --- yacas/yacas.desktop 2007-06-06 01:04:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/yacas/yacas.desktop 2007-06-26 20:28:29.000000000 +0200 @@ -1,12 +1,10 @@ [Desktop Entry] +Encoding=UTF-8 Categories=Education;Math; Name=Yacas GenericName=YACAS Computer algebra system Type=Application -Exec=proteusworksheet -Icon=yacaslogo.xpm -Encoding=UTF-8 -Name[de]=Yacas -GenericName[de]=YACAS Computer Algebra System -Name[fr]=Yacas -GenericName[fr]=YACAS Computer algebra system +Exec=yacas +Icon=yacaslogo +StartupNotify=true +Terminal=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 wodim
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package wodim checked in at Thu Jun 28 19:45:06 CEST 2007. -------- --- wodim/wodim.changes 2007-05-03 18:26:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/wodim/wodim.changes 2007-06-28 19:05:02.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jun 28 19:04:07 CEST 2007 - nadvornik(a)suse.cz + +- updated to 1.1.6: + * adding generic drive guessing + * some bugfixes + +------------------------------------------------------------------- Old: ---- cdrkit-1.1.5.1-eltorito.patch cdrkit-1.1.5.1.tar.gz New: ---- cdrkit-1.1.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wodim.spec ++++++ --- /var/tmp/diff_new_pack.bC1705/_old 2007-06-28 19:43:50.000000000 +0200 +++ /var/tmp/diff_new_pack.bC1705/_new 2007-06-28 19:43:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wodim (Version 1.1.5.1) +# spec file for package wodim (Version 1.1.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,17 +12,16 @@ Name: wodim BuildRequires: cmake file-devel gcc-c++ libcap-devel libstdc++-devel resmgr -License: GNU General Public License (GPL) +License: GNU General Public License (GPL), This software is under GPL but you should read the following clarifications: Group: Productivity/Multimedia/CD/Record PreReq: permissions Autoreqprov: on -Version: 1.1.5.1 -Release: 5 +Version: 1.1.6 +Release: 1 Source: cdrkit-%{version}.tar.gz Source1: scan_scsi.linux Source2: cdinfo.c Source5: README.SUSE -Patch1: cdrkit-%{version}-eltorito.patch URL: http://cdrkit.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Tool for Writing CDRs @@ -123,7 +122,6 @@ %prep %setup -q -n cdrkit-%{version} -%patch1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -265,6 +263,10 @@ /usr/bin/list_audio_tracks %changelog +* Thu Jun 28 2007 - nadvornik(a)suse.cz +- updated to 1.1.6: + * adding generic drive guessing + * some bugfixes * Thu May 03 2007 - nadvornik(a)suse.cz - fixed crash on hidden boot catalog directory [#247950] * Tue Apr 24 2007 - nadvornik(a)suse.cz ++++++ cdrkit-1.1.5.1.tar.gz -> cdrkit-1.1.6.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/3rd-party/geteltorito.1 new/cdrkit-1.1.6/3rd-party/geteltorito.1 --- old/cdrkit-1.1.5.1/3rd-party/geteltorito.1 1970-01-01 01:00:00.000000000 +0100 +++ new/cdrkit-1.1.6/3rd-party/geteltorito.1 2007-05-06 17:16:03.000000000 +0200 @@ -0,0 +1,51 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH GETELTORITO 1 "Mai 6, 2007" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +geteltorito \- an El Torito boot image extractor +.SH SYNOPSIS +.B geteltorito +.RI < image | drive > +> outfile +.br +.SH DESCRIPTION +This manual page documents briefly the +.B geteltorito +command. +.PP +\fBgeteltorito\fP is a Perl script which extracts the initial/default boot +image from a CD if existent. It will not extract any of other possibly existing +boot images that are allowed by the +.B El Torito +standard. The image data are +written to +.BR STDOUT +all other information is written to +.BR STDERR +(e.g. type and size +of image). If you want to write the image to a file instead of +.BR STDOUT +you can +specify the filename wanted on the command line using option +.BR \-o\ <filename>. + +.SH SEE ALSO +.BR genisoimage (1), +.BR isoinfo (1). +.br +.SH AUTHOR +geteltorito was written by Rainer Krienke <krienke(a)uni-koblenz.de>. +.PP +This manual page was written by Eduard Bloch <blade(a)debian.org> based on +README.geteltorito from geteltorito-0.4 package. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/Changelog new/cdrkit-1.1.6/Changelog --- old/cdrkit-1.1.5.1/Changelog 2007-04-21 11:43:17.000000000 +0200 +++ new/cdrkit-1.1.6/Changelog 2007-05-06 16:39:31.000000000 +0200 @@ -1,3 +1,26 @@ +cdrkit (1.1.6) RELEASED; urgency=low + + [ Vladimir Nadvornik ] + * genisoimage/eltorito.c: care about inhibit flags when preparing eltorito + boot catalog directory entry, avoiding possible crashes + + [ Eduard Bloch] + * ALL: customize the base manpage subdirectory below PREFIX using the new + MANSUBDIR variable + * make sure that the buffer is flushed and drive is ready before closing + session + * icedax: find libossaudio on OpenBSD and use it + * icedax: fixed bug with --devices (unnoticed segfault due to wrong + list_devices arguments) + * wodim/scsi_scan.h: moved Linux-specific recorder location guesser to an + extra method for automatic drive opening, and added an alternative + guessing method, using list_devices(...) picking up the first drive having + appropriate device type in the inquiry info. This generic method is also + used on Linux when the original guesser fails. + * wodim/wodim.c: count all track sizes when looking for an appropriate drive + + -- Eduard Bloch <blade(a)debian.org> Sun, 06 May 2007 16:39:08 +0200 + cdrkit (1.1.5.1) RELEASED; urgency=low * resync with cosmetical last-minute changes from Peter Samuelson diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/.clean new/cdrkit-1.1.6/.clean --- old/cdrkit-1.1.5.1/.clean 2006-08-18 19:34:13.000000000 +0200 +++ new/cdrkit-1.1.6/.clean 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh -rm -rf */OBJ */*/OBJ libs/* incs/* -rm -f core */core */*/core -rm -f .EDT* */.EDT* */*/.EDT* -rm -f .vedt* */.vedt* */*/.vedt* -rm -f *.bak */*.bak */*/*.bak -rm -f */tags */*/tags -rm -f */TAGS */*/TAGS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/genisoimage/CMakeLists.txt new/cdrkit-1.1.6/genisoimage/CMakeLists.txt --- old/cdrkit-1.1.5.1/genisoimage/CMakeLists.txt 2006-12-14 23:12:40.000000000 +0100 +++ new/cdrkit-1.1.6/genisoimage/CMakeLists.txt 2007-05-03 12:27:24.000000000 +0200 @@ -61,5 +61,5 @@ diag/isodump.1 diag/isoinfo.1 diag/isovfy.1 -DESTINATION share/man/man1) -INSTALL(FILES genisoimagerc.5 DESTINATION share/man/man5) +DESTINATION ${MANSUBDIR}/man1) +INSTALL(FILES genisoimagerc.5 DESTINATION "${MANSUBDIR}/man5") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/genisoimage/eltorito.c new/cdrkit-1.1.6/genisoimage/eltorito.c --- old/cdrkit-1.1.5.1/genisoimage/eltorito.c 2006-12-08 14:38:43.000000000 +0100 +++ new/cdrkit-1.1.6/genisoimage/eltorito.c 2007-05-03 12:01:20.000000000 +0200 @@ -228,6 +228,15 @@ iso9660_file_length(p2, s_entry, 0); /* flag file as necessary */ + + /* + * If the current directory is hidden, then hide this entry + */ + if (this_dir->dir_flags & INHIBIT_ISO9660_ENTRY) + bcat_de_flags |= INHIBIT_ISO9660_ENTRY; + if (this_dir->dir_flags & INHIBIT_JOLIET_ENTRY) + bcat_de_flags |= INHIBIT_JOLIET_ENTRY; + s_entry->de_flags = bcat_de_flags; if ((use_XA || use_RockRidge) && diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/icedax/CMakeLists.txt new/cdrkit-1.1.6/icedax/CMakeLists.txt --- old/cdrkit-1.1.5.1/icedax/CMakeLists.txt 2007-02-09 23:02:42.000000000 +0100 +++ new/cdrkit-1.1.6/icedax/CMakeLists.txt 2007-05-03 13:15:47.000000000 +0200 @@ -10,9 +10,14 @@ ENDIF(HAVE_SYS_SOUNDCARD_H) FIND_FILE (HAVE_LINUX_SOUNDCARD_H linux/soundcard.h) IF(HAVE_LINUX_SOUNDCARD_H) - ADD_DEFINITIONS(-DHAVE_LINUX_SOUNDCARD_H) + ADD_DEFINITIONS(-DHAVE_LINUX_SOUNDCARD_H) ENDIF(HAVE_LINUX_SOUNDCARD_H) +FIND_LIBRARY(HAVE_LIBOSSAUDIO "ossaudio") +IF(HAVE_LIBOSSAUDIO) + LIST(APPEND EXTRA_LIBS "ossaudio") +ENDIF(HAVE_LIBOSSAUDIO) + LIST(APPEND EXTRA_LIBS paranoia) IF (WIN32) LIST(APPEND EXTRA_LIBS winmm) @@ -25,5 +30,5 @@ INSTALL(TARGETS icedax DESTINATION bin) INSTALL(PROGRAMS pitchplay readmult cdda2mp3 cdda2ogg DESTINATION bin) -INSTALL(FILES cdda2ogg.1 icedax.1 pitchplay.1 readmult.1 list_audio_tracks.1 DESTINATION share/man/man1) +INSTALL(FILES cdda2ogg.1 icedax.1 pitchplay.1 readmult.1 list_audio_tracks.1 DESTINATION ${MANSUBDIR}/man1) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/icedax/interface.c new/cdrkit-1.1.6/icedax/interface.c --- old/cdrkit-1.1.5.1/icedax/interface.c 2007-04-10 17:01:46.000000000 +0200 +++ new/cdrkit-1.1.6/icedax/interface.c 2007-05-04 02:45:51.000000000 +0200 @@ -613,7 +613,7 @@ } if (global.scandevs) { - list_devices(stdout); + list_devices(usalp, stdout, 0); exit(0); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/include/AddSchilyBits.cmake new/cdrkit-1.1.6/include/AddSchilyBits.cmake --- old/cdrkit-1.1.5.1/include/AddSchilyBits.cmake 2006-11-26 23:01:59.000000000 +0100 +++ new/cdrkit-1.1.6/include/AddSchilyBits.cmake 2007-05-03 12:27:24.000000000 +0200 @@ -3,7 +3,11 @@ LIST(APPEND EXTRA_LIBS "rols") -# not the proper place but ok, because it is linked from everywhere +# abuse this include file to make sure the target is set + + IF(NOT MANSUBDIR) + SET(MANSUBDIR "share/man") + ENDIF(NOT MANSUBDIR) ENDIF(NOT CHECKED_rols) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/INSTALL new/cdrkit-1.1.6/INSTALL --- old/cdrkit-1.1.5.1/INSTALL 2007-01-02 16:43:27.000000000 +0100 +++ new/cdrkit-1.1.6/INSTALL 2007-05-03 12:27:24.000000000 +0200 @@ -9,7 +9,7 @@ - GNU make - working GCC compiler environment - maybe additional requirements for your operating system, see - doc/plattforms/... and FAQ. + doc/platforms/... and FAQ. Recommended: glibc (Linux standard) or GNU libiconv COMPILATION: @@ -20,26 +20,22 @@ Run: make install -To force a custom target directory, use something like: - -make install PREFIX=/opt/cdrkit +To customize the target paths, some variables can be appended to this line: +PREFIX=/opt/cdrkit/latest (default: CMake preset, e.g. /usr/local) +MANSUBDIR=man (default: share/man) TROUBLESHOOTING: -Problem: "make install" uses the wrong target directory and appends /usr/local - to it. -Solution: override the complete target path with PREFIX=... (see above) - Problem: Linking error. Solution: Look for missing dependencies. If you installed additional libraries in non-system paths, they may have a conflict with the system libraries which are already installed. Make sure that the linker gets the right ones, those -that belong to the headers. For example, if you installed libmagic and libiconf +that belong to the headers. For example, if you installed libmagic and libiconv into /usr/local/{include,lib} and your compiler or linker have different defaults (eg. they use /usr/lib, /usr/include or intermix them), then you can set CFLAGS and LDFLAGS vars to override the system defaults, assumed by cmake. Example: -(AIX5l, /usr/lib is default lib dir but /usr/local/include is prefered by gcc +(AIX5l, /usr/lib is default lib dir but /usr/local/include is preferred by gcc for headers), command: make clean make CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib @@ -64,7 +60,7 @@ Solution: Examine the following files: build/CMakeFiles/CMakeFiles/CMakeOutput.log build/CMakeFiles/CMakeOutput.log -and look for failed commands. Some checks are expected to fail if the plattform +and look for failed commands. Some checks are expected to fail if the platform does not provide a certain feature, others must not fail. Look the failing check and use THE FORCE to find related problems and solutions. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/Makefile new/cdrkit-1.1.6/Makefile --- old/cdrkit-1.1.5.1/Makefile 2007-04-21 11:46:29.000000000 +0200 +++ new/cdrkit-1.1.6/Makefile 2007-05-06 12:23:54.000000000 +0200 @@ -10,6 +10,10 @@ CMAKETWEAKS += ( cd build ; cmake .. -DCMAKE_INSTALL_PREFIX="$(PREFIX)") || exit 1; endif +ifneq ($(MANSUBDIR),) +CMAKETWEAKS += ( cd build ; cmake .. -DMANSUBDIR="$(MANSUBDIR)" ) || exit 1; +endif + default_target: all DISTNAME=cdrkit-$(shell cat VERSION) @@ -28,7 +32,7 @@ clean: rm -rf build -release: +tarball: # if test "$(shell svn status | grep -v -i make)" ; then echo Uncommited files found. Run \"svn status\" to display them. ; exit 1 ; fi @if test -f ../$(DISTNAME).tar.gz ; then echo ../$(DISTNAME).tar.gz exists, not overwritting ; exit 1; fi -svn up @@ -41,6 +45,14 @@ test -e /etc/debian_version && ln -f ../$(DISTNAME).tar.gz ../$(DEBSRCNAME) || true test -e ../tarballs && ln -f ../$(DISTNAME).tar.gz ../tarballs/$(DEBSRCNAME) || true +tarball-remove: + rm -f ../$(DISTNAME).tar.gz ../tarballs/$(DEBSRCNAME) ../$(DEBSRCNAME) + +SVNBASE=$(shell svn info | grep URL: | cut -f2 -d' ' | xargs dirname) +release: tarball + svn ci + svn cp $(SVNBASE)/trunk $(SVNBASE)/tags/release_$(shell cat VERSION) + #%:: # $(MAKE) $(MAKE_FLAGS) build/Makefile # $(CMAKETWEAKS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/readom/CMakeLists.txt new/cdrkit-1.1.6/readom/CMakeLists.txt --- old/cdrkit-1.1.5.1/readom/CMakeLists.txt 2006-12-08 11:15:57.000000000 +0100 +++ new/cdrkit-1.1.6/readom/CMakeLists.txt 2007-05-03 12:27:24.000000000 +0200 @@ -16,4 +16,4 @@ INSTALL(TARGETS readom DESTINATION bin) INSTALL(FILES readom.1 -DESTINATION share/man/man1) +DESTINATION ${MANSUBDIR}/man1) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/TODO new/cdrkit-1.1.6/TODO --- old/cdrkit-1.1.5.1/TODO 2007-04-21 11:20:05.000000000 +0200 +++ new/cdrkit-1.1.6/TODO 2007-05-06 15:23:48.000000000 +0200 @@ -1,4 +1,12 @@ + - on various places in drv_dvd.c, check for the correct answer ("long write in + progress" and friends) instead of using the dumb wait_unit_ready method. + + - (for consideration) similar got natname management in libusal, add a method + to check whether the device can be opened without side effects (for safety) + and then get the device capabilities to select the best drive for the input + size. Kind of generic implementation of the Linux specific guessing code. + - look for alternative ways to find the maximum DMA transfer size, Schilling wrote something about SKGETSIZE ioctl being fixed in recent Linux kernel versions diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/VERSION new/cdrkit-1.1.6/VERSION --- old/cdrkit-1.1.5.1/VERSION 2007-04-21 11:43:17.000000000 +0200 +++ new/cdrkit-1.1.6/VERSION 2007-05-06 12:23:54.000000000 +0200 @@ -1 +1 @@ -1.1.5.1 +1.1.6 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/wodim/CMakeLists.txt new/cdrkit-1.1.6/wodim/CMakeLists.txt --- old/cdrkit-1.1.5.1/wodim/CMakeLists.txt 2007-01-26 01:38:32.000000000 +0100 +++ new/cdrkit-1.1.6/wodim/CMakeLists.txt 2007-05-03 12:27:24.000000000 +0200 @@ -34,4 +34,4 @@ INSTALL(TARGETS wodim DESTINATION bin) INSTALL(FILES wodim.1 -DESTINATION share/man/man1) +DESTINATION ${MANSUBDIR}/man1) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/wodim/drv_mmc.c new/cdrkit-1.1.6/wodim/drv_mmc.c --- old/cdrkit-1.1.5.1/wodim/drv_mmc.c 2007-02-09 23:02:42.000000000 +0100 +++ new/cdrkit-1.1.6/wodim/drv_mmc.c 2007-05-06 12:23:54.000000000 +0200 @@ -225,45 +225,45 @@ }; cdr_t cdr_mdvd = { - 0, 0, - CDR_SWABAUDIO, - CDR_CDRW_ALL, - 370,370, - "mmc_mdvd", - "generic SCSI-3/mmc DVD-R(W) driver", - 0, - (dstat_t *)0, - identify_mmc, - attach_mdvd, - init_mmc, - getdisktype_mdvd, - scsi_load, - scsi_unload, - read_buff_cap, - cmd_dummy, /* check_recovery */ - (int(*)__PR((SCSI *, cdr_t *, int)))cmd_dummy, /* recover */ - speed_select_mdvd, - select_secsize, - next_wr_addr_mdvd, - (int(*)(SCSI *, Ulong))cmd_ill, /* reserve_track */ - scsi_cdr_write, - (int(*)__PR((track_t *, void *, BOOL)))cmd_dummy, /* gen_cue */ - (int(*)__PR((SCSI *usalp, cdr_t *, track_t *)))cmd_dummy, /* send_cue */ - write_leadin_mmc, - open_track_mdvd, - close_track_mdvd, - open_session_mdvd, - cmd_dummy, - cmd_dummy, /* abort */ - read_session_offset, - fixate_mdvd, - stats_mmc, - blank_mmc, - format_mdvd, - send_opc_mmc, - opt1_mdvd, - opt2_mmc, - dvd_dual_layer_split, + 0, 0, + CDR_SWABAUDIO, + CDR_CDRW_ALL, + 370,370, + "mmc_mdvd", + "generic SCSI-3/mmc DVD-R(W) driver", + 0, + (dstat_t *)0, + identify_mmc, + attach_mdvd, + init_mmc, + getdisktype_mdvd, + scsi_load, + scsi_unload, + read_buff_cap, + cmd_dummy, /* check_recovery */ + (int(*)__PR((SCSI *, cdr_t *, int)))cmd_dummy, /* recover */ + speed_select_mdvd, + select_secsize, + next_wr_addr_mdvd, + (int(*)(SCSI *, Ulong))cmd_ill, /* reserve_track */ + scsi_cdr_write, + (int(*)__PR((track_t *, void *, BOOL)))cmd_dummy, /* gen_cue */ + (int(*)__PR((SCSI *usalp, cdr_t *, track_t *)))cmd_dummy, /* send_cue */ + write_leadin_mmc, + open_track_mdvd, + close_track_mdvd, + open_session_mdvd, + cmd_dummy, + cmd_dummy, /* abort */ + read_session_offset, + fixate_mdvd, + stats_mmc, + blank_mmc, + format_mdvd, + send_opc_mmc, + opt1_mdvd, + opt2_mmc, + dvd_dual_layer_split, }; /* @@ -1499,23 +1499,25 @@ static int getdisktype_mdvd(SCSI *usalp, cdr_t *dp) { - int ret = 0; - dstat_t *dsp = dp->cdr_dstat; + int ret = 0; + dstat_t *dsp = dp->cdr_dstat; + + struct track_info track_info; + printf("HINT: use dvd+rw-mediainfo from dvd+rw-tools for information extraction.\n"); + /* if(getdisktype_mmc(usalp, dp)<0) + return -1; + */ + + /* read rzone info to get the space left on disk */ + /*ds_trlast is the last rzone on disk, can be invisible */ + if(read_rzone_info(usalp, (caddr_t)&track_info, sizeof(track_info))>=0) + dsp->ds_maxblocks=a_to_u_4_byte(track_info.free_blocks)+a_to_4_byte(track_info.next_writable_addr); + + dsp->ds_disktype&= ~DT_CD; + dsp->ds_disktype|= DT_DVD; + + return (ret); - struct track_info track_info; - if(getdisktype_mmc(usalp, dp)<0) - return -1; - - /* read rzone info to get the space left on disk */ - /*ds_trlast is the last rzone on disk, can be invisible */ - if(read_rzone_info(usalp, (caddr_t)&track_info, sizeof(track_info))>=0) - dsp->ds_maxblocks=a_to_u_4_byte(track_info.free_blocks)+a_to_4_byte(track_info.next_writable_addr); - - dsp->ds_disktype&= ~DT_CD; - dsp->ds_disktype|= DT_DVD; - - return (ret); - } static int @@ -2717,6 +2719,11 @@ fixate_mdvd(SCSI *usalp, cdr_t *dp, track_t *trackp) { int ret; + if (scsi_flush_cache(usalp, (dp->cdr_cmdflags&F_IMMED) != 0) < 0) { + printf("Trouble flushing the cache\n"); + return -1; + } + wait_unit_ready(usalp, 300); /* XXX Wait for ATAPI */ /*set a really BIG timeout and call fixate_mmc The BIG timeout is needed in case there was a very short rzone to write at the beginning of the disk, because lead-out needs to be at some distance. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/wodim/scsi_scan.c new/cdrkit-1.1.6/wodim/scsi_scan.c --- old/cdrkit-1.1.5.1/wodim/scsi_scan.c 2007-04-10 17:01:46.000000000 +0200 +++ new/cdrkit-1.1.6/wodim/scsi_scan.c 2007-05-04 09:31:20.000000000 +0200 @@ -35,9 +35,6 @@ #include <mconfig.h> #include <stdio.h> -#include <stdxlib.h> -#include <standard.h> -#include <btorder.h> #include <errno.h> #include <schily.h> @@ -53,11 +50,12 @@ #include <sys/stat.h> #include <unistd.h> #include <string.h> -#include <ctype.h> static void print_product(FILE *f, struct scsi_inquiry *ip); int select_target(SCSI *usalp, FILE *f); +#define MAXDEVCOUNT (256+26) + extern BOOL check_linux_26(); static void print_product(FILE *f, struct scsi_inquiry *ip) { @@ -70,21 +68,130 @@ usal_fprintdev(f, ip); } -#define MAXDEVCOUNT (256+26) +SCSI * open_auto(int64_t need_size, int debug, int lverbose) { + int res; + SCSI * usalp = NULL; + char errstr[80]; + +#ifdef __linux__ + /* quick-and-dirty code but should do what is supposed to, more quickly */ + + /* + * For Linux, try these strategies, in order: + * 1. stat /dev/cdrw or /dev/dvdrw, depending on size we need. + * 2. Read /proc/sys/dev/cdrom/info, look for a CD-R/DVD-R. + * Will fail for kernel 2.4 or if cdrom module not loaded. + * 3. stat /dev/cdrom, just assume that it can write media. + + An example for procfs file contents, beware of the TABs + +--- +CD-ROM information, Id: cdrom.c 3.20 2003/12/17 + +drive name: hdc hda +drive speed: 40 40 +drive # of slots: 1 1 +Can close tray: 1 1 +Can open tray: 1 1 +Can lock tray: 1 1 +Can change speed: 1 1 +Can select disk: 0 0 +Can read multisession: 1 1 +Can read MCN: 1 1 +Reports media changed: 1 1 +Can play audio: 1 1 +Can write CD-R: 0 1 +Can write CD-RW: 0 1 +Can read DVD: 1 1 +Can write DVD-R: 0 1 +Can write DVD-RAM: 0 1 +Can read MRW: 0 1 +Can write MRW: 0 1 +Can write RAM: 0 1 + +--- +*/ + struct stat statbuf; + /* XXX Good guess? BD-RE recorders may not support CDRW anymore... */ + char *type="CD-R", *key="Can write CD-R:", *guessdev="/dev/cdrw", *result=NULL; + FILE *fh; + + if( need_size > 360000*2048 ) { + type="DVD-R"; + guessdev="/dev/dvdrw"; + key="Can write DVD-R:"; + } + + if(need_size>10240) /* don't bother with weird numbers */ + fprintf(stderr, "Looking for a %s drive to store %.2f MiB...\n", type, (float)need_size/1048576.0); + if(0==stat(guessdev, &statbuf)) + result=guessdev; + else if(0!= (fh = fopen("/proc/sys/dev/cdrom/info", "r")) ) { + /* ok, going the hard way */ + char *nameline=NULL; + static char buf[256]; + int kn = strlen(key); + + buf[255]='\0'; + + while(fgets(buf, sizeof(buf), fh)) { + if(0==strncmp(buf, "drive name:", 11)) + nameline=strdup(buf); + if(nameline && 0==strncmp(buf, key, kn)) { + int p=kn; + char *descptr=nameline+11; /* start at the known whitespace */ + while(p<sizeof(buf) && buf[p]) { + if(buf[p]=='1' || buf[p]=='0') { + /* find the beginning of the descriptor */ + for(;isspace((Uchar) *descptr);descptr++) + ; + } + if(buf[p]=='1') { + result=descptr-5; + /* terminate on space/newline and stop there */ + for(;*descptr;descptr++) { + if(isspace((Uchar) *descptr)) + *(descptr--)='\0'; + } + strncpy(result, "/dev/", 5); + break; + } + else { /* no hit, move to after word ending */ + for(; *descptr && ! isspace((Uchar) *descptr); descptr++) + ; + } + p++; + } + } + + } + fclose(fh); + } -# warning Check windows SPT driver + if(result) + fprintf(stderr, "Detected %s drive: %s\n", type, result); + if (0==stat("/dev/cdrom", &statbuf)) { + result = "/dev/cdrom"; + fprintf(stderr, "Using /dev/cdrom of unknown capabilities\n"); + } + if(result) + return usal_open(result, errstr, sizeof(errstr), debug, lverbose); +#endif /* __linux__ */ + + usalp = usal_open(NULL, errstr, sizeof(errstr), debug, lverbose); + if(!usalp) + return NULL; + res = list_devices(usalp, stdout, 1); + if(res>0) + return usalp; + else + usal_close(usalp); + return NULL; +} -int list_devices(SCSI *usalp, FILE *f) { +int list_devices(SCSI *usalp, FILE *f, int pickup_first) { int initiator; -#ifdef FMT - int cscsibus = usal_scsibus(usalp); - int ctarget = usal_target(usalp); - int clun = usal_lun(usalp); -#endif - int n, i; - int low = -1; - int high = -1; - int amt = 0; + int i; int bus; int tgt; int lun = 0; @@ -110,8 +217,6 @@ //fprintf(f, "scsibus%d:\n", bus); for (tgt = 0; tgt < 16; tgt++) { - n = bus*100 + tgt; - usal_settarget(usalp, bus, tgt, lun); have_tgt = unit_ready(usalp) || usalp->scmd->error != SCG_FATAL; @@ -134,6 +239,7 @@ getdev(usalp, FALSE); if(usalp->inq->type == INQ_ROMD || usalp->inq->type == INQ_WORM) { char *p; + for(p=usalp->inq->vendor_info + 7 ; p >= usalp->inq->vendor_info; p--) { if(isspace((unsigned char)*p)) *p='\0'; @@ -147,6 +253,11 @@ break; } snprintf(buf, sizeof(buf), "%2d dev='%s'\t%s : '%.8s' '%.16s'\n", ndevs, usal_natname(usalp, bus, tgt, lun), perms, usalp->inq->vendor_info, usalp->inq->prod_ident); + /* alternative use, only select the first device */ + if(pickup_first) { + printf("Using drive: %s\n", usal_natname(usalp, bus, tgt, lun)); + return 1; + } lines[ndevs++]=strdup(buf); } @@ -154,6 +265,12 @@ } usalp->silent--; + /* should have been returned before if there was a recorder */ + if(pickup_first) + return 0; + + /* now start the output */ + fprintf(stdout, "%s: Overview of accessible drives (%d found) :\n" "-------------------------------------------------------------------------\n", get_progname(), ndevs); @@ -163,19 +280,7 @@ } fprintf(stdout, "-------------------------------------------------------------------------\n"); - - - n = -1; -#ifdef FMT - getint("Select target", &n, low, high); - bus = n/100; - tgt = n%100; - usal_settarget(usalp, bus, tgt, lun); - return (select_unit(usalp)); - - usal_settarget(usalp, cscsibus, ctarget, clun); -#endif - return (amt); + return ndevs; } int select_target(SCSI *usalp, FILE *f) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/wodim/scsi_scan.h new/cdrkit-1.1.6/wodim/scsi_scan.h --- old/cdrkit-1.1.5.1/wodim/scsi_scan.h 2006-11-23 19:57:28.000000000 +0100 +++ new/cdrkit-1.1.6/wodim/scsi_scan.h 2007-05-04 02:45:51.000000000 +0200 @@ -34,6 +34,10 @@ #ifndef _SCSI_SCAN_H #define _SCSI_SCAN_H +#include <usal/scsitransp.h> + extern int select_target(SCSI *usalp, FILE *f); +extern int list_devices(SCSI *usalp, FILE *f, int pickup_type); +extern SCSI * open_auto(int64_t need_size, int debug, int lverbose); #endif /* _SCSI_SCAN_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cdrkit-1.1.5.1/wodim/wodim.c new/cdrkit-1.1.6/wodim/wodim.c --- old/cdrkit-1.1.5.1/wodim/wodim.c 2007-04-10 17:01:46.000000000 +0200 +++ new/cdrkit-1.1.6/wodim/wodim.c 2007-05-04 02:45:51.000000000 +0200 @@ -12,7 +12,7 @@ /* * - * Modified by Eduard Bloch in 08/2006 + * Modified by Eduard Bloch in 08/2006 and later */ /* @(#)cdrecord.c 1.310 06/02/09 Copyright 1995-2006 J. Schilling */ @@ -360,9 +360,9 @@ * XXX mlockall() needs root privilleges. */ if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0) { - if(lverbose>2) - fprintf(stderr, - "W: Cannot do mlockall(2). Possibly increased risk for buffer underruns.\n"); + if(lverbose>2) + fprintf(stderr, + "W: Cannot do mlockall(2). Possibly increased risk for buffer underruns.\n"); } #endif @@ -402,22 +402,36 @@ exit(0); } - /* - if (scandevs) - return (scan_devices(usalp, stdout, stderr)); -*/ - usalp = usal_open(dev, errstr, sizeof (errstr), - debug, lverbose); - if(!usalp) - { - errmsg("\nCannot open SCSI driver!\n" - "For possible targets try 'wodim --devices' or 'wodim -scanbus'.\n" - "For possible transport specifiers try 'wodim dev=help'.\n" - "For IDE/ATAPI devices configuration, see the file README.ATAPI.setup from\n" - "the wodim documentation.\n"); - exit(EX_BAD); - } - + if( (!dev || *dev=='\0'|| 0==strcmp(dev, "-1")) && (flags & F_SCANBUS)==0 ) { + int64_t need_size=0L; + struct stat statbuf; + int t; + + fprintf(stderr, "Device was not specified. Trying to find an appropriate drive...\n"); + + /* estimate how much data user wants to write */ + for(t=1;t<=tracks;t++) { + if(track[t].tracksize>=0) + need_size+=track[t].tracksize; + else if(0==stat(track[t].filename, &statbuf)) + need_size+=statbuf.st_size; + } + usalp=open_auto(need_size, debug, lverbose); + } + + if(!usalp) + usalp = usal_open(dev, errstr, sizeof(errstr), debug, lverbose); + + if(!usalp) + { + errmsg("\nCannot open SCSI driver!\n" + "For possible targets try 'wodim --devices' or 'wodim -scanbus'.\n" + "For possible transport specifiers try 'wodim dev=help'.\n" + "For IDE/ATAPI devices configuration, see the file README.ATAPI.setup from\n" + "the wodim documentation.\n"); + exit(EX_BAD); + } + #ifdef HAVE_PRIV_SET #ifdef PRIV_DEBUG fprintf(stderr, "file_dac_read: %d\n", priv_ineffect(PRIV_FILE_DAC_READ)); @@ -511,8 +525,8 @@ if ((buf = usal_getbuf(usalp, bufsize)) == NULL) comerr("Cannot get SCSI I/O buffer.\n"); - if (scandevs) - return (list_devices(usalp, stdout)); + if (scandevs) + return (list_devices(usalp, stdout, 0)); if ((flags & F_SCANBUS) != 0) { select_target(usalp, stdout); @@ -3741,129 +3755,6 @@ if (dev != *devp && (*flagsp & F_SCANBUS) == 0) *devp = dev; - /* quick-and-dirty code but should do what is supposed to. Possible - * replacement with libhal using code in future. */ - if ( (!*devp || 0 == strcmp(*devp, "-1")) && (*flagsp & (F_VERSION|F_SCANBUS)) == 0) { -#ifdef __linux__ - /* - * For Linux, try these strategies, in order: - * 1. stat /dev/cdrw or /dev/dvdrw, depending on size we need. - * 2. Read /proc/sys/dev/cdrom/info, look for a CD-R/DVD-R. - * Will fail for kernel 2.4 or if cdrom module not loaded. - * 3. stat /dev/cdrom, just assume that it can write media. - - An example for procfs file contents, beware of the TABs - ---- -CD-ROM information, Id: cdrom.c 3.20 2003/12/17 - -drive name: hdc hda -drive speed: 40 40 -drive # of slots: 1 1 -Can close tray: 1 1 -Can open tray: 1 1 -Can lock tray: 1 1 -Can change speed: 1 1 -Can select disk: 0 0 -Can read multisession: 1 1 -Can read MCN: 1 1 -Reports media changed: 1 1 -Can play audio: 1 1 -Can write CD-R: 0 1 -Can write CD-RW: 0 1 -Can read DVD: 1 1 -Can write DVD-R: 0 1 -Can write DVD-RAM: 0 1 -Can read MRW: 0 1 -Can write MRW: 0 1 -Can write RAM: 0 1 - ---- -*/ - struct stat statbuf; - char *type="CD-R", *key="Can write CD-R:", *guessdev="/dev/cdrw", *result=NULL; - long long filesize=0; - FILE *fh; - - if(tracks>0) { - filesize=trackp[tracks].tracksize; - if(filesize<=0 && 0==stat(trackp[tracks].filename, &statbuf)) { - filesize=statbuf.st_size; - } - } - - if( filesize > 360000*2048 ) { - type="DVD-R"; - guessdev="/dev/dvdrw"; - key="Can write DVD-R:"; - } - - fprintf(stderr, "INFO: no device specified, looking for a %s drive to store %.2f MiB...\n", type, (float)filesize/1048576.0); - if(0==stat(guessdev, &statbuf)) - result=guessdev; - else if(0!= (fh = fopen("/proc/sys/dev/cdrom/info", "r")) ) { - /* ok, going the hard way */ - char *nameline=NULL; - static char buf[256]; - int kn = strlen(key); - - buf[255]='\0'; - - while(fgets(buf, sizeof(buf), fh)) { - if(0==strncmp(buf, "drive name:", 11)) - nameline=strdup(buf); - if(nameline && 0==strncmp(buf, key, kn)) { - int p=kn; - char *descptr=nameline+11; /* start at the known whitespace */ - while(p<sizeof(buf) && buf[p]) { - if(buf[p]=='1' || buf[p]=='0') { - /* find the beginning of the descriptor */ - for(;isspace((Uchar) *descptr);descptr++) - ; - } - if(buf[p]=='1') { - result=descptr-5; - /* terminate on space/newline and stop there */ - for(;*descptr;descptr++) { - if(isspace((Uchar) *descptr)) - *(descptr--)='\0'; - } - strncpy(result, "/dev/", 5); - break; - } - else { /* no hit, move to after word ending */ - for(; *descptr && ! isspace((Uchar) *descptr); descptr++) - ; - } - p++; - } - } - - } - fclose(fh); - } - - if(result) { - fprintf(stderr, "Detected %s drive: %s\n", type, result); - *devp=result; - } - else if (0==stat("/dev/cdrom", &statbuf)) { - *devp = "/dev/cdrom"; - fprintf(stderr, "Using /dev/cdrom of unknown capabilities\n"); - } - else { - fprintf(stderr, "Unable to find a %s drive. Please specify manually using the dev= argument\n" - "or other configuration methods, see wodim(1) for details.\n", type); - } -#else - printf("Guessing of a capable drive not implemented for this platform yet.\n" - "Use the dev= argument, or --devices to get a list of available drives.\n"); -#endif - } - if (!*devp && (*flagsp & (F_VERSION|F_SCANBUS)) == 0) { - errmsgno(EX_BAD, "No CD/DVD-Recorder device specified.\n"); - susage(EX_BAD); - } if (*devp && ((strncmp(*devp, "HELP", 4) == 0) || (strncmp(*devp, "help", 4) == 0))) { @@ -3874,7 +3765,7 @@ if (tracks != 0) { fprintf(stderr, "No tracks allowed with -load, -lock, -setdropts, -msinfo, -toc, -atip, -fix,\n" - "-version, -checkdrive, -prcap, -inq, -scanbus, -devices, -reset and -abort options.\n" ); + "-version, -checkdrive, -prcap, -inq, -scanbus, --devices, -reset and -abort options.\n" ); exit(EXIT_FAILURE); } return ispacket; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 strigi
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package strigi checked in at Thu Jun 28 19:44:56 CEST 2007. -------- --- strigi/strigi.changes 2007-05-31 23:24:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/strigi/strigi.changes 2007-06-25 19:13:00.678787000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 25 14:01:15 CEST 2007 - stbinner(a)suse.de + +- update to current SVN + +------------------------------------------------------------------- Old: ---- STRIGI_BRANCH.diff New: ---- STRIGI_BRANCH.diff.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ strigi.spec ++++++ --- /var/tmp/diff_new_pack.X25133/_old 2007-06-28 19:42:56.000000000 +0200 +++ /var/tmp/diff_new_pack.X25133/_new 2007-06-28 19:42:56.000000000 +0200 @@ -19,9 +19,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://www.vandenoever.info/software/strigi/ Version: 0.5.1 -Release: 17 +Release: 25 Source: strigi-%{version}.tar.bz2 -Patch1: STRIGI_BRANCH.diff +Patch1: STRIGI_BRANCH.diff.bz2 %description strigi is a very fast crawling, very small memory footprint, no @@ -71,7 +71,7 @@ %prep %setup -q -%patch1 +%patch1 -p 1 %build export CXXFLAGS="$RPM_OPT_FLAGS" @@ -109,6 +109,7 @@ #%_libdir/strigi/strigita_magic.so %_libdir/strigi/strigita_au.so %_libdir/strigi/strigita_pcx.so +%_libdir/strigi/strigita_gif.so #%_libdir/strigi/strigita_tga.so /usr/share/strigi %_libdir/libcluceneindex.so.* @@ -138,6 +139,8 @@ %_libdir/pkgconfig/libstreams.pc %changelog +* Mon Jun 25 2007 - stbinner(a)suse.de +- update to current SVN * Thu May 31 2007 - dmueller(a)suse.de - update to current SVN: * xesam support ++++++ STRIGI_BRANCH.diff.bz2 ++++++ ++++ 9912 lines (skipped) ++++ between strigi/STRIGI_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/strigi/STRIGI_BRANCH.diff.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 sqlite
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package sqlite checked in at Thu Jun 28 19:43:39 CEST 2007. -------- --- sqlite/sqlite.changes 2007-04-27 09:38:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/sqlite/sqlite.changes 2007-06-26 11:31:34.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Jun 26 11:29:19 CEST 2007 - adrian(a)suse.de + +- update to version 3.4.0 + WARNING: this version might cause incompatibilities due to new + limits. These limits could be raised again, if we run in + trouble, but let's follow upstream for now. + * Two important bugfixes for database corruption. + * New features like incremental BLOB I/O and incremental vacuum + +------------------------------------------------------------------- Old: ---- sqlite-3.3.17.tar.bz2 New: ---- disable-check.diff sqlite-3.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sqlite.spec ++++++ --- /var/tmp/diff_new_pack.W19362/_old 2007-06-28 19:42:39.000000000 +0200 +++ /var/tmp/diff_new_pack.W19362/_new 2007-06-28 19:42:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package sqlite (Version 3.3.17) +# spec file for package sqlite (Version 3.4.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,7 +19,7 @@ Group: Productivity/Databases/Servers Summary: Embeddable SQL Database Engine URL: http://www.sqlite.org/ -Version: 3.3.17 +Version: 3.4.0 Release: 1 Source0: http://www.sqlite.org/%name-%version.tar.bz2 Source1: sqlite.desktop @@ -30,6 +30,7 @@ Patch5: fix-64bit-3.diff Patch6: sqlite-fts.diff Patch7: sqlite-load-ext.diff +Patch8: disable-check.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -101,6 +102,7 @@ %patch5 %patch6 %patch7 +%patch8 # does not work due to our ulimits in our build system rm test/bigfile.test autoreconf -f -i @@ -139,9 +141,9 @@ tcllibdir=%_libdir install -d $RPM_BUILD_ROOT%_mandir/man1/ install -m 0644 ../sqlite3.1 $RPM_BUILD_ROOT%_mandir/man1/ -%if %{?suse_version:1}%{?!suse_version:0} - sed -i 's,%buildroot,,' %buildroot/%tclscriptdir/sqlite*/pkgIndex.tcl -%endif +#%if %{?suse_version:1}%{?!suse_version:0} +# sed -i 's,%buildroot,,' %buildroot/%tclscriptdir/sqlite*/pkgIndex.tcl +#%endif # # install the susehelp meta file mkdir -p $RPM_BUILD_ROOT/usr/share/susehelp/meta/Development/Libraries/ @@ -162,7 +164,6 @@ %files tcl %defattr(-,root,root) -%_libdir/libtclsqlite*.so %tclscriptdir @@ -177,6 +178,13 @@ %_libdir/pkgconfig/sqlite3.pc %changelog +* Tue Jun 26 2007 - adrian(a)suse.de +- update to version 3.4.0 + WARNING: this version might cause incompatibilities due to new + limits. These limits could be raised again, if we run in + trouble, but let's follow upstream for now. + * Two important bugfixes for database corruption. + * New features like incremental BLOB I/O and incremental vacuum * Fri Apr 27 2007 - adrian(a)suse.de - update to version 3.3.17 * bug fix in forwards-compatibility logic of SQLite ++++++ disable-check.diff ++++++ --- test/expr.test +++ test/expr.test 2007/06/26 09:05:03 @@ -136,8 +136,8 @@ test_expr expr-1.102 {i1=40, i2=1} {i2<<i1} 1099511627776 test_expr expr-1.103 {i1=0} {(-2147483648.0 % -1)} 0.0 -test_expr expr-1.104 {i1=0} {(-9223372036854775808 % -1)} 0.0 -test_expr expr-1.105 {i1=0} {(-9223372036854775808 / -1)>1} 1 +#test_expr expr-1.104 {i1=0} {(-9223372036854775808 % -1)} 0.0 +test_expr expr-1.105 {i1=0} {(-9223372036854775808 / -1)>1} 1 test_expr expr-2.1 {r1=1.23, r2=2.34} {r1+r2} 3.57 test_expr expr-2.2 {r1=1.23, r2=2.34} {r1-r2} -1.11 ++++++ sqlite-3.3.17.tar.bz2 -> sqlite-3.4.0.tar.bz2 ++++++ ++++ 31902 lines of diff (skipped) ++++++ sqlite.diff ++++++ --- /var/tmp/diff_new_pack.W19362/_old 2007-06-28 19:42:42.000000000 +0200 +++ /var/tmp/diff_new_pack.W19362/_new 2007-06-28 19:42:42.000000000 +0200 @@ -1,6 +1,6 @@ --- Makefile.in -+++ Makefile.in 2007/04/16 08:15:55 -@@ -277,7 +277,7 @@ ++++ Makefile.in 2007/06/26 07:07:30 +@@ -284,7 +284,7 @@ libsqlite3.la: $(LIBOBJ) $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \ @@ -9,58 +9,11 @@ libtclsqlite3.la: tclsqlite.lo libsqlite3.la $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \ ---- src/printf.c -+++ src/printf.c 2007/04/16 08:15:55 -@@ -843,7 +843,6 @@ - return z; - } - --#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) - /* - ** A version of printf() that understands %lld. Used for debugging. - ** The printf() built into some versions of windows does not understand %lld -@@ -859,4 +858,3 @@ - fprintf(stdout,"%s", zBuf); - fflush(stdout); - } --#endif ---- tclinstaller.tcl -+++ tclinstaller.tcl 2007/04/16 08:15:55 -@@ -7,19 +7,23 @@ - set VERSION [lindex $argv 0] - set LIBFILE .libs/libtclsqlite3[info sharedlibextension] - if { ![info exists env(DESTDIR)] } { set env(DESTDIR) "" } --set LIBDIR $env(DESTDIR)[lindex $auto_path 0] -+if { ![info exists env(tcllibdir)] } { set env(tcllibdir) [lindex $auto_path 0] } -+if { ![info exists env(tclscriptdir)] } { set env(tclscriptdir) $env(libdir) } -+set LIBDIR $env(DESTDIR)$env(tcllibdir) -+set SCRIPTDIR $env(DESTDIR)$env(tclscriptdir) - set LIBNAME [file tail $LIBFILE] --set LIB $LIBDIR/sqlite3/$LIBNAME -+set LIB $LIBDIR/$LIBNAME - --file delete -force $LIBDIR/sqlite3 --file mkdir $LIBDIR/sqlite3 --set fd [open $LIBDIR/sqlite3/pkgIndex.tcl w] --puts $fd "package ifneeded sqlite3 $VERSION \[list load $LIB sqlite3\]" -+file delete -force $SCRIPTDIR/sqlite3 -+file mkdir $SCRIPTDIR/sqlite3 -+set fd [open $SCRIPTDIR/sqlite3/pkgIndex.tcl w] -+puts $fd "package ifneeded sqlite3 $VERSION {load $LIBNAME sqlite3}" - close $fd - - # We cannot use [file copy] because that will just make a copy of - # a symbolic link. We have to open and copy the file for ourselves. - # -+file mkdir $LIBDIR - set in [open $LIBFILE] - fconfigure $in -translation binary - set out [open $LIB w] --- test/printf.test -+++ test/printf.test 2007/04/16 08:15:55 -@@ -157,12 +157,6 @@ - sqlite3_mprintf_scaled {A double: %g} 1.0e307 100.0 - } {A double: NaN} ++++ test/printf.test 2007/06/26 07:07:30 +@@ -163,12 +163,6 @@ + sqlite3_mprintf_scaled {A double: %+g} 1.0e307 100.0 + } {A double: +Inf} -do_test printf-8.1 { - sqlite3_mprintf_int {%u %u %u} 0x7fffffff 0x80000000 0xffffffff @@ -72,11 +25,11 @@ sqlite3_mprintf_int64 {%llu %llu %llu} 2147483647 2147483648 4294967296 } {2147483647 2147483648 4294967296} --- test/vtab_err.test -+++ test/vtab_err.test 2007/04/16 08:15:55 -@@ -147,23 +147,4 @@ ++++ test/vtab_err.test 2007/06/26 07:07:30 +@@ -146,23 +146,4 @@ + COMMIT; } - -do_malloc_test vtab_err-2 -tclprep { - register_echo_module [sqlite3_connection_pointer db] -} -sqlbody { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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