Hello community,
here is the log from the commit of package yast2-packager
checked in at Fri Feb 23 13:08:29 CET 2007.
--------
--- yast2-packager/yast2-packager.changes 2007-02-21 18:04:20.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-02-23 12:36:16.296025000 +0100
@@ -1,0 +2,7 @@
+Fri Feb 23 08:54:05 CET 2007 - lslezak@suse.cz
+
+- it is posible to specify HTTP/HTTP port in the source
+ configuration module (#247019), removed workaround for #179424
+- 2.15.17
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.15.16.tar.bz2
New:
----
yast2-packager-2.15.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.GNg889/_old 2007-02-23 13:08:07.000000000 +0100
+++ /var/tmp/diff_new_pack.GNg889/_new 2007-02-23 13:08:07.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.15.16)
+# spec file for package yast2-packager (Version 2.15.17)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-packager
-Version: 2.15.16
+Version: 2.15.17
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.15.16.tar.bz2
+Source0: yast2-packager-2.15.17.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml
Requires: yast2-country
@@ -45,7 +45,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.15.16
+%setup -n yast2-packager-2.15.17
%build
%{prefix}/bin/y2tool y2autoconf
@@ -83,6 +83,10 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Fri Feb 23 2007 - lslezak@suse.cz
+- it is posible to specify HTTP/HTTP port in the source
+ configuration module (#247019), removed workaround for #179424
+- 2.15.17
* Wed Feb 21 2007 - lslezak@suse.cz
- allow to change name (alias) of a source (#228978)
- 2.15.16
++++++ yast2-packager-2.15.16.tar.bz2 -> yast2-packager-2.15.17.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.16/configure new/yast2-packager-2.15.17/configure
--- old/yast2-packager-2.15.16/configure 2007-02-21 18:03:37.000000000 +0100
+++ new/yast2-packager-2.15.17/configure 2007-02-23 12:34:57.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-packager 2.15.16.
+# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.17.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.15.16'
-PACKAGE_STRING='yast2-packager 2.15.16'
+PACKAGE_VERSION='2.15.17'
+PACKAGE_STRING='yast2-packager 2.15.17'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,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-packager 2.15.16 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.15.17 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.15.16:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.15.17:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.15.16
+yast2-packager configure 2.15.17
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,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-packager $as_me 2.15.16, which was
+It was created by yast2-packager $as_me 2.15.17, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.15.16'
+ VERSION='2.15.17'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.16"
+VERSION="2.15.17"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3260,7 +3260,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-packager $as_me 2.15.16, which was
+This file was extended by yast2-packager $as_me 2.15.17, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3303,7 +3303,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.15.16
+yast2-packager config.status 2.15.17
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-packager-2.15.16/configure.in new/yast2-packager-2.15.17/configure.in
--- old/yast2-packager-2.15.16/configure.in 2007-02-21 18:03:33.000000000 +0100
+++ new/yast2-packager-2.15.17/configure.in 2007-02-23 12:34:52.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.15.16, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.17, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.16"
+VERSION="2.15.17"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.16/src/modules/SourceDialogs.ycp new/yast2-packager-2.15.17/src/modules/SourceDialogs.ycp
--- old/yast2-packager-2.15.16/src/modules/SourceDialogs.ycp 2007-02-19 14:26:46.000000000 +0100
+++ new/yast2-packager-2.15.17/src/modules/SourceDialogs.ycp 2007-02-23 09:04:43.000000000 +0100
@@ -26,6 +26,7 @@
import "Message";
import "Report";
import "NetworkPopup";
+import "String";
// common functions / data
@@ -658,9 +659,18 @@
string password = UI::WidgetExists (`id (`password))
? (string)UI::QueryWidget (`id (`password), `Value)
: "";
+ string port = UI::WidgetExists (`id (`port))
+ ? (string)UI::QueryWidget (`id (`port), `Value)
+ : "";
+
term widget = `VBox (
- // text entry
- `TextEntry (`id (`server), _("Server &Name"), server),
+ `HBox(
+ // text entry
+ `TextEntry (`id (`server), _("Server &Name"), server),
+ (type == `http || type == `https) ?
+ `HSquash(`TextEntry (`id (`port), _("&Port"), port))
+ : `Empty()
+ ),
type == `samba
// text entry
? `TextEntry (`id (`share), _("&Share"))
@@ -698,6 +708,14 @@
);
UI::ReplaceWidget (`id (`server_rp), widget);
+ if (UI::WidgetExists(`id(`port)))
+ {
+ // maximum port number is 65535
+ UI::ChangeWidget(`id(`port), `InputMaxLength, 5);
+ // allow only numbers in the port spec
+ UI::ChangeWidget(`id(`port), `ValidChars, String::CDigit());
+ }
+
// update widget status
UI::ChangeWidget (`id (`username), `Enabled, !anonymous);
UI::ChangeWidget (`id (`password), `Enabled, !anonymous);
@@ -796,6 +814,17 @@
if (UI::WidgetExists (`id (`workgroup)))
UI::ChangeWidget (`id (`workgroup), `Enabled, !anonymous);
}
+
+ // set HTTP/HTTPS port if it's specified
+ if (type == `http || type == `https)
+ {
+ string port_num = parsed["port"]:"";
+
+ if (port_num != nil && port_num != "")
+ {
+ UI::ChangeWidget(`id(`port), `Value, port_num);
+ }
+ }
}
/**
@@ -878,6 +907,12 @@
if (iso)
_url = PosprocessISOURL (_url);
}
+
+ // set HTTP/HTTPS port
+ if (type == `http || type == `https)
+ {
+ parsed["port"] = (string)UI::QueryWidget(`id(`port), `Value);
+ }
}
@@ -902,6 +937,7 @@
"init" : ServerInit,
"store" : ServerStore,
"handle" : ServerHandle,
+// help text - server dialog
"help" : _("<p><big><b>Server and Directory</b></big><br>
Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>
to specify the NFS server host name and path on the server.
@@ -912,6 +948,9 @@
or ISO Image</b>.
If the location is a file holding an ISO image
of the media, set <b>ISO Image</b>.</p>")
+// help text - server dialog, there is a "Port" widget
++ _("<p>It's possible to set the <b>Port</b> number for a HTTP/HTTPS source.
+Leave it empty to use the default port.</p>")
+ multi_cd_help,
];
}
@@ -1176,13 +1215,7 @@
global string EditPopup (string url) {
SetURL (url);
string proto = URLScheme (url);
-
map parsed_url = URL::Parse(url);
- if (parsed_url["port"]:"" != "")
- {
- y2milestone("A port found in the URL, using 'url' scheme");
- proto = "url";
- }
y2milestone ("Displaying popup for protocol %1", proto);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.16/VERSION new/yast2-packager-2.15.17/VERSION
--- old/yast2-packager-2.15.16/VERSION 2007-02-21 18:00:25.000000000 +0100
+++ new/yast2-packager-2.15.17/VERSION 2007-02-23 12:28:54.000000000 +0100
@@ -1 +1 @@
-2.15.16
+2.15.17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org