Mailinglist Archive: opensuse-commit (1792 mails)
| < Previous | Next > |
commit yast2-http-server for openSUSE:11.4
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sun, 27 Feb 2011 13:19:36 +0100
- Message-id: <20110227121936.47997202A4@hilbert.suse.de>
Hello community,
here is the log from the commit of package yast2-http-server for openSUSE:11.4
checked in at Sun Feb 27 13:19:36 CET 2011.
--------
--- old-versions/11.4/all/yast2-http-server/yast2-http-server.changes
2010-05-20 10:08:11.000000000 +0200
+++ 11.4/yast2-http-server/yast2-http-server.changes 2011-02-25
14:00:09.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Feb 25 13:53:54 CET 2011 - jsrain@xxxxxxx
+
+- fixed server flags handling (bnc#656589)
+- 2.20.0
+
+-------------------------------------------------------------------
calling whatdependson for 11.4-i586
Old:
----
yast2-http-server-2.19.1.tar.bz2
New:
----
yast2-http-server-2.20.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-http-server.spec ++++++
--- /var/tmp/diff_new_pack.oDveRy/_old 2011-02-27 13:19:15.000000000 +0100
+++ /var/tmp/diff_new_pack.oDveRy/_new 2011-02-27 13:19:15.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-http-server (Version 2.19.1)
+# spec file for package yast2-http-server
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,11 +19,11 @@
Name: yast2-http-server
-Version: 2.19.1
-Release: 2
+Version: 2.20.0
+Release: 1.<RELEASE2>
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-http-server-2.19.1.tar.bz2
+Source0: yast2-http-server-2.20.0.tar.bz2
Prefix: /usr
@@ -43,7 +43,7 @@
configuration.
%prep
-%setup -n yast2-http-server-2.19.1
+%setup -n yast2-http-server-2.20.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -82,4 +82,5 @@
/usr/share/YaST2/scrconf/*
/usr/lib/YaST2/servers_non_y2/*
%doc %{prefix}/share/doc/packages/yast2-http-server
+
%changelog
++++++ yast2-http-server-2.19.1.tar.bz2 -> yast2-http-server-2.20.0.tar.bz2
++++++
++++ 8467 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.19.1/Makefile.am
new/yast2-http-server-2.20.0/Makefile.am
--- old/yast2-http-server-2.19.1/Makefile.am 2009-04-23 18:37:18.000000000
+0200
+++ new/yast2-http-server-2.20.0/Makefile.am 2011-02-25 13:59:29.000000000
+0100
@@ -32,10 +32,10 @@
# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
-# where devtools instal m4 snippets
+# where devtools install m4 snippets
# argh, executed literally
#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
+ACLOCAL_AMFLAGS = -I . -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
cmp -s $< $@ || cp -f $< $@
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.19.1/VERSION new/yast2-http-server-2.20.0/VERSION
--- old/yast2-http-server-2.19.1/VERSION 2010-05-14 09:08:38.000000000
+0200
+++ new/yast2-http-server-2.20.0/VERSION 2011-02-25 13:54:36.000000000
+0100
@@ -1 +1 @@
-2.19.1
+2.20.0
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.19.1/autodocs-ycp.ami
new/yast2-http-server-2.20.0/autodocs-ycp.ami
--- old/yast2-http-server-2.19.1/autodocs-ycp.ami 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-http-server-2.20.0/autodocs-ycp.ami 2011-02-25
13:59:29.000000000 +0100
@@ -0,0 +1,32 @@
+# -*- makefile -*- Automake include file
+# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
+
+# Builds source documentation for YCP sources
+# Uses ycpdoc
+# PARAMETERS:
+# AUTODOCS_YCP: Files that the ycp autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.ycp
+# AUTODOCS_PM: Files that the perl autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
+# Optional - the default is $(srcdir)/../../src
+
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
+
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
+CLEANFILES = $(html_DATA) pod2htm*.tmp
+
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_STRIP ?= $(srcdir)/../../src
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+ ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
+ for i in $(AUTODOCS_PM); do \
+ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__};
b=$${b%.pm}; \
+ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
+ done
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.19.1/configure.in
new/yast2-http-server-2.20.0/configure.in
--- old/yast2-http-server-2.19.1/configure.in 2009-04-23 18:37:18.000000000
+0200
+++ new/yast2-http-server-2.20.0/configure.in 2011-02-25 13:59:28.000000000
+0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-http-server
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-http-server, 2.18.7, http://bugs.opensuse.org/,
yast2-http-server)
+AC_INIT(yast2-http-server, 2.20.0, 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.18.7"
+VERSION="2.20.0"
RPMNAME="yast2-http-server"
MAINTAINER="Michal Zugec <mzugec@xxxxxxx>"
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.19.1/doc/Makefile.am
new/yast2-http-server-2.20.0/doc/Makefile.am
--- old/yast2-http-server-2.19.1/doc/Makefile.am 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-http-server-2.20.0/doc/Makefile.am 2010-08-18
13:48:03.000000000 +0200
@@ -0,0 +1,12 @@
+#
+# Makefile.am for devtools/devtools/skeletons/config/doc
+#
+
+SUBDIRS = autodocs
+
+htmldir = $(docdir)
+
+doc_DATA =
+html_DATA =
+
+EXTRA_DIST = $(doc_DATA) $(html_DATA)
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.19.1/doc/autodocs/Makefile.am
new/yast2-http-server-2.20.0/doc/autodocs/Makefile.am
--- old/yast2-http-server-2.19.1/doc/autodocs/Makefile.am 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-http-server-2.20.0/doc/autodocs/Makefile.am 2010-08-18
13:48:03.000000000 +0200
@@ -0,0 +1,3 @@
+# Makefile.am for YCP module .../doc/autodocs
+
+include $(top_srcdir)/autodocs-ycp.ami
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.19.1/missing new/yast2-http-server-2.20.0/missing
--- old/yast2-http-server-2.19.1/missing 2009-04-23 18:37:25.000000000
+0200
+++ new/yast2-http-server-2.20.0/missing 2011-02-25 13:59:33.000000000
+0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@xxxxxxxxxxxxxxxx>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to <bug-automake@xxxxxxx>."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
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.19.1/src/YaST/HTTPDData.pm
new/yast2-http-server-2.20.0/src/YaST/HTTPDData.pm
--- old/yast2-http-server-2.19.1/src/YaST/HTTPDData.pm 2009-03-05
14:58:04.000000000 +0100
+++ new/yast2-http-server-2.20.0/src/YaST/HTTPDData.pm 2011-02-24
14:57:41.000000000 +0100
@@ -361,8 +361,26 @@
my $use_ssl = 0;
foreach( @{GetModuleList()} ){ $use_ssl = 1 if /^ssl$/ }
- if ($use_ssl == 1) {YaPI::HTTPD->SetServerFlags("SSL");}
- else {YaPI::HTTPD->SetServerFlags("");}
+ my @flags = split(' ', YaPI::HTTPD->GetServerFlags());
+ my $flags_have_ssl = 0;
+ @flags = grep {
+ if ($_ eq "SSL") {
+ if ($use_ssl) {
+ $flags_have_ssl = 1;
+ } else {
+ 0;
+ }
+ } else {
+ 1;
+ }
+ } @flags;
+
+ if ($use_ssl == 1 && $flags_have_ssl == 0) {
+ push @flags, "SSL"
+ }
+
+ YaPI::HTTPD->SetServerFlags(join(" ", @flags));
+
return 1;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |