Hello community,
here is the log from the commit of package yast2-printer
checked in at Fri Nov 10 11:57:11 CET 2006.
--------
--- yast2-printer/yast2-printer.changes 2006-11-08 20:13:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2006-11-10 10:46:45.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 10 10:41:21 CET 2006 - mzugec@suse.cz
+
+- #217259 - printer segfaults - finally fixed
+- 2.14.11
+
+-------------------------------------------------------------------
Old:
----
yast2-printer-2.14.10.tar.bz2
New:
----
yast2-printer-2.14.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.jYBOzg/_old 2006-11-10 11:57:03.000000000 +0100
+++ /var/tmp/diff_new_pack.jYBOzg/_new 2006-11-10 11:57:03.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-printer (Version 2.14.10)
+# spec file for package yast2-printer (Version 2.14.11)
#
# 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-printer
-Version: 2.14.10
+Version: 2.14.11
Release: 1
License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.14.10.tar.bz2
+Source0: yast2-printer-2.14.11.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel cups-devel cups-drivers cups-drivers-stp docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite zlib-devel
Requires: yast2 netcat zlib blocxx
@@ -34,7 +34,7 @@
%prep
-%setup -n yast2-printer-2.14.10
+%setup -n yast2-printer-2.14.11
%build
%{prefix}/bin/y2tool y2autoconf
@@ -55,10 +55,9 @@
done
#mkdir -p $RPM_BUILD_ROOT/var/lib/YaST2/
#touch $RPM_BUILD_ROOT/var/lib/YaST2/ppd_db.ycp
-
-%post
+#%post
# delete ppd_db.ycp because of CUPS 1.1->1.2 (bugzilla #214265)
-rm -f /var/lib/YaST2/ppd_db.ycp
+#rm -f /var/lib/YaST2/ppd_db.ycp
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -107,6 +106,9 @@
%doc %{prefix}/share/doc/packages/yast2-printer
%changelog -n yast2-printer
+* Fri Nov 10 2006 - mzugec@suse.cz
+- #217259 - printer segfaults - finally fixed
+- 2.14.11
* Wed Nov 08 2006 - mzugec@suse.cz
- #217259 - printer segfaults
- 2.14.10
++++++ yast2-printer-2.14.10.tar.bz2 -> yast2-printer-2.14.11.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.14.10/VERSION new/yast2-printer-2.14.11/VERSION
--- old/yast2-printer-2.14.10/VERSION 2006-11-08 20:10:57.000000000 +0100
+++ new/yast2-printer-2.14.11/VERSION 2006-11-10 10:41:14.000000000 +0100
@@ -1 +1 @@
-2.14.10
+2.14.11
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.14.10/agent-ppd/src/PPDdb.cc new/yast2-printer-2.14.11/agent-ppd/src/PPDdb.cc
--- old/yast2-printer-2.14.10/agent-ppd/src/PPDdb.cc 2006-03-27 09:47:47.000000000 +0200
+++ new/yast2-printer-2.14.11/agent-ppd/src/PPDdb.cc 2006-11-10 09:55:36.000000000 +0100
@@ -7,7 +7,7 @@
* Authors:
* Michal Svec
*
- * $Id: PPDdb.cc 29398 2006-03-27 07:47:43Z mzugec $
+ * $Id: PPDdb.cc 34233 2006-11-10 08:55:16Z mzugec $
*/
#include
@@ -1745,7 +1745,9 @@
for(; it1 != db.end(); it1++) {
PPD::Models::iterator it2 = (*it1).second.models.begin();
for(; it2 != (*it1).second.models.end(); it2++) {
- PPD::Drivers::iterator it3 = (*it2).second.drivers.begin();
+ PPD::Drivers::iterator it3;
+driver_init:
+ it3 = (*it2).second.drivers.begin();
while(it3 != (*it2).second.drivers.end()){
DriverInfo di = it3->second;
string driver_name = di.nickname;
@@ -1754,7 +1756,8 @@
if (it4 == ppdfiles.end())
{ // no more existing file
y2debug ("Erasing file %s", driver_name.c_str());
- (*it2).second.drivers.erase (filename);
+ (*it2).second.drivers.erase (filename);
+ goto driver_init;
}
else if (it4->second.dir_newer || it4->second.file_newer)
{ // parent dir changed or file changed,
@@ -1766,6 +1769,7 @@
{
y2debug ("Erasing %s", driver_name.c_str());
(*it2).second.drivers.erase (driver_name);
+ goto driver_init;
}
else
{
@@ -1779,6 +1783,7 @@
{
y2debug ("Erasing %s", driver_name.c_str());
(*it2).second.drivers.erase (driver_name);
+ goto driver_init;
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.14.10/configure new/yast2-printer-2.14.11/configure
--- old/yast2-printer-2.14.10/configure 2006-11-08 19:58:28.000000000 +0100
+++ new/yast2-printer-2.14.11/configure 2006-11-10 09:56:25.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-printer 2.14.9.
+# Generated by GNU Autoconf 2.59 for yast2-printer 2.14.10.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-printer'
PACKAGE_TARNAME='yast2-printer'
-PACKAGE_VERSION='2.14.9'
-PACKAGE_STRING='yast2-printer 2.14.9'
+PACKAGE_VERSION='2.14.10'
+PACKAGE_STRING='yast2-printer 2.14.10'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -959,7 +959,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-printer 2.14.9 to adapt to many kinds of systems.
+\`configure' configures yast2-printer 2.14.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1026,7 +1026,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-printer 2.14.9:";;
+ short | recursive ) echo "Configuration of yast2-printer 2.14.10:";;
esac
cat <<\_ACEOF
@@ -1169,7 +1169,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-printer configure 2.14.9
+yast2-printer configure 2.14.10
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1183,7 +1183,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-printer $as_me 2.14.9, which was
+It was created by yast2-printer $as_me 2.14.10, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1913,7 +1913,7 @@
# Define the identity of the package.
PACKAGE='yast2-printer'
- VERSION='2.14.9'
+ VERSION='2.14.10'
cat >>confdefs.h <<_ACEOF
@@ -2124,7 +2124,7 @@
-VERSION="2.14.9"
+VERSION="2.14.10"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec "
@@ -21730,7 +21730,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-printer $as_me 2.14.9, which was
+This file was extended by yast2-printer $as_me 2.14.10, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21793,7 +21793,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-printer config.status 2.14.9
+yast2-printer config.status 2.14.10
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-printer-2.14.10/configure.in new/yast2-printer-2.14.11/configure.in
--- old/yast2-printer-2.14.10/configure.in 2006-11-08 19:58:04.000000000 +0100
+++ new/yast2-printer-2.14.11/configure.in 2006-11-10 09:56:04.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-printer, 2.14.9, http://bugs.opensuse.org/, yast2-printer)
+AC_INIT(yast2-printer, 2.14.10, http://bugs.opensuse.org/, yast2-printer)
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.9"
+VERSION="2.14.10"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.14.10/src/modules/Printerlib.ycp new/yast2-printer-2.14.11/src/modules/Printerlib.ycp
--- old/yast2-printer-2.14.10/src/modules/Printerlib.ycp 2006-10-30 18:23:55.000000000 +0100
+++ new/yast2-printer-2.14.11/src/modules/Printerlib.ycp 2006-11-10 09:55:36.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Petr Blahos
*
- * $Id: Printerlib.ycp 33905 2006-10-30 17:22:25Z mzugec $
+ * $Id: Printerlib.ycp 34233 2006-11-10 08:55:16Z mzugec $
*
* Printer library exported functions. What else?!?
*/
@@ -177,9 +177,9 @@
if (haskey ((map)SCR::Read (.proc.modules), "usblp"))
SCR::Execute (.target.bash, sformat ("
MAIN_PID=$$
-{/bin/echo -en %1 > %2 ; kill MAIN_PID} &
+{/bin/echo -en %1 > %2 ; kill $MAIN_PID;} &
ECHO_PID=$!
-{sleep 2s ; kill $ECHO_PID &>/dev/null ; } &", sequence, device));
+{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &", sequence, device));
}
/**
@@ -698,7 +698,6 @@
integer pos = pass[0]:0;
integer str_size= pass[1]:0;
string pass = substring("*****************************************************************************", 0, str_size-2);
-// y2internal("string %1", substring(visible_string, pos+1,str_size-2));
visible_string = substring(visible_string,0,pos+1) + pass + substring(visible_string,pos+str_size-1);
}
y2milestone("replace string %1", visible_string);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.14.10/testsuite/tests/detectPrinters.out new/yast2-printer-2.14.11/testsuite/tests/detectPrinters.out
--- old/yast2-printer-2.14.10/testsuite/tests/detectPrinters.out 2006-03-21 08:59:09.000000000 +0100
+++ new/yast2-printer-2.14.11/testsuite/tests/detectPrinters.out 2006-11-10 10:21:18.000000000 +0100
@@ -26,7 +26,7 @@
Read .target.size "/usr/lib/cups/backend/usb" -1
Execute .target.bash "grep '^usblp ' /proc/modules" 0
Read .proc.modules $["usblp":""]
-Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill MAIN_PID} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ; } &" 0
+Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0
Read .ppd.db.vendorname "Epson" ""
Read .ppd.db.modelname ["Epson", "USB Printer"] ""
Execute .target.bash "grep '^usblp ' /proc/modules" 0
@@ -37,7 +37,7 @@
Read .target.size "/usr/lib/cups/backend/usb" -1
Execute .target.bash "grep '^usblp ' /proc/modules" 0
Read .proc.modules $["usblp":""]
-Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill MAIN_PID} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ; } &" 0
+Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0
Read .ppd.db.vendorname "Epson" ""
Read .ppd.db.modelname ["Epson", "USB Printer"] ""
Execute .target.bash "grep '^usblp ' /proc/modules" 0
@@ -49,7 +49,7 @@
Execute .target.bash_output "/usr/lib/cups/backend/usb" $["exit":0, "stderr":"", "stdout":"direct usb://EPSON/Stylus%20Photo%20810?serial=W33040110201335050 \"EPSON Stylus Photo 810\" \"USB Printer #1\"\ndirect usb:/dev/usb/lp1 \"Unknown\" \"USB Printer #2\"\ndirect usb:/dev/usb/lp2 \"Unknown\" \"USB Printer #3\""]
Execute .target.bash "grep '^usblp ' /proc/modules" 0
Read .proc.modules $["usblp":""]
-Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill MAIN_PID} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ; } &" 0
+Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0
Read .ppd.db.vendorname "Epson" ""
Read .ppd.db.modelname ["Epson", "Stylus Photo 810"] ""
Execute .target.bash "grep '^usblp ' /proc/modules" 0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org