Hello community,
here is the log from the commit of package yast2-printer
checked in at Fri Jun 9 23:37:08 CEST 2006.
--------
--- yast2-printer/yast2-printer.changes 2006-06-07 17:59:30.000000000 +0200
+++ yast2-printer/yast2-printer.changes 2006-06-09 11:25:46.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jun 9 11:22:04 CEST 2006 - mzugec@suse.cz
+
+- fixed #181780 - corrupted URI for smb
+
+-------------------------------------------------------------------
Old:
----
yast2-printer-2.13.18.tar.bz2
New:
----
yast2-printer-2.13.19.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.uQ8ItI/_old 2006-06-09 23:37:02.000000000 +0200
+++ /var/tmp/diff_new_pack.uQ8ItI/_new 2006-06-09 23:37:02.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-printer (Version 2.13.18)
+# spec file for package yast2-printer (Version 2.13.19)
#
# 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.13.18
+Version: 2.13.19
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.13.18.tar.bz2
+Source0: yast2-printer-2.13.19.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-devtools yast2-testsuite
Requires: yast2 netcat zlib blocxx
@@ -33,7 +33,7 @@
%prep
-%setup -n yast2-printer-2.13.18
+%setup -n yast2-printer-2.13.19
%build
%{prefix}/bin/y2tool y2autoconf
@@ -99,6 +99,8 @@
%doc %{prefix}/share/doc/packages/yast2-printer
%changelog -n yast2-printer
+* Fri Jun 09 2006 - mzugec@suse.cz
+- fixed #181780 - corrupted URI for smb
* Wed Jun 07 2006 - visnov@suse.cz
- fix build
- 2.13.18
++++++ yast2-printer-2.13.18.tar.bz2 -> yast2-printer-2.13.19.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.18/VERSION new/yast2-printer-2.13.19/VERSION
--- old/yast2-printer-2.13.18/VERSION 2006-06-07 17:53:26.000000000 +0200
+++ new/yast2-printer-2.13.19/VERSION 2006-06-09 11:21:56.000000000 +0200
@@ -1 +1 @@
-2.13.18
+2.13.19
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.18/agents/ag_smb_queues new/yast2-printer-2.13.19/agents/ag_smb_queues
--- old/yast2-printer-2.13.18/agents/ag_smb_queues 2005-01-24 15:31:41.000000000 +0100
+++ new/yast2-printer-2.13.19/agents/ag_smb_queues 2006-06-09 11:24:10.000000000 +0200
@@ -6,7 +6,7 @@
#
# Get printers present on samba server $1.
#
-# $Id: ag_smb_queues 2928 2002-06-27 08:53:17Z jsrain $
+# $Id: ag_smb_queues 31417 2006-06-09 09:21:36Z mzugec $
#
export LC_ALL=C
#exec 2>/dev/null
@@ -17,11 +17,11 @@
unset IFS
case "$COMMAND" in
- "result ("*)
+ '`result ('*)
exit
;;
- 'Read (., '*)
- HOST=$(echo "$COMMAND" | sed 's/^Read (., *"\(.*\)")/\1/')
+ '`Read (., '*)
+ HOST=$(echo "$COMMAND" | sed 's/^`Read (., *"\(.*\)")/\1/')
echo [
nmblookup -A $HOST |
awk 'BEGIN { N=0} /> -/ { if (0==N){ N=1; system ("smbclient -N -L " $1); } }' |
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.18/configure new/yast2-printer-2.13.19/configure
--- old/yast2-printer-2.13.18/configure 2006-05-24 15:49:45.000000000 +0200
+++ new/yast2-printer-2.13.19/configure 2006-06-09 11:06:28.000000000 +0200
@@ -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.13.16.
+# Generated by GNU Autoconf 2.59 for yast2-printer 2.13.17.
#
# 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.13.16'
-PACKAGE_STRING='yast2-printer 2.13.16'
+PACKAGE_VERSION='2.13.17'
+PACKAGE_STRING='yast2-printer 2.13.17'
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.13.16 to adapt to many kinds of systems.
+\`configure' configures yast2-printer 2.13.17 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.13.16:";;
+ short | recursive ) echo "Configuration of yast2-printer 2.13.17:";;
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.13.16
+yast2-printer configure 2.13.17
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.13.16, which was
+It was created by yast2-printer $as_me 2.13.17, 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.13.16'
+ VERSION='2.13.17'
cat >>confdefs.h <<_ACEOF
@@ -2124,7 +2124,7 @@
-VERSION="2.13.16"
+VERSION="2.13.17"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec "
@@ -21730,7 +21730,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-printer $as_me 2.13.16, which was
+This file was extended by yast2-printer $as_me 2.13.17, 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.13.16
+yast2-printer config.status 2.13.17
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.13.18/configure.in new/yast2-printer-2.13.19/configure.in
--- old/yast2-printer-2.13.18/configure.in 2006-05-24 15:49:32.000000000 +0200
+++ new/yast2-printer-2.13.19/configure.in 2006-06-09 11:06:06.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-printer, 2.13.16, http://bugs.opensuse.org/, yast2-printer)
+AC_INIT(yast2-printer, 2.13.17, 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.13.16"
+VERSION="2.13.17"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.18/printer.pot new/yast2-printer-2.13.19/printer.pot
--- old/yast2-printer-2.13.18/printer.pot 2006-05-24 15:50:12.000000000 +0200
+++ new/yast2-printer-2.13.19/printer.pot 2006-04-27 16:01:04.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-24 15:50+0200\n"
+"POT-Creation-Date: 2006-04-27 16:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -1890,7 +1890,7 @@
msgstr ""
#: src/common/helps.ycp:121
-msgid "<p>Select the CUPS settings to configure.</p>"
+msgid "<p>Select the CUPS settings to configure</p>"
msgstr ""
#. Help text 1/3 or 1/2
@@ -2880,7 +2880,7 @@
#. popup request
#: src/cups/dialogs-cups.ycp:869 src/cups/dialogs-cups.ycp:896
-#: src/cups/dialogs-cups.ycp:1062 src/cups/dialogs-cups.ycp:1086
+#: src/cups/dialogs-cups.ycp:1061 src/cups/dialogs-cups.ycp:1085
msgid "&IP Address"
msgstr ""
@@ -2907,9 +2907,9 @@
#. selectionbox label
#. selectionbox
#. selectionbox label
-#: src/cups/dialogs-cups.ycp:988 src/cups/dialogs-cups.ycp:1025
-#: src/cups/dialogs-cups.ycp:1051 src/cups/dialogs-cups.ycp:1073
-#: src/cups/dialogs-cups.ycp:1079 src/cups/dialogs-cups.ycp:1101
+#: src/cups/dialogs-cups.ycp:988 src/cups/dialogs-cups.ycp:1026
+#: src/cups/dialogs-cups.ycp:1051 src/cups/dialogs-cups.ycp:1072
+#: src/cups/dialogs-cups.ycp:1078 src/cups/dialogs-cups.ycp:1100
msgid "Browse Addre&sses"
msgstr ""
@@ -2933,12 +2933,8 @@
msgid "CUPS Server Settings"
msgstr ""
-#: src/cups/dialogs-cups.ycp:1048
-msgid "Really replace with the suggested value?"
-msgstr ""
-
#. error popup
-#: src/cups/misc-cups.ycp:118 src/modules/CUPS.ycp:335
+#: src/modules/CUPS.ycp:335
#, ycp-format
msgid ""
"An error occurred while saving queue %1.\n"
@@ -2947,7 +2943,7 @@
msgstr ""
#. popup
-#: src/cups/misc-cups.ycp:133 src/modules/CUPS.ycp:350
+#: src/modules/CUPS.ycp:350
#, ycp-format
msgid ""
"An error occurred while communicating with the \n"
@@ -3176,7 +3172,7 @@
#. to translators: error popup when cups daemon cannot execute backend for printer connection
#. or connection type is not in list of available connections
#: src/modules/Printer.ycp:1605
-msgid "An appropriate back-end is not available."
+msgid "An appropriate back-end is not available"
msgstr ""
#. summary text
@@ -3246,14 +3242,14 @@
#. part of summary
#. %1 is link to change the firewall settings
-#: src/modules/Printer.ycp:1866
+#: src/modules/Printer.ycp:1854
#, ycp-format
msgid "Port for listening to remote CUPS servers is closed by firewall %1"
msgstr ""
#. part of summary, %1 is list of interfaces
#. %2 is link to change the firewall settings
-#: src/modules/Printer.ycp:1875
+#: src/modules/Printer.ycp:1863
#, ycp-format
msgid "Port for listening to remote CUPS servers is open on %1 %2"
msgstr ""
@@ -3517,19 +3513,19 @@
msgstr ""
#. progress bar label
-#: src/modules/Printerdb.ycp:353 src/modules/Printerdb.ycp:362
+#: src/modules/Printerdb.ycp:352 src/modules/Printerdb.ycp:361
msgid ""
"The list of installed drivers has changed.\n"
"Building database of drivers..."
msgstr ""
#. error report
-#: src/modules/Printerdb.ycp:382
+#: src/modules/Printerdb.ycp:381
msgid "An error occurred while creating the printer database."
msgstr ""
#. message popup
-#: src/modules/Printerdb.ycp:697
+#: src/modules/Printerdb.ycp:696
#, ycp-format
msgid ""
"An error occurred while saving queue %1.\n"
@@ -3537,12 +3533,12 @@
msgstr ""
#. heading
-#: src/modules/Printerdb.ycp:751
+#: src/modules/Printerdb.ycp:750
msgid "Error: No Suitable PPD File Downloaded"
msgstr ""
#. reported message
-#: src/modules/Printerdb.ycp:767
+#: src/modules/Printerdb.ycp:766
#, ycp-format
msgid "%1 file was added to the database"
msgid_plural "%1 files were added to the database"
@@ -3550,7 +3546,7 @@
msgstr[1] ""
#. question popup, %1 is list of package names
-#: src/modules/Printerdb.ycp:829
+#: src/modules/Printerdb.ycp:828
#, ycp-format
msgid ""
"Printer drivers are not installed. Install\n"
@@ -3558,7 +3554,7 @@
msgstr ""
#. error report
-#: src/modules/Printerdb.ycp:834
+#: src/modules/Printerdb.ycp:833
msgid "Installing packages failed."
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.18/src/common/dialogs-connection.ycp new/yast2-printer-2.13.19/src/common/dialogs-connection.ycp
--- old/yast2-printer-2.13.18/src/common/dialogs-connection.ycp 2006-06-07 17:47:31.000000000 +0200
+++ new/yast2-printer-2.13.19/src/common/dialogs-connection.ycp 2006-06-09 11:24:10.000000000 +0200
@@ -9,7 +9,7 @@
* Petr Blahos
* Jiri Srain
*
- * $Id: dialogs-connection.ycp 31303 2006-06-02 16:46:50Z mzugec $
+ * $Id: dialogs-connection.ycp 31417 2006-06-09 09:21:36Z mzugec $
*
*/
{
@@ -1223,7 +1223,7 @@
list<string> queues = [];
if ("samba" == type)
{
- queues = (list<string>)SCR::Read (.smb.queues, full_hostname);
+ queues = (list<string>)SCR::Read (.smb.queues, hostname);
}
else if ("ipp" == type)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.18/src/modules/Printer.ycp new/yast2-printer-2.13.19/src/modules/Printer.ycp
--- old/yast2-printer-2.13.18/src/modules/Printer.ycp 2006-06-07 17:47:31.000000000 +0200
+++ new/yast2-printer-2.13.19/src/modules/Printer.ycp 2006-06-09 11:24:10.000000000 +0200
@@ -12,7 +12,7 @@
* Petr Blahos
* Jiri Srain
*
- * $Id: Printer.ycp 31303 2006-06-02 16:46:50Z mzugec $
+ * $Id: Printer.ycp 31417 2006-06-09 09:21:36Z mzugec $
*
* Well we all know what modules are for.
*/
@@ -839,6 +839,7 @@
{
uri = e["uri"]:"";
y2milestone ("Read samba URI: %1", uri);
+ // mzugec comment: parsing samba URI with URL::Parse() is not good idea, output is useless
map tokens = URL::Parse (uri);
list<string> pth = splitstring (tokens["path"]:"", "/");
pth = filter (string c, pth, {return c != "" && ! issubstring (c, "@");});
@@ -850,7 +851,9 @@
pth[0] = "";
tokens["path"] = mergestring (pth, "/");
}
- uri = URL::Build (tokens);
+ // URL::Build() is not opposite of URL::Parse() in this case, so output is broken
+ // comment this part because of bug #181780
+// uri = URL::Build (tokens);
uri = regexpsub (uri,
"^smb(:\/\/.*)$",
"samba\\1");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org