openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
April 2008
- 1 participants
- 2130 discussions
Hello community,
here is the log from the commit of package yast2-product-creator
checked in at Wed Apr 30 12:04:04 CEST 2008.
--------
--- yast2-product-creator/yast2-product-creator.changes 2008-04-29 17:21:23.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-product-creator/yast2-product-creator.changes 2008-04-30 11:58:09.621546000 +0200
@@ -1,0 +2,13 @@
+Wed Apr 30 11:55:18 CEST 2008 - lslezak(a)suse.cz
+
+- added missing ')' in a help text (bnc#384166)
+- 2.16.16
+
+-------------------------------------------------------------------
+Wed Apr 30 10:34:21 CEST 2008 - jsuchome(a)suse.cz
+
+- fixed kiwi templates
+- text fixes (software selection labels)
+- 2.16.15
+
+-------------------------------------------------------------------
Old:
----
yast2-product-creator-2.16.14.tar.bz2
New:
----
yast2-product-creator-2.16.16.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.v11413/_old 2008-04-30 12:03:56.000000000 +0200
+++ /var/tmp/diff_new_pack.v11413/_new 2008-04-30 12:03:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-product-creator (Version 2.16.14)
+# spec file for package yast2-product-creator (Version 2.16.16)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-product-creator
-Version: 2.16.14
+Version: 2.16.16
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.16.14.tar.bz2
+Source0: yast2-product-creator-2.16.16.tar.bz2
Prefix: /usr
BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-security yast2-testsuite
PreReq: %fillup_prereq
@@ -39,7 +39,7 @@
%prep
-%setup -n yast2-product-creator-2.16.14
+%setup -n yast2-product-creator-2.16.16
%build
%{prefix}/bin/y2tool y2autoconf
@@ -85,7 +85,15 @@
/usr/share/YaST2/scrconf/*.scr
/usr/lib/YaST2/servers_non_y2/ag_*
/var/adm/fillup-templates/sysconfig.product-creator
+
%changelog
+* Wed Apr 30 2008 lslezak(a)suse.cz
+- added missing ')' in a help text (bnc#384166)
+- 2.16.16
+* Wed Apr 30 2008 jsuchome(a)suse.cz
+- fixed kiwi templates
+- text fixes (software selection labels)
+- 2.16.15
* Tue Apr 29 2008 lslezak(a)suse.cz
- do not require yast2-instserver package, ag_content agent is now
in yast2 package (bnc#339126)
++++++ yast2-product-creator-2.16.14.tar.bz2 -> yast2-product-creator-2.16.16.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.14/configure new/yast2-product-creator-2.16.16/configure
--- old/yast2-product-creator-2.16.14/configure 2008-04-29 17:17:18.000000000 +0200
+++ new/yast2-product-creator-2.16.16/configure 2008-04-30 11:57:38.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-product-creator 2.16.14.
+# Generated by GNU Autoconf 2.61 for yast2-product-creator 2.16.16.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-product-creator'
PACKAGE_TARNAME='yast2-product-creator'
-PACKAGE_VERSION='2.16.14'
-PACKAGE_STRING='yast2-product-creator 2.16.14'
+PACKAGE_VERSION='2.16.16'
+PACKAGE_STRING='yast2-product-creator 2.16.16'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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-product-creator 2.16.14 to adapt to many kinds of systems.
+\`configure' configures yast2-product-creator 2.16.16 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-product-creator 2.16.14:";;
+ short | recursive ) echo "Configuration of yast2-product-creator 2.16.16:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-product-creator configure 2.16.14
+yast2-product-creator configure 2.16.16
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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-product-creator $as_me 2.16.14, which was
+It was created by yast2-product-creator $as_me 2.16.16, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-product-creator'
- VERSION='2.16.14'
+ VERSION='2.16.16'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.14"
+VERSION="2.16.16"
RPMNAME="yast2-product-creator"
MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>"
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-product-creator $as_me 2.16.14, which was
+This file was extended by yast2-product-creator $as_me 2.16.16, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-product-creator config.status 2.16.14
+yast2-product-creator config.status 2.16.16
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.14/configure.in new/yast2-product-creator-2.16.16/configure.in
--- old/yast2-product-creator-2.16.14/configure.in 2008-04-29 17:17:14.000000000 +0200
+++ new/yast2-product-creator-2.16.16/configure.in 2008-04-30 11:57:33.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-product-creator, 2.16.14, http://bugs.opensuse.org/, yast2-product-creator)
+AC_INIT(yast2-product-creator, 2.16.16, http://bugs.opensuse.org/, yast2-product-creator)
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.16.14"
+VERSION="2.16.16"
RPMNAME="yast2-product-creator"
MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.14/src/Kiwi.ycp new/yast2-product-creator-2.16.16/src/Kiwi.ycp
--- old/yast2-product-creator-2.16.14/src/Kiwi.ycp 2008-04-07 15:05:48.000000000 +0200
+++ new/yast2-product-creator-2.16.16/src/Kiwi.ycp 2008-04-30 11:56:26.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for kiwi configuration, input and output functions.
* Authors: Jiri Suchomel <jsuchome(a)suse.cz>
*
- * $Id: Kiwi.ycp 46083 2008-04-04 10:47:01Z jsuchome $
+ * $Id: Kiwi.ycp 47191 2008-04-30 08:43:40Z jsuchome $
*/
{
module "Kiwi";
@@ -37,7 +37,7 @@
// directories with user-made templated
global list<string> templates_dirs = [];
- global string default_packagemanager = "smart";
+ global string default_packagemanager = "zypper";
list<map> all_sources = [];
@@ -458,7 +458,7 @@
]];
if (KiwiConfig["inherit"]:"" != "")
write_list[0,"inherit"] = KiwiConfig["inherit"]:"";
- if (haskey (KiwiConfig, "profiles"))
+ if (size (KiwiConfig["profiles"]:[]) > 0)
{
write_list[0,"__children"] = add (write_list[0,"__children"]:[], $[
"__key" : "profiles",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.14/src/product-creator.ycp new/yast2-product-creator-2.16.16/src/product-creator.ycp
--- old/yast2-product-creator-2.16.14/src/product-creator.ycp 2008-04-17 07:23:16.000000000 +0200
+++ new/yast2-product-creator-2.16.16/src/product-creator.ycp 2008-04-30 11:57:30.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Anas Nashif <nashif(a)suse.de>
*
- * $Id: product-creator.ycp 46772 2008-04-17 05:23:16Z lslezak $
+ * $Id: product-creator.ycp 47200 2008-04-30 09:57:30Z lslezak $
*
* Main file for product-creator configuration. Uses all other files.
*/
@@ -83,7 +83,7 @@
],
"configfile" : $[
// cmd line help text for the 'configfile' option, %1 is a file name
- "help" : sformat(_("Path to the configuration file (default is %1"),
+ "help" : sformat(_("Path to the configuration file (default is %1)"),
ProductCreator::ConfigFile),
"type" : "string"
],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.14/VERSION new/yast2-product-creator-2.16.16/VERSION
--- old/yast2-product-creator-2.16.14/VERSION 2008-04-29 15:26:24.000000000 +0200
+++ new/yast2-product-creator-2.16.16/VERSION 2008-04-30 11:56:54.000000000 +0200
@@ -1 +1 @@
-2.16.14
+2.16.16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package vsftpd
checked in at Wed Apr 30 12:01:40 CEST 2008.
--------
--- vsftpd/vsftpd.changes 2008-04-01 16:24:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/vsftpd/vsftpd.changes 2008-04-30 11:58:49.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 30 11:58:17 CEST 2008 - hvogel(a)suse.de
+
+- Make the unpriv bits run as ftpsecure and not as nobody
+ [bnc#384776]
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vsftpd.spec ++++++
--- /var/tmp/diff_new_pack.VO4689/_old 2008-04-30 12:01:14.000000000 +0200
+++ /var/tmp/diff_new_pack.VO4689/_new 2008-04-30 12:01:14.000000000 +0200
@@ -19,7 +19,7 @@
BuildRequires: libcap-devel
%endif
Version: 2.0.6
-Release: 8
+Release: 15
Summary: Very Secure FTP Daemon - Written from Scratch
License: GPL v2 or later
Group: Productivity/Networking/Ftp/Servers
@@ -42,7 +42,7 @@
Patch8: %name-2.0.5-utf8-log-names.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: ftp-server
-PreReq: %insserv_prereq
+PreReq: %insserv_prereq /usr/sbin/useradd
%description
Vsftpd is an FTP server, or d�mon. The "vs" stands for Very Secure.
@@ -95,6 +95,9 @@
install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
install -m 644 %{S:6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
+%pre
+/usr/sbin/useradd -r -o -g nogroup -s /bin/false -c "Secure FTP User" -d /var/lib/empty ftpsecure 2> /dev/null || :
+
%preun
%stop_on_removal %name
@@ -124,6 +127,9 @@
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
%changelog
+* Wed Apr 30 2008 hvogel(a)suse.de
+- Make the unpriv bits run as ftpsecure and not as nobody
+ [bnc#384776]
* Tue Apr 01 2008 mkoenig(a)suse.de
- remove dir /usr/share/omc/svcinfo.d as it is provided now
by filesystem
++++++ vsftpd-2.0.4-conf.diff ++++++
--- /var/tmp/diff_new_pack.VO4689/_old 2008-04-30 12:01:14.000000000 +0200
+++ /var/tmp/diff_new_pack.VO4689/_new 2008-04-30 12:01:14.000000000 +0200
@@ -27,7 +27,7 @@
+# It is recommended that you define on your system a unique user which the
+# ftp server can use as a totally isolated and unprivileged user.
+#
-+#nopriv_user=ftpsecure
++nopriv_user=ftpsecure
+#
+# You may fully customise the login banner string:
+#
@@ -46,12 +46,12 @@
+#deny_email_enable=YES
+#
+# (default follows)
-+#
+ #
+#banned_email_file=/etc/vsftpd.banned_emails
+#
+# If enabled, all user and group information in
+# directory listings will be displayed as "ftp".
- #
++#
+#hide_ids=YES
+
+# Local FTP user Settings
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package tulip
checked in at Wed Apr 30 12:01:01 CEST 2008.
--------
--- tulip/tulip.changes 2008-04-16 00:17:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/tulip/tulip.changes 2008-04-30 10:03:46.229170000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 22 19:02:38 CEST 2008 - kkaempf(a)suse.de
+
+- update documentation to 3.0.0
+ - drop "BuildRequires" for generating documentation
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tulip.spec ++++++
--- /var/tmp/diff_new_pack.Nt2412/_old 2008-04-30 12:00:43.000000000 +0200
+++ /var/tmp/diff_new_pack.Nt2412/_new 2008-04-30 12:00:43.000000000 +0200
@@ -15,13 +15,13 @@
BuildRequires: Mesa-devel freefont glew-devel libdrm-devel libjpeg-devel libqt4-devel libxml2-devel update-alternatives update-desktop-files xorg-x11-devel
# These are for (cd docs; make html) below
# To speed up build time, this is pre-generated
-BuildRequires: doxygen graphviz-gd java libqt4-devel-doc-data passivetex texlive texlive-bin xmltex
+#BuildRequires: doxygen graphviz-gd xmltex passivetex texlive texlive-bin java libqt4-devel-doc-data
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
Summary: Visualization of huge graphs
Version: 3.0.0
-Release: 1
+Release: 8
Prefix: /usr
# .so version
%define tulip_version %{version}
@@ -279,8 +279,9 @@
--mandir=/usr/share/man \
--disable-static \
--enable-stats-gui \
+ --with-qt-dir=/usr/bin \
--with-qt-libraries=%{_libdir} \
- --with-qt-includes=/usr/include/Qt \
+ --with-qt-includes=/usr/include \
--x-includes=/usr/X11R6/include \
--x-libraries=/usr/X11R6/%{_lib} \
--with-gl-includes=/usr/include \
@@ -293,11 +294,12 @@
%install
make DESTDIR=${RPM_BUILD_ROOT} install
+cd docs
+sh gen-profile.sh
+make DESTDIR=${RPM_BUILD_ROOT} install
+cd ..
%suse_update_desktop_file -i %{name} Graphics 3DGraphics
find ${RPM_BUILD_ROOT}%{_libdir} -name *.la | xargs rm -f
-chmod -x ${RPM_BUILD_ROOT}%{_docdir}/%{name}/doxygen/tulip.html
-chmod -x ${RPM_BUILD_ROOT}%{_docdir}/%{name}/common/*
-chmod -x ${RPM_BUILD_ROOT}%{_docdir}/%{name}/userHandbook/images/*.png
%if 0%{?suse_version} > 1020
# create symlinks for man pages and documentation
%fdupes -s %{buildroot}/%{_mandir}/man3
@@ -379,6 +381,9 @@
%{_mandir}/man3/*
%changelog
+* Tue Apr 22 2008 kkaempf(a)suse.de
+- update documentation to 3.0.0
+ - drop "BuildRequires" for generating documentation
* Tue Apr 15 2008 kkaempf(a)suse.de
- update to 3.0.0
Main changes:
++++++ tulip-docs-3.0.0.tar.bz2 ++++++
tulip/tulip-docs-3.0.0.tar.bz2 /mounts/work_src_done/STABLE/tulip/tulip-docs-3.0.0.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package nvu
checked in at Wed Apr 30 11:59:39 CEST 2008.
--------
--- nvu/nvu.changes 2007-06-07 16:04:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/nvu/nvu.changes 2008-04-30 11:09:42.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Apr 30 11:09:23 CEST 2008 - sbrabec(a)suse.cz
+
+- Set MAXPATHLEN correctly to prevent buffer overflow crash.
+
+-------------------------------------------------------------------
New:
----
nvu-overflow.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nvu.spec ++++++
--- /var/tmp/diff_new_pack.r30773/_old 2008-04-30 11:59:29.000000000 +0200
+++ /var/tmp/diff_new_pack.r30773/_new 2008-04-30 11:59:29.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package nvu (Version 1.0)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,14 +10,15 @@
# norootforbuild
+
Name: nvu
BuildRequires: gcc-c++ gtk2-devel krb5-devel libgnome-devel libidl-devel mozilla-nspr-devel orbit-devel tcsh unzip update-desktop-files zip
%define NVU 1
-License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
Version: 1.0
-Release: 60
+Release: 137
Summary: Web Authoring System
-URL: http://www.nvu.com/
+Url: http://www.nvu.com/
Group: Productivity/Publishing/HTML/Editors
Source: %{name}-%{version}-sources.tar.bz2
Source1: nvu.desktop
@@ -32,6 +33,7 @@
Patch7: dumpstack.patch
Patch8: nvu-undefined-operation.patch
Patch9: nvu-uninitialized-variable.patch
+Patch10: nvu-overflow.patch
%define _use_internal_dependency_generator 0
%define my_provides %{_builddir}/%{?buildsubdir}/my-provides
%define my_requires %{_builddir}/%{?buildsubdir}/my-requires
@@ -47,24 +49,21 @@
Nvu Features
-- WYSIWYG editing of pages, making Web creation as easy as typing a
+* WYSIWYG editing of pages, making Web creation as easy as typing a
letter with your word processor.
-- Integrated file management via FTP. Simply log in to your Web
+* Integrated file management via FTP. Simply log in to your Web
site and navigate through your files, editing Web pages on the
fly, directly from your site.
-- Reliable HTML code creation that works with today's most popular
+* Reliable HTML code creation that works with today's most popular
browsers.
-- Jump between WYSIWYG editing mode and HTML using tabs.
-
-- Tabbed editing to make working on multiple pages a snap.
+* Jump between WYSIWYG editing mode and HTML using tabs.
-- Powerful support for frames, forms, tables, and templates.
+* Tabbed editing to make working on multiple pages a snap.
-- The easiest-to-use, most powerful Web authoring system available for
-desktop Linux users.
+* Powerful support for frames, forms, tables, and templates.
@@ -85,6 +84,7 @@
%patch7
%patch8
%patch9
+%patch10
cp composer/config/mozconfig.linux .mozconfig
echo "ac_add_options --with-system-nspr" >>.mozconfig
echo "export CFLAGS=\"$RPM_OPT_FLAGS -fno-strict-aliasing\"" >>.mozconfig
@@ -147,60 +147,62 @@
/usr/share/*/nvu.*
%changelog
-* Thu Jun 07 2007 - sbrabec(a)suse.cz
+* Wed Apr 30 2008 sbrabec(a)suse.cz
+- Set MAXPATHLEN correctly to prevent buffer overflow crash.
+* Thu Jun 07 2007 sbrabec(a)suse.cz
- Removed invalid desktop Category "Application" (#254654).
-* Thu May 31 2007 - sbrabec(a)suse.cz
+* Thu May 31 2007 sbrabec(a)suse.cz
- Fixed undefined behavior of code and undefined variables.
- Build everything with RPM_OPT_FLAGS.
-* Thu May 10 2007 - ro(a)suse.de
+* Fri May 11 2007 ro(a)suse.de
- added unzip to buildrequires
-* Mon Nov 13 2006 - sbrabec(a)suse.cz
+* Mon Nov 13 2006 sbrabec(a)suse.cz
- Fixed Requires/Provides correctly (#216100#c14).
-* Fri Nov 03 2006 - sbrabec(a)suse.cz
+* Fri Nov 03 2006 sbrabec(a)suse.cz
- Do not provide and require internal libraries (#216100).
-* Sat Sep 30 2006 - aj(a)suse.de
+* Sat Sep 30 2006 aj(a)suse.de
- Cleanup BuildRequires.
-* Wed Feb 15 2006 - stbinner(a)suse.de
+* Wed Feb 15 2006 stbinner(a)suse.de
- fix GenericName in .desktop file
-* Wed Jan 25 2006 - mls(a)suse.de
+* Wed Jan 25 2006 mls(a)suse.de
- converted neededforbuild to BuildRequires
-* Tue Jan 24 2006 - mmarek(a)suse.cz
+* Tue Jan 24 2006 mmarek(a)suse.cz
- fix parallel build
-* Thu Jan 19 2006 - sbrabec(a)suse.cz
+* Thu Jan 19 2006 sbrabec(a)suse.cz
- Fixed build error (added dumpstack.patch from MozillaFirefox).
-* Tue Sep 27 2005 - ro(a)suse.de
+* Tue Sep 27 2005 ro(a)suse.de
- fix inplicit function declaration
-* Fri Aug 19 2005 - sbrabec(a)suse.cz
+* Fri Aug 19 2005 sbrabec(a)suse.cz
- Added gtk.patch from mozilla.
-* Tue Aug 02 2005 - sbrabec(a)suse.cz
+* Tue Aug 02 2005 sbrabec(a)suse.cz
- Updated nss-opt.patch from mozilla.
-* Thu Jun 30 2005 - sbrabec(a)suse.cz
+* Thu Jun 30 2005 sbrabec(a)suse.cz
- Updated to version 1.0.
-* Wed May 11 2005 - sbrabec(a)suse.cz
+* Wed May 11 2005 sbrabec(a)suse.cz
- Build with system nspr (#78320).
-* Tue May 10 2005 - sbrabec(a)suse.cz
+* Tue May 10 2005 sbrabec(a)suse.cz
- Do not require self-provided libraries (#78320).
-* Fri Apr 22 2005 - ro(a)suse.de
+* Fri Apr 22 2005 ro(a)suse.de
- apply mozilla-gcc4.patch
-* Sat Mar 19 2005 - ro(a)suse.de
+* Sat Mar 19 2005 ro(a)suse.de
- try to fix build
-* Fri Mar 18 2005 - sbrabec(a)suse.cz
+* Fri Mar 18 2005 sbrabec(a)suse.cz
- Do not provide mozilla libraries (#73619).
-* Thu Feb 03 2005 - sbrabec(a)suse.cz
+* Thu Feb 03 2005 sbrabec(a)suse.cz
- Build as separate package.
- Updated to version 0.80.
-* Thu Nov 18 2004 - ro(a)suse.de
+* Thu Nov 18 2004 ro(a)suse.de
- use kerberos-devel-packages
-* Fri Sep 24 2004 - stark(a)suse.de
+* Fri Sep 24 2004 stark(a)suse.de
- enabled logging for non-debug builds to be able to get some
logfiles for debugging
-* Thu Sep 23 2004 - sbrabec(a)suse.cz
+* Thu Sep 23 2004 sbrabec(a)suse.cz
- Fixed desktop file and icon.
-* Fri Sep 17 2004 - stark(a)suse.de
+* Sat Sep 18 2004 stark(a)suse.de
- added security-fix to mozilla source (doesn't affect NVU)
-* Fri Sep 17 2004 - ro(a)suse.de
+* Fri Sep 17 2004 ro(a)suse.de
- one lib64 in path is enough, change progdir
-* Wed Sep 15 2004 - ro(a)suse.de
+* Wed Sep 15 2004 ro(a)suse.de
- use version number directly
-* Wed Sep 15 2004 - sbrabec(a)suse.cz
+* Wed Sep 15 2004 sbrabec(a)suse.cz
- New SuSE package, version 0.41.
++++++ nvu-overflow.patch ++++++
--- toolkit/xre/nsAppRunner.h
+++ toolkit/xre/nsAppRunner.h
@@ -38,15 +38,7 @@
#ifndef nsAppRunner_h__
#define nsAppRunner_h__
-#ifndef MAXPATHLEN
-#ifdef _MAX_PATH
-#define MAXPATHLEN _MAX_PATH
-#elif defined(CCHMAXPATH)
-#define MAXPATHLEN CCHMAXPATH
-#else
-#define MAXPATHLEN 1024
-#endif
-#endif
+#define MAXPATHLEN 4096
#include "nscore.h"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package star
checked in at Wed Apr 30 11:58:09 CEST 2008.
--------
--- star/star.changes 2008-04-28 16:21:15.000000000 +0200
+++ /mounts/work_src_done/STABLE/star/star.changes 2008-04-29 15:29:40.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 29 15:23:56 CEST 2008 - mkoenig(a)suse.de
+
+- set version to 1.5final to avoid update problem with previous
+ version number 1.5a70.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ star.spec ++++++
--- /var/tmp/diff_new_pack.E24973/_old 2008-04-30 11:57:49.000000000 +0200
+++ /var/tmp/diff_new_pack.E24973/_new 2008-04-30 11:57:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package star (Version 1.5)
+# spec file for package star (Version 1.5final)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,9 +17,10 @@
Group: Productivity/Archiving/Backup
AutoReqProv: on
Provides: rmt
-Version: 1.5
+Version: 1.5final
Release: 1
-Source: ftp://ftp.berlios.de/pub/star/alpha/star-%{version}.tar.bz2
+%define upver 1.5
+Source: ftp://ftp.berlios.de/pub/star/alpha/star-%{upver}.tar.bz2
Source1: README-FIRST
Source2: tests.tar.bz2
Patch0: star-configuration.diff
@@ -154,6 +155,9 @@
/usr/share/man/man1/tartest.1.gz
%changelog
+* Tue Apr 29 2008 mkoenig(a)suse.de
+- set version to 1.5final to avoid update problem with previous
+ version number 1.5a70.
* Mon Apr 28 2008 skh(a)suse.de
- update to version 1.5 final (see Changelog in package documentation
for all changes)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-metapackage-handler
checked in at Wed Apr 30 11:53:41 CEST 2008.
--------
--- yast2-metapackage-handler/yast2-metapackage-handler.changes 2008-04-16 09:52:27.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-metapackage-handler/yast2-metapackage-handler.changes 2008-04-30 09:16:22.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Apr 30 09:15:18 CEST 2008 - mvidner(a)suse.cz
+
+- reviewed for autobuild
+
+-------------------------------------------------------------------
+Tue Apr 29 15:03:04 CEST 2008 - benji(a)opensuse.org
+
+- Fixed duplicated Wizard steps (bnc#384492).
+- Allow translatable repository names.
+- Disabled back button when on first step of wizard.
+- 0.8.4
+
+-------------------------------------------------------------------
Old:
----
yast2-metapackage-handler-0.8.3.tar.bz2
New:
----
yast2-metapackage-handler-0.8.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-metapackage-handler.spec ++++++
--- /var/tmp/diff_new_pack.l11789/_old 2008-04-30 11:53:37.000000000 +0200
+++ /var/tmp/diff_new_pack.l11789/_new 2008-04-30 11:53:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-metapackage-handler (Version 0.8.3)
+# spec file for package yast2-metapackage-handler (Version 0.8.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,12 +13,12 @@
Url: http://en.opensuse.org/Meta_Packages
Name: yast2-metapackage-handler
-Version: 0.8.3
+Version: 0.8.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-metapackage-handler-0.8.3.tar.bz2
+Source0: yast2-metapackage-handler-0.8.4.tar.bz2
Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig
@@ -63,7 +63,7 @@
Benjamin Weber
%prep
-%setup -n yast2-metapackage-handler-0.8.3
+%setup -n yast2-metapackage-handler-0.8.4
%if %suse_version <= 1020
%patch0
%endif
@@ -133,8 +133,14 @@
%endif
%{_datadir}/mime/packages/*.xml
%{_datadir}/applications/yast2-metapackage-handler*.desktop
-
%changelog
+* Wed Apr 30 2008 mvidner(a)suse.cz
+- reviewed for autobuild
+* Tue Apr 29 2008 benji(a)opensuse.org
+- Fixed duplicated Wizard steps (bnc#384492).
+- Allow translatable repository names.
+- Disabled back button when on first step of wizard.
+- 0.8.4
* Wed Apr 16 2008 jsrain(a)suse.cz
- merged texts from proofread
- 0.8.3
++++++ yast2-metapackage-handler-0.8.3.tar.bz2 -> yast2-metapackage-handler-0.8.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/aclocal.m4 new/yast2-metapackage-handler-0.8.4/aclocal.m4
--- old/yast2-metapackage-handler-0.8.3/aclocal.m4 2008-04-16 09:47:55.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/aclocal.m4 2008-04-29 15:08:26.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,15 +11,12 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
-You have another version of autoconf. It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -34,7 +31,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.1], [],
+m4_if([$1], [1.10], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,10 +47,8 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -146,13 +141,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 13
+# serial 12
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -257,17 +252,16 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
-_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $_am_arg | $_am_arg:* )
+ $1 | $1:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -504,7 +498,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/config.guess new/yast2-metapackage-handler-0.8.4/config.guess
--- old/yast2-metapackage-handler-0.8.3/config.guess 2008-04-16 09:47:59.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/config.guess 2008-04-29 15:08:29.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2008-01-08'
+timestamp='2006-07-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -171,7 +171,6 @@
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
- sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -340,7 +339,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ i86pc:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -542,7 +541,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -791,7 +790,7 @@
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- *:MINGW*:*)
+ i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -801,18 +800,12 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- *:Interix*:[3456]*)
- case ${UNAME_MACHINE} in
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T | authenticamd)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
- exit ;;
- esac ;;
+ x86:Interix*:[3456]*)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T:Interix*:[3456]*)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -846,17 +839,10 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- eval $set_cc_for_build
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_EABI__
- then
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
- else
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
- fi
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
@@ -974,9 +960,6 @@
x86_64:Linux:*:*)
echo x86_64-${VENDOR}-linux-gnu
exit ;;
- xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
- exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1235,15 +1218,6 @@
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
- SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux${UNAME_RELEASE}
- exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/config.sub new/yast2-metapackage-handler-0.8.4/config.sub
--- old/yast2-metapackage-handler-0.8.3/config.sub 2008-04-16 09:47:59.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/config.sub 2008-04-29 15:08:29.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2008-01-16'
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -245,12 +245,12 @@
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fido | fr30 | frv \
+ | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep \
+ | maxq | mb | microblaze | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -324,7 +324,7 @@
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -369,14 +369,10 @@
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa*-* \
+ | xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
- # Recognize the basic CPU types without company name, with glob match.
- xtensa*)
- basic_machine=$basic_machine-unknown
- ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -447,14 +443,6 @@
basic_machine=ns32k-sequent
os=-dynix
;;
- blackfin)
- basic_machine=bfin-unknown
- os=-linux
- ;;
- blackfin-*)
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -487,8 +475,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16)
- basic_machine=cr16-unknown
+ cr16c)
+ basic_machine=cr16c-unknown
os=-elf
;;
crds | unos)
@@ -680,14 +668,6 @@
basic_machine=m68k-isi
os=-sysv
;;
- m68knommu)
- basic_machine=m68k-unknown
- os=-linux
- ;;
- m68knommu-*)
- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -703,10 +683,6 @@
basic_machine=i386-pc
os=-mingw32
;;
- mingw32ce)
- basic_machine=arm-unknown
- os=-mingw32ce
- ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -833,14 +809,6 @@
basic_machine=i860-intel
os=-osf
;;
- parisc)
- basic_machine=hppa-unknown
- os=-linux
- ;;
- parisc-*)
- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
pbd)
basic_machine=sparc-tti
;;
@@ -957,9 +925,6 @@
basic_machine=sh-hitachi
os=-hms
;;
- sh5el)
- basic_machine=sh5le-unknown
- ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1049,10 +1014,6 @@
basic_machine=tic6x-unknown
os=-coff
;;
- tile*)
- basic_machine=tile-unknown
- os=-linux-gnu
- ;;
tx39)
basic_machine=mipstx39-unknown
;;
@@ -1258,7 +1219,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ | -skyos* | -haiku* | -rdos* | -toppers*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1453,9 +1414,6 @@
m68*-cisco)
os=-aout
;;
- mep-*)
- os=-elf
- ;;
mips*-cisco)
os=-elf
;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/configure new/yast2-metapackage-handler-0.8.4/configure
--- old/yast2-metapackage-handler-0.8.3/configure 2008-04-16 09:47:58.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/configure 2008-04-29 15:08:28.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-metapackage-handler 0.8.3.
+# Generated by GNU Autoconf 2.61 for yast2-metapackage-handler 0.8.4.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-metapackage-handler'
PACKAGE_TARNAME='yast2-metapackage-handler'
-PACKAGE_VERSION='0.8.3'
-PACKAGE_STRING='yast2-metapackage-handler 0.8.3'
+PACKAGE_VERSION='0.8.4'
+PACKAGE_STRING='yast2-metapackage-handler 0.8.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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-metapackage-handler 0.8.3 to adapt to many kinds of systems.
+\`configure' configures yast2-metapackage-handler 0.8.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-metapackage-handler 0.8.3:";;
+ short | recursive ) echo "Configuration of yast2-metapackage-handler 0.8.4:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-metapackage-handler configure 0.8.3
+yast2-metapackage-handler configure 0.8.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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-metapackage-handler $as_me 0.8.3, which was
+It was created by yast2-metapackage-handler $as_me 0.8.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-metapackage-handler'
- VERSION='0.8.3'
+ VERSION='0.8.4'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="0.8.3"
+VERSION="0.8.4"
RPMNAME="yast2-metapackage-handler"
MAINTAINER="Martin Vidner <mvidner(a)suse.cz>"
@@ -3311,7 +3311,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-metapackage-handler $as_me 0.8.3, which was
+This file was extended by yast2-metapackage-handler $as_me 0.8.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3354,7 +3354,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-metapackage-handler config.status 0.8.3
+yast2-metapackage-handler config.status 0.8.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/configure.in new/yast2-metapackage-handler-0.8.4/configure.in
--- old/yast2-metapackage-handler-0.8.3/configure.in 2008-04-16 09:47:47.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/configure.in 2008-04-29 15:08:24.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-metapackage-handler
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-metapackage-handler, 0.8.3, http://bugs.opensuse.org/, yast2-metapackage-handler)
+AC_INIT(yast2-metapackage-handler, 0.8.4, http://bugs.opensuse.org/, yast2-metapackage-handler)
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="0.8.3"
+VERSION="0.8.4"
RPMNAME="yast2-metapackage-handler"
MAINTAINER="Martin Vidner <mvidner(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/doc/Makefile.in new/yast2-metapackage-handler-0.8.4/doc/Makefile.in
--- old/yast2-metapackage-handler-0.8.3/doc/Makefile.in 2008-04-16 09:47:59.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/doc/Makefile.in 2008-04-29 15:08:29.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/install-sh new/yast2-metapackage-handler-0.8.4/install-sh
--- old/yast2-metapackage-handler-0.8.3/install-sh 2008-04-16 09:47:59.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/install-sh 2008-04-29 15:08:29.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2006-12-25.00
+scriptversion=2006-10-14.15
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
+doit="${DOITPROG-}"
if test -z "$doit"; then
doit_exec=exec
else
@@ -58,49 +58,34 @@
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
- test "$posix_glob" != "?" || {
- if (set -f) 2>/dev/null; then
- posix_glob=
- else
- posix_glob=:
- fi
- }
-'
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+posix_glob=
posix_mkdir=
# Desired mode of installed file.
mode=0755
-chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
+chgrpcmd=
stripcmd=
-
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
src=
dst=
dir_arg=
-dst_arg=
-
-copy_on_change=false
+dstarg=
no_target_directory=
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
@@ -110,55 +95,65 @@
In the 4th, create DIRECTORIES.
Options:
- --help display this help and exit.
- --version display version info and exit.
-
- -c (ignored)
- -C install only if different (preserve the last data modification time)
- -d create directories instead of installing files.
- -g GROUP $chgrpprog installed files to GROUP.
- -m MODE $chmodprog installed files to MODE.
- -o USER $chownprog installed files to USER.
- -s $stripprog installed files.
- -t DIRECTORY install into DIRECTORY.
- -T report an error if DSTFILE is a directory.
+-c (ignored)
+-d create directories instead of installing files.
+-g GROUP $chgrpprog installed files to GROUP.
+-m MODE $chmodprog installed files to MODE.
+-o USER $chownprog installed files to USER.
+-s $stripprog installed files.
+-t DIRECTORY install into DIRECTORY.
+-T report an error if DSTFILE is a directory.
+--help display this help and exit.
+--version display version info and exit.
Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
- RMPROG STRIPPROG
+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
"
while test $# -ne 0; do
case $1 in
- -c) ;;
-
- -C) copy_on_change=true;;
+ -c) shift
+ continue;;
- -d) dir_arg=true;;
+ -d) dir_arg=true
+ shift
+ continue;;
-g) chgrpcmd="$chgrpprog $2"
- shift;;
+ shift
+ shift
+ continue;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
+ shift
+ shift
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
- shift;;
+ continue;;
-o) chowncmd="$chownprog $2"
- shift;;
-
- -s) stripcmd=$stripprog;;
-
- -t) dst_arg=$2
- shift;;
-
- -T) no_target_directory=true;;
+ shift
+ shift
+ continue;;
+
+ -s) stripcmd=$stripprog
+ shift
+ continue;;
+
+ -t) dstarg=$2
+ shift
+ shift
+ continue;;
+
+ -T) no_target_directory=true
+ shift
+ continue;;
--version) echo "$0 $scriptversion"; exit $?;;
@@ -170,22 +165,21 @@
*) break;;
esac
- shift
done
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
- if test -n "$dst_arg"; then
+ if test -n "$dstarg"; then
# $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dst_arg"
+ set fnord "$@" "$dstarg"
shift # fnord
fi
shift # arg
- dst_arg=$arg
+ dstarg=$arg
done
fi
@@ -230,7 +224,7 @@
do
# Protect names starting with `-'.
case $src in
- -*) src=./$src;;
+ -*) src=./$src ;;
esac
if test -n "$dir_arg"; then
@@ -248,22 +242,22 @@
exit 1
fi
- if test -z "$dst_arg"; then
+ if test -z "$dstarg"; then
echo "$0: no destination specified." >&2
exit 1
fi
- dst=$dst_arg
+ dst=$dstarg
# Protect names starting with `-'.
case $dst in
- -*) dst=./$dst;;
+ -*) dst=./$dst ;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
- echo "$0: $dst_arg: Is a directory" >&2
+ echo "$0: $dstarg: Is a directory" >&2
exit 1
fi
dstdir=$dst
@@ -384,19 +378,26 @@
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix='/';;
- -*) prefix='./';;
- *) prefix='';;
+ /*) prefix=/ ;;
+ -*) prefix=./ ;;
+ *) prefix= ;;
esac
- eval "$initialize_posix_glob"
+ case $posix_glob in
+ '')
+ if (set -f) 2>/dev/null; then
+ posix_glob=true
+ else
+ posix_glob=false
+ fi ;;
+ esac
oIFS=$IFS
IFS=/
- $posix_glob set -f
+ $posix_glob && set -f
set fnord $dstdir
shift
- $posix_glob set +f
+ $posix_glob && set +f
IFS=$oIFS
prefixes=
@@ -458,54 +459,41 @@
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
- { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
- { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
- # If -C, don't bother to copy if it wouldn't change the file.
- if $copy_on_change &&
- old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
- new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
-
- eval "$initialize_posix_glob" &&
- $posix_glob set -f &&
- set X $old && old=:$2:$4:$5:$6 &&
- set X $new && new=:$2:$4:$5:$6 &&
- $posix_glob set +f &&
-
- test "$old" = "$new" &&
- $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
- then
- rm -f "$dsttmp"
- else
- # Rename the file to the real destination.
- $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
- {
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- test ! -f "$dst" ||
- $doit $rmcmd -f "$dst" 2>/dev/null ||
- { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
- } ||
- { echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
- }
- fi || exit 1
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # Now rename the file to the real destination.
+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+ || {
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ if test -f "$dst"; then
+ $doit $rmcmd -f "$dst" 2>/dev/null \
+ || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+ && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
+ || {
+ echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ else
+ :
+ fi
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ } || exit 1
trap '' 0
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/Makefile.in new/yast2-metapackage-handler-0.8.4/Makefile.in
--- old/yast2-metapackage-handler-0.8.3/Makefile.in 2008-04-16 09:47:59.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/Makefile.in 2008-04-29 15:08:30.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -389,8 +389,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -415,8 +415,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -426,12 +426,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -504,10 +505,6 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -534,8 +531,6 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -692,10 +687,10 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-generic distclean-tags distcleancheck \
- distdir distuninstallcheck dvi dvi-am html html-am info \
- info-am install install-am install-data install-data-am \
+ dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
install-data-local install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/OneClickInstall.pot new/yast2-metapackage-handler-0.8.4/OneClickInstall.pot
--- old/yast2-metapackage-handler-0.8.3/OneClickInstall.pot 2008-04-01 10:48:40.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/OneClickInstall.pot 2007-09-03 14:25:50.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-01 10:48+0200\n"
+"POT-Creation-Date: 2007-09-03 14:25+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -16,341 +16,240 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/OneClickInstallCLI.ycp:23
-msgid "Error: Nothing to do specified in the YMP file"
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:29
-msgid "If you choose to continue, the following repositories will be subscribed to:"
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:39
-msgid "If you choose to continue, the following software packages will be installed:"
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:61
-#, ycp-format
-msgid "Unable to retrieve YMP at %1"
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:73
-msgid "Adding Repositories..."
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:80
-msgid "Error: Unable to add repositories"
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:87
-msgid "Removing Packages..."
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:93
-msgid "Error: Unable to remove packages"
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:100
-msgid "Installing Patterns..."
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:106
-msgid "Error: Unable to install patterns"
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:113
-msgid "Installing Packages..."
+#. * <region name="String constants"> *
+#: src/OneClickInstallUI.ycp:50
+msgid "Select the software components you wish to install:"
msgstr ""
-#: src/OneClickInstallCLI.ycp:119
-msgid "Error: Unable to install packages"
+#: src/OneClickInstallUI.ycp:51
+msgid "Select the software components you wish to remove:"
msgstr ""
-#: src/OneClickInstallCLI.ycp:131
-msgid "Warning: Unable to remove temporarily added repositories."
+#: src/OneClickInstallUI.ycp:52
+msgid "Select the software repositories you wish to subscribe to:"
msgstr ""
-#: src/OneClickInstallCLI.ycp:134
-msgid "Finished"
+#: src/OneClickInstallUI.ycp:53
+msgid "Repository Description:"
msgstr ""
-#: src/OneClickInstallCLI.ycp:152
-msgid "Error: Must be root"
+#: src/OneClickInstallUI.ycp:54
+msgid "Package Description:"
msgstr ""
-#: src/OneClickInstallCLI.ycp:159
-msgid "One Click Install Command Line Installer"
+#: src/OneClickInstallUI.ycp:55
+msgid "Additional Software Repositories"
msgstr ""
-#: src/OneClickInstallCLI.ycp:165 src/OneClickInstallCLI.ycp:170
-msgid "Processes a YMP file, ready for installation"
+#: src/OneClickInstallUI.ycp:56
+msgid "Software to be Installed"
msgstr ""
-#: src/OneClickInstallCLI.ycp:178
-msgid "URL of .ymp file"
+#: src/OneClickInstallUI.ycp:57
+msgid "Software to be Removed"
msgstr ""
-#: src/OneClickInstallCLI.ycp:183
-msgid "File to put internal representation of YMP into"
+#: src/OneClickInstallUI.ycp:58
+msgid "Please wait while this software is being installed."
msgstr ""
-#: src/OneClickInstallCLI.ycp:188
-msgid "File containing internal representation of One Click Install instructions"
+#: src/OneClickInstallUI.ycp:59
+msgid "Software installation"
msgstr ""
-#. * <region name="String constants"> *
-#: src/OneClickInstallUI.ycp:42
+#: src/OneClickInstallUI.ycp:60
msgid "This wizard will install software onto your computer."
msgstr ""
-#: src/OneClickInstallUI.ycp:43
+#: src/OneClickInstallUI.ycp:61
msgid "See http://en.opensuse.org/MetaPackages for more information."
msgstr ""
-#: src/OneClickInstallUI.ycp:48 src/OneClickInstallWidgets.ycp:35
-msgid "Select the software components you wish to install:"
-msgstr ""
-
-#. Add the splash to the advanced steps too. Requested.
-#: src/OneClickInstallUI.ycp:71 src/OneClickInstallUI.ycp:200
-msgid "Software Description"
-msgstr ""
-
-#: src/OneClickInstallUI.ycp:72 src/OneClickInstallUI.ycp:97
-#: src/OneClickInstallUI.ycp:117 src/OneClickInstallUI.ycp:135
-#: src/OneClickInstallUI.ycp:151 src/OneClickInstallUI.ycp:168
-msgid "Installation Settings"
-msgstr ""
-
-#: src/OneClickInstallUI.ycp:73 src/OneClickInstallUI.ycp:98
-#: src/OneClickInstallUI.ycp:118 src/OneClickInstallUI.ycp:136
-#: src/OneClickInstallUI.ycp:152 src/OneClickInstallUI.ycp:169
-msgid "Perform Installation"
+#: src/OneClickInstallUI.ycp:62
+msgid "Warning:"
msgstr ""
-#: src/OneClickInstallUI.ycp:74 src/OneClickInstallUI.ycp:99
-#: src/OneClickInstallUI.ycp:119 src/OneClickInstallUI.ycp:137
-#: src/OneClickInstallUI.ycp:153 src/OneClickInstallUI.ycp:170
-msgid "Results"
+#: src/OneClickInstallUI.ycp:63
+msgid "If you choose to continue, the following changes will be made to your system"
msgstr ""
-#: src/OneClickInstallUI.ycp:95 src/OneClickInstallUI.ycp:114
-#: src/OneClickInstallUI.ycp:134
-msgid "Repositories"
+#: src/OneClickInstallUI.ycp:64
+msgid "The following repositories will be subscribed to:"
msgstr ""
-#: src/OneClickInstallUI.ycp:96 src/OneClickInstallUI.ycp:115
-#: src/OneClickInstallUI.ycp:150 src/OneClickInstallUI.ycp:166
-msgid "Software"
+#: src/OneClickInstallUI.ycp:65
+msgid "The following software items will be installed:"
msgstr ""
-#: src/OneClickInstallUI.ycp:116 src/OneClickInstallUI.ycp:167
-msgid "Removals"
+#: src/OneClickInstallUI.ycp:66
+msgid "The following software items will be REMOVED:"
msgstr ""
-#: src/OneClickInstallUI.ycp:184
-msgid "Nothing to do"
+#: src/OneClickInstallUI.ycp:67
+msgid "Unfortunately the installation has failed, see the log file at /var/log/YaST2/y2log for more information. Failure stage was: "
msgstr ""
-#. #329644
-#: src/OneClickInstallUI.ycp:256
-#, ycp-format
-msgid "%1 Installation"
+#: src/OneClickInstallUI.ycp:68
+msgid "Error Message"
msgstr ""
-#: src/OneClickInstallUI.ycp:258
-msgid "Installation Steps"
+#: src/OneClickInstallUI.ycp:69
+msgid "Installation was successful"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:15
-msgid "Additional Software Repositories"
+#: src/OneClickInstallUI.ycp:70
+msgid "Installation was only partially successful."
msgstr ""
-#: src/OneClickInstallWidgets.ycp:18
-msgid "Select the software repositories you wish to subscribe to:"
+#: src/OneClickInstallUI.ycp:71
+msgid "Installation status:"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:21
+#: src/OneClickInstallUI.ycp:72
msgid "Remain subscribed to these repositories after installation"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:32
-msgid "Software to be Installed"
-msgstr ""
-
-#: src/OneClickInstallWidgets.ycp:46
-msgid "Software to be Removed"
-msgstr ""
-
-#: src/OneClickInstallWidgets.ycp:49
-msgid "Select the software components you wish to remove:"
+#: src/OneClickInstallUI.ycp:73
+msgid "You will remain subscribed to these repositories after installation."
msgstr ""
-#: src/OneClickInstallWidgets.ycp:58
-msgid "Installation not possible"
+#: src/OneClickInstallUI.ycp:74
+msgid "These repositories will only be added during installation, you will not remain subscribed."
msgstr ""
-#: src/OneClickInstallWidgets.ycp:59
-msgid "The install link/file you opened does not contain instructions for this version of openSUSE."
+#: src/OneClickInstallUI.ycp:75
+msgid "Note:"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:68
-msgid "Please wait while this software is being installed."
+#: src/OneClickInstallUI.ycp:76
+msgid "There is nothing to do."
msgstr ""
-#: src/OneClickInstallWidgets.ycp:104
-msgid "Repository Description:"
+#: src/OneClickInstallUI.ycp:77
+msgid "Advanced mode with ability to change settings."
msgstr ""
-#: src/OneClickInstallWidgets.ycp:143 src/OneClickInstallWidgets.ycp:176
-msgid "Package Description:"
+#: src/OneClickInstallUI.ycp:78
+msgid "Welcome"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:225
-msgid ""
-"Have you reviewed the changes that will be made to your system?\n"
-"(Malicious packages could damage your system.)"
+#. %1: software package
+#: src/OneClickInstallUI.ycp:80
+#, ycp-format
+msgid "This wizard will install <b>%1</b> onto your computer."
msgstr ""
-#: src/OneClickInstallWidgets.ycp:227
-msgid "Don't ask me this again"
+#: src/OneClickInstallUI.ycp:81
+msgid "Summary"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:295
-msgid "These repositories will only be added during installation, you will not remain subscribed."
+#: src/OneClickInstallUI.ycp:82
+msgid "Description"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:298
-msgid "You will remain subscribed to these repositories after installation."
+#: src/OneClickInstallUI.ycp:83
+msgid "The following repositories could not be added"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:302
-msgid "If you choose to continue, the following changes will be made to your system"
+#: src/OneClickInstallUI.ycp:84
+msgid "The following patterns could not be installed"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:307
-msgid "Software to be REMOVED:"
+#: src/OneClickInstallUI.ycp:85
+msgid "The following packages could not be installed"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:313
-msgid "Repositories to be added:"
+#: src/OneClickInstallUI.ycp:191
+msgid "Software Description"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:314
-msgid "Note:"
+#: src/OneClickInstallUI.ycp:192 src/OneClickInstallUI.ycp:217
+#: src/OneClickInstallUI.ycp:237 src/OneClickInstallUI.ycp:255
+#: src/OneClickInstallUI.ycp:271 src/OneClickInstallUI.ycp:288
+msgid "Installation Settings"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:320
-msgid "Software to be installed:"
+#: src/OneClickInstallUI.ycp:193 src/OneClickInstallUI.ycp:218
+#: src/OneClickInstallUI.ycp:238 src/OneClickInstallUI.ycp:256
+#: src/OneClickInstallUI.ycp:272 src/OneClickInstallUI.ycp:289
+msgid "Perform Installation"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:335
-msgid "Proposal"
+#: src/OneClickInstallUI.ycp:194 src/OneClickInstallUI.ycp:219
+#: src/OneClickInstallUI.ycp:239 src/OneClickInstallUI.ycp:257
+#: src/OneClickInstallUI.ycp:273 src/OneClickInstallUI.ycp:290
+msgid "Results"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:339
-msgid "Customise"
+#: src/OneClickInstallUI.ycp:215 src/OneClickInstallUI.ycp:234
+#: src/OneClickInstallUI.ycp:254
+msgid "Repositories"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:392
-msgid "Software installation"
+#: src/OneClickInstallUI.ycp:216 src/OneClickInstallUI.ycp:235
+#: src/OneClickInstallUI.ycp:270 src/OneClickInstallUI.ycp:286
+msgid "Software"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:402
-msgid "Installation was successful"
+#: src/OneClickInstallUI.ycp:236 src/OneClickInstallUI.ycp:287
+msgid "Removals"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:406
-msgid "Installation was only partially successful."
+#: src/OneClickInstallUI.ycp:304
+msgid "Nothing to do"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:410
-msgid "Unfortunately the installation has failed, see the log file at /var/log/YaST2/y2log for more information. Failure stage was: "
+#: src/OneClickInstallUI.ycp:389
+msgid "Installation Steps"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:411
-msgid "Error Message"
+#: src/OneClickInstallUI.ycp:509
+msgid ""
+"Have you reviewed the changes that will be made to your system?\n"
+"\n"
+"Malicious packages could damage your system."
msgstr ""
-#: src/OneClickInstallWidgets.ycp:416
-msgid "The following repositories could not be added"
+#: src/OneClickInstallWorker.ycp:81
+msgid "An error occurred while creating the installation source."
msgstr ""
-#: src/OneClickInstallWidgets.ycp:426
-msgid "The following patterns could not be installed"
+#: src/OneClickInstallWorker.ycp:81
+msgid "Details:"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:436
-msgid "The following packages could not be installed"
+#: src/OneClickInstallWorker.ycp:81
+msgid "Try again?"
msgstr ""
-#: src/OneClickInstallWorker.ycp:35
+#: src/OneClickInstallWorker.ycp:237
msgid "An error occurred while attempting to subscribe to the required repositories. Please review the yast2 logs for more information."
msgstr ""
-#: src/OneClickInstallWorker.ycp:54
+#: src/OneClickInstallWorker.ycp:248
msgid "An error occurred while attempting to remove the specified packages. Please review the yast2 logs for more information."
msgstr ""
-#: src/OneClickInstallWorker.ycp:67
+#: src/OneClickInstallWorker.ycp:259
msgid "An error occurred while attempting to install the specified patterns. Please review the yast2 logs for more information."
msgstr ""
-#: src/OneClickInstallWorker.ycp:79
+#: src/OneClickInstallWorker.ycp:270
msgid "An error occurred while attempting to install the specified packages. Please review the yast2 logs for more information."
msgstr ""
-#: src/OneClickInstallWorker.ycp:94
+#: src/OneClickInstallWorker.ycp:281
msgid "An error occurred while attempting to unsubscribe from the repositories that were used to perform the installation. You can remove them manually in YaST > Software Repositories. Please review the yast2 logs for more information."
msgstr ""
-#: src/OneClickInstallWorker.ycp:103
+#: src/OneClickInstallWorker.ycp:289
msgid "No error occurred."
msgstr ""
-#: src/OneClickInstallWorkerFunctions.ycp:88
-msgid "Loading Package Management"
-msgstr ""
-
-#: src/OneClickInstallWorkerFunctions.ycp:93
-#, ycp-format
-msgid "Adding repository %1"
-msgstr ""
-
-#: src/OneClickInstallWorkerFunctions.ycp:109
-msgid "An error occurred while initializing the software repository."
-msgstr ""
-
-#: src/OneClickInstallWorkerFunctions.ycp:109
-msgid "Details:"
-msgstr ""
-
-#: src/OneClickInstallWorkerFunctions.ycp:109
-msgid "Try again?"
-msgstr ""
-
-#: src/OneClickInstallWorkerFunctions.ycp:143
-#, ycp-format
-msgid "Marking package %1 for installation"
-msgstr ""
-
-#: src/OneClickInstallWorkerFunctions.ycp:146
-#, ycp-format
-msgid "Warning: package %1 could not be installed."
-msgstr ""
-
-#: src/OneClickInstallWorkerFunctions.ycp:156
-msgid "Performing Installation..."
-msgstr ""
-
-#: src/OneClickInstallWorkerFunctions.ycp:184
-#, ycp-format
-msgid "Warning: pattern %1 could not be installed."
-msgstr ""
-
#: src/OneClickInstallWorkerResponse.ycp:7
msgid "unknown"
msgstr ""
#: src/OneClickInstallWorkerResponse.ycp:8
-msgid "Administrator (root) privileges are required, either they were not supplied or an unknown error occurred."
+msgid "An unknown error occurred."
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/src/Makefile.in new/yast2-metapackage-handler-0.8.4/src/Makefile.in
--- old/yast2-metapackage-handler-0.8.3/src/Makefile.in 2008-04-16 09:47:59.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/src/Makefile.in 2008-04-29 15:08:29.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/src/OneClickInstallUI.ycp new/yast2-metapackage-handler-0.8.4/src/OneClickInstallUI.ycp
--- old/yast2-metapackage-handler-0.8.3/src/OneClickInstallUI.ycp 2008-04-16 09:33:41.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/src/OneClickInstallUI.ycp 2008-04-29 15:00:33.000000000 +0200
@@ -251,7 +251,7 @@
define void SetupWizard()
{
- Wizard::OpenNextBackStepsDialog();
+ UI::WizardCommand(`DeleteSteps());
Wizard::SetDesktopIcon("sw_single"); // #329644
Wizard::SetContents (sformat(_("%1 Installation"),OneClickInstall::GetName()), `Empty(), HELP_TEXT, true, true);
@@ -261,6 +261,7 @@
UI::WizardCommand(`AddStep( step["label"]:"", step["id"]:"" ) );
});
}
+ Wizard::OpenNextBackStepsDialog();
SetupWizard();
@@ -283,6 +284,14 @@
define void show_step(integer no)
{
+ if (no == 0)
+ {
+ Wizard::DisableBackButton();
+ } else
+ {
+ Wizard::EnableBackButton();
+ }
+
string current_id = (installation_steps[ no ]:nil)["id"]:"";
if (is_done(no))
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/src/OneClickInstall.ycp new/yast2-metapackage-handler-0.8.4/src/OneClickInstall.ycp
--- old/yast2-metapackage-handler-0.8.3/src/OneClickInstall.ycp 2008-01-08 17:40:02.000000000 +0100
+++ new/yast2-metapackage-handler-0.8.4/src/OneClickInstall.ycp 2008-04-29 15:00:33.000000000 +0200
@@ -151,8 +151,14 @@
if (recommended != "false")
recommended = "true";
- //Find the name of this repository
- string name = YPX::SelectValue(xml,THIS_REPO_XPATH + "name");
+
+ //Get the name in our language
+ string name = YPX::SelectValue(xml,THIS_REPO_XPATH + "name[@lang='" + Language::language + "']");
+ //If that failed, try without a language
+ if (name == "")
+ name = YPX::SelectValue(xml,THIS_REPO_XPATH + "name[not(@lang)]");
+
+
//Find the summary of this repository, in our language.
string summary = YPX::SelectValue(xml,THIS_REPO_XPATH + "summary[@lang='"+ Language::language +"']");
//If that failed, try without a language.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/VERSION new/yast2-metapackage-handler-0.8.4/VERSION
--- old/yast2-metapackage-handler-0.8.3/VERSION 2008-04-16 09:34:36.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/VERSION 2008-04-29 15:04:46.000000000 +0200
@@ -1 +1 @@
-0.8.3
+0.8.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-instserver
checked in at Wed Apr 30 11:53:28 CEST 2008.
--------
--- yast2-instserver/yast2-instserver.changes 2008-04-29 17:10:43.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-instserver/yast2-instserver.changes 2008-04-30 07:20:42.291121000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 30 07:18:44 CEST 2008 - lslezak(a)suse.cz
+
+- fixed .spec file (removed left over agent files)
+- 2.16.5
+
+-------------------------------------------------------------------
Old:
----
yast2-instserver-2.16.4.tar.bz2
New:
----
yast2-instserver-2.16.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-instserver.spec ++++++
--- /var/tmp/diff_new_pack.lc9918/_old 2008-04-30 11:53:14.000000000 +0200
+++ /var/tmp/diff_new_pack.lc9918/_new 2008-04-30 11:53:14.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-instserver (Version 2.16.4)
+# spec file for package yast2-instserver (Version 2.16.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,12 +13,12 @@
Url: http://www.suse.com/
Name: yast2-instserver
-Version: 2.16.4
+Version: 2.16.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-instserver-2.16.4.tar.bz2
+Source0: yast2-instserver-2.16.5.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-slp yast2-testsuite
# ag_content agent
@@ -40,7 +40,7 @@
Anas Nashif <nashif(a)suse.de>
%prep
-%setup -n yast2-instserver-2.16.4
+%setup -n yast2-instserver-2.16.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,11 +73,12 @@
%doc %{prefix}/share/doc/packages/yast2-instserver
/etc/YaST2/instserver
/etc/apache2/conf.d/inst_server.conf.in
-/usr/share/YaST2/scrconf/*.scr
-/usr/lib/YaST2/servers_non_y2/ag_*
%dir /etc/apache2
%dir /etc/apache2/conf.d
%changelog
+* Wed Apr 30 2008 lslezak(a)suse.cz
+- fixed .spec file (removed left over agent files)
+- 2.16.5
* Tue Apr 29 2008 lslezak(a)suse.cz
- ag_content agent moved to yast2.rpm (bnc#339126)
- 2.16.4
++++++ yast2-instserver-2.16.4.tar.bz2 -> yast2-instserver-2.16.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.16.4/configure new/yast2-instserver-2.16.5/configure
--- old/yast2-instserver-2.16.4/configure 2008-04-29 17:10:09.000000000 +0200
+++ new/yast2-instserver-2.16.5/configure 2008-04-30 07:20:10.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-instserver 2.16.4.
+# Generated by GNU Autoconf 2.61 for yast2-instserver 2.16.5.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-instserver'
PACKAGE_TARNAME='yast2-instserver'
-PACKAGE_VERSION='2.16.4'
-PACKAGE_STRING='yast2-instserver 2.16.4'
+PACKAGE_VERSION='2.16.5'
+PACKAGE_STRING='yast2-instserver 2.16.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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-instserver 2.16.4 to adapt to many kinds of systems.
+\`configure' configures yast2-instserver 2.16.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-instserver 2.16.4:";;
+ short | recursive ) echo "Configuration of yast2-instserver 2.16.5:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-instserver configure 2.16.4
+yast2-instserver configure 2.16.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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-instserver $as_me 2.16.4, which was
+It was created by yast2-instserver $as_me 2.16.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-instserver'
- VERSION='2.16.4'
+ VERSION='2.16.5'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.4"
+VERSION="2.16.5"
RPMNAME="yast2-instserver"
MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>"
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-instserver $as_me 2.16.4, which was
+This file was extended by yast2-instserver $as_me 2.16.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-instserver config.status 2.16.4
+yast2-instserver config.status 2.16.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.16.4/configure.in new/yast2-instserver-2.16.5/configure.in
--- old/yast2-instserver-2.16.4/configure.in 2008-04-29 17:10:04.000000000 +0200
+++ new/yast2-instserver-2.16.5/configure.in 2008-04-30 07:20:05.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-instserver, 2.16.4, http://bugs.opensuse.org/, yast2-instserver)
+AC_INIT(yast2-instserver, 2.16.5, http://bugs.opensuse.org/, yast2-instserver)
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.16.4"
+VERSION="2.16.5"
RPMNAME="yast2-instserver"
MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.16.4/VERSION new/yast2-instserver-2.16.5/VERSION
--- old/yast2-instserver-2.16.4/VERSION 2008-04-29 17:09:15.000000000 +0200
+++ new/yast2-instserver-2.16.5/VERSION 2008-04-30 07:18:39.000000000 +0200
@@ -1 +1 @@
-2.16.4
+2.16.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-installation
checked in at Wed Apr 30 11:53:05 CEST 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-04-28 17:50:51.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2008-04-30 10:26:24.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Apr 30 10:24:19 CEST 2008 - locilka(a)suse.cz
+
+- Making automatic installation more robust (bnc #384972).
+- 2.16.42
+
+-------------------------------------------------------------------
+Tue Apr 29 12:59:49 CEST 2008 - locilka(a)suse.cz
+
+- Disabling Progress when calling inst_finish scripts.
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.16.41.tar.bz2
New:
----
yast2-installation-2.16.42.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.rd9222/_old 2008-04-30 11:52:57.000000000 +0200
+++ /var/tmp/diff_new_pack.rd9222/_new 2008-04-30 11:52:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.16.41)
+# spec file for package yast2-installation (Version 2.16.42)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-installation
-Version: 2.16.41
+Version: 2.16.42
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.16.41.tar.bz2
+Source0: yast2-installation-2.16.42.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# PackageCallbacks::RegisterEmptyProgressCallbacks()
@@ -107,7 +107,7 @@
Lukas Ocilka <locilka(a)suse.cz>
%prep
-%setup -n yast2-installation-2.16.41
+%setup -n yast2-installation-2.16.42
%build
%{prefix}/bin/y2tool y2autoconf
@@ -173,6 +173,11 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Wed Apr 30 2008 locilka(a)suse.cz
+- Making automatic installation more robust (bnc #384972).
+- 2.16.42
+* Tue Apr 29 2008 locilka(a)suse.cz
+- Disabling Progress when calling inst_finish scripts.
* Mon Apr 28 2008 locilka(a)suse.cz
- Handling KDE3 vs KDE4 in default logon and window managers
(bnc #381821).
++++++ yast2-installation-2.16.41.tar.bz2 -> yast2-installation-2.16.42.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.41/src/clients/inst_automatic_configuration.ycp new/yast2-installation-2.16.42/src/clients/inst_automatic_configuration.ycp
--- old/yast2-installation-2.16.41/src/clients/inst_automatic_configuration.ycp 2008-04-22 18:52:44.000000000 +0200
+++ new/yast2-installation-2.16.42/src/clients/inst_automatic_configuration.ycp 2008-04-30 10:29:50.000000000 +0200
@@ -140,8 +140,15 @@
current_sub_step = current_sub_step + 1;
current_step = current_step + 1;
- UI::ChangeWidget (`id ("one_set_progress"), `Value, current_sub_step);
- UI::ChangeWidget (`id ("autoconf_progress"), `Value, current_step);
+ if (UI::WidgetExists (`id ("one_set_progress")))
+ UI::ChangeWidget (`id ("one_set_progress"), `Value, current_sub_step);
+ else
+ y2error ("Widget one_set_progress doesn't exist");
+
+ if (UI::WidgetExists (`id ("autoconf_progress")))
+ UI::ChangeWidget (`id ("autoconf_progress"), `Value, current_step);
+ else
+ y2error ("Widget autoconf_progress doesn't exist");
}
void DummyFunction () {
@@ -251,18 +258,28 @@
foreach (map one_autoconf_call, proposal_scripts_to_call, {
string type = one_autoconf_call["type"]:"";
+ integer nr_of_steps = ((one_autoconf_call["type"]:"" == "proposals" ? 2:1) * size (one_autoconf_call["items"]:[]));
+ string label = one_autoconf_call["label"]:_("Automatic configuration...");
+
+ y2milestone ("Steps: %1, Label: %2", nr_of_steps, label);
+
// reset the faster prgress
current_sub_step = 0;
- UI::ReplaceWidget (`id ("rp_one_set_progress"),
- `ProgressBar (
- `id ("one_set_progress"),
- one_autoconf_call["label"]:_("Automatic configuration..."),
- ((one_autoconf_call["type"]:"" == "proposals" ? 2:1) * size (one_autoconf_call["items"]:[])),
- 0
- )
- );
- y2milestone ("Steps: %1", ((one_autoconf_call["type"]:"" == "proposals" ? 2:1) * size (one_autoconf_call["items"]:[])));
- y2milestone ("Label: %1", one_autoconf_call["label"]:_("Automatic configuration..."));
+ if (UI::WidgetExists (`id ("rp_one_set_progress"))) {
+ UI::ReplaceWidget (`id ("rp_one_set_progress"),
+ `ProgressBar (
+ `id ("one_set_progress"),
+ label,
+ nr_of_steps,
+ 0
+ )
+ );
+ } else {
+ y2error ("Widget rp_one_set_progress doesn't exist! Cannot provide useful progress...");
+ y2warning ("---------------------- UI DUMP ----------------------");
+ UI::DumpWidgetTree();
+ y2warning ("---------------------- UI DUMP ----------------------");
+ }
switch (type) {
case "scripts":
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.41/src/clients/inst_extrasources.ycp new/yast2-installation-2.16.42/src/clients/inst_extrasources.ycp
--- old/yast2-installation-2.16.41/src/clients/inst_extrasources.ycp 2008-04-28 15:49:52.000000000 +0200
+++ new/yast2-installation-2.16.42/src/clients/inst_extrasources.ycp 2008-04-29 18:32:42.000000000 +0200
@@ -23,6 +23,7 @@
import "ProductFeatures";
// We need the constructor
import "ProductControl";
+import "Installation";
/**
* Returns list of maps of repositories to register. See bnc #381360.
@@ -137,7 +138,7 @@
Pkg::SourceStartManager (false);
// to initialize target because of installed products
- return (Pkg::TargetInit ("/", false) == true);
+ return (Pkg::TargetInit (Installation::destdir, false) == true);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.41/src/clients/inst_finish.ycp new/yast2-installation-2.16.42/src/clients/inst_finish.ycp
--- old/yast2-installation-2.16.41/src/clients/inst_finish.ycp 2008-04-17 11:08:36.000000000 +0200
+++ new/yast2-installation-2.16.42/src/clients/inst_finish.ycp 2008-04-29 13:00:56.000000000 +0200
@@ -6,7 +6,7 @@
* Arvin Schnell <arvin(a)suse.de>
* Jiri Srain <jsrain(a)suse.de>
*
- * $Id: inst_finish.ycp 46602 2008-04-14 14:57:13Z locilka $
+ * $Id: inst_finish.ycp 47153 2008-04-29 11:00:56Z locilka $
*
* Writes:
* [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot
@@ -190,7 +190,9 @@
y2milestone ("Calling inst_finish script: %1 (Info)", s);
// TODO: check if client exists
// client doesn't need to exist on purpose
+ boolean orig = Progress::set (false);
map info = (map)WFM::CallFunction (s, ["Info"]);
+ Progress::set (orig);
if (info == nil) {
y2error ("Client %1 returned invalid data", s);
@@ -257,7 +259,11 @@
}
if (haskey (step, "title"))
Progress::Title (step["title"]:"");
+
+ boolean orig = Progress::set (false);
WFM::CallFunction (step["client"]:"", ["Write"]);
+ Progress::set (orig);
+
if (UI::PollInput () == `abort && Popup::ConfirmAbort (`incomplete))
{
aborted = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.41/VERSION new/yast2-installation-2.16.42/VERSION
--- old/yast2-installation-2.16.41/VERSION 2008-04-28 15:58:35.000000000 +0200
+++ new/yast2-installation-2.16.42/VERSION 2008-04-30 10:24:08.000000000 +0200
@@ -1 +1 @@
-2.16.41
+2.16.42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package aufs
checked in at Wed Apr 30 11:50:22 CEST 2008.
--------
--- aufs/aufs.changes 2008-04-16 22:24:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/aufs/aufs.changes 2008-04-30 07:26:40.635420000 +0200
@@ -1,0 +2,5 @@
+Tue Apr 29 22:19:41 CEST 2008 - jeffm(a)suse.com
+
+- update to CVS 2008-04-29, new 2.6.25 API
+
+-------------------------------------------------------------------
Old:
----
aufs-2.6.25-api.diff
aufs-cvs20080324.tar.bz2
New:
----
aufs-cvs20080429.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aufs.spec ++++++
--- /var/tmp/diff_new_pack.bO2928/_old 2008-04-30 11:49:48.000000000 +0200
+++ /var/tmp/diff_new_pack.bO2928/_new 2008-04-30 11:49:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package aufs (Version cvs20080324)
+# spec file for package aufs (Version cvs20080429)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,16 +17,14 @@
BuildRequires: e2fsprogs-devel kernel-source kernel-syms module-init-tools
License: GPL v2 or later
Group: System/Filesystems
-Version: cvs20080324
-Release: 11
+Version: cvs20080429
+Release: 1
Source0: aufs-%{version}.tar.bz2
Source100: preamble
Patch0: aa-hack
Patch1: local.mk-fix
Patch2: aufs-stack-protect-stub.diff
-Patch3: aufs-2.6.25-api.diff
-Patch4: aufs-fsetattr
-# Patch3: aufs-cvs20071112.dif
+Patch3: aufs-fsetattr
Url: http://aufs.sf.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Utilities to Manipulate aufs Components
@@ -66,14 +64,13 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
export EXTRA_CFLAGS="$RPM_OPT_FLAGS"
mkdir -p obj || true
for flavor in %flavors_to_build; do
rm -rf obj/$flavor
- cp -r fs/aufs obj/$flavor
+ cp -r fs/aufs25 obj/$flavor
# export KFLAVOR=$flavor
# export KBUILD_EXTMOD=`pwd`/obj/$flavor
make -f local.mk KDIR=/usr/src/linux-obj/%_target_cpu/$flavor \
@@ -105,6 +102,8 @@
/usr/share/man/man?/*
%changelog
+* Wed Apr 30 2008 jeffm(a)suse.com
+- update to CVS 2008-04-29, new 2.6.25 API
* Thu Apr 17 2008 jeffm(a)suse.com
- Added fix for ia_file/fsetattr changes
* Fri Mar 28 2008 jeffm(a)suse.com
++++++ aa-hack ++++++
--- /var/tmp/diff_new_pack.bO2928/_old 2008-04-30 11:49:48.000000000 +0200
+++ /var/tmp/diff_new_pack.bO2928/_new 2008-04-30 11:49:48.000000000 +0200
@@ -1,62 +1,61 @@
---- aufs/fs/aufs/vfsub.c
-+++ aufs/fs/aufs/vfsub.c
-@@ -779,7 +779,7 @@
- if (!IS_IMMUTABLE(h_inode) && !IS_APPEND(h_inode)) {
- vfsub_ignore(a->vargs);
- lockdep_off();
-- *a->errp = notify_change(a->h_dentry, a->ia);
-+ *a->errp = notify_change(a->h_dentry, 0, a->ia);
- lockdep_on();
- if (!*a->errp)
- au_update_fuse_h_inode(NULL, a->h_dentry); /*ignore*/
---- aufs/fs/aufs/vfsub.c
-+++ aufs/fs/aufs/vfsub.c
-@@ -345,7 +345,7 @@
+From: Jeff Mahoney <jeffm(a)suse.com>
+Subject: aufs: AppArmor compatibility
+
+ This patch adds NULL vfsmounts for AppArmor enabled kernels.
+
+Signed-off-by: Jeff Mahoney <jeffm(a)suse.com>
+---
+ fs/aufs25/vfsub.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+--- a/fs/aufs25/vfsub.c
++++ b/fs/aufs25/vfsub.c
+@@ -57,7 +57,7 @@ int do_vfsub_symlink(struct inode *dir,
dir->i_ino, AuDLNPair(dentry), symname, mode);
IMustLock(dir);
- err = vfs_symlink(dir, dentry, symname, mode);
-+ err = vfs_symlink(dir, dentry, 0, symname, mode);
++ err = vfs_symlink(dir, dentry, NULL, symname, mode);
if (!err) {
/* dir inode is locked */
au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
-@@ -363,7 +363,7 @@
+@@ -74,7 +74,7 @@ int do_vfsub_mknod(struct inode *dir, st
LKTRTrace("i%lu, %.*s, 0x%x\n", dir->i_ino, AuDLNPair(dentry), mode);
IMustLock(dir);
- err = vfs_mknod(dir, dentry, mode, dev);
-+ err = vfs_mknod(dir, dentry, 0, mode, dev);
++ err = vfs_mknod(dir, dentry, NULL, mode, dev);
if (!err) {
/* dir inode is locked */
au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
-@@ -383,7 +383,7 @@
+@@ -93,7 +93,7 @@ int do_vfsub_link(struct dentry *src_den
IMustLock(dir);
lockdep_off();
- err = vfs_link(src_dentry, dir, dentry);
-+ err = vfs_link(src_dentry, 0, dir, dentry, 0);
++ err = vfs_link(src_dentry, NULL, dir, dentry, 0);
lockdep_on();
if (!err) {
LKTRTrace("src_i %p, dst_i %p\n",
-@@ -410,7 +410,7 @@
+@@ -119,7 +119,7 @@ int do_vfsub_rename(struct inode *src_di
IMustLock(src_dir);
lockdep_off();
- err = vfs_rename(src_dir, src_dentry, dir, dentry);
-+ err = vfs_rename(src_dir, src_dentry, 0, dir, dentry, 0);
++ err = vfs_rename(src_dir, src_dentry, NULL, dir, dentry, 0);
lockdep_on();
if (!err) {
/* dir inode is locked */
-@@ -429,7 +429,7 @@
+@@ -137,7 +137,7 @@ int do_vfsub_mkdir(struct inode *dir, st
LKTRTrace("i%lu, %.*s, 0x%x\n", dir->i_ino, AuDLNPair(dentry), mode);
IMustLock(dir);
- err = vfs_mkdir(dir, dentry, mode);
-+ err = vfs_mkdir(dir, dentry, 0, mode);
++ err = vfs_mkdir(dir, dentry, NULL, mode);
if (!err) {
/* dir inode is locked */
au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
-@@ -446,7 +446,7 @@
+@@ -154,7 +154,7 @@ int do_vfsub_rmdir(struct inode *dir, st
IMustLock(dir);
lockdep_off();
@@ -65,7 +64,7 @@
lockdep_on();
/* dir inode is locked */
if (!err)
-@@ -463,7 +463,7 @@
+@@ -171,7 +171,7 @@ int do_vfsub_unlink(struct inode *dir, s
/* vfs_unlink() locks inode */
lockdep_off();
@@ -74,3 +73,12 @@
lockdep_on();
/* dir inode is locked */
if (!err)
+@@ -402,7 +402,7 @@ static void call_notify_change(void *arg
+ if (!IS_IMMUTABLE(h_inode) && !IS_APPEND(h_inode)) {
+ vfsub_ignore(a->vargs);
+ lockdep_off();
+- *a->errp = notify_change(a->h_dentry, a->ia);
++ *a->errp = notify_change(a->h_dentry, NULL, a->ia);
+ lockdep_on();
+ if (!*a->errp)
+ au_update_fuse_h_inode(NULL, a->h_dentry); /*ignore*/
++++++ aufs-cvs20080324.tar.bz2 -> aufs-cvs20080429.tar.bz2 ++++++
++++ 58147 lines of diff (skipped)
++++++ aufs-fsetattr ++++++
--- /var/tmp/diff_new_pack.bO2928/_old 2008-04-30 11:49:51.000000000 +0200
+++ /var/tmp/diff_new_pack.bO2928/_new 2008-04-30 11:49:51.000000000 +0200
@@ -8,34 +8,34 @@
Signed-off-by: Jeff Mahoney <jeffm(a)suse.com>
---
- fs/aufs/dir.c | 1 +
- fs/aufs/f_op.c | 1 +
- fs/aufs/i_op.c | 26 ++++++++++++++------------
- fs/aufs/inode.h | 1 +
- fs/aufs/misc.c | 5 ++---
- fs/aufs/vfsub.c | 13 ++++++++++---
- fs/aufs/vfsub.h | 2 ++
+ fs/aufs25/dir.c | 1 +
+ fs/aufs25/f_op.c | 1 +
+ fs/aufs25/i_op.c | 26 ++++++++++++++------------
+ fs/aufs25/inode.h | 1 +
+ fs/aufs25/misc.c | 5 ++---
+ fs/aufs25/vfsub.c | 13 ++++++++++---
+ fs/aufs25/vfsub.h | 2 ++
7 files changed, 31 insertions(+), 18 deletions(-)
---- a/fs/aufs/dir.c
-+++ b/fs/aufs/dir.c
-@@ -573,4 +573,5 @@ struct file_operations aufs_dir_fop = {
+--- a/fs/aufs25/dir.c
++++ b/fs/aufs25/dir.c
+@@ -570,4 +570,5 @@ struct file_operations aufs_dir_fop = {
.release = aufs_release_dir,
.flush = aufs_flush,
.fsync = aufs_fsync_dir,
+ .fsetattr = aufs_fsetattr,
};
---- a/fs/aufs/f_op.c
-+++ b/fs/aufs/f_op.c
-@@ -880,4 +880,5 @@ struct file_operations aufs_file_fop = {
+--- a/fs/aufs25/f_op.c
++++ b/fs/aufs25/f_op.c
+@@ -658,4 +658,5 @@ struct file_operations aufs_file_fop = {
.splice_write = aufs_splice_write,
.splice_read = aufs_splice_read,
#endif
+ .fsetattr = aufs_fsetattr,
};
---- a/fs/aufs/i_op.c
-+++ b/fs/aufs/i_op.c
-@@ -622,7 +622,8 @@ static long aufs_fallocate(struct inode
+--- a/fs/aufs25/i_op.c
++++ b/fs/aufs25/i_op.c
+@@ -608,7 +608,8 @@ static long aufs_fallocate(struct inode
}
#endif
@@ -45,7 +45,7 @@
{
int err;
struct inode *inode;
-@@ -630,7 +631,6 @@ static int aufs_setattr(struct dentry *d
+@@ -616,7 +617,6 @@ static int aufs_setattr(struct dentry *d
struct vfsub_args vargs;
struct super_block *sb;
__u32 events;
@@ -53,7 +53,7 @@
loff_t sz;
struct au_icpup_args rargs;
-@@ -641,13 +641,8 @@ static int aufs_setattr(struct dentry *d
+@@ -627,13 +627,8 @@ static int aufs_setattr(struct dentry *d
sb = dentry->d_sb;
si_read_lock(sb, AuLock_FLUSH);
@@ -63,12 +63,12 @@
- file = ia->ia_file;
+ if (file)
fi_write_lock(file);
-- ia->ia_file = au_h_fptr(file);
+- ia->ia_file = au_h_fptr(file, au_fbstart(file));
- }
sz = -1;
if ((ia->ia_valid & ATTR_SIZE)
-@@ -785,16 +780,23 @@ static int aufs_setattr(struct dentry *d
+@@ -679,16 +674,23 @@ static int aufs_setattr(struct dentry *d
}
di_write_unlock(dentry);
out:
@@ -93,12 +93,12 @@
+ return aufs_do_setattr(file->f_dentry, ia, file);
+}
+
- /* currently, for fuse only */
- #ifdef CONFIG_AUFS_WORKAROUND_FUSE
- static int aufs_getattr(struct vfsmount *mnt, struct dentry *dentry,
---- a/fs/aufs/inode.h
-+++ b/fs/aufs/inode.h
-@@ -55,6 +55,7 @@ int aufs_read_inode(struct inode *inode)
+ /* ---------------------------------------------------------------------- */
+
+ static int h_readlink(struct dentry *dentry, int bindex, char __user *buf,
+--- a/fs/aufs25/inode.h
++++ b/fs/aufs25/inode.h
+@@ -65,6 +65,7 @@ int au_test_h_perm_sio(struct inode *h_i
/* i_op.c */
extern struct inode_operations aufs_iop, aufs_symlink_iop, aufs_dir_iop;
@@ -106,24 +106,24 @@
/* au_wr_dir flags */
#define AuWrDir_ADD_ENTRY 1
---- a/fs/aufs/misc.c
-+++ b/fs/aufs/misc.c
-@@ -266,10 +266,9 @@ int au_copy_file(struct file *dst, struc
+--- a/fs/aufs25/misc.c
++++ b/fs/aufs25/misc.c
+@@ -286,10 +286,9 @@ int au_copy_file(struct file *dst, struc
} while (err == -EAGAIN || err == -EINTR);
if (err == 1) {
ia->ia_size = dst->f_pos;
- ia->ia_valid = ATTR_SIZE | ATTR_FILE;
- ia->ia_file = dst;
+ ia->ia_valid = ATTR_SIZE;
- vfsub_i_lock_nested(h_i, AuLsc_I_CHILD2);
+ mutex_lock_nested(&h_i->i_mutex, AuLsc_I_CHILD2);
- err = vfsub_notify_change(h_d, ia, &vargs);
+ err = vfsub_fnotify_change(h_d, ia, &vargs, dst);
- vfsub_i_unlock(h_i);
+ mutex_unlock(&h_i->i_mutex);
}
}
---- a/fs/aufs/vfsub.c
-+++ b/fs/aufs/vfsub.c
-@@ -1119,6 +1119,7 @@ struct notify_change_args {
+--- a/fs/aufs25/vfsub.c
++++ b/fs/aufs25/vfsub.c
+@@ -463,6 +463,7 @@ struct notify_change_args {
struct dentry *h_dentry;
struct iattr *ia;
struct vfsub_args *vargs;
@@ -131,18 +131,18 @@
};
static void call_notify_change(void *args)
-@@ -1135,7 +1136,7 @@ static void call_notify_change(void *arg
+@@ -479,7 +480,7 @@ static void call_notify_change(void *arg
if (!IS_IMMUTABLE(h_inode) && !IS_APPEND(h_inode)) {
vfsub_ignore(a->vargs);
lockdep_off();
-- *a->errp = notify_change(a->h_dentry, 0, a->ia);
-+ *a->errp = fnotify_change(a->h_dentry, 0, a->ia, a->file);
+- *a->errp = notify_change(a->h_dentry, NULL, a->ia);
++ *a->errp = fnotify_change(a->h_dentry, NULL, a->ia, a->file);
lockdep_on();
if (!*a->errp)
au_update_fuse_h_inode(NULL, a->h_dentry); /*ignore*/
-@@ -1145,8 +1146,8 @@ static void call_notify_change(void *arg
- AuTraceErr(*a->errp);
+@@ -510,8 +511,8 @@ static void vfsub_notify_change_dlgt(str
}
+ #endif
-int vfsub_notify_change(struct dentry *dentry, struct iattr *ia,
- struct vfsub_args *vargs)
@@ -151,7 +151,7 @@
{
int err;
struct notify_change_args args = {
-@@ -1173,6 +1174,12 @@ int vfsub_notify_change(struct dentry *d
+@@ -527,6 +528,12 @@ int vfsub_notify_change(struct dentry *d
return err;
}
@@ -164,9 +164,9 @@
/* ---------------------------------------------------------------------- */
struct unlink_args {
---- a/fs/aufs/vfsub.h
-+++ b/fs/aufs/vfsub.h
-@@ -613,6 +613,8 @@ int vfsub_sio_rmdir(struct inode *dir, s
+--- a/fs/aufs25/vfsub.h
++++ b/fs/aufs25/vfsub.h
+@@ -483,6 +483,8 @@ int vfsub_sio_rmdir(struct inode *dir, s
/* ---------------------------------------------------------------------- */
++++++ aufs-stack-protect-stub.diff ++++++
--- /var/tmp/diff_new_pack.bO2928/_old 2008-04-30 11:49:51.000000000 +0200
+++ /var/tmp/diff_new_pack.bO2928/_new 2008-04-30 11:49:51.000000000 +0200
@@ -1,10 +1,13 @@
-diff -rup a/fs/aufs/sysaufs.c b/fs/aufs/sysaufs.c
---- a/fs/aufs/sysaufs.c 2007-06-04 04:15:32.000000000 +0200
-+++ b/fs/aufs/sysaufs.c 2007-06-05 17:21:45.923161000 +0200
-@@ -620,3 +620,8 @@ int is_branch(struct super_block *h_sb)
- return found;
+---
+ fs/aufs25/sysaufs.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/fs/aufs25/sysaufs.c
++++ b/fs/aufs25/sysaufs.c
+@@ -572,3 +572,8 @@ void sysaufs_fin(void)
+ sysfs_remove_group(&aufs_subsys.kobj, &sysaufs_attr_group);
+ kset_unregister(&aufs_subsys);
}
- #endif
+
+#ifndef CONFIG_CC_STACKPROTECTOR
+void __stack_chk_fail(void)
++++++ local.mk-fix ++++++
--- /var/tmp/diff_new_pack.bO2928/_old 2008-04-30 11:49:51.000000000 +0200
+++ /var/tmp/diff_new_pack.bO2928/_new 2008-04-30 11:49:51.000000000 +0200
@@ -1,11 +1,16 @@
---- aufs/local.mk.orig 2007-03-27 14:44:56.000000000 +0200
-+++ aufs/local.mk 2007-05-09 13:19:07.000000000 +0200
-@@ -76,7 +76,7 @@
- test ! -e $@ && ln -s $< $@ || :
- fs/aufs/aufs.ko: FORCE
+From: Jeff M
+---
+ local.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/local.mk
++++ b/local.mk
+@@ -136,7 +136,7 @@ aufs.ko: fs/aufs/aufs.ko
+ ${TgtPath}/aufs.ko: FORCE
# @echo ${AUFS_DEF_CONFIG}
-- ${MAKE} -C ${KDIR} M=${CURDIR}/fs/aufs modules
+ @echo ${TgtPath}
+- ${MAKE} -C ${KDIR} M=${CURDIR}/${TgtPath} modules
+ ${MAKE} -C ${KDIR} M=${M} modules
- fs/aufs/Kconfig: Kconfig.in
+ ${TgtPath}/Kconfig: Kconfig.in
@cpp -undef -nostdinc -P -I${KDIR}/include $< | \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package java-1_6_0-openjdk
checked in at Wed Apr 30 11:49:02 CEST 2008.
--------
--- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2008-04-29 00:21:59.000000000 +0200
+++ /mounts/work_src_done/STABLE/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2008-04-30 09:25:54.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Apr 30 09:25:30 CEST 2008 - adrian(a)suse.de
+
+- switch to openjdk-bootstrap for all %ix86
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_6_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.c30769/_old 2008-04-30 11:47:02.000000000 +0200
+++ /var/tmp/diff_new_pack.c30769/_new 2008-04-30 11:47:02.000000000 +0200
@@ -48,7 +48,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Bootstrapping using gcj doesn't work in openSUSE so far, OpenJDK needs java-1.6:
%define gcjbootstrap 0
-%ifarch i386 ia64 ppc s390 x86_64
+%ifarch %ix86 ia64 ppc s390 x86_64
%define openjdk_bootstrap 1
%else
%define openjdk_bootstrap 0
@@ -731,6 +731,8 @@
%{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
%changelog
+* Wed Apr 30 2008 adrian(a)suse.de
+- switch to openjdk-bootstrap for all %%ix86
* Tue Apr 29 2008 ro(a)suse.de
- switch to openjdk-bootstrap for i386,ppc,x86_64
* Fri Apr 25 2008 bk(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0