October 2006 - openSUSE Commits - openSUSE Mailing Lists

commit microcode_ctl
by root＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package microcode_ctl checked in at Tue Oct 31 16:53:58 CET 2006. -------- --- arch/i386/microcode_ctl/microcode_ctl.changes 2006-07-28 21:30:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/microcode_ctl/microcode_ctl.changes 2006-10-31 15:57:41.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Oct 31 15:56:11 CET 2006 - garloff(a)suse.de + +- microcode_ctl-1.15: Updated microcode within archive, but really + the code is unchanged from 1.11. + +------------------------------------------------------------------- Old: ---- microcode_ctl-1.14.tar.bz2 New: ---- microcode_ctl-1.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ microcode_ctl.spec ++++++ --- /var/tmp/diff_new_pack.bsIAJT/_old 2006-10-31 16:53:47.000000000 +0100 +++ /var/tmp/diff_new_pack.bsIAJT/_new 2006-10-31 16:53:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package microcode_ctl (Version 1.14) +# spec file for package microcode_ctl (Version 1.15) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,15 +11,15 @@ # norootforbuild Name: microcode_ctl -License: GPL, Other License(s), see package +License: GNU General Public License (GPL) - all versions, Other License(s), see package ExclusiveArch: %ix86 x86_64 URL: http://www.urbanmyth.org/microcode/ Group: Hardware/Other Autoreqprov: on Summary: Microcode Updates for Intel CPUs -Version: 1.14 +Version: 1.15 Release: 1 -%define tarver 1.14 +%define tarver 1.15 Source0: microcode_ctl-%{tarver}.tar.bz2 Source1: microcode.init #Source2: intel-ia32microcode-05Jan2006.txt.bz2 @@ -77,6 +77,9 @@ %doc README Changelog %changelog -n microcode_ctl +* Tue Oct 31 2006 - garloff(a)suse.de +- microcode_ctl-1.15: Updated microcode within archive, but really + the code is unchanged from 1.11. * Fri Jul 28 2006 - garloff(a)suse.de - microcode_ctl-1.14: Latest microcode from intel. * Tue Feb 28 2006 - garloff(a)suse.de ++++++ microcode_ctl-1.14.tar.bz2 -> microcode_ctl-1.15.tar.bz2 ++++++ ++++ 32684 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lynx
by root＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package lynx checked in at Tue Oct 31 16:53:42 CET 2006. -------- --- lynx/lynx.changes 2006-10-16 10:23:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/lynx/lynx.changes 2006-10-31 16:28:37.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Oct 31 16:27:56 CET 2006 - kssingvo(a)suse.de + +- disabled color support for non-color lynx, enabled color support + for lynx-color +- added helpful directories to pkg documentation: samples, scripts + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lynx.spec ++++++ --- /var/tmp/diff_new_pack.iEA4Ir/_old 2006-10-31 16:53:20.000000000 +0100 +++ /var/tmp/diff_new_pack.iEA4Ir/_new 2006-10-31 16:53:20.000000000 +0100 @@ -12,7 +12,7 @@ Name: lynx BuildRequires: openssl-devel postfix -License: GPL +License: GNU General Public License (GPL) - all versions Group: Productivity/Networking/Web/Browsers Provides: lynxssl web_browser Obsoletes: lynxssl @@ -20,7 +20,7 @@ Requires: xli Autoreqprov: on Version: 2.8.6_rel2 -Release: 1 +Release: 6 URL: http://lynx.isc.org Summary: A Text-Based WWW Browser Source: http://lynx.isc.org/current/lynx2.8.6rel.2.tar.bz2 @@ -63,6 +63,19 @@ --prefix=/usr \ --mandir=%{_mandir} \ --sysconfdir=/etc \ + --disable-default-colors \ + --disable-color-style \ + --with-screen=ncursesw \ + --enable-ipv6 +make +mv lynx lynx-bw +make distclean +./configure \ + --with-ssl \ + --enable-nls \ + --prefix=/usr \ + --mandir=%{_mandir} \ + --sysconfdir=/etc \ --enable-default-colors \ --with-screen=ncursesw \ --enable-ipv6 @@ -73,19 +86,25 @@ make clean make EXTRAA="-DSHOW_COLOR=TRUE" mkdir -p $RPM_BUILD_ROOT -install lynx $RPM_BUILD_ROOT/usr/bin/lynx-color +mv $RPM_BUILD_ROOT/usr/bin/lynx $RPM_BUILD_ROOT/usr/bin/lynx-color +install lynx-bw $RPM_BUILD_ROOT/usr/bin/lynx %find_lang %name %files -f %name.lang %defattr(-,root,root) -%doc README COPYING PROBLEMS lynx_help /usr/bin/lynx /usr/bin/lynx-color %config /etc/lynx.cfg %config /etc/lynx.lss %doc %{_mandir}/man1/lynx.1.gz +%doc AUTHORS CHANGES README COPYING README PROBLEMS +%doc lynx_help samples scripts %changelog -n lynx +* Tue Oct 31 2006 - kssingvo(a)suse.de +- disabled color support for non-color lynx, enabled color support + for lynx-color +- added helpful directories to pkg documentation: samples, scripts * Mon Oct 16 2006 - ssommer(a)suse.de - updated to 2.8.6rel.2: Highligths: * broaden the conditions on which to reload the color-style info @@ -115,7 +134,7 @@ * highlight the target and pause for 20 milliseconds when selecting a link with the mouse * add -stderr option to write error messages when doing a -dump -or --source. + -source. * add -nonumbers option, which modifies the output of -dump to suppress the link-numbering * add -listonly option, which modifies the output of -dump to show ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 lapack
by root＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package lapack checked in at Tue Oct 31 16:53:14 CET 2006. -------- --- lapack/lapack.changes 2006-01-25 21:37:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/lapack/lapack.changes 2006-10-31 16:25:45.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Oct 31 15:48:05 CET 2006 - rguenther(a)suse.de + +- Trim BuildRequires. +- Build and package -fPIC static library variants. [#205310] +- Fix installing of the libblas.so symlink. +- Do not package the matrix testing setup library libtmglib. +- Do not package useless README file. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lapack.spec ++++++ --- /var/tmp/diff_new_pack.CcDZSq/_old 2006-10-31 16:52:20.000000000 +0100 +++ /var/tmp/diff_new_pack.CcDZSq/_new 2006-10-31 16:52:20.000000000 +0100 @@ -5,17 +5,17 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: lapack -BuildRequires: f2c gcc-fortran gmp-devel tcsh +BuildRequires: gcc-fortran Summary: Linear Algebra Package Version: 3.0 -Release: 927 -License: distributable +Release: 951 +License: Public Domain, Freeware Group: Development/Libraries/Parallel Source0: lapack-%{version}.tar.bz2 Source1: manpages.tgz @@ -93,24 +93,30 @@ rm -rf $RPM_BUILD_ROOT ( cd BLAS/SRC +make static F77=gfortran F77FLAGS="-c $RPM_OPT_FLAGS -fPIC" +mv ../../libblas.a ../../libblas_pic.a +make clean make static F77=gfortran F77FLAGS="-c $RPM_OPT_FLAGS" make clean -make shared F77=gfortran F77FLAGS="-c $RPM_OPT_FLAGS -fPIC" +make shared F77=gfortran F77FLAGS="-c $RPM_OPT_FLAGS" ) ln -sf libblas.so.3.0.0 libblas.so ( cd SRC +make static FORTRAN=gfortran F77=gfortran RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC" +mv ../liblapack.a ../liblapack_pic.a +make clean make static FORTRAN=gfortran F77=gfortran RPM_OPT_FLAGS="$RPM_OPT_FLAGS" make clean -make shared FORTRAN=gfortran F77=gfortran RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC" +make shared FORTRAN=gfortran F77=gfortran RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ) -ln -sf liblapack.so.3.0.0 liblapack.so -make FORTRAN=gfortran F77=gfortran tmglib %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/%{_libdir} -LIB=%{_lib} make install-libs DESTDIR=$RPM_BUILD_ROOT +LIB=%{_lib} make install-blas install-lapack DESTDIR=$RPM_BUILD_ROOT +install -m 644 libblas_pic.a $RPM_BUILD_ROOT/%{_libdir} +install -m 644 liblapack_pic.a $RPM_BUILD_ROOT/%{_libdir} install -d $RPM_BUILD_ROOT%{_mandir}/man3 function CopyFile { NEW_FILENAME=$(basename $1 .l).3 @@ -146,13 +152,15 @@ %files %defattr(-,root,root) -%doc README -%{_libdir}/liblapack.* -%{_libdir}/libtmglib.* +%{_libdir}/liblapack.so* +%{_libdir}/liblapack.a +%{_libdir}/liblapack_pic.a %files -n blas %defattr(-,root,root) -%{_libdir}/libblas.* +%{_libdir}/libblas.so* +%{_libdir}/libblas.a +%{_libdir}/libblas_pic.a %files -n blasman -f blasmans %defattr(-,root,root) @@ -161,6 +169,12 @@ %defattr(-,root,root) %changelog -n lapack +* Tue Oct 31 2006 - rguenther(a)suse.de +- Trim BuildRequires. +- Build and package -fPIC static library variants. [#205310] +- Fix installing of the libblas.so symlink. +- Do not package the matrix testing setup library libtmglib. +- Do not package useless README file. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Sat Jan 14 2006 - kukuk(a)suse.de ++++++ lapack-3.0.dif ++++++ --- /var/tmp/diff_new_pack.CcDZSq/_old 2006-10-31 16:52:20.000000000 +0100 +++ /var/tmp/diff_new_pack.CcDZSq/_new 2006-10-31 16:52:20.000000000 +0100 @@ -279,7 +279,7 @@ + +install-shared: install-dir + install -m 755 $(SHARED) $(DESTDIR)/usr/${LIB} -+ ( cd $(DESTDIR)/usr/lib;\ ++ ( cd $(DESTDIR)/usr/${LIB};\ + ln -s liblapack.so.$(VER) liblapack.so.$(SO);\ + ln -s liblapack.so.$(SO) liblapack.so; ) + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yum-utils
by root＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package yum-utils checked in at Tue Oct 31 15:54:57 CET 2006. -------- --- yum-utils/yum-utils.changes 2006-10-05 11:33:48.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yum-utils/yum-utils.changes 2006-10-31 15:38:44.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Oct 31 15:39:01 CET 2006 - cthiel(a)suse.de + +- update to version 1.0.1 + * priorities plugin added. + * added a -c option to yumdownloader + * fix for handling of local repos in reposync, repotrack and yumdownloader + +------------------------------------------------------------------- Old: ---- yum-utils-1.0.tar.bz2 New: ---- yum-utils-1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yum-utils.spec ++++++ --- /var/tmp/diff_new_pack.ub0bdo/_old 2006-10-31 15:54:53.000000000 +0100 +++ /var/tmp/diff_new_pack.ub0bdo/_new 2006-10-31 15:54:53.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yum-utils (Version 1.0) +# spec file for package yum-utils (Version 1.0.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,9 +12,9 @@ Name: yum-utils BuildRequires: python-devel -Version: 1.0 +Version: 1.0.1 Release: 1 -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/Packages Summary: Utilities based around the yum package manager Source: %{name}-%{version}.tar.bz2 @@ -55,6 +55,11 @@ %{_mandir}/*/* %changelog -n yum-utils +* Tue Oct 31 2006 - cthiel(a)suse.de +- update to version 1.0.1 + * priorities plugin added. + * added a -c option to yumdownloader + * fix for handling of local repos in reposync, repotrack and yumdownloader * Thu Oct 05 2006 - cthiel(a)suse.de - update to version 1.0 * no changes to latests cvs HEAD ++++++ yum-utils-1.0.tar.bz2 -> yum-utils-1.0.1.tar.bz2 ++++++ ++++ 3090 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-scanner
by root＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package yast2-scanner checked in at Tue Oct 31 15:54:49 CET 2006. -------- --- yast2-scanner/yast2-scanner.changes 2006-09-11 15:24:18.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-scanner/yast2-scanner.changes 2006-10-31 15:47:23.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Oct 31 15:14:14 CET 2006 - jsmeix(a)suse.de + +- V 2.14.4 +- Replaced complicated SetUsbScannerAccessPermissions() + and SetScsiScannerAccessPermissions() functions by a simpler + test_and_set_scanner_access_permissions script and call this + script from a simple SetScannerAccessPermissions() function + (for background info see Suse Bugzilla bug 160899). +- Added user information regarding outdated hpoj driver. +- Fixed possible tmp races in some scripts (only $TMP_DATA + was created using mktemp but not $TMP_DATA.raw). + +------------------------------------------------------------------- Old: ---- yast2-scanner-2.14.3.tar.bz2 New: ---- yast2-scanner-2.14.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-scanner.spec ++++++ --- /var/tmp/diff_new_pack.cjgJzK/_old 2006-10-31 15:54:39.000000000 +0100 +++ /var/tmp/diff_new_pack.cjgJzK/_new 2006-10-31 15:54:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-scanner (Version 2.14.3) +# spec file for package yast2-scanner (Version 2.14.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-scanner -Version: 2.14.3 +Version: 2.14.4 Release: 1 -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-scanner-2.14.3.tar.bz2 +Source0: yast2-scanner-2.14.4.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 @@ -41,7 +41,7 @@ Johannes Meixner <jsmeix(a)suse.de> %prep -%setup -n yast2-scanner-2.14.3 +%setup -n yast2-scanner-2.14.4 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +75,16 @@ %doc %{prefix}/share/doc/packages/yast2-scanner %changelog -n yast2-scanner +* Tue Oct 31 2006 - jsmeix(a)suse.de +- V 2.14.4 +- Replaced complicated SetUsbScannerAccessPermissions() + and SetScsiScannerAccessPermissions() functions by a simpler + test_and_set_scanner_access_permissions script and call this + script from a simple SetScannerAccessPermissions() function + (for background info see Suse Bugzilla bug 160899). +- Added user information regarding outdated hpoj driver. +- Fixed possible tmp races in some scripts (only $TMP_DATA + was created using mktemp but not $TMP_DATA.raw). * Mon Sep 11 2006 - jsmeix(a)suse.de - V 2.14.3 - Disable showing Progress from SuSEFirewall::Read call and ++++++ yast2-scanner-2.14.3.tar.bz2 -> yast2-scanner-2.14.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/VERSION new/yast2-scanner-2.14.4/VERSION --- old/yast2-scanner-2.14.3/VERSION 2006-09-11 15:19:51.000000000 +0200 +++ new/yast2-scanner-2.14.4/VERSION 2006-10-31 15:14:08.000000000 +0100 @@ -1 +1 @@ -2.14.3 +2.14.4 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/configure new/yast2-scanner-2.14.4/configure --- old/yast2-scanner-2.14.3/configure 2006-09-11 15:20:01.000000000 +0200 +++ new/yast2-scanner-2.14.4/configure 2006-10-31 15:39:51.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-scanner 2.14.3. +# Generated by GNU Autoconf 2.59 for yast2-scanner 2.14.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-scanner' PACKAGE_TARNAME='yast2-scanner' -PACKAGE_VERSION='2.14.3' -PACKAGE_STRING='yast2-scanner 2.14.3' +PACKAGE_VERSION='2.14.4' +PACKAGE_STRING='yast2-scanner 2.14.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-scanner 2.14.3 to adapt to many kinds of systems. +\`configure' configures yast2-scanner 2.14.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-scanner 2.14.3:";; + short | recursive ) echo "Configuration of yast2-scanner 2.14.4:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-scanner configure 2.14.3 +yast2-scanner configure 2.14.4 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-scanner $as_me 2.14.3, which was +It was created by yast2-scanner $as_me 2.14.4, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-scanner' - VERSION='2.14.3' + VERSION='2.14.4' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.14.3" +VERSION="2.14.4" RPMNAME="yast2-scanner" MAINTAINER="Johannes Meixner <jsmeix(a)suse.de>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-scanner $as_me 2.14.3, which was +This file was extended by yast2-scanner $as_me 2.14.4, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2748,7 +2748,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-scanner config.status 2.14.3 +yast2-scanner config.status 2.14.4 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/configure.in new/yast2-scanner-2.14.4/configure.in --- old/yast2-scanner-2.14.3/configure.in 2006-09-11 15:19:58.000000000 +0200 +++ new/yast2-scanner-2.14.4/configure.in 2006-10-31 15:39:48.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-scanner, 2.14.3, http://bugs.opensuse.org/, yast2-scanner) +AC_INIT(yast2-scanner, 2.14.4, http://bugs.opensuse.org/, yast2-scanner) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.3" +VERSION="2.14.4" RPMNAME="yast2-scanner" MAINTAINER="Johannes Meixner <jsmeix(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/src/Scanner.ycp new/yast2-scanner-2.14.4/src/Scanner.ycp --- old/yast2-scanner-2.14.3/src/Scanner.ycp 2006-09-11 15:23:58.000000000 +0200 +++ new/yast2-scanner-2.14.4/src/Scanner.ycp 2006-10-31 15:45:06.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Scanner settings, input and output functions * Authors: Johannes Meixner <jsmeix(a)suse.de> * - * $Id: Scanner.ycp 32802 2006-09-11 13:25:35Z jsmeix $ + * $Id: Scanner.ycp 33942 2006-10-31 14:45:01Z jsmeix $ * * Representation of the configuration of scanner. * Input and output routines. @@ -234,6 +234,7 @@ string network_scanning_config_filename = "/var/lib/YaST2/network_scanning_config.ycp"; string determine_network_scanning_config_commandline = "/usr/lib/YaST2/bin/determine_network_scanner_config YCP >" + network_scanning_config_filename; string setup_network_scanning_config_commandline = "/usr/lib/YaST2/bin/setup_network_scanner_config"; +string test_and_set_scanner_access_permissions_commandline = "/usr/lib/YaST2/bin/test_and_set_scanner_access_permissions"; // The result map is used as a simple common local store for whatever additional results // (in particular commandline exit code, stdout, stderr, and whatever messages) // so that the local functions in this module can be of easy-to-use boolean type. @@ -524,215 +525,26 @@ } /** - * Search the autodetected_scanners list for USB scanners - * and if at least one USB scanner was found, - * then do the following: - * 1. - * Notify resmgr to grant access for locally logged in users via the command: - * /sbin/resmgr add /dev/bus/usb/<bus-number>/<device-number> scanner usb - * This would grant resmgr access as long as the system runs - * and as long as the scanner is not unplugged from the USB and re-plugged - * without the need to reboot or to unplug the scanner from the USB - * and re-plug it again which would trigger the udev -> HAL -> resmgr machinery. - * 2. - * Create the file /etc/hal/fdi/policy/10osvendor/80-scanner.fdi - * with an entry for each autodetected USB scanner like - * ----------------------------------------------------------------------------------- - * <match key="info.category" string="usbraw"> - * <match key="@info.parent:usb.vendor_id" int="0x1a2b"> - * <match key="@info.parent:usb.product_id" int="0x3c4d"> - * <merge key="resmgr.class" type="string">scanner</merge> - * </match> - * </match> - * </match> - * ----------------------------------------------------------------------------------- - * Regardless whether or not there is an autodetected USB scanner, - * /etc/hal/fdi/policy/10osvendor/80-scanner.fdi will be (re)-created. - * If there is no autodetected USB scanner or USB vendor or product ID is missing - * for all autodetected USB scanners, at least the header, a comment, and the footer - * is written to have all XML tags there so that at least the comment - * how to create entries manually is available for the user. - * Ignore whether or not an autodetected USB scanner appears in the active_scanners list - * (i.e. simply grant access to all autodetected USB scanners) - * because on x86_64 "scanimage -L" cannot find scanners using the 32-bit epkowa backend - * when it comes from the proprietary 32-bit-only "iscan" package for Epson scanners - * (but it would work if the 64-bit epkowa backend from iscan-free is used) - * so that in this case the scanner cannot appear in the active_scanners list - * but "sane-find-scanner" finds (almost all) Epson USB scanners - * so that the scanner is in the autodetected_scanners list. + * Test and set scanner access permissions for USB scanners and SCSI scanners + * for resmgr via HAL by calling a bash script which does all the work. * @return true on success */ -boolean SetUsbScannerAccessPermissions() -{ // First of all the multi-line strings because such strings cannot be indented: - string content = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?> -<deviceinfo version=\"0.2\"> - <device> - - -"; - string content_entry = " - <match key=\"info.category\" string=\"usbraw\"> - <match key=\"@info.parent:usb_device.vendor_id\" int=\"%1\"> - <match key=\"@info.parent:usb_device.product_id\" int=\"%2\"> - <merge key=\"resmgr.class\" type=\"string\">scanner</merge> - </match> - </match> - </match> -"; - string content_footer = " - </device> -</deviceinfo> -"; - string resmgr_scanner_config_dir = "/etc/hal/fdi/policy/10osvendor"; - string resmgr_scanner_config_file = resmgr_scanner_config_dir + "/80-scanner.fdi"; - boolean autodetected_usb_scanner_with_missing_ids = false; - string usb_vendor_and_product_id = ""; - list< string > usb_vendor_and_product_ids = []; - SCR::Execute( .target.mkdir, resmgr_scanner_config_dir ); - foreach( map< string, string > autodetected_scanner, - autodetected_scanners, - { if( "USB" == autodetected_scanner["connection"]:"unknown" ) - { // This autodetected scanner is a USB scanner. - // Notify resmgr to grant access for locally logged in users. - // This would grant resmgr access as long as the system runs - // and as long as the scanner is not unplugged from the USB and re-plugged - // without the need to reboot or to unplug the scanner from the USB - // and re-plug it again which would trigger the udev -> HAL -> resmgr machinery. - list< string > device_parts = splitstring( autodetected_scanner["device"]:"libusb:000:000", ":" ); - string usb_bus_number = device_parts[1]:"000"; - string usb_device_number = device_parts[2]:"000"; - if( "000" != usb_bus_number - && "000" != usb_device_number - ) - { // Don't show a user information if the following command fails - // because if the user has stopped resmgr, he should know what he does - // and if resmgr fails to add it, I don't know what I should tell the user - // except a very long explanation how all the stuff works: - ExecuteBashCommand( "/sbin/resmgr add /dev/bus/usb/" - + usb_bus_number - + "/" - + usb_device_number - + " scanner usb" - ); - } - // Set up the stuff for HAL so that also after a reboot - // or when the user unplugs the scanner from the USB and re-plugs it again - // the udev -> HAL -> resmgr machinery will grant the same kind of access: - string usb_vendor_id = autodetected_scanner["usb_vendor_id"]:""; - string usb_product_id = autodetected_scanner["usb_product_id"]:""; - string description = autodetected_scanner["description"]:"no description"; - if( "" == usb_vendor_id - || "" == usb_product_id - ) - { // No USB vendor ID or no USB product ID: - autodetected_usb_scanner_with_missing_ids = true; - y2milestone( "No USB vendor ID or no USB product ID for '%1'. Therefore no entry in %2", - description, - resmgr_scanner_config_file - ); - } - else - { // USB vendor ID and USB product ID exist: - usb_vendor_and_product_id = usb_vendor_id + usb_product_id; - // Avoid duplicate entries in the content (e.g. when several same models are connected): - if( ! contains( usb_vendor_and_product_ids, usb_vendor_and_product_id ) ) - { // The USB vendor product ID was not yet added to the content - // i.e. the current scanner is not a second or third same model: - content = content + sformat( content_entry, usb_vendor_id, usb_product_id ); - usb_vendor_and_product_ids = add( usb_vendor_and_product_ids, usb_vendor_and_product_id ); - } - } - } - } - ); - // Regardless whether or not there is an autodetected USB scanner, - // /etc/hal/fdi/policy/10osvendor/80-scanner.fdi will be (re)-created. - // If there is no content_entry (i.e. there is no autodetected USB scanner - // or USB vendor or product ID is missing for all autodetected USB scanners), - // the content_footer is added to have all XML tags closed and then at least - // the comment how to create entries manually is available for the user: - content = content + content_footer; - if( ! (boolean)SCR::Write( .target.string, resmgr_scanner_config_file, content ) ) - { y2milestone( "Failed to (re)-create %1", resmgr_scanner_config_file ); - // Displayed in error dialog of ActivateBackend function: - result["stderr"] = sformat( // Displayed in an error dialog (%1 is a filename). - // Only a simple message because this error does not happen on a normal system - // (i.e. a system which is not totally broken or totally messed up). - _("Cannot write file %1."), - resmgr_scanner_config_file - ); - return false; - } - y2milestone( "(Re)-created %1", resmgr_scanner_config_file ); - if( autodetected_usb_scanner_with_missing_ids ) - { // There is at least one autodetected USB scanner with no USB vendor or product ID - // so that there is no normal user access for this scanner. - // Displayed in error dialog of ActivateBackend function: - result["stderr"] = sformat( // Displayed in an error dialog (%1 is a filename). - // Only a simple message because this error does not happen on a normal system. - _("Cannot add scanner to %1 (USB vendor or product ID missing)."), - resmgr_scanner_config_file - ); - return false; - } - return true; -} - -/** - * Search the active_scanners list for possible SCSI scanners (":/dev/" in SANE device) - * and if at least one possible SCSI scanner was found, - * then run /etc/init.d/sane-dev (using "restart" to be safe that outdated permissions are reset) - * and enable it for reboot ("insserv") - * otherwise stop it and disable it for reboot ("insserv -r"). - * Note that it must search for ":/dev/" to find only SCSI scanners ("backend:/dev/sg...") - * because for example the hpaio backend may have also "/dev/" in its device, - * e.g.: "hpaio:/usb/HP_LaserJet_1220?device=/dev/usb/lp0", - * this depends on the particular model (e.g. when it doesn't report a serial number). - * @return true on success - */ -boolean SetScsiScannerAccessPermissions() -{ boolean active_scsi_scanner = false; +boolean SetScannerAccessPermissions() +{ // Build the command line parameter: + string sane_devices = ""; foreach( map< string, string > active_scanner, active_scanners, - { if( issubstring( active_scanner["sane_device"]:"", ":/dev/" ) ) - { active_scsi_scanner = true; - } + { sane_devices = sane_devices + active_scanner["sane_device"]:"unknown" + ";"; } ); - if( active_scsi_scanner ) - { if( ! Service::Enable( "sane-dev" ) ) - { y2milestone( "Service::Enable('sane-dev') failed." ); - result["stderr"] = Service::Error(); - return false; - } - if( ! Service::Restart( "sane-dev" ) ) - { y2milestone( "Service::Restart('sane-dev') failed." ); - result["stderr"] = Service::Error(); - return false; - } - y2milestone( "Service sane-dev (re)-started and enabled." ); - } - else - { if( ! Service::Stop( "sane-dev" ) ) - { y2milestone( "Service::Stop('sane-dev') failed." ); - result["stderr"] = Service::Error(); - return false; - } - if( ! Service::Disable( "sane-dev" ) ) - { y2milestone( "Service::Disable('sane-dev') failed." ); - result["stderr"] = Service::Error(); - return false; - } - y2milestone( "Service sane-dev stopped and disabled." ); + // Execute the command line: + if( ! ExecuteBashCommand( test_and_set_scanner_access_permissions_commandline + + " '" + + sane_devices + + "'" + ) + ) + { return false; } return true; } @@ -1561,12 +1373,17 @@ Alternatively proceed and change the printer configuration to use the hplip service. "); string hpoj_message = - // Message of a Popup::YesNo for scanners which should be set up with the hpoj driver + // Message of a Popup::ContinueCancel for scanners which should be set up with the hpoj driver // Do not change or translate "hpoj", it is a driver name. // Do not change or translate "PTAL", it is a subsystem name. // Do not change or translate "ptal", it is a service name. // Do not change or translate "hplip", it is a service name. -_("The hpoj driver requires the PTAL system to be set up and running. +_("The hpoj driver is outdated and no longer maintained. +To use the up-to-date driver hpaio do not proceed, go back and select the driver hpaio. + +If the hpaio driver does not work for you and you must use the hpoj driver: + +The hpoj driver requires the PTAL system to be set up and running. In particular, the ptal service must be up and running. Before the ptal service can be started, the PTAL system must be initialized. @@ -1760,20 +1577,15 @@ if( "hpoj" == backend_name && user_confirmation ) - { if( ! Popup::YesNo( hpoj_message ) ) + { if( ! Popup::ContinueCancel( hpoj_message ) ) { // The user has decided not to initialize/activate/start the PTAL system: - // Don't abort (i.e. return false) in this case because it is no error - // when the user has decided not to initialize/activate/start the PTAL system - // because it may be already up and running or the user may want to set it up manually. - // Regardless of the state of the PTAL system the backend can be activated in /etc/sane.d/dll.conf - Report::Warning( - // Message of a Report::Warning for scanners which should be set up with the hpoj backend. - // Only a simple message because before there was a Popup::YesNo - // which asked the user whether he wants to let YaST activate the ptal service - // so that this message is shown if the user has explicitely rejected to do it. - // Do not change or translate "ptal", it is a service name. - _("If the ptal service is not running, the scanner cannot work.") + // Usually this is because of the hpoj_message which explains that hpoj is outdated + // and that the user should cancel and try hpaio instead. + y2milestone( "Set up hpoj SANE backend cancelled by user." ); + Progress::Title( // Last progress step progress bar title when the Progress was aborted: + _("Cancelled") ); + return false; } else { // The user has decided to initialize/activate/start the PTAL system: @@ -1832,26 +1644,14 @@ } else { Progress::NextStage(); - if( ! SetUsbScannerAccessPermissions() + if( ! SetScannerAccessPermissions() && user_confirmation ) - { Report::Warning( sformat( // Message of a Report::Warning when setting USB scanner access permissions failed + { Report::Warning( sformat( // Message of a Report::Warning when setting scanner access permissions failed // where %1 can be replaced by an error message if such an error message exists. // Only a simple message because this error does not happen on a normal system // (i.e. a system which is not totally broken or totally messed up). - _("Failed to set USB scanner access permissions.\n%1"), - OnlyMeaningfulErrorMessage( result["stderr"]:"" ) - ) - ); - } - if( ! SetScsiScannerAccessPermissions() - && user_confirmation - ) - { Report::Warning( sformat( // Message of a Report::Warning when setting SCSI scanner access permissions failed - // where %1 can be replaced by an error message if such an error message exists. - // Only a simple message because this error does not happen on a normal system - // (i.e. a system which is not totally broken or totally messed up). - _("Failed to set SCSI scanner access permissions.\n%1"), + _("Failed to set scanner access permissions.\n%1"), OnlyMeaningfulErrorMessage( result["stderr"]:"" ) ) ); @@ -2057,26 +1857,14 @@ { active_scanners = []; } else - { if( ! SetUsbScannerAccessPermissions() - && user_confirmation - ) - { Report::Warning( sformat( // Message of a Report::Warning when setting USB scanner access permissions failed - // where %1 can be replaced by an error message if such an error message exists. - // Only a simple message because this error does not happen on a normal system - // (i.e. a system which is not totally broken or totally messed up). - _("Failed to set USB scanner access permissions.\n%1"), - OnlyMeaningfulErrorMessage( result["stderr"]:"" ) - ) - ); - } - if( ! SetScsiScannerAccessPermissions() + { if( ! SetScannerAccessPermissions() && user_confirmation ) - { Report::Warning( sformat( // Message of a Report::Warning when re-setting SCSI scanner access permissions failed + { Report::Warning( sformat( // Message of a Report::Warning when setting scanner access permissions failed // where %1 can be replaced by an error message if such an error message exists. // Only a simple message because this error does not happen on a normal system // (i.e. a system which is not totally broken or totally messed up). - _("Failed to reset SCSI scanner access permissions.\n%1"), + _("Failed to set scanner access permissions.\n%1"), OnlyMeaningfulErrorMessage( result["stderr"]:"" ) ) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/tools/Makefile.am new/yast2-scanner-2.14.4/tools/Makefile.am --- old/yast2-scanner-2.14.3/tools/Makefile.am 2006-08-15 11:24:12.000000000 +0200 +++ new/yast2-scanner-2.14.4/tools/Makefile.am 2006-10-31 14:10:05.000000000 +0100 @@ -11,6 +11,7 @@ setup_ptal_scanner_service \ setup_hplip_scanner_service \ determine_network_scanner_config \ - setup_network_scanner_config + setup_network_scanner_config \ + test_and_set_scanner_access_permissions EXTRA_DIST = $(ybin_SCRIPTS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/tools/Makefile.in new/yast2-scanner-2.14.4/tools/Makefile.in --- old/yast2-scanner-2.14.3/tools/Makefile.in 2006-09-11 15:20:02.000000000 +0200 +++ new/yast2-scanner-2.14.4/tools/Makefile.in 2006-10-31 15:39:52.000000000 +0100 @@ -168,7 +168,8 @@ setup_ptal_scanner_service \ setup_hplip_scanner_service \ determine_network_scanner_config \ - setup_network_scanner_config + setup_network_scanner_config \ + test_and_set_scanner_access_permissions EXTRA_DIST = $(ybin_SCRIPTS) all: all-am diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/tools/activate_scanner_backend new/yast2-scanner-2.14.4/tools/activate_scanner_backend --- old/yast2-scanner-2.14.3/tools/activate_scanner_backend 2006-08-15 11:24:12.000000000 +0200 +++ new/yast2-scanner-2.14.4/tools/activate_scanner_backend 2006-10-31 14:16:13.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005 +# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005, 2006 #set -x diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/tools/autodetect_scanners new/yast2-scanner-2.14.4/tools/autodetect_scanners --- old/yast2-scanner-2.14.3/tools/autodetect_scanners 2006-08-16 14:20:13.000000000 +0200 +++ new/yast2-scanner-2.14.4/tools/autodetect_scanners 2006-10-31 14:16:13.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005 +# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005, 2006 #set -x @@ -16,13 +16,14 @@ # Input: -# Create a temporary file: +# Create temporary file names: TMP_DATA=$(mktemp -u /tmp/$MY_NAME.XXXXXX) +TMP_DATA_RAW=$(mktemp -u /tmp/$MY_NAME.XXXXXX) # Get the raw data MAXIMUM_WAIT="10" if [ -x /usr/bin/sane-find-scanner ] -then sane-find-scanner -q >${TMP_DATA}.raw & +then sane-find-scanner -q >$TMP_DATA_RAW & sanefindscannerPID=$! for i in $( seq $MAXIMUM_WAIT ) do ps hp $sanefindscannerPID | grep -q sane-find-scanner || break @@ -31,12 +32,11 @@ if ps hp $sanefindscannerPID | grep -q sane-find-scanner then kill -9 $sanefindscannerPID &>/dev/null fi -else - echo "Cannot execute /usr/bin/sane-find-scanner" 1>&2 - exit 2 +else echo "Cannot execute /usr/bin/sane-find-scanner" 1>&2 + exit 2 fi # Only USB and SCSI scanners are taken into account: -cat ${TMP_DATA}.raw | egrep '^found SCSI |^found USB ' | sort -u | sed -e 's/^found //' | tr \" \' >$TMP_DATA && rm ${TMP_DATA}.raw +egrep '^found SCSI |^found USB ' <$TMP_DATA_RAW | sort -u | sed -e 's/^found //' | tr \" \' >$TMP_DATA # Output: @@ -82,7 +82,7 @@ then echo -e " \$[]\n]" fi -# Remove the temporary file -rm $TMP_DATA +# Remove the temporary files +rm $TMP_DATA $TMP_DATA_RAW exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/tools/create_scanner_database new/yast2-scanner-2.14.4/tools/create_scanner_database --- old/yast2-scanner-2.14.3/tools/create_scanner_database 2006-08-16 12:34:22.000000000 +0200 +++ new/yast2-scanner-2.14.4/tools/create_scanner_database 2006-10-31 14:16:13.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005 +# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005, 2006 #set -x diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/tools/deactivate_scanner_backend new/yast2-scanner-2.14.4/tools/deactivate_scanner_backend --- old/yast2-scanner-2.14.3/tools/deactivate_scanner_backend 2006-08-15 11:24:12.000000000 +0200 +++ new/yast2-scanner-2.14.4/tools/deactivate_scanner_backend 2006-10-31 14:16:13.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005 +# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005, 2006 #set -x export PATH="/sbin:/usr/sbin:/usr/bin:/bin" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/tools/determine_active_scanner_backends new/yast2-scanner-2.14.4/tools/determine_active_scanner_backends --- old/yast2-scanner-2.14.3/tools/determine_active_scanner_backends 2006-08-15 11:24:12.000000000 +0200 +++ new/yast2-scanner-2.14.4/tools/determine_active_scanner_backends 2006-10-31 14:16:13.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005 +# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005, 2006 #set -x diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/tools/determine_active_scanners new/yast2-scanner-2.14.4/tools/determine_active_scanners --- old/yast2-scanner-2.14.3/tools/determine_active_scanners 2006-08-15 11:24:12.000000000 +0200 +++ new/yast2-scanner-2.14.4/tools/determine_active_scanners 2006-10-31 14:16:13.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005 +# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005, 2006 #set -x @@ -16,13 +16,14 @@ # Input: -# Create a temporary file: +# Create temporary file names: TMP_DATA=$(mktemp -u /tmp/$MY_NAME.XXXXXX) +TMP_DATA_RAW=$(mktemp -u /tmp/$MY_NAME.XXXXXX) # Get the raw data MAXIMUM_WAIT="60" if [ -x /usr/bin/scanimage ] -then scanimage -f '%d,%v,%m;' >${TMP_DATA}.raw & +then scanimage -f '%d,%v,%m;' >$TMP_DATA_RAW & scanimagePID=$! for i in $( seq $MAXIMUM_WAIT ) do ps $scanimagePID &>/dev/null || break @@ -35,7 +36,7 @@ echo "Cannot execute /usr/bin/scanimage" 1>&2 exit 2 fi -tr ';' '\n' <${TMP_DATA}.raw | sort -u >$TMP_DATA && rm ${TMP_DATA}.raw +tr ';' '\n' <$TMP_DATA_RAW | sort -u >$TMP_DATA # Output: @@ -63,7 +64,7 @@ then echo -e " \$[]\n]" fi -# Remove the temporary file -rm $TMP_DATA +# Remove the temporary files: +rm $TMP_DATA $TMP_DATA_RAW exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/tools/determine_network_scanner_config new/yast2-scanner-2.14.4/tools/determine_network_scanner_config --- old/yast2-scanner-2.14.3/tools/determine_network_scanner_config 2006-08-15 11:24:12.000000000 +0200 +++ new/yast2-scanner-2.14.4/tools/determine_network_scanner_config 2006-10-31 14:16:13.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005 +# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005, 2006 #set -x diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/tools/setup_hplip_scanner_service new/yast2-scanner-2.14.4/tools/setup_hplip_scanner_service --- old/yast2-scanner-2.14.3/tools/setup_hplip_scanner_service 2006-08-15 11:24:12.000000000 +0200 +++ new/yast2-scanner-2.14.4/tools/setup_hplip_scanner_service 2006-10-31 14:16:13.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005 +# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005, 2006 #set -x diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/tools/setup_network_scanner_config new/yast2-scanner-2.14.4/tools/setup_network_scanner_config --- old/yast2-scanner-2.14.3/tools/setup_network_scanner_config 2006-08-15 11:24:12.000000000 +0200 +++ new/yast2-scanner-2.14.4/tools/setup_network_scanner_config 2006-10-31 14:16:13.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005 +# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005, 2006 #set -x diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/tools/setup_ptal_scanner_service new/yast2-scanner-2.14.4/tools/setup_ptal_scanner_service --- old/yast2-scanner-2.14.3/tools/setup_ptal_scanner_service 2006-08-15 11:24:12.000000000 +0200 +++ new/yast2-scanner-2.14.4/tools/setup_ptal_scanner_service 2006-10-31 14:16:13.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005 +# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005, 2006 #set -x diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/tools/test_and_set_scanner_access_permissions new/yast2-scanner-2.14.4/tools/test_and_set_scanner_access_permissions --- old/yast2-scanner-2.14.3/tools/test_and_set_scanner_access_permissions 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-scanner-2.14.4/tools/test_and_set_scanner_access_permissions 2006-10-31 15:37:51.000000000 +0100 @@ -0,0 +1,123 @@ +#! /bin/bash +# +# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005, 2006 + +#set -x + +export PATH="/sbin:/usr/sbin:/usr/bin:/bin" +export LC_ALL="POSIX" +export LANG="POSIX" +umask 022 + +# When the package "sane" is installed, this file is created +# which lists all known USB scanners: +HAL_GLOBAL_FILE="/etc/hal/fdi/policy/10osvendor/70-scanner.fdi" +# This file is written by this script for those scanners +# which are not listed in HAL_GLOBAL_FILE: +HAL_LOCAL_FILE="/etc/hal/fdi/policy/10osvendor/80-scanner.fdi" + +# Create temporary file names: +MY_NAME=${0##*/} +TMP_DATA=$(mktemp -u /tmp/$MY_NAME.XXXXXX) +TMP_DATA_RAW=$(mktemp -u /tmp/$MY_NAME.XXXXXX) + +# Get the raw data (i.e. the SANE devices for the active scanners). +# Either it is specified as command line parameter $1 +# (this is how YaST calls it to avoid duplicate time-consuming "scanimage" calls +# because it knows the SANE devices from its determine_active_scanners call) +# or (if $1 is empty) then run "scanimage" to determine the SANE devices: +if [ -n "$1" ] +then echo "$1" >$TMP_DATA_RAW +else MAXIMUM_WAIT="60" + if [ -x /usr/bin/scanimage ] + then scanimage -f '%d;' >$TMP_DATA_RAW & + scanimagePID=$! + for i in $( seq $MAXIMUM_WAIT ) + do ps $scanimagePID &>/dev/null || break + sleep 1 + done + if ps $scanimagePID &>/dev/null + then kill -9 $scanimagePID &>/dev/null + fi + else echo "Cannot execute /usr/bin/scanimage" 1>&2 + exit 2 + fi +fi +# Split it into seperated lines, remove the SANE backend name, and remove duplicates +# (duplicates happen when different SANE backends are active for the same scanner): +tr ';' '\n' <$TMP_DATA_RAW | cut -d ':' -s -f 2- | sort -u >$TMP_DATA +# TMP_DATA should contain lines with plain device infos for scanners like +# libusb:001:002 +# libusb:004:005 +# /dev/sg0 +# /dev/sg2 +# A detailed syntax check is not done here because it happens later, +# see "Test for USB and SCSI scanners and ignore anything else" below. + +# Write header to HAL_LOCAL_FILE +# and exit silently if this fails for whatever reason +# (e.g. no hal package installed): +cat /dev/null >$HAL_LOCAL_FILE || exit 0 +echo '<?xml version="1.0" encoding="ISO-8859-1"?>' >>$HAL_LOCAL_FILE +echo '<deviceinfo version="0.2">' >>$HAL_LOCAL_FILE +echo ' <device>' >>$HAL_LOCAL_FILE +echo '' >>$HAL_LOCAL_FILE +echo '' >>$HAL_LOCAL_FILE +echo '' >>$HAL_LOCAL_FILE + +# Test and set scanner access permissions: +exec <$TMP_DATA +while read LINE +do # Test for USB and SCSI scanners and ignore anything else: + if echo $LINE | grep -q '^libusb:[0-9][0-9]*:[0-9][0-9]*$' + then # It is a USB scanner: + # Determine the USB vendor and product IDs: + BUS_DEVICE=$( echo $LINE | cut -d ':' -s -f 2- ) + VENDOR_PRODUCT=$( lsusb -s $BUS_DEVICE | grep -o 'ID [0-9A-Fa-f]*:[0-9A-Fa-f]*' | cut -b 4- ) + VENDOR=$( echo $VENDOR_PRODUCT | cut -d ':' -s -f 1 ) + PRODUCT=$( echo $VENDOR_PRODUCT | cut -d ':' -s -f 2 ) + # Test if this scanner is not already listed in the global HAL file: + if ! grep -i -A 1 "usb_device.vendor_id\" int=\"0x$VENDOR\"" $HAL_GLOBAL_FILE | grep -q -i "usb_device.product_id\" int=\"0x$PRODUCT\"" + then # Write an entry to the local HAL file: + echo ' <match key="info.category" string="usbraw">' >>$HAL_LOCAL_FILE + echo " <match key=\"@info.parent:usb_device.vendor_id\" int=\"0x$VENDOR\">" >>$HAL_LOCAL_FILE + echo " <match key=\"@info.parent:usb_device.product_id\" int=\"0x$PRODUCT\">" >>$HAL_LOCAL_FILE + echo ' <append key="info.capabilities" type="strlist">scanner</append>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo '' >>$HAL_LOCAL_FILE + fi + fi + if echo $LINE | grep -q '^/dev/sg[0-9][0-9]*$' + then # It is a SCSI scanner: + # Test if this scanner does not show up as "scanner" but as "processor": + if ! lsscsi -g | grep $LINE | grep -i 'scanner' + then # Write an entry to the local HAL file: + echo ' <match key="info.category" string="scsi_generic">' >>$HAL_LOCAL_FILE + echo ' <match key="@info.parent:scsi.type" string="processor">' >>$HAL_LOCAL_FILE + echo ' <append key="info.capabilities" type="strlist">scanner</append>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo '' >>$HAL_LOCAL_FILE + fi + fi +done + +# Write footer to HAL_LOCAL_FILE: +echo ' </device>' >>$HAL_LOCAL_FILE +echo '</deviceinfo>' >>$HAL_LOCAL_FILE + +# Remove the temporary files: +rm $TMP_DATA $TMP_DATA_RAW +exit 0 + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.3/tools/test_scanner_backend new/yast2-scanner-2.14.4/tools/test_scanner_backend --- old/yast2-scanner-2.14.3/tools/test_scanner_backend 2006-08-15 11:45:36.000000000 +0200 +++ new/yast2-scanner-2.14.4/tools/test_scanner_backend 2006-10-31 14:16:13.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005 +# Johannes Meixner <jsmeix(a)suse.de>, 2004, 2005, 2006 #set -x ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-http-server
by root＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package yast2-http-server checked in at Tue Oct 31 15:37:23 CET 2006. -------- --- yast2-http-server/yast2-http-server.changes 2006-09-13 20:31:46.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-http-server/yast2-http-server.changes 2006-10-31 14:22:02.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Oct 31 14:19:56 CET 2006 - mzugec(a)suse.cz + +- #180776 - missing option for SSL vhosts +- 2.14.2 + +------------------------------------------------------------------- Old: ---- yast2-http-server-2.14.1.tar.bz2 New: ---- yast2-http-server-2.14.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.LrkeSD/_old 2006-10-31 15:37:18.000000000 +0100 +++ /var/tmp/diff_new_pack.LrkeSD/_new 2006-10-31 15:37:18.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-http-server (Version 2.14.1) +# spec file for package yast2-http-server (Version 2.14.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,14 +11,14 @@ # norootforbuild Name: yast2-http-server -Version: 2.14.1 +Version: 2.14.2 Release: 1 -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-http-server-2.14.1.tar.bz2 +Source0: yast2-http-server-2.14.2.tar.bz2 prefix: /usr -BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-dns-server yast2-network yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite +BuildRequires: docbook-xsl-stylesheets doxygen libxslt libzio perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-dns-server yast2-network yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite Requires: yast2 yast2-network yast2-firewall yast2-perl-bindings libzio BuildArchitectures: noarch Summary: YaST2 - HTTP Server Configuration @@ -34,7 +34,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-http-server-2.14.1 +%setup -n yast2-http-server-2.14.2 %build %{prefix}/bin/y2tool y2autoconf @@ -70,6 +70,9 @@ %doc %{prefix}/share/doc/packages/yast2-http-server %changelog -n yast2-http-server +* Tue Oct 31 2006 - mzugec(a)suse.cz +- #180776 - missing option for SSL vhosts +- 2.14.2 * Wed Sep 13 2006 - mzugec(a)suse.cz - 2.14.1 - #180776 - change work with virtual hosts for better ssl support for future * Mon Jul 17 2006 - mzugec(a)suse.cz ++++++ yast2-http-server-2.14.1.tar.bz2 -> yast2-http-server-2.14.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.14.1/VERSION new/yast2-http-server-2.14.2/VERSION --- old/yast2-http-server-2.14.1/VERSION 2006-09-13 14:54:40.000000000 +0200 +++ new/yast2-http-server-2.14.2/VERSION 2006-10-31 14:19:53.000000000 +0100 @@ -1 +1 @@ -2.14.1 +2.14.2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.14.1/agents/ag_http_server new/yast2-http-server-2.14.2/agents/ag_http_server --- old/yast2-http-server-2.14.1/agents/ag_http_server 2006-09-13 14:27:46.000000000 +0200 +++ new/yast2-http-server-2.14.2/agents/ag_http_server 2006-10-31 12:44:25.000000000 +0100 @@ -114,15 +114,16 @@ $entry->{VirtualByName} = 0; $vhost_files{'default-server.conf'} = [ $entry ]; + #new hash - map sorted by virtual hosts foreach my $file (keys (%vhost_files)) { foreach my $conf ($vhost_files{$file}){ foreach my $vhost ( @$conf ) { if ($file eq 'default-server.conf'){ $hash_table{'main'} = $vhost; - foreach my $data ( @{$vhost->{'DATA'}} ) - { if ($data->{'KEY'} eq 'NameVirtualHost'){ $hash_table{ $data->{'VALUE'} } = []; } - } +# foreach my $data ( @{$vhost->{'DATA'}} ) +# { if ($data->{'KEY'} eq 'NameVirtualHost'){ $hash_table{ $data->{'VALUE'} } = []; } +# } } else { if (exists $vhost->{'HostIP'}){ if ( exists $hash_table{ $vhost->{'HostIP'}} ){ push(@{$hash_table{ $vhost->{'HostIP'}}}, $vhost); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.14.1/src/HttpServer.ycp new/yast2-http-server-2.14.2/src/HttpServer.ycp --- old/yast2-http-server-2.14.1/src/HttpServer.ycp 2006-09-13 19:55:21.000000000 +0200 +++ new/yast2-http-server-2.14.2/src/HttpServer.ycp 2006-10-31 14:20:55.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Data for configuration of http-server, input and output functions. * Authors: Stanislav Visnovsky <visnov(a)suse.cz> * - * $Id: HttpServer.ycp 32565 2006-08-25 08:10:40Z mzugec $ + * $Id: HttpServer.ycp 33935 2006-10-31 13:20:53Z mzugec $ * * Representation of the configuration of http-server. * Input and output routines. @@ -319,7 +319,7 @@ /* HttpServer read dialog caption */ string caption = _("Saving HTTP Server Configuration"); - integer steps = 3; + integer steps = 2; // We do not set help text here, because it was set outside Progress::New(caption, " ", steps, [ @@ -359,7 +359,7 @@ // write hosts YaST::HTTPDData::WriteHosts(); - + Progress::NextStage(); import "SuSEFirewall"; Progress::set(false);// Progress::off (); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.14.1/src/HttpServerWidgets.ycp new/yast2-http-server-2.14.2/src/HttpServerWidgets.ycp --- old/yast2-http-server-2.14.1/src/HttpServerWidgets.ycp 2006-09-11 19:24:40.000000000 +0200 +++ new/yast2-http-server-2.14.2/src/HttpServerWidgets.ycp 2006-10-31 14:20:55.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain(a)suse.cz> * Stanislav Visnovsky <visnov(a)suse.cz> * - * $Id: HttpServerWidgets.ycp 32814 2006-09-11 17:26:17Z mzugec $ + * $Id: HttpServerWidgets.ycp 33935 2006-10-31 13:20:53Z mzugec $ */ { @@ -219,11 +219,9 @@ res = false; break; } -//y2internal("ip1 - %1\nip2 - %2\n%3", ip, vhost["id"]:"", vhost); if (vhost["id"]:"" == ip) { // this is valid only if both of them are name-based, not ip-based -//y2internal("%1\n%2", YaST::HTTPDData::GetVhostType(host)["type"]:"", namebased); if ( YaST::HTTPDData::GetVhostType(host)["type"]:""=="name-based" && namebased ) { // error message - the entered ip address is already @@ -1071,10 +1069,10 @@ string dns_zone = ""; global void initVhostDetails(string key){ -map <string, any> servername = find(map<string,any> row, vhost_descr,``(row["KEY"]:"" == "ServerName")); -dns_zone=""; + map <string, any> servername = find(map<string,any> row, vhost_descr,``(row["KEY"]:"" == "ServerName")); + dns_zone=""; -if (Package::Installed("bind")) + if (Package::Installed("bind")) { if ( Service::Status("named") == 0 ){ foreach(string key, map<string, any> value, (map<string, map<string, any> >) DnsServerAPI::GetZones(), { @@ -1130,6 +1128,12 @@ } } else y2milestone(_("There is no DNS server running on this machine.")); } + + // disable using SSL for name-based virtual host + foreach(map<string, any> row, vhost_descr, { + if (row["KEY"]:"" == "VirtualByName" && row["VALUE"]:"0" =="1") UI::ChangeWidget(`ssl_support, `Enabled, false); + }); + } global define symbol handleVhostDetails (string key, map event){ @@ -1149,9 +1153,13 @@ { UI::ChangeWidget(`certfile, `Enabled, true); UI::ChangeWidget(`browse_cert, `Enabled, true); + UI::ChangeWidget(`keyfile, `Enabled, true); + UI::ChangeWidget(`browse_key, `Enabled, true); } else { UI::ChangeWidget(`certfile, `Enabled, false); UI::ChangeWidget(`browse_cert, `Enabled, false); + UI::ChangeWidget(`keyfile, `Enabled, false); + UI::ChangeWidget(`browse_key, `Enabled, false); } @@ -1185,17 +1193,30 @@ case `browse_cert : { - string ssl_dir = UI::AskForExistingFile("/etc/apache2/ssl.crt", "*.crt *.pem", _("Choose Certificate File") ); - if (ssl_dir != nil) UI::ChangeWidget (`certfile, `Value, ssl_dir ); - //TODO - validate certificate - if (size((string) UI::QueryWidget(`certfile, `Value)) == 0) - { + string cert_file = UI::AskForExistingFile("/etc/apache2/ssl.crt", "*.crt *.pem", _("Choose Certificate File") ); + if (cert_file != nil && SCR::Execute(.target.bash, sformat("openssl x509 -in %1", cert_file))==0) UI::ChangeWidget (`certfile, `Value, cert_file ); + else + { + UI::ChangeWidget (`certfile, `Value, ""); // translators: error popup Popup::Error ( _("Enter the certificate file.") ); - } + } break; } + case `browse_key : + { + string key_file = UI::AskForExistingFile("/etc/apache2/ssl.key", "*.key *.pem", _("Choose Certificate Key File") ); +// boolean keyfile = (SCR::Execute(.target.bash, sformat("openssl rsa -in %1", cert_file))==0)?true:false; + if (key_file != nil && SCR::Execute(.target.bash, sformat("openssl rsa -in %1", key_file))==0) UI::ChangeWidget (`keyfile, `Value, key_file ); + else + { + UI::ChangeWidget (`keyfile, `Value, ""); + // translators: error popup + Popup::Error ( _("Enter the key file.") ); + } + break; + } } return nil; @@ -1228,23 +1249,27 @@ map <string, any> ssl_values = $[]; if (UI::QueryWidget(`ssl_support, `Value) == true) { - YaST::HTTPDData::ModifyModuleList ([ "ssl" ], true); - ssl_values = $[ - "KEY":"_SECTION", - "SECTIONNAME":"IfDefine", - "SECTIONPARAM":"SSL", - "VALUE":[ $["KEY":"SSLCertificateFile", "VALUE":UI::QueryWidget(`certfile, `Value)], - $["KEY":"SSLEngine", "VALUE":"on"] ] - ]; - } + string cert_file = tostring(UI::QueryWidget(`certfile, `Value)); + string key_file = tostring(UI::QueryWidget(`keyfile, `Value)); + + if (size(cert_file)>0 && size(key_file)>0){ + YaST::HTTPDData::ModifyModuleList ([ "ssl" ], true); + ssl_values = $[ + "KEY":"_SECTION", + "SECTIONNAME":"IfDefine", + "SECTIONPARAM":"SSL", + "VALUE":[ $["KEY":"SSLCertificateFile", "VALUE":cert_file], + $["KEY":"SSLCertificateKeyFile", "VALUE":key_file], + $["KEY":"SSLEngine", "VALUE":"on"] ] + ]; + } else y2error("%1 is not valid Certificate File!", cert_file); + } if (size(ssl_values)>0) vhost_descr = add(vhost_descr, ssl_values); -y2internal("%1", vhost_descr); any result = YaST::HTTPDData::CreateHost ( ip["VALUE"]:""+"/"+servername["VALUE"]:"", vhost_descr ); - y2milestone ("%1", result); if ( result == nil) { map<string,string> error = (map<string,string>) YaST::HTTPDData::Error (); @@ -1268,9 +1293,7 @@ }); if (UI::QueryWidget(`pub_html, `Value)==true) tmp_descr=add(tmp_descr, $["KEY":"UserDir", "VALUE":"public_html"]); -// YaST::HTTPDData::ModifyHost(ip["VALUE"]:""+"/"+servername["VALUE"]:"", tmp_descr); } -y2internal("host values %1", YaST::HTTPDData::GetHost(ip["VALUE"]:""+"/"+servername["VALUE"]:"")); HttpServer::modified = true; vhost_descr = []; } @@ -1540,13 +1563,19 @@ `VBox( `Left( `CheckBox(`id(`ssl_support), `opt(`notify), _("Enable &SSL Support for This Virtual Host"))), - `HBox( + `VBox( // translators: textentry, certificate file path + `HBox( + `Label(""), `TextEntry( `id( `certfile ), _("&Certificate File Path") ), - `VBox( - `Label(""), `PushButton(`id(`browse_cert ), Label::BrowseButton () ) - )) + ), + `HBox( + `Label(""), + `TextEntry( `id( `keyfile ), _("&Certificate Key File Path") ), + `PushButton(`id(`browse_key ), Label::BrowseButton () ) + ) + ) )), `VSpacing (1), @@ -1687,6 +1716,12 @@ }); list< map<string,any> > options = []; + + map<string, any> vhost = YaST::HTTPDData::GetVhostType(currenthost); + if (vhost["type"]:""=="ip-based") options = add(options, $["KEY":"VirtualByName", "VALUE":"0"]); + else options = add(options, $["KEY":"VirtualByName", "VALUE":"1"]); + options = add(options, $["KEY":"HostIP", "VALUE": vhost["id"]:""]); + foreach (map<string, any> option, YaST::HTTPDData::GetHost(currenthost), ``{ if ( option["KEY"]:"unknown" == "_SECTION" && option["SECTIONPARAM"]:"unknown" == "SSL") { @@ -1716,7 +1751,6 @@ } else options = add(options, option); }); if (found == false) { options = add(options, $["KEY":"_SECTION", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":forssl]); } - YaST::HTTPDData::ModifyHost (currenthost, options ); setHostOptions(nil); HttpServer::modified = true; } @@ -1877,7 +1911,6 @@ */ global void HostStore (string key, map event) { - list< map<string,any> > options = []; foreach (integer key, map<string,any> values, host_options, ``{ @@ -1885,7 +1918,6 @@ { //In main host SSL can't be used -/* if (values["KEY"]:"" == "SSL") { options = add(options, $[ @@ -1896,7 +1928,6 @@ "OVERHEAD" : values["OVERHEAD"]:""]); y2milestone("SSL section - %1", options); } -*/ if (values["KEY"]:"" == "Directory") { @@ -1945,7 +1976,6 @@ * @return list of items for the table */ global define list HostTableContents (map descr) ``{ - if (host_options == nil) { // fill the data @@ -1960,7 +1990,6 @@ boolean documentroot = false; list< map<string, any> > host = YaST::HTTPDData::GetHost(currenthost); - foreach (map<string, any> option, host, ``{ string key = option["KEY"]: "unknown"; @@ -1987,7 +2016,7 @@ "VALUE" : "", "DATA": option["VALUE"]:[], "OVERHEAD" : option["OVERHEAD"]:"" - ]; + ]; res = add (res, option_counter); option_counter = option_counter + 1; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.14.1/src/YaPI/HTTPD.pm new/yast2-http-server-2.14.2/src/YaPI/HTTPD.pm --- old/yast2-http-server-2.14.1/src/YaPI/HTTPD.pm 2006-09-13 14:12:32.000000000 +0200 +++ new/yast2-http-server-2.14.2/src/YaPI/HTTPD.pm 2006-10-31 12:44:15.000000000 +0100 @@ -554,6 +554,14 @@ } } + +sub modifyMain { + my $self = shift; + my $data = shift; + + $vhost_files->{'main'}{'DATA'} = $data; +} + sub modifyVH { my $self = shift; my $hostid = shift; @@ -580,7 +588,6 @@ } sub validateNVH (){ - my @nb = (); foreach my $key ( keys( %{$vhost_files} ) ){ if(($key ne 'ip-based') && ($key ne 'main')){ @@ -594,9 +601,9 @@ $vhost_files->{main}{DATA} = \@tmp_data; -foreach my $ip (@nb){ - push(@{$vhost_files->{main}{DATA}}, {KEY=>'NameVirtualHost', VALUE=>$ip} ); -} + foreach my $ip (@nb){ + push(@{$vhost_files->{main}{DATA}}, {KEY=>'NameVirtualHost', VALUE=>$ip} ); + } } @@ -882,9 +889,26 @@ sub writeHosts (){ my $self = shift; my @vhosts = @{$vhost_files->{'ip-based'}}; + + foreach my $key ( keys(%{$vhost_files}) ) { + switch($key) + { + case "ip-based" { + } + case "main" {} + else { + foreach my $hostList ( $vhost_files->{$key} ) { + foreach my $hostentryHash ( @$hostList ) { + push( @vhosts, $hostentryHash ) ; + } + } + } + } + } + my %data = ( 'default-server.conf' =>$vhost_files->{'main'}, 'yast2_vhosts.conf'=>\@vhosts ); -# SCR->Write(".http_server.vhosts", \%data); + SCR->Write(".http_server.vhosts", \%data); } ####################################################### diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.14.1/src/YaST/HTTPDData.pm new/yast2-http-server-2.14.2/src/YaST/HTTPDData.pm --- old/yast2-http-server-2.14.1/src/YaST/HTTPDData.pm 2006-09-12 10:52:43.000000000 +0200 +++ new/yast2-http-server-2.14.2/src/YaST/HTTPDData.pm 2006-10-31 12:44:31.000000000 +0100 @@ -255,7 +255,9 @@ # } $dirty{MODIFIED}->{$hostid} = 1 unless( exists($dirty{NEW}->{$hostid}) ); - } + } else { + YaPI::HTTPD->modifyMain($hostdata); + } return 1; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase3
by root＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package kdebase3 checked in at Tue Oct 31 15:37:09 CET 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-10-31 12:49:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-10-31 14:55:35.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Oct 31 14:55:21 CET 2006 - dmueller(a)suse.de + +- fix kdesu prompt again (#216563) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.Bdnzrg/_old 2006-10-31 15:34:30.000000000 +0100 +++ /var/tmp/diff_new_pack.Bdnzrg/_new 2006-10-31 15:34:30.000000000 +0100 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.5 -Release: 29 +Release: 30 %define kde_version 3.5.5 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -368,7 +368,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 158 +Release: 159 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -1475,6 +1475,8 @@ %endif %changelog -n kdebase3 +* Tue Oct 31 2006 - dmueller(a)suse.de +- fix kdesu prompt again (#216563) * Tue Oct 31 2006 - coolo(a)suse.de - update 3.5 branch and kickoff diff to fix restart (#216092) * Mon Oct 30 2006 - coolo(a)suse.de ++++++ less_verbal_kdesu.patch ++++++ --- /var/tmp/diff_new_pack.Bdnzrg/_old 2006-10-31 15:34:31.000000000 +0100 +++ /var/tmp/diff_new_pack.Bdnzrg/_new 2006-10-31 15:34:31.000000000 +0100 @@ -1,18 +1,24 @@ --- kdesu/kdesu/sudlg.cpp +++ kdesu/kdesu/sudlg.cpp -@@ -35,13 +35,9 @@ - prompt = i18n("Please enter your password." ); +@@ -29,18 +29,10 @@ + setCaption(i18n("Run as %1").arg(user)); + + QString prompt; +- if (superUserCommand == "sudo" && m_User == "root") { +- prompt = i18n("Please enter your password." ); ++ if (m_User == "root") { ++ prompt = i18n("Please enter the Administrator (root) password to continue."); } else { - if (m_User == "root") { +- if (m_User == "root") { - prompt = i18n("The action you requested needs root privileges. " - "Please enter root's password below or click " - "Ignore to continue with your current privileges."); -+ prompt = i18n("Please enter the Administrator (root) password to continue."); - } else { +- } else { - prompt = i18n("The action you requested needs additional privileges. " - "Please enter the password for \"%1\" below or click " - "Ignore to continue with your current privileges.").arg(m_User); -+ prompt = i18n("Please enter password for \"%1\" to continue.").arg(m_User); - } +- } ++ prompt = i18n("Please enter password for \"%1\" to continue.").arg(m_User); } setPrompt(prompt); + ++++++ suspend-unmount.diff ++++++ --- /var/tmp/diff_new_pack.Bdnzrg/_old 2006-10-31 15:34:31.000000000 +0100 +++ /var/tmp/diff_new_pack.Bdnzrg/_new 2006-10-31 15:34:32.000000000 +0100 @@ -1,13 +1,15 @@ ---- kioslave/media/mediamanager/mediamanager.cpp +Index: kioslave/media/mediamanager/mediamanager.cpp +=================================================================== +--- kioslave/media/mediamanager/mediamanager.cpp.orig +++ kioslave/media/mediamanager/mediamanager.cpp -@@ -326,7 +326,29 @@ +@@ -326,6 +326,28 @@ void MediaManager::slotMediumChanged(con emit mediumChanged(name); } +QString MediaManager::unmountAllManual() +{ + QPtrList<Medium> list = m_mediaList.list(); - ++ + QPtrList<Medium>::const_iterator it = list.begin(); + QPtrList<Medium>::const_iterator end = list.end(); + @@ -26,13 +28,14 @@ + // return last error + return result; +} -+ + extern "C" { KDE_EXPORT KDEDModule *create_mediamanager(const QCString &obj) - { ---- kioslave/media/mediamanager/mediamanager.h +Index: kioslave/media/mediamanager/mediamanager.h +=================================================================== +--- kioslave/media/mediamanager/mediamanager.h.orig +++ kioslave/media/mediamanager/mediamanager.h -@@ -57,6 +57,8 @@ +@@ -57,6 +57,8 @@ k_dcop: bool removablePlug(const QString &devNode, const QString &label); bool removableUnplug(const QString &devNode); bool removableCamera(const QString &devNode); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package yast2-storage checked in at Tue Oct 31 15:34:29 CET 2006. -------- --- yast2-storage/yast2-storage.changes 2006-10-30 18:15:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2006-10-31 13:21:11.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Oct 31 13:20:33 CET 2006 - fehr(a)suse.de + +- propagate value of Mode::test() to libstorage to avoid problems + with testsuite +- version 2.14.15 + +------------------------------------------------------------------- Old: ---- yast2-storage-2.14.14.tar.bz2 New: ---- yast2-storage-2.14.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.BCr4G9/_old 2006-10-31 15:34:15.000000000 +0100 +++ /var/tmp/diff_new_pack.BCr4G9/_new 2006-10-31 15:34:15.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.14.14) +# spec file for package yast2-storage (Version 2.14.15) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-storage -Version: 2.14.14 +Version: 2.14.15 Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.14.14.tar.bz2 +Source0: yast2-storage-2.14.15.tar.bz2 prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms 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 Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings @@ -40,7 +40,7 @@ %prep -%setup -n yast2-storage-2.14.14 +%setup -n yast2-storage-2.14.15 %build %{prefix}/bin/y2tool y2autoconf @@ -165,6 +165,10 @@ %doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description %changelog -n yast2-storage +* Tue Oct 31 2006 - fehr(a)suse.de +- propagate value of Mode::test() to libstorage to avoid problems + with testsuite +- version 2.14.15 * Mon Oct 30 2006 - fehr(a)suse.de - fix missing LVM/EVMS/HOME proposal buttons on empty disk (#215674) - fix too small boot partition with VM proposal on PPC (#216222) ++++++ yast2-storage-2.14.14.tar.bz2 -> yast2-storage-2.14.15.tar.bz2 ++++++ ++++ 6077 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.14.14/VERSION new/yast2-storage-2.14.15/VERSION --- old/yast2-storage-2.14.14/VERSION 2006-10-26 13:50:07.000000000 +0200 +++ new/yast2-storage-2.14.15/VERSION 2006-10-31 13:21:16.000000000 +0100 @@ -1 +1 @@ -2.14.14 +2.14.15 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.14.14/storage/src/modules/Storage.ycp new/yast2-storage-2.14.15/storage/src/modules/Storage.ycp --- old/yast2-storage-2.14.14/storage/src/modules/Storage.ycp 2006-10-26 13:20:42.000000000 +0200 +++ new/yast2-storage-2.14.15/storage/src/modules/Storage.ycp 2006-10-31 13:30:47.000000000 +0100 @@ -19,7 +19,7 @@ * wurde versucht "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen näher erklärt. * - * $Id: Storage.ycp 33681 2006-10-26 11:20:40Z fehr $ + * $Id: Storage.ycp 33934 2006-10-31 12:30:46Z fehr $ */ { @@ -272,7 +272,7 @@ define any createInterface() { - any ret = LibStorage::createStorageInterface(false, false, true); + any ret = LibStorage::createStorageInterface(false, Mode::test(), true); if( ZeroNewPartitions ) LibStorage::StorageInterface::setZeroNewPartitions(ret,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 yast2-pkg-bindings
by root＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package yast2-pkg-bindings checked in at Tue Oct 31 15:23:11 CET 2006. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-10-30 14:55:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-10-31 14:23:44.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Oct 31 12:55:14 CET 2006 - lslezak(a)suse.cz + +- fixed PkgTaboo() built-in - set lock on the USER level (#186205) +- 2.13.102 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-2.13.101.tar.bz2 New: ---- yast2-pkg-bindings-2.13.102.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.lv84IN/_old 2006-10-31 15:22:46.000000000 +0100 +++ /var/tmp/diff_new_pack.lv84IN/_new 2006-10-31 15:22:46.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.13.101) +# spec file for package yast2-pkg-bindings (Version 2.13.102) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-pkg-bindings -Version: 2.13.101 +Version: 2.13.102 Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.13.101.tar.bz2 +Source0: yast2-pkg-bindings-2.13.102.tar.bz2 prefix: /usr BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools BuildRequires: libzypp-devel >= 2.4.0 @@ -40,7 +40,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-pkg-bindings-2.13.101 +%setup -n yast2-pkg-bindings-2.13.102 %build %{prefix}/bin/y2tool y2autoconf @@ -71,6 +71,9 @@ %doc %{prefix}/share/doc/packages/yast2-pkg-bindings %changelog -n yast2-pkg-bindings +* Tue Oct 31 2006 - lslezak(a)suse.cz +- fixed PkgTaboo() built-in - set lock on the USER level (#186205) +- 2.13.102 * Mon Oct 30 2006 - lslezak(a)suse.cz - return OPTIONALURLS and EXTRAURLS properties of a Product resolvable (#213031) ++++++ yast2-pkg-bindings-2.13.101.tar.bz2 -> yast2-pkg-bindings-2.13.102.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.101/VERSION new/yast2-pkg-bindings-2.13.102/VERSION --- old/yast2-pkg-bindings-2.13.101/VERSION 2006-10-30 14:46:46.000000000 +0100 +++ new/yast2-pkg-bindings-2.13.102/VERSION 2006-10-31 12:56:11.000000000 +0100 @@ -1 +1 @@ -2.13.101 +2.13.102 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.101/configure new/yast2-pkg-bindings-2.13.102/configure --- old/yast2-pkg-bindings-2.13.101/configure 2006-10-30 14:47:03.000000000 +0100 +++ new/yast2-pkg-bindings-2.13.102/configure 2006-10-31 13:01:21.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.13.101. +# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.13.102. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='yast2-pkg-bindings' PACKAGE_TARNAME='yast2-pkg-bindings' -PACKAGE_VERSION='2.13.101' -PACKAGE_STRING='yast2-pkg-bindings 2.13.101' +PACKAGE_VERSION='2.13.102' +PACKAGE_STRING='yast2-pkg-bindings 2.13.102' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1428,7 +1428,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-pkg-bindings 2.13.101 to adapt to many kinds of systems. +\`configure' configures yast2-pkg-bindings 2.13.102 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1499,7 +1499,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.101:";; + short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.102:";; esac cat <<\_ACEOF @@ -1607,7 +1607,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-pkg-bindings configure 2.13.101 +yast2-pkg-bindings configure 2.13.102 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1621,7 +1621,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-pkg-bindings $as_me 2.13.101, which was +It was created by yast2-pkg-bindings $as_me 2.13.102, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2422,7 +2422,7 @@ # Define the identity of the package. PACKAGE='yast2-pkg-bindings' - VERSION='2.13.101' + VERSION='2.13.102' cat >>confdefs.h <<_ACEOF @@ -2649,7 +2649,7 @@ -VERSION="2.13.101" +VERSION="2.13.102" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" @@ -21609,7 +21609,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-pkg-bindings $as_me 2.13.101, which was +This file was extended by yast2-pkg-bindings $as_me 2.13.102, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21662,7 +21662,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-pkg-bindings config.status 2.13.101 +yast2-pkg-bindings config.status 2.13.102 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.101/configure.in new/yast2-pkg-bindings-2.13.102/configure.in --- old/yast2-pkg-bindings-2.13.101/configure.in 2006-10-30 14:46:49.000000000 +0100 +++ new/yast2-pkg-bindings-2.13.102/configure.in 2006-10-31 13:01:08.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.13.101, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.13.102, http://bugs.opensuse.org/, yast2-pkg-bindings) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.101" +VERSION="2.13.102" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.101/src/Package.cc new/yast2-pkg-bindings-2.13.102/src/Package.cc --- old/yast2-pkg-bindings-2.13.101/src/Package.cc 2006-10-12 10:45:36.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.102/src/Package.cc 2006-10-31 12:53:26.000000000 +0100 @@ -1740,7 +1740,9 @@ // remove the transactions, lock the status return YCPBoolean( (it != zypp_ptr()->pool().byNameEnd(name)) && it->status().resetTransact(whoWantsIt) - && it->status().setLock(true, whoWantsIt) + // lock the package at the USER level (bug #186205) + && it->status().resetTransact(zypp::ResStatus::USER) + && it->status().setLock(true, zypp::ResStatus::USER) ); } catch (...) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-ncurses
by root＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package yast2-ncurses checked in at Tue Oct 31 15:22:38 CET 2006. -------- --- yast2-ncurses/yast2-ncurses.changes 2006-10-11 11:33:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2006-10-31 12:47:54.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Oct 30 12:48:44 CET 2006 - gs(a)suse.de + +- Package Installation: Fold hidden patterns into parents (Fate #301229) +- Online Update: show list of installable (relevant) patches + (bug # 168758) +- 2.13.47 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-2.13.46.tar.bz2 New: ---- yast2-ncurses-2.13.47.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.3evK9e/_old 2006-10-31 15:13:07.000000000 +0100 +++ /var/tmp/diff_new_pack.3evK9e/_new 2006-10-31 15:13:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.13.46) +# spec file for package yast2-ncurses (Version 2.13.47) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ncurses -Version: 2.13.46 +Version: 2.13.47 Release: 1 -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.13.46.tar.bz2 +Source0: yast2-ncurses-2.13.47.tar.bz2 prefix: /usr BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel @@ -41,7 +41,7 @@ %prep -%setup -n yast2-ncurses-2.13.46 +%setup -n yast2-ncurses-2.13.47 %build %{prefix}/bin/y2tool y2autoconf @@ -74,6 +74,11 @@ %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog -n yast2-ncurses +* Mon Oct 30 2006 - gs(a)suse.de +- Package Installation: Fold hidden patterns into parents (Fate #301229) +- Online Update: show list of installable (relevant) patches + (bug # 168758) +- 2.13.47 * Wed Oct 11 2006 - gs(a)suse.de - Online Update: Allow deletion of patches (bug #208694) Package Installation: change status to delete if '-' is pressed, ++++++ yast2-ncurses-2.13.46.tar.bz2 -> yast2-ncurses-2.13.47.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/Makefile.am new/yast2-ncurses-2.13.47/Makefile.am --- old/yast2-ncurses-2.13.46/Makefile.am 2006-09-14 11:35:30.000000000 +0200 +++ new/yast2-ncurses-2.13.47/Makefile.am 2006-10-29 11:02:35.000000000 +0100 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common @@ -67,7 +66,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in +$(RPMNAME).pc: $(RPMNAME).pc.in config.status ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/Makefile.in new/yast2-ncurses-2.13.47/Makefile.in --- old/yast2-ncurses-2.13.46/Makefile.in 2006-09-14 11:35:50.000000000 +0200 +++ new/yast2-ncurses-2.13.47/Makefile.in 2006-10-29 11:02:50.000000000 +0100 @@ -162,6 +162,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = $(shell cat $(srcdir)/VERSION) XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ZYPP_CFLAGS = @ZYPP_CFLAGS@ ZYPP_LIBS = @ZYPP_LIBS@ @@ -236,15 +237,14 @@ ystartupdir = @ystartupdir@ #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english @@ -255,7 +255,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal CLEANFILES = MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec @@ -773,7 +773,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in +@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in config.status @CREATE_PKGCONFIG_TRUE@ ./config.status --file=$@:$< dist-hook: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/VERSION new/yast2-ncurses-2.13.47/VERSION --- old/yast2-ncurses-2.13.46/VERSION 2006-10-11 11:33:38.000000000 +0200 +++ new/yast2-ncurses-2.13.47/VERSION 2006-10-31 09:55:54.000000000 +0100 @@ -1 +1 @@ -2.13.46 +2.13.47 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/configure new/yast2-ncurses-2.13.47/configure --- old/yast2-ncurses-2.13.46/configure 2006-09-14 11:35:45.000000000 +0200 +++ new/yast2-ncurses-2.13.47/configure 2006-10-29 11:02:45.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-ncurses 2.13.41. +# Generated by GNU Autoconf 2.59 for yast2-ncurses 2.13.46. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ncurses' PACKAGE_TARNAME='yast2-ncurses' -PACKAGE_VERSION='2.13.41' -PACKAGE_STRING='yast2-ncurses 2.13.41' +PACKAGE_VERSION='2.13.46' +PACKAGE_STRING='yast2-ncurses 2.13.46' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -466,7 +466,7 @@ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_F ALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YDOXYGEN CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP AGENT_LIBADD EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA PKG_CONFIG ac_pt_PKG_CONFIG ZYPP_CFLAGS ZYPP_LIBS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT Y2DEVTOOLS_PREFIX CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_FALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YDOXYGEN CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP AGENT_LIBADD EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA PKG_CONFIG ac_pt_PKG_CONFIG ZYPP_CFLAGS ZYPP_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -971,7 +971,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-ncurses 2.13.41 to adapt to many kinds of systems. +\`configure' configures yast2-ncurses 2.13.46 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1038,7 +1038,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ncurses 2.13.41:";; + short | recursive ) echo "Configuration of yast2-ncurses 2.13.46:";; esac cat <<\_ACEOF @@ -1184,7 +1184,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-ncurses configure 2.13.41 +yast2-ncurses configure 2.13.46 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1198,7 +1198,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-ncurses $as_me 2.13.41, which was +It was created by yast2-ncurses $as_me 2.13.46, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1928,7 +1928,7 @@ # Define the identity of the package. PACKAGE='yast2-ncurses' - VERSION='2.13.41' + VERSION='2.13.46' cat >>confdefs.h <<_ACEOF @@ -2139,9 +2139,9 @@ -VERSION="2.13.41" +VERSION="2.13.46" RPMNAME="yast2-ncurses" -MAINTAINER="Martin Lazar <mlazar(a)suse.cz>" +MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" pkgconfigdir=\${libdir}/pkgconfig pkgconfigdatadir=\${datadir}/pkgconfig @@ -2383,6 +2383,8 @@ { (exit 1); exit 1; }; } fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` + devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -4873,7 +4875,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4876 "configure"' > conftest.$ac_ext + echo '#line 4878 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5774,7 +5776,7 @@ # Provide some information about the compiler. -echo "$as_me:5777:" \ +echo "$as_me:5779:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6837,11 +6839,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6840: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6842: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6844: \$? = $ac_status" >&5 + echo "$as_me:6846: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7105,11 +7107,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7108: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7110: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7112: \$? = $ac_status" >&5 + echo "$as_me:7114: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7209,11 +7211,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7212: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7214: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7216: \$? = $ac_status" >&5 + echo "$as_me:7218: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9554,7 +9556,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9557 "configure" +#line 9559 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9654,7 +9656,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9657 "configure" +#line 9659 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11994,11 +11996,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11997: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11999: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12001: \$? = $ac_status" >&5 + echo "$as_me:12003: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12098,11 +12100,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12101: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12103: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12105: \$? = $ac_status" >&5 + echo "$as_me:12107: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13668,11 +13670,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13671: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13673: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13675: \$? = $ac_status" >&5 + echo "$as_me:13677: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13772,11 +13774,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13775: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13777: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13779: \$? = $ac_status" >&5 + echo "$as_me:13781: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15975,11 +15977,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15978: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15980: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15982: \$? = $ac_status" >&5 + echo "$as_me:15984: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16243,11 +16245,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16246: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16248: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16250: \$? = $ac_status" >&5 + echo "$as_me:16252: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16347,11 +16349,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16350: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16352: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16354: \$? = $ac_status" >&5 + echo "$as_me:16356: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19544,6 +19546,149 @@ +if test "${ac_cv_header_ncursesw_curses_h+set}" = set; then + echo "$as_me:$LINENO: checking for ncursesw/curses.h" >&5 +echo $ECHO_N "checking for ncursesw/curses.h... $ECHO_C" >&6 +if test "${ac_cv_header_ncursesw_curses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_ncursesw_curses_h" >&5 +echo "${ECHO_T}$ac_cv_header_ncursesw_curses_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking ncursesw/curses.h usability" >&5 +echo $ECHO_N "checking ncursesw/curses.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <ncursesw/curses.h> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking ncursesw/curses.h presence" >&5 +echo $ECHO_N "checking ncursesw/curses.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <ncursesw/curses.h> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: ncursesw/curses.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ncursesw/curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ncursesw/curses.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ncursesw/curses.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: ncursesw/curses.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ncursesw/curses.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ncursesw/curses.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ncursesw/curses.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ncursesw/curses.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ncursesw/curses.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ncursesw/curses.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ncursesw/curses.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ncursesw/curses.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ncursesw/curses.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ncursesw/curses.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ncursesw/curses.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ---------------------------------------- ## +## Report this to http://bugs.opensuse.org/ ## +## ---------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for ncursesw/curses.h" >&5 +echo $ECHO_N "checking for ncursesw/curses.h... $ECHO_C" >&6 +if test "${ac_cv_header_ncursesw_curses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_ncursesw_curses_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_ncursesw_curses_h" >&5 +echo "${ECHO_T}$ac_cv_header_ncursesw_curses_h" >&6 + +fi +if test $ac_cv_header_ncursesw_curses_h = yes; then + CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" +fi + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then @@ -20160,7 +20305,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-ncurses $as_me 2.13.41, which was +This file was extended by yast2-ncurses $as_me 2.13.46, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20223,7 +20368,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-ncurses config.status 2.13.41 +yast2-ncurses config.status 2.13.46 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -20485,6 +20630,7 @@ s,@LN_S@,$LN_S,;t t s,@PKG_CONFIG_PATH@,$PKG_CONFIG_PATH,;t t s,@XGETTEXT@,$XGETTEXT,;t t +s,@Y2DEVTOOLS_PREFIX@,$Y2DEVTOOLS_PREFIX,;t t s,@CREATE_PKGCONFIG_TRUE@,$CREATE_PKGCONFIG_TRUE,;t t s,@CREATE_PKGCONFIG_FALSE@,$CREATE_PKGCONFIG_FALSE,;t t s,@CREATE_PKGCONFIG_NOARCH_TRUE@,$CREATE_PKGCONFIG_NOARCH_TRUE,;t t diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/configure.in new/yast2-ncurses-2.13.47/configure.in --- old/yast2-ncurses-2.13.46/configure.in 2006-09-14 11:35:30.000000000 +0200 +++ new/yast2-ncurses-2.13.47/configure.in 2006-10-29 11:02:35.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ncurses dnl -dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses, 2.13.41, http://bugs.opensuse.org/, yast2-ncurses) +AC_INIT(yast2-ncurses, 2.13.46, http://bugs.opensuse.org/, yast2-ncurses) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,9 +17,9 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.41" +VERSION="2.13.46" RPMNAME="yast2-ncurses" -MAINTAINER="Martin Lazar <mlazar(a)suse.cz>" +MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" dnl pkgconfig honors lib64 pkgconfigdir=\${libdir}/pkgconfig @@ -110,6 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -158,6 +160,9 @@ AC_HEADER_STDC +AC_CHECK_HEADER([ncursesw/curses.h], + [CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"]) + PKG_CHECK_MODULES([ZYPP], [libzypp]) AC_CONFIG_FILES(Makefile src/Makefile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/doc/Makefile.in new/yast2-ncurses-2.13.47/doc/Makefile.in --- old/yast2-ncurses-2.13.46/doc/Makefile.in 2006-09-14 11:35:49.000000000 +0200 +++ new/yast2-ncurses-2.13.47/doc/Makefile.in 2006-10-29 11:02:49.000000000 +0100 @@ -126,6 +126,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ZYPP_CFLAGS = @ZYPP_CFLAGS@ ZYPP_LIBS = @ZYPP_LIBS@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/doc/autodocs/Makefile.in new/yast2-ncurses-2.13.47/doc/autodocs/Makefile.in --- old/yast2-ncurses-2.13.46/doc/autodocs/Makefile.in 2006-09-14 11:35:49.000000000 +0200 +++ new/yast2-ncurses-2.13.47/doc/autodocs/Makefile.in 2006-10-29 11:02:49.000000000 +0100 @@ -146,6 +146,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ZYPP_CFLAGS = @ZYPP_CFLAGS@ ZYPP_LIBS = @ZYPP_LIBS@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/src/Makefile.in new/yast2-ncurses-2.13.47/src/Makefile.in --- old/yast2-ncurses-2.13.46/src/Makefile.in 2006-09-14 11:46:47.000000000 +0200 +++ new/yast2-ncurses-2.13.47/src/Makefile.in 2006-10-29 11:02:49.000000000 +0100 @@ -199,6 +199,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ZYPP_CFLAGS = @ZYPP_CFLAGS@ ZYPP_LIBS = @ZYPP_LIBS@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/src/NCPopupSelection.cc new/yast2-ncurses-2.13.47/src/NCPopupSelection.cc --- old/yast2-ncurses-2.13.46/src/NCPopupSelection.cc 2006-10-08 13:52:12.000000000 +0200 +++ new/yast2-ncurses-2.13.47/src/NCPopupSelection.cc 2006-10-29 12:21:20.000000000 +0100 @@ -25,6 +25,7 @@ #include "PkgNames.h" #include "NCPkgTable.h" #include "ObjectStatStrategy.h" +#include <zypp/ui/PatternContents.h> #include "YQZypp.h" @@ -159,7 +160,8 @@ packages = selPtr->install_packages (); else if (patPtr) { - packages = patPtr->install_packages (); + zypp::ui::PatternContents patternContents( patPtr ); + packages = patternContents.install_packages(); } packager->showSelPackages( getCurrentLine(), packages ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/src/PackageSelector.cc new/yast2-ncurses-2.13.47/src/PackageSelector.cc --- old/yast2-ncurses-2.13.46/src/PackageSelector.cc 2006-10-11 10:44:32.000000000 +0200 +++ new/yast2-ncurses-2.13.47/src/PackageSelector.cc 2006-10-31 12:39:08.000000000 +0100 @@ -748,7 +748,7 @@ if ( filter == "installable" ) { // show common label "Online Update Patches" - static_cast<NCLabel *>(filterLabel)->setLabel( YCPString(PkgNames::Patches()) ); + static_cast<NCLabel *>(filterLabel)->setLabel( YCPString(PkgNames::YOUPatches()) ); } else if ( filter == "installed" ) { @@ -1136,6 +1136,7 @@ { NCPkgTable * packageList = getPackageList(); + bool displayPatch = false; if ( !packageList || !patchPtr || !selectable ) @@ -1144,27 +1145,71 @@ return false; } - if ( filter == "all" - || ( filter == "installed" && selectable->status() == S_KeepInstalled ) - // FIXME Is filter installable correct? There was a method installable() before. Condition was: - // ( patchPtr->installable() && patchPtr->getSelectable()->status() != PMSelectable::S_KeepInstalled ) - || ( filter == "installable" && ( selectable->status() != S_KeepInstalled ) ) - || ( filter == "new" && ( selectable->status() == S_Install || - selectable->status() == S_NoInst ) ) - || ( filter == "security" && patchPtr->category() == "security" ) - || ( filter == "recommended" && patchPtr->category() == "recommended" ) - || ( filter == "optional" && patchPtr->category() == "optional" ) - || ( filter == "YaST2" && patchPtr->category() == "yast" ) + if ( filter == "all" ) + { + displayPatch = true; + } + else if ( filter == "installed" ) + { + if ( selectable->hasInstalledObj() ) + displayPatch = true; + } + else if ( filter == "installable" ) + { + if ( selectable->hasInstalledObj() ) // installed? + { + // display only if broken + if ( selectable->installedPoolItem().status().isIncomplete() ) + { + displayPatch = true; + NCMIL << "Installed patch is broken: " << patchPtr->name().c_str() << " - " + << patchPtr->summary().c_str() << endl; + } + } + else // not installed - display only if needed + { + if ( selectable->candidatePoolItem().status().isNeeded() ) + { + displayPatch = true; + } + else + { + NCMIL << "Patch not needed: " << patchPtr->name().c_str() << " - " + << patchPtr->summary().c_str() << endl; + } + } + } + else if ( filter == "new" ) + { + if ( !selectable->hasInstalledObj() ) + displayPatch = true; + } + else if ( filter == "security" ) + { + if ( patchPtr->category() == "security" ) + displayPatch = true; + } - ) + else if ( filter == "recommended" ) { - packageList->createPatchEntry( patchPtr, selectable ); - return true; + if ( patchPtr->category() == "recommended" ) + displayPatch = true; } - else + else if ( filter == "optional" ) { - return false; + if ( patchPtr->category() == "optional" ) + displayPatch = true; + } + else if ( filter == "YaST2" ) + { + if ( patchPtr->category() == "yast" ) + displayPatch = true; } + + if ( displayPatch ) + packageList->createPatchEntry( patchPtr, selectable ); + + return displayPatch; } @@ -2084,6 +2129,10 @@ // the patch size is not available // descr += PkgNames::Size(); // descr += patchPtr->size().asString( 8 ); + descr += "<b>"; + descr += PkgNames::PatchKind(); + descr += ": </b>"; + descr += patchPtr->category(); descr += "<br>"; // get and format the patch description zypp::Text value = patchPtr->description(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/testsuite/Makefile.in new/yast2-ncurses-2.13.47/testsuite/Makefile.in --- old/yast2-ncurses-2.13.46/testsuite/Makefile.in 2006-09-14 11:35:50.000000000 +0200 +++ new/yast2-ncurses-2.13.47/testsuite/Makefile.in 2006-10-29 11:02:50.000000000 +0100 @@ -164,6 +164,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ZYPP_CFLAGS = @ZYPP_CFLAGS@ ZYPP_LIBS = @ZYPP_LIBS@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0