Hello community,
here is the log from the commit of package yast2-http-server
checked in at Thu Nov 20 01:51:15 CET 2008.
--------
--- yast2-http-server/yast2-http-server.changes 2008-09-08 12:44:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-http-server/yast2-http-server.changes 2008-11-19 16:45:35.000000000 +0100
@@ -1,0 +2,11 @@
+Wed Nov 19 16:39:26 CET 2008 - mzugec@suse.cz
+
+- fixed Listen entry problem (bnc#445460)
+- 2.17.5
+
+-------------------------------------------------------------------
+Fri Nov 14 11:19:20 CET 2008 - ug@suse.de
+
+- rnc file fixed
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-http-server-2.17.4.tar.bz2
New:
----
yast2-http-server-2.17.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-http-server.spec ++++++
--- /var/tmp/diff_new_pack.f11538/_old 2008-11-20 01:51:08.000000000 +0100
+++ /var/tmp/diff_new_pack.f11538/_new 2008-11-20 01:51:08.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-http-server (Version 2.17.4)
+# spec file for package yast2-http-server (Version 2.17.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-http-server
-Version: 2.17.4
+Version: 2.17.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-http-server-2.17.4.tar.bz2
+Source0: yast2-http-server-2.17.5.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt libzio perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-network yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
Requires: yast2-network yast2-perl-bindings libzio
@@ -44,7 +44,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-http-server-2.17.4
+%setup -n yast2-http-server-2.17.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -80,6 +80,11 @@
/usr/lib/YaST2/servers_non_y2/*
%doc %{prefix}/share/doc/packages/yast2-http-server
%changelog
+* Wed Nov 19 2008 mzugec@suse.cz
+- fixed Listen entry problem (bnc#445460)
+- 2.17.5
+* Fri Nov 14 2008 ug@suse.de
+- rnc file fixed
* Mon Sep 08 2008 mzugec@suse.cz
- proofreading
- 2.17.4
++++++ yast2-http-server-2.17.4.tar.bz2 -> yast2-http-server-2.17.5.tar.bz2 ++++++
++++ 3232 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-http-server-2.17.4/agents/ag_http_server new/yast2-http-server-2.17.5/agents/ag_http_server
--- old/yast2-http-server-2.17.4/agents/ag_http_server 2008-01-24 14:40:00.000000000 +0100
+++ new/yast2-http-server-2.17.5/agents/ag_http_server 2008-11-19 16:37:35.000000000 +0100
@@ -403,7 +403,7 @@
%listen = ();
foreach my $entry ( @{$args[0]} ) {
my $key = "";
- if( exists( $entry->{'ADDRESS'} ) ) {
+ if( exists( $entry->{'ADDRESS'} ) and $entry->{'ADDRESS'} ne '') {
$key = $entry->{'ADDRESS'}.':';
}
$key .= $entry->{'PORT'};
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-http-server-2.17.4/configure.in new/yast2-http-server-2.17.5/configure.in
--- old/yast2-http-server-2.17.4/configure.in 2008-09-08 12:41:37.000000000 +0200
+++ new/yast2-http-server-2.17.5/configure.in 2008-11-19 16:37:53.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-http-server
dnl
-dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-http-server, 2.17.3, http://bugs.opensuse.org/, yast2-http-server)
+AC_INIT(yast2-http-server, 2.17.4, http://bugs.opensuse.org/, yast2-http-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.3"
+VERSION="2.17.4"
RPMNAME="yast2-http-server"
MAINTAINER="Michal Zugec "
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-http-server-2.17.4/src/http-server.rnc new/yast2-http-server-2.17.5/src/http-server.rnc
--- old/yast2-http-server-2.17.4/src/http-server.rnc 2008-01-24 14:40:00.000000000 +0100
+++ new/yast2-http-server-2.17.5/src/http-server.rnc 2008-11-18 15:33:54.000000000 +0100
@@ -33,13 +33,7 @@
element OVERHEAD { text }? &
element SECTIONNAME { text }? &
element SECTIONPARAM { text }? &
- element VALUE {
- LIST,
- element listentry {
- element KEY { text }? &
- element VALUE { text }?
- }*
- }*
+ element VALUE { text }?
}*
}
}*
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-http-server-2.17.4/src/HttpServer.ycp new/yast2-http-server-2.17.5/src/HttpServer.ycp
--- old/yast2-http-server-2.17.4/src/HttpServer.ycp 2008-06-20 16:25:43.000000000 +0200
+++ new/yast2-http-server-2.17.5/src/HttpServer.ycp 2008-11-19 16:43:27.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Data for configuration of http-server, input and output functions.
* Authors: Stanislav Visnovsky
*
- * $Id: HttpServer.ycp 48180 2008-06-09 15:09:52Z mzugec $
+ * $Id: HttpServer.ycp 53435 2008-11-19 15:43:26Z mzugec $
*
* Representation of the configuration of http-server.
* Input and output routines.
@@ -343,7 +343,7 @@
// write hosts
YaST::HTTPDData::WriteHosts();
- Progress::NextStage();
+ Progress::NextStage();
import "SuSEFirewall";
Progress::set(false);// Progress::off ();
@@ -351,7 +351,7 @@
if (YaST::HTTPDData::WriteListen (false) == nil)
{
// FIXME: show popup
-
+
y2error ("Writing listen failed, firewall problems?");
}
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-http-server-2.17.4/src/wizard-dialog.ycp new/yast2-http-server-2.17.5/src/wizard-dialog.ycp
--- old/yast2-http-server-2.17.4/src/wizard-dialog.ycp 2008-08-19 12:01:25.000000000 +0200
+++ new/yast2-http-server-2.17.5/src/wizard-dialog.ycp 2008-11-19 16:43:27.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs for wizard
* Authors: Michal Zugec
*
- * $Id: wizard-dialog.ycp 49993 2008-08-12 14:05:53Z mzugec $
+ * $Id: wizard-dialog.ycp 53435 2008-11-19 15:43:26Z mzugec $
*/
{
@@ -79,14 +79,14 @@
} );
// save interface information
if (all==true) {
- YaST::HTTPDData::CreateListen( tointeger(UI::QueryWidget( `id("open_port"), `Value )),
+ YaST::HTTPDData::CreateListen( tointeger(UI::QueryWidget( `id("open_port"), `Value )),
tointeger(UI::QueryWidget( `id("open_port"), `Value )), "");
- }
+ }
else {
- // save firewall open port information
+ // save firewall open port information
foreach(string ip, if_sel, {
YaST::HTTPDData::CreateListen( tointeger(UI::QueryWidget( `id("open_port"), `Value )),
- tointeger(UI::QueryWidget( `id("open_port"), `Value )), ip);
+ tointeger(UI::QueryWidget( `id("open_port"), `Value )), ip);
y2milestone("Listen on : %1", ip);
});
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-http-server-2.17.4/src/YaPI/HTTPD.pm new/yast2-http-server-2.17.5/src/YaPI/HTTPD.pm
--- old/yast2-http-server-2.17.4/src/YaPI/HTTPD.pm 2008-07-16 18:21:11.000000000 +0200
+++ new/yast2-http-server-2.17.5/src/YaPI/HTTPD.pm 2008-11-19 16:37:35.000000000 +0100
@@ -299,10 +299,11 @@
use Switch;
use Data::Dumper;
use YaPI;
-use YaST::YCP;
+use YaST::YCP qw(:LOGGING sformat);
use YaPI::HTTPDModules;
use YaST::httpdUtils;
use YaST::HTTPDData;
+use Data::Dumper;
@YaPI::HTTPD::ISA = qw( YaPI YaST::httpdUtils YaST::HTTPDData );
YaST::YCP::Import ("SCR");
YaST::YCP::Import ("Service");
@@ -1306,9 +1307,11 @@
}
my @listenEntries = @{$self->GetCurrentListen()};
my %newEntry;
+ $newEntry{ADDRESS} = '';
$newEntry{ADDRESS} = $ip if ($ip);
$newEntry{ADDRESS} = "[$ip]" if ($ip=~m/\:/);
$newEntry{PORT} = ($fromPort eq $toPort)?($fromPort):($fromPort.'-'.$toPort);
+y2warning("SCR::WRITE listentries", Dumper(\@listenEntries), "new entry ", Dumper(\%newEntry));
SCR->Write( ".http_server.listen", [ @listenEntries, \%newEntry ] );
if( $doFirewall ) {
@@ -1420,6 +1423,8 @@
}
$fp=$tp if ($fp eq '');
$port = ($fp eq $tp)?($fp):($fp.'-'.$tp);
+ } elsif ($new =~/[\D]*([\d]*)[\D]*/){
+ $port=$1;
}
push(@ret, {ADDRESS => $ip, PORT=>$port});
}
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-http-server-2.17.4/src/YaST/HTTPDData.pm new/yast2-http-server-2.17.5/src/YaST/HTTPDData.pm
--- old/yast2-http-server-2.17.4/src/YaST/HTTPDData.pm 2008-07-16 18:21:11.000000000 +0200
+++ new/yast2-http-server-2.17.5/src/YaST/HTTPDData.pm 2008-11-19 16:37:35.000000000 +0100
@@ -1,8 +1,9 @@
package YaST::HTTPDData;
-use YaST::YCP;
+use YaST::YCP qw(:LOGGING sformat);
use YaPI::HTTPDModules;
use YaPI::HTTPD;
use YaST::httpdUtils;
+use Data::Dumper;
@YaST::HTTPDData::ISA = qw( YaST::httpdUtils );
@@ -532,10 +533,10 @@
delete($delListen{"$ip:$fromPort:$toPort"});
foreach my $old ( @oldListen ) {
- if( ($ip and exists($old->{ADDRESS}) and $ip eq $old->{ADDRESS}) and
+ if($ip and (exists($old->{ADDRESS}) and $ip eq $old->{ADDRESS}) and
($port eq $old->{PORT}) ) {
return 1; # already created listen
- } elsif( not($ip) and not(exists($old->{ADDRESS})) and
+ } elsif( not($ip) and (not(exists($old->{ADDRESS})) or $old->{ADDRESS} eq '') and
$port eq $old->{PORT} ) {
return 1; # already created listen
}
@@ -565,9 +566,12 @@
sub GetCurrentListen {
my $self = shift;
my @new;
+#y2internal("BEGIN - newListen ", Dumper(\%newListen), "oldListen", Dumper(@oldListen), "delListen ", Dumper(\%delListen));
+#y2internal("new ", Dumper(\@new));
foreach my $new ( keys(%newListen) ) {
my ($ip, $fp, $tp, $port) = ('', '', '', '');
- if ($new =~ m/\[([\w\W]*)\]/){
+# if (
+ $new =~ m/\[([\w\W]*)\]/; #) {
$ip=$1;
if ($new =~ m/\[$ip\]:([\d\:]*)/){
($fp, $tp) = split(/:/, $1);
@@ -576,8 +580,10 @@
}
$tp=$fp if ($tp eq '');
$port = ($fp eq $tp)?($fp):($fp.'-'.$tp);
- }
+# }
push( @new, { ADDRESS => $ip, PORT => $port } );
+#y2internal("MIDDLE newListen ", Dumper(\%newListen), "oldListen", Dumper(@oldListen), "delListen ", Dumper(\%delListen));
+#y2internal("new ", Dumper(\@new));
}
foreach my $old ( @oldListen ) {
if( $old->{PORT} =~ /-/ ) {
@@ -590,6 +596,8 @@
}
push( @new, $old );
}
+#y2internal("END - newListen ", Dumper(\%newListen), "oldListen", Dumper(@oldListen), "delListen ", Dumper(\%delListen));
+#y2internal("new ", Dumper(\@new));
return \@new;
}
@@ -601,7 +609,8 @@
foreach my $toDel ( keys(%delListen) ) {
my ($ip, $fp, $tp, $port) = ('', '', '', '');
- if ($toDel =~ m/\[([\w\W]*)\]/){
+# if (
+ $toDel =~ m/\[([\w\W]*)\]/; #){
$ip=$1;
if ($toDel =~ m/\[$ip\]:([\d\:]*)/){
($fp, $tp) = split(/:/, $1);
@@ -609,13 +618,14 @@
( $ip, $fp, $tp ) = split(/:/, $toDel);
}
$tp=$fp if ($tp eq '');
- }
+# }
$ip="[$ip]" if ($ip=~m/:/);
YaPI::HTTPD->DeleteListen( $fp, $tp, $ip, $doFirewall );
}
foreach my $new ( keys(%newListen) ) {
my ($ip, $fp, $tp, $port) = ('', '', '', '');
- if ($new =~ m/\[([\w\W]*)\]/){
+# if (
+ $new =~ m/\[([\w\W]*)\]/; #){
$ip=$1;
if ($new =~ m/\[$ip\]:([\d\:]*)/){
($fp, $tp) = split(/:/, $1);
@@ -624,7 +634,7 @@
}
$tp=$fp if ($tp eq '');
$port = ($fp eq $tp)?($fp):($fp.'-'.$tp);
- }
+# }
unless( YaPI::HTTPD->CreateListen( $fp, $tp, $ip, $doFirewall ) ) {
$ret = undef;
}
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-http-server-2.17.4/VERSION new/yast2-http-server-2.17.5/VERSION
--- old/yast2-http-server-2.17.4/VERSION 2008-09-08 12:43:29.000000000 +0200
+++ new/yast2-http-server-2.17.5/VERSION 2008-11-19 16:39:23.000000000 +0100
@@ -1 +1 @@
-2.17.4
+2.17.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org