openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 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
July 2008
- 1 participants
- 875 discussions
Hello community,
here is the log from the commit of package kde4-webkitpart
checked in at Fri Jul 25 16:09:23 CEST 2008.
--------
--- KDE/kde4-webkitpart/kde4-webkitpart.changes 2008-04-25 11:40:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/kde4-webkitpart/kde4-webkitpart.changes 2008-07-25 07:18:10.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jul 25 07:16:34 CEST 2008 - stbinner(a)suse.de
+
+- update to SVN r837566
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kde4-webkitpart.spec ++++++
--- /var/tmp/diff_new_pack.z12802/_old 2008-07-25 16:09:09.000000000 +0200
+++ /var/tmp/diff_new_pack.z12802/_new 2008-07-25 16:09:09.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kde4-webkitpart (Version 4.0.71.svn800669)
+# spec file for package kde4-webkitpart (Version 4.1.0.svn837566)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,8 +16,8 @@
License: LGPL v2.0 or later; LGPL v2.1 or later
Group: System/GUI/KDE
Summary: WebKit render engine for Konqueror
-Version: 4.0.71.svn800669
-Release: 2
+Version: 4.1.0.svn837566
+Release: 1
Source0: libs.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch: webkitpart-preference.diff
@@ -34,7 +34,7 @@
%prep
%setup -q -n libs
-%patch
+#%patch
%build
%cmake_kde4 -d build
@@ -62,7 +62,10 @@
/usr/share/kde4/apps/cmake/modules/FindWebKitKde.cmake
/usr/share/kde4/apps/webkitpart
/usr/share/kde4/services/webkitpart.desktop
+/usr/share/icons/hicolor/*/apps/webkit.*
%changelog
+* Fri Jul 25 2008 stbinner(a)suse.de
+- update to SVN r837566
* Fri Apr 25 2008 stbinner(a)suse.de
- initial package in abuild
++++++ libs.tar.bz2 ++++++
++++ 4536 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 openais
checked in at Fri Jul 25 16:08:57 CEST 2008.
--------
--- openais/openais.changes 2008-07-15 23:18:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/openais/openais.changes 2008-07-21 15:47:37.000000000 +0200
@@ -1,0 +2,16 @@
+Mon Jul 21 15:38:00 CEST 2008 - abeekhof(a)suse.de
+
+- Switch to the stable series of OpenAIS (Whitetank 0.80) which
+ behaves significantly better for clusters larger than 4 nodes
+- Upstream version is 0.80.3 (SVN 1551)
+- Tarball includes 8 patches backported from the development series
+ that are required to support Pacemaker. Patch summary:
+ - a generic init-script
+ - Fix DESTDIR, PREFIX and LCRSODIR
+ - Repair loading of external services
+ - Add some new calls into objdb
+ - Patch to remove segfault on the exiting of a service.
+ - Patch to allow controlled exit of a service.
+ - load and unload service engines at runtime
+
+-------------------------------------------------------------------
Old:
----
install.patch
keygen.patch
ucred.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openais.spec ++++++
--- /var/tmp/diff_new_pack.o10426/_old 2008-07-25 16:08:27.000000000 +0200
+++ /var/tmp/diff_new_pack.o10426/_new 2008-07-25 16:08:27.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package openais (Version 0.82)
+# spec file for package openais (Version 0.80)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,8 +18,8 @@
Name: openais
Summary: The OpenAIS Standards-Based Cluster Framework executive and APIs
-Version: 0.82
-Release: 18
+Version: 0.80
+Release: 1
License: BSD 3-Clause
%if 0%{?fedora_version}
Group: Productivity/Clustering/HA
@@ -28,14 +28,12 @@
%endif
Url: http://www.openais.org/
Source: openais.tar.gz
-Patch1: install.patch
-Patch2: keygen.patch
-#Patch3: disable-crypto.patch
-Patch4: ucred.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(pre): /usr/sbin/useradd
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
+Obsoletes: %{name} == 0.82
+Obsoletes: %{name} == 0.83
%description
This package contains the openais executive, openais service handlers,
@@ -64,6 +62,9 @@
Robert Peterson
Abhijith Das
+%if 0%{?suse_version}
+%endif
+
%package devel
License: BSD 3-Clause
Summary: The openais Standards-Based Cluster Framework libraries
@@ -102,11 +103,7 @@
Abhijith Das
%prep
-%setup -n openais
-%patch1 -p1
-%patch2 -p2
-#%patch3 -p2
-%patch4 -p2
+%setup -n openais/branches/whitetank
%build
# -O3 required for performance reasons
@@ -126,6 +123,9 @@
install -m 755 test/openais-cfgtool $RPM_BUILD_ROOT%{_sbindir}
find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f
find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f
+%if 0%{?suse_version}
+ln -sf ../../etc/init.d/openais $RPM_BUILD_ROOT/%{_sbindir}/rcopenais
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -159,9 +159,9 @@
%else
if [ $1 -eq 0 ]; then
%{_initrddir}/openais stop &>/dev/null || :
+ /sbin/chkconfig --del openais || :
fi
%endif
-/sbin/chkconfig --del openais || :
%postun
/sbin/ldconfig
@@ -186,39 +186,15 @@
%config(noreplace) /etc/ais/amf.conf
%config /etc/ld.so.conf.d/openais-*.conf
%{_initrddir}/openais
-%exclude %{_sysconfdir}/init.d/ais
+%if 0%{?suse_version}
+%{_sbindir}/rcopenais
+%endif
%dir %{_libexecdir}/lcrso
-%{_libexecdir}/lcrso/aisparser.lcrso
-%{_libexecdir}/lcrso/objdb.lcrso
-%{_libexecdir}/lcrso/service_amf.lcrso
-%{_libexecdir}/lcrso/service_cfg.lcrso
-%{_libexecdir}/lcrso/service_ckpt.lcrso
-%{_libexecdir}/lcrso/service_clm.lcrso
-%{_libexecdir}/lcrso/service_cpg.lcrso
-%{_libexecdir}/lcrso/service_evs.lcrso
-%{_libexecdir}/lcrso/service_evt.lcrso
-%{_libexecdir}/lcrso/service_lck.lcrso
-%{_libexecdir}/lcrso/service_msg.lcrso
-%{_libexecdir}/lcrso/vsf_ykd.lcrso
%dir %{_libdir}/openais
-%{_libdir}/openais/libaisutil.so*
-%{_libdir}/openais/libais.so*
-%{_libdir}/openais/libcpg.so*
-%{_libdir}/openais/libevs.so*
-%{_libdir}/openais/libcfg.so*
-%{_libdir}/openais/libSaAmf.so*
-%{_libdir}/openais/libSaCkpt.so*
-%{_libdir}/openais/libSaClm.so*
-%{_libdir}/openais/libSaEvt.so*
-%{_libdir}/openais/libSaLck.so*
-%{_libdir}/openais/libSaMsg.so*
-%{_libdir}/openais/libtotem_pg.so*
-%{_mandir}/man8/openais_overview.8*
-%{_mandir}/man8/cpg_overview.8*
-%{_mandir}/man8/evs_overview.8*
-%{_mandir}/man8/logsys_overview.8*
+%{_libexecdir}/lcrso/*.lcrso
+%{_libdir}/openais/lib*.so*
+%{_mandir}/man8/*.8*
%{_mandir}/man5/openais.conf.5*
-%{_mandir}/man5/amf.conf.5*
%files devel
%defattr(-,root,root,-)
@@ -226,61 +202,30 @@
%doc %{_docdir}/%{name}-%{version}/CHANGELOG
%doc %{_docdir}/%{name}-%{version}/README.devmap
%dir %{_includedir}/openais/
-%{_includedir}/openais/ais_util.h
-%{_includedir}/openais/ipc_gen.h
-%{_includedir}/openais/mar_gen.h
-%{_includedir}/openais/swab.h
-%{_includedir}/openais/cpg.h
-%{_includedir}/openais/cfg.h
-%{_includedir}/openais/evs.h
-%{_includedir}/openais/saAis.h
-%{_includedir}/openais/saAmf.h
-%{_includedir}/openais/saCkpt.h
-%{_includedir}/openais/saClm.h
-%{_includedir}/openais/saEvt.h
-%{_includedir}/openais/saLck.h
-%{_includedir}/openais/saMsg.h
-%dir %{_includedir}/openais/totem/
-%{_includedir}/openais/totem/aispoll.h
-%{_includedir}/openais/totem/totem.h
-%{_includedir}/openais/totem/totemip.h
-%{_includedir}/openais/totem/totempg.h
%dir %{_includedir}/openais/lcr/
-%{_includedir}/openais/lcr/lcr_ckpt.h
-%{_includedir}/openais/lcr/lcr_comp.h
-%{_includedir}/openais/lcr/lcr_ifact.h
-%dir %{_includedir}/openais/service
-%{_includedir}/openais/service/config.h
-%{_includedir}/openais/service/objdb.h
-%{_includedir}/openais/service/logsys.h
-%{_includedir}/openais/service/swab.h
-%{_includedir}/openais/service/service.h
-%{_includedir}/openais/service/timer.h
-%{_includedir}/openais/service/flow.h
-%{_includedir}/openais/service/ipc.h
-%{_mandir}/man3/cpg_dispatch.3*
-%{_mandir}/man3/cpg_fd_get.3*
-%{_mandir}/man3/cpg_finalize.3*
-%{_mandir}/man3/cpg_initialize.3*
-%{_mandir}/man3/cpg_join.3*
-%{_mandir}/man3/cpg_leave.3*
-%{_mandir}/man3/cpg_mcast_joined.3*
-%{_mandir}/man3/cpg_membership_get.3*
-%{_mandir}/man3/cpg_local_get.3*
-%{_mandir}/man3/cpg_context_get.3*
-%{_mandir}/man3/cpg_context_set.3*
-%{_mandir}/man3/evs_dispatch.3*
-%{_mandir}/man3/evs_fd_get.3*
-%{_mandir}/man3/evs_finalize.3*
-%{_mandir}/man3/evs_initialize.3*
-%{_mandir}/man3/evs_join.3*
-%{_mandir}/man3/evs_leave.3*
-%{_mandir}/man3/evs_mcast_groups.3*
-%{_mandir}/man3/evs_mcast_joined.3*
-%{_mandir}/man3/evs_membership_get.3*
-%{_sysconfdir}/init.d/ais
+%dir %{_includedir}/openais/totem/
+%dir %{_includedir}/openais/service/
+%{_includedir}/openais/*.h
+%{_includedir}/openais/lcr/*.h
+%{_includedir}/openais/totem/*.h
+%{_includedir}/openais/service/*.h
+%{_mandir}/man3/cpg_*.3*
+%{_mandir}/man3/evs_*.3*
%changelog
+* Mon Jul 21 2008 abeekhof(a)suse.de
+- Switch to the stable series of OpenAIS (Whitetank 0.80) which
+ behaves significantly better for clusters larger than 4 nodes
+- Upstream version is 0.80.3 (SVN 1551)
+- Tarball includes 8 patches backported from the development series
+ that are required to support Pacemaker. Patch summary:
+ - a generic init-script
+ - Fix DESTDIR, PREFIX and LCRSODIR
+ - Repair loading of external services
+ - Add some new calls into objdb
+ - Patch to remove segfault on the exiting of a service.
+ - Patch to allow controlled exit of a service.
+ - load and unload service engines at runtime
* Sun Jun 29 2008 abeekhof(a)suse.de
- Enable encryption
* Sat May 03 2008 abeekhof(a)suse.de
++++++ openais.tar.gz ++++++
openais/openais.tar.gz /mounts/work_src_done/STABLE/openais/openais.tar.gz differ: byte 5, 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 yast2-qt-pkg
checked in at Fri Jul 25 16:06:56 CEST 2008.
--------
--- yast2-qt-pkg/yast2-qt-pkg.changes 2008-07-17 13:17:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-qt-pkg/yast2-qt-pkg.changes 2008-07-25 16:06:33.505423000 +0200
@@ -1,0 +2,6 @@
+Wed Jul 23 16:12:56 CEST 2008 - ma(a)suse.de
+
+- Remove references to obsolete freshens dependencies.
+- V 2.17.3
+
+-------------------------------------------------------------------
@@ -175 +180,0 @@
-Thu Apr 17 22:17:53 CEST 2008 - dmacvicar(a)suse.de
@@ -176,0 +182 @@
+Thu Apr 17 22:17:53 CEST 2008 - dmacvicar(a)suse.de
Old:
----
yast2-qt-pkg-2.17.2.tar.bz2
New:
----
yast2-qt-pkg-2.17.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt-pkg.spec ++++++
--- /var/tmp/diff_new_pack.WQ8420/_old 2008-07-25 16:06:45.000000000 +0200
+++ /var/tmp/diff_new_pack.WQ8420/_new 2008-07-25 16:06:45.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-qt-pkg (Version 2.17.2)
+# spec file for package yast2-qt-pkg (Version 2.17.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
Name: yast2-qt-pkg
-Version: 2.17.2
-Release: 4
+Version: 2.17.3
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-pkg-2.17.2.tar.bz2
+Source0: yast2-qt-pkg-2.17.3.tar.bz2
BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel
BuildRequires: libqt4-devel libxslt perl-XML-Writer sgml-skel update-desktop-files
Summary: YaST2 - Graphical User Interface
@@ -75,6 +75,9 @@
%_prefix/share/YaST2/images/*
%changelog
+* Wed Jul 23 2008 ma(a)suse.de
+- Remove references to obsolete freshens dependencies.
+- V 2.17.3
* Thu Jul 17 2008 ma(a)suse.de
- Remove obsolete references to Script/Message/Atom
* Tue Jul 15 2008 dmacvicar(a)suse.de
++++++ yast2-qt-pkg-2.17.2.tar.bz2 -> yast2-qt-pkg-2.17.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.17.2/package/yast2-qt-pkg.changes new/yast2-qt-pkg-2.17.3/package/yast2-qt-pkg.changes
--- old/yast2-qt-pkg-2.17.2/package/yast2-qt-pkg.changes 2008-07-17 13:12:25.000000000 +0200
+++ new/yast2-qt-pkg-2.17.3/package/yast2-qt-pkg.changes 2008-07-23 16:27:36.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Jul 23 16:12:56 CEST 2008 ma(a)suse.de
+
+- Remove references to obsolete freshens dependencies.
+- V 2.17.3
+
+-------------------------------------------------------------------
Thu Jul 17 11:42:54 CEST 2008 - ma(a)suse.de
- Remove obsolete references to Script/Message/Atom
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.17.2/src/YQPkgDependenciesView.cc new/yast2-qt-pkg-2.17.3/src/YQPkgDependenciesView.cc
--- old/yast2-qt-pkg-2.17.2/src/YQPkgDependenciesView.cc 2008-07-17 13:12:25.000000000 +0200
+++ new/yast2-qt-pkg-2.17.3/src/YQPkgDependenciesView.cc 2008-07-23 16:27:36.000000000 +0200
@@ -50,7 +50,7 @@
return;
}
- QString html_text = htmlStart();
+ QString html_text = htmlStart();
html_text += htmlHeading( selectable );
ZyppObj candidate = selectable->candidateObj();
@@ -92,7 +92,6 @@
row( "Obsoletes:", pkg->dep( zypp::Dep::OBSOLETES ) ) +
row( "Recommends:", pkg->dep( zypp::Dep::RECOMMENDS ) ) +
row( "Suggests:", pkg->dep( zypp::Dep::SUGGESTS ) ) +
- row( "Freshens:", pkg->dep( zypp::Dep::FRESHENS ) ) +
row( "Enances:", pkg->dep( zypp::Dep::ENHANCES ) ) +
row( "Supplements:", pkg->dep( zypp::Dep::SUPPLEMENTS ) )
);
@@ -123,7 +122,6 @@
row( "Obsoletes:", p1->dep( zypp::Dep::OBSOLETES ), p2->dep( zypp::Dep::OBSOLETES ) ) +
row( "Recommends:", p1->dep( zypp::Dep::RECOMMENDS ), p2->dep( zypp::Dep::RECOMMENDS ) ) +
row( "Suggests:", p1->dep( zypp::Dep::SUGGESTS ), p2->dep( zypp::Dep::SUGGESTS ) ) +
- row( "Freshens:", p1->dep( zypp::Dep::FRESHENS ), p2->dep( zypp::Dep::FRESHENS ) ) +
row( "Enances:", p1->dep( zypp::Dep::ENHANCES ), p2->dep( zypp::Dep::ENHANCES ) ) +
row( "Supplements:", p1->dep( zypp::Dep::SUPPLEMENTS ), p2->dep( zypp::Dep::SUPPLEMENTS ) )
);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.17.2/VERSION.cmake new/yast2-qt-pkg-2.17.3/VERSION.cmake
--- old/yast2-qt-pkg-2.17.2/VERSION.cmake 2008-07-17 13:12:25.000000000 +0200
+++ new/yast2-qt-pkg-2.17.3/VERSION.cmake 2008-07-23 16:27:36.000000000 +0200
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "17")
-SET(VERSION_PATCH "2")
+SET(VERSION_PATCH "3")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-pkg-bindings
checked in at Fri Jul 25 16:06:18 CEST 2008.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-07-17 13:21:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-07-22 12:05:24.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jul 22 11:50:31 CEST 2008 - coolo(a)suse.de
+
+- 2.17.2 (for add-on)
+
+-------------------------------------------------------------------
New Changes file:
--- /dev/null 2006-09-20 18:56:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings-devel-doc.changes 2008-05-16 13:08:51.000000000 +0200
@@ -0,0 +1,40 @@
+-------------------------------------------------------------------
+Fri May 16 08:18:31 CEST 2008 - lslezak(a)suse.cz
+
+- documented lock API
+- 2.16.35
+
+-------------------------------------------------------------------
+Thu Apr 3 13:41:41 CEST 2008 - ma(a)suse.de
+
+- use repo name as mediaset label.
+
+-------------------------------------------------------------------
+Tue Mar 11 07:31:42 CET 2008 - coolo(a)suse.de
+
+- devtools requires redudant prefix definition
+
+-------------------------------------------------------------------
+Wed Mar 5 22:13:55 CET 2008 - coolo(a)suse.de
+
+- fixing spec file syntax
+
+-------------------------------------------------------------------
+Tue Dec 18 19:32:50 CET 2007 - lslezak(a)suse.cz
+
+- updated generating of the documentation to the new source file
+ layout
+- 2.16.7
+
+-------------------------------------------------------------------
+Wed Oct 3 10:06:31 CEST 2007 - mvidner(a)suse.cz
+
+- Do not try to package COPYRIGHT.english, it is gone from
+ devtools (#299144).
+- 2.16.0
+
+-------------------------------------------------------------------
+Thu Jul 26 15:55:21 CEST 2007 - lslezak(a)suse.cz
+
+- Initial version
+
Old:
----
yast2-pkg-bindings-2.17.1.tar.bz2
New:
----
yast2-pkg-bindings-2.17.2.tar.bz2
yast2-pkg-bindings-devel-doc.changes
yast2-pkg-bindings-devel-doc.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
#
# spec file for package yast2-pkg-bindings-devel-doc (Version 2.17.2)
#
# 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.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: yast2-pkg-bindings-devel-doc
Version: 2.17.2
Release: 1
License: GPL v2 or later
Group: Documentation/HTML
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-pkg-bindings-2.17.2.tar.bz2
Prefix: %_prefix
# same as in the main package (because we use the same configure.in.in)
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools
BuildArch: noarch
Requires: yast2-pkg-bindings = %{version}
Summary: YaST2 - Documentation for yast2-pkg-bindings package
Group: Documentation/HTML
%description
This documenation package describes the package manager API (Pkg::
namespace) used in YaST scripts. The documentation is autogenerated
from the pkg-bindings sources.
Authors:
--------
Ladislav Slez�k <lslezak(a)novell.com>
%prep
%setup -n yast2-pkg-bindings-2.17.2
# build only documentation, ignore all other directories
echo "doc" > SUBDIRS
%build
%{prefix}/bin/y2tool y2autoconf
%{prefix}/bin/y2tool y2automake
autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
make %{?jobs:-j%jobs}
%install
make install DESTDIR="$RPM_BUILD_ROOT"
[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
%clean
rm -rf "$RPM_BUILD_ROOT"
%files
%defattr(-,root,root)
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings/html
%dir %{prefix}/share/doc/packages/yast2-pkg-bindings
%exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/COPYING
%exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/README
%changelog
* Fri May 16 2008 lslezak(a)suse.cz
- documented lock API
- 2.16.35
* Thu Apr 03 2008 ma(a)suse.de
- use repo name as mediaset label.
* Tue Mar 11 2008 coolo(a)suse.de
- devtools requires redudant prefix definition
* Thu Mar 06 2008 coolo(a)suse.de
- fixing spec file syntax
* Tue Dec 18 2007 lslezak(a)suse.cz
- updated generating of the documentation to the new source file
layout
- 2.16.7
* Wed Oct 03 2007 mvidner(a)suse.cz
- Do not try to package COPYRIGHT.english, it is gone from
devtools (#299144).
- 2.16.0
* Thu Jul 26 2007 lslezak(a)suse.cz
- Initial version
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.aX5137/_old 2008-07-25 16:06:03.000000000 +0200
+++ /var/tmp/diff_new_pack.aX5137/_new 2008-07-25 16:06:03.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.17.1)
+# spec file for package yast2-pkg-bindings (Version 2.17.2)
#
# 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-pkg-bindings
-Version: 2.17.1
-Release: 7
+Version: 2.17.2
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.17.1.tar.bz2
+Source0: yast2-pkg-bindings-2.17.2.tar.bz2
Prefix: /usr
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools
BuildRequires: libzypp-devel >= 5.0.0
@@ -40,7 +40,7 @@
Stanislav Visnovsky <visnov(a)suse.cz>
%prep
-%setup -n yast2-pkg-bindings-2.17.1
+%setup -n yast2-pkg-bindings-2.17.2
# build only the library, ignore documentation (it is in devel-doc package)
echo "src" > SUBDIRS
@@ -71,7 +71,10 @@
%{_libdir}/YaST2/plugin/libpy2Pkg.so.*
%{_libdir}/YaST2/plugin/libpy2Pkg.so
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
+
%changelog
+* Tue Jul 22 2008 coolo(a)suse.de
+- 2.17.2 (for add-on)
* Thu Jul 17 2008 ma(a)suse.de
- Remove obsolete references to Script/Message/Atom
* Fri Jun 27 2008 lslezak(a)suse.cz
++++++ yast2-pkg-bindings-2.17.1.tar.bz2 -> yast2-pkg-bindings-2.17.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.1/configure new/yast2-pkg-bindings-2.17.2/configure
--- old/yast2-pkg-bindings-2.17.1/configure 2008-07-14 14:06:06.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.2/configure 2008-07-22 12:05: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-pkg-bindings 2.17.1.
+# Generated by GNU Autoconf 2.61 for yast2-pkg-bindings 2.17.2.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.17.1'
-PACKAGE_STRING='yast2-pkg-bindings 2.17.1'
+PACKAGE_VERSION='2.17.2'
+PACKAGE_STRING='yast2-pkg-bindings 2.17.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1449,7 +1449,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-pkg-bindings 2.17.1 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.17.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1520,7 +1520,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.17.1:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.17.2:";;
esac
cat <<\_ACEOF
@@ -1629,7 +1629,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.17.1
+yast2-pkg-bindings configure 2.17.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1643,7 +1643,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-pkg-bindings $as_me 2.17.1, which was
+It was created by yast2-pkg-bindings $as_me 2.17.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2464,7 +2464,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.17.1'
+ VERSION='2.17.2'
cat >>confdefs.h <<_ACEOF
@@ -2692,7 +2692,7 @@
-VERSION="2.17.1"
+VERSION="2.17.2"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>"
@@ -21574,7 +21574,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-pkg-bindings $as_me 2.17.1, which was
+This file was extended by yast2-pkg-bindings $as_me 2.17.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21627,7 +21627,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.17.1
+yast2-pkg-bindings config.status 2.17.2
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-pkg-bindings-2.17.1/configure.in new/yast2-pkg-bindings-2.17.2/configure.in
--- old/yast2-pkg-bindings-2.17.1/configure.in 2008-07-14 14:05:51.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.2/configure.in 2008-07-22 12:04:59.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.17.1, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.17.2, http://bugs.opensuse.org/, yast2-pkg-bindings)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.1"
+VERSION="2.17.2"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.1/VERSION new/yast2-pkg-bindings-2.17.2/VERSION
--- old/yast2-pkg-bindings-2.17.1/VERSION 2008-07-07 15:53:36.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.2/VERSION 2008-07-22 11:50:49.000000000 +0200
@@ -1 +1 @@
-2.17.1
+2.17.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
checked in at Fri Jul 25 16:05:51 CEST 2008.
--------
--- yast2/yast2.changes 2008-07-23 15:17:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-07-25 16:04:32.120532000 +0200
@@ -1,0 +2,6 @@
+Fri Jul 25 16:00:44 CEST 2008 - mzugec(a)suse.cz
+
+- support for tunnel devices in NetworkInterfaces (FaTE#302184)
+- 2.17.9
+
+-------------------------------------------------------------------
Old:
----
yast2-2.17.8.tar.bz2
New:
----
yast2-2.17.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.qH3974/_old 2008-07-25 16:05:18.000000000 +0200
+++ /var/tmp/diff_new_pack.qH3974/_new 2008-07-25 16:05:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.17.8)
+# spec file for package yast2 (Version 2.17.9)
#
# 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
-Version: 2.17.8
+Version: 2.17.9
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.17.8.tar.bz2
+Source0: yast2-2.17.9.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
@@ -141,7 +141,7 @@
Steffen Winterfeldt <snwint(a)suse.de>
%prep
-%setup -n yast2-2.17.8
+%setup -n yast2-2.17.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -245,6 +245,9 @@
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Fri Jul 25 2008 mzugec(a)suse.cz
+- support for tunnel devices in NetworkInterfaces (FaTE#302184)
+- 2.17.9
* Tue Jul 22 2008 locilka(a)suse.cz
- Added new DnsServerAPI::GetReverseIPforIPv6 function.
- 2.17.8
++++++ yast2-2.17.8.tar.bz2 -> yast2-2.17.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.8/configure new/yast2-2.17.9/configure
--- old/yast2-2.17.8/configure 2008-07-22 18:46:57.000000000 +0200
+++ new/yast2-2.17.9/configure 2008-07-25 15:57:49.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 2.17.7.
+# Generated by GNU Autoconf 2.61 for yast2 2.17.8.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.17.7'
-PACKAGE_STRING='yast2 2.17.7'
+PACKAGE_VERSION='2.17.8'
+PACKAGE_STRING='yast2 2.17.8'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1199,7 +1199,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 2.17.7 to adapt to many kinds of systems.
+\`configure' configures yast2 2.17.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1270,7 +1270,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.17.7:";;
+ short | recursive ) echo "Configuration of yast2 2.17.8:";;
esac
cat <<\_ACEOF
@@ -1348,7 +1348,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.17.7
+yast2 configure 2.17.8
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1362,7 +1362,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 $as_me 2.17.7, which was
+It was created by yast2 $as_me 2.17.8, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2183,7 +2183,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.17.7'
+ VERSION='2.17.8'
cat >>confdefs.h <<_ACEOF
@@ -2411,7 +2411,7 @@
-VERSION="2.17.7"
+VERSION="2.17.8"
RPMNAME="yast2"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
@@ -3412,7 +3412,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2 $as_me 2.17.7, which was
+This file was extended by yast2 $as_me 2.17.8, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3455,7 +3455,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2 config.status 2.17.7
+yast2 config.status 2.17.8
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-2.17.8/configure.in new/yast2-2.17.9/configure.in
--- old/yast2-2.17.8/configure.in 2008-07-22 18:46:53.000000000 +0200
+++ new/yast2-2.17.9/configure.in 2008-07-25 15:57:41.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.17.7, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.17.8, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.7"
+VERSION="2.17.8"
RPMNAME="yast2"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.8/library/modules/Version.ycp new/yast2-2.17.9/library/modules/Version.ycp
--- old/yast2-2.17.8/library/modules/Version.ycp 2008-07-23 15:18:14.000000000 +0200
+++ new/yast2-2.17.9/library/modules/Version.ycp 2008-07-25 16:02:10.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.17.8";
+global string yast2 = "2.17.9";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.8/library/network/src/NetworkInterfaces.ycp new/yast2-2.17.9/library/network/src/NetworkInterfaces.ycp
--- old/yast2-2.17.8/library/network/src/NetworkInterfaces.ycp 2008-07-07 13:50:27.000000000 +0200
+++ new/yast2-2.17.9/library/network/src/NetworkInterfaces.ycp 2008-07-25 10:01:02.000000000 +0200
@@ -83,7 +83,7 @@
* Predefined network card regular expressions
*/
global map<string,string> CardRegex = $[
- "netcard" : "arc|ath|bnep|ci|ctc|dummy|bond|escon|eth|fddi|ficon|hsi|qeth|lcs|iucv|myri|tr|usb|wlan|xp|vlan|br",
+ "netcard" : "arc|ath|bnep|ci|ctc|dummy|bond|escon|eth|fddi|ficon|hsi|qeth|lcs|iucv|myri|tr|usb|wlan|xp|vlan|br|tun|tap",
"modem" : "ppp|modem",
"isdn" : "isdn|ippp",
"dsl" : "dsl",
@@ -185,6 +185,7 @@
foreach(string dev_type,map confs, Devices, {
if (haskey(confs, dev)){
string int_type = confs[dev, "INTERFACETYPE"]:"";
+ if (size(confs[dev, "TUNNEL"]:"")>0) int_type = confs[dev, "TUNNEL"]:"";
if(size(int_type)>0) type = int_type;
}
});
@@ -831,7 +832,7 @@
* for this hardware
*/
global list<string> GetDeviceTypes(){
- list<string> dev_types = ["eth", "tr", "vlan", "br"];
+ list<string> dev_types = ["eth", "tr", "vlan", "br", "tun", "tap"];
if(Arch::s390 ()) dev_types = (list<string>) merge(dev_types, [ "hsi", "ctc", "escon", "ficon", "iucv", "qeth", "lcs"]);
else dev_types = (list<string>) merge(dev_types, [ "arc", "bnep", "dummy", "fddi", "myri", "usb", "wlan", "bond" ]);
if(Arch::ia64 ()) dev_types = add(dev_types, "xp");
@@ -934,7 +935,11 @@
/* Device type label */
"vlan" : [ _("VLAN"), _("Virtual LAN") ],
/* Device type label */
- "br" : [ _("Network Bridge"), _("Network Bridge") ],
+ "br" : [ _("Bridge"), _("Network Bridge") ],
+ /* Device type label */
+ "tun" : [ _("TUN"), _("Network TUNnel") ],
+ /* Device type label */
+ "tap" : [ _("TAP"), _("Network TAP") ],
];
if(haskey(device_types, type)) return device_types[type, (longdescr==true) ? 1 : 0]:"";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.8/VERSION new/yast2-2.17.9/VERSION
--- old/yast2-2.17.8/VERSION 2008-07-23 15:17:53.000000000 +0200
+++ new/yast2-2.17.9/VERSION 2008-07-25 16:00:40.000000000 +0200
@@ -1 +1 @@
-2.17.8
+2.17.9
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 heartbeat
checked in at Fri Jul 25 16:03:47 CEST 2008.
--------
--- heartbeat/heartbeat.changes 2008-04-12 19:36:08.000000000 +0200
+++ /mounts/work_src_done/STABLE/heartbeat/heartbeat.changes 2008-07-18 15:50:10.000000000 +0200
@@ -1,0 +2,7 @@
+Fri July 18 13:39:00 CEST 2008 - abeekhof(a)suse.de
+
+- Merge with upstream (dev tree: 95b9cf7578f4)
+- Stonithd has been moved into Pacemaker
+- Build with --enable-libc-malloc instead of Heartbeat's home grown allocator
+
+--------------------------------------------------------------------
Old:
----
heartbeat-bootstrap.patch
lrmd-return-rc.diff
lrm-true-rc.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ heartbeat.spec ++++++
--- /var/tmp/diff_new_pack.z31038/_old 2008-07-25 16:03:15.000000000 +0200
+++ /var/tmp/diff_new_pack.z31038/_new 2008-07-25 16:03:15.000000000 +0200
@@ -25,7 +25,7 @@
Name: heartbeat
Summary: The Heartbeat Subsystem for High-Availability Linux
Version: 2.1.3
-Release: 1
+Release: 28
License: GPL v2 or later; LGPL v2.1 or later
Url: http://linux-ha.org/
%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
@@ -38,9 +38,6 @@
Source2: heartbeat.rpmlintrc
Patch1: heartbeat-doc-directory.diff
Patch2: heartbeat-cmi-indication-temporary-fix.diff
-Patch4: lrmd-return-rc.diff
-Patch5: lrm-true-rc.diff
-Patch7: heartbeat-bootstrap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-core = %{version}-%{release}
Requires: %{name}-resources = %{version}-%{release}
@@ -352,9 +349,6 @@
%setup -n heartbeat
%patch1 -p0
%patch2 -p0
-%patch4 -p1
-%patch5 -p1
-%patch7 -p0
%if 0%{?suse_version}
cp $RPM_SOURCE_DIR/heartbeat.suse.in ./heartbeat/init.d/heartbeat.in
%endif
@@ -393,7 +387,7 @@
--with-group-name=%{gname} --with-ccmuser-name=%{uname} \
--with-group-id=%{uid} --with-ccmuser-id=%{uid} \
--with-hapkgversion=%{version} \
- --enable-glib-malloc \
+ --enable-libc-malloc \
--enable-pretty \
%if %without_fatal_warnings
--enable-fatal-warnings=no \
@@ -593,11 +587,8 @@
%{_libdir}/libccmclient.so.*
%{_libdir}/librecoverymgr.so.*
%{_libdir}/heartbeat/plugins/AppHBNotification
-%{_libdir}/libstonithd.so.*
-%{_libdir}/heartbeat/plugins/RAExec/stonith**
/sbin/rcheartbeat
%{_libdir}/heartbeat/apphbd
-%{_libdir}/heartbeat/stonithd
%{_bindir}/cl_respawn
%attr (2555, root, haclient) %{_bindir}/cl_status
%doc %{_mandir}/man1/cl_status.1*
@@ -640,13 +631,11 @@
%{_libdir}/heartbeat/findif
%{_libdir}/heartbeat/ha_logd
%{_libdir}/heartbeat/ha_logger
-%exclude %{_libdir}/heartbeat/haresources2cib.*
%{_libdir}/heartbeat/lrmadmin
%{_libdir}/heartbeat/lrmd
%{_libdir}/heartbeat/ocf-returncodes
%{_libdir}/heartbeat/ocf-shellfuncs
%{_libdir}/heartbeat/plugins/RAExec
-%exclude %{_libdir}/heartbeat/plugins/RAExec/stonith*
%{_libdir}/heartbeat/send_arp
%{_libdir}/heartbeat/utillib.sh
%doc %{_mandir}/man8/apphbd.8*
@@ -682,30 +671,27 @@
%{_libdir}/liblrm*.so
%{_libdir}/libpils*.so
%{_libdir}/libplumb*.so
-%{_libdir}/libplumbgpl*.so
%{_libdir}/libapphb*.so
%{_libdir}/libstonith*.so
-%exclude %{_libdir}/libstonithd*.so
#%{_datadir}/heartbeat/logtest
%{_libdir}/heartbeat/logtest
%{_datadir}/heartbeat/lrmtest
+%{_datadir}/heartbeat/ra-api-1.dtd
%exclude %{_libdir}/heartbeat/lrmtest
+%exclude %{_libdir}/heartbeat/ra-api-1.dtd
%files devel
%defattr(-,root,root)
#%doc %{_datadir}/doc/%{name}-%{version}
%{_includedir}/saf/
%{_includedir}/ocf/
-%{_includedir}/heartbeat/fencing
%{_includedir}/heartbeat/HBauth.h
%{_includedir}/heartbeat/HBcomm.h
%{_includedir}/heartbeat/hb_api.h
%{_includedir}/heartbeat/recoverymgr.h
-%exclude %{_includedir}/heartbeat/mgmt
%{_libdir}/libccmclient*.so
%{_libdir}/libclm*.so
%{_libdir}/libhbclient*.so
-%{_libdir}/libstonithd*.so
%{_libdir}/librecoverymgr*.so
%{_libdir}/heartbeat/quorumdtest
%{_libdir}/heartbeat/clmtest
@@ -717,18 +703,16 @@
%{_libdir}/heartbeat/apphbtest
%{_libdir}/heartbeat/base64_md5_test
%{_libdir}/heartbeat/ccm_testclient
-%{_datadir}/heartbeat/stonithdtest
%{_datadir}/heartbeat/cts
%{_datadir}/heartbeat/BasicSanityCheck
%{_datadir}/heartbeat/TestHeartbeatComm
-%exclude %{_libdir}/heartbeat/stonithdtest
%files resources
%defattr(-,root,root)
%dir /usr/lib/ocf
-%dir /usr/lib/ocf/resource.d
-%dir /usr/lib/ocf/resource.d/heartbeat
-/usr/lib/ocf/resource.d/heartbeat
+#%dir /usr/lib/ocf/resource.d
+%exclude %{_sysconfdir}/ha.d/resource.d/ldirectord
+/usr/lib/ocf/resource.d
###########################################################
# Files for ldirectord
@@ -748,6 +732,10 @@
%config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord
%changelog
+* Fri Jul 18 2008 abeekhof(a)suse.de
+- Merge with upstream (dev tree: 95b9cf7578f4)
+- Stonithd has been moved into Pacemaker
+- Build with --enable-libc-malloc instead of Heartbeat's home grown allocator
* Sat Apr 12 2008 abeekhof(a)suse.de
- Merge with upstream (dev tree: 2fd7a214a161)
- CRM now maintained as the pacemaker project
++++++ heartbeat.tar.gz ++++++
++++ 173165 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-core
checked in at Fri Jul 25 15:40:20 CEST 2008.
--------
--- yast2-core/yast2-core.changes 2008-07-22 10:14:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-core/yast2-core.changes 2008-07-25 10:51:35.581461000 +0200
@@ -1,0 +2,11 @@
+Fri Jul 25 10:34:30 CEST 2008 - aschnell(a)suse.de
+
+- fixed requires for yast2-core-devel
+- 2.17.6
+
+-------------------------------------------------------------------
+Thu Jul 24 09:16:13 CEST 2008 - mvidner(a)suse.cz
+
+- Better error message when an agent dies with errors (bnc#401706).
+
+-------------------------------------------------------------------
Old:
----
yast2-core-2.17.5.tar.bz2
New:
----
yast2-core-2.17.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-core.spec ++++++
--- /var/tmp/diff_new_pack.y16567/_old 2008-07-25 15:40:04.000000000 +0200
+++ /var/tmp/diff_new_pack.y16567/_new 2008-07-25 15:40:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-core (Version 2.17.5)
+# spec file for package yast2-core (Version 2.17.6)
#
# 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-core
-Version: 2.17.5
+Version: 2.17.6
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-core-2.17.5.tar.bz2
+Source0: yast2-core-2.17.6.tar.bz2
Prefix: /usr
# obviously
BuildRequires: gcc-c++
@@ -68,7 +68,7 @@
Requires: libxcrypt-devel hwinfo-devel
Requires: glibc-devel libstdc++-devel pcre-devel libblocxx-devel sysfsutils
# required for libscr
-Requires: Policykit-devel dbus-1-devel
+Requires: PolicyKit-devel dbus-1-devel
# for FlexLexer.h; I think that this dependency could be made
# private but it seems not worth the effort
Requires: flex
@@ -88,7 +88,7 @@
Stanislav Visnovsky <visnov(a)suse.cz>
%prep
-%setup -n yast2-core-2.17.5
+%setup -n yast2-core-2.17.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -170,6 +170,11 @@
%doc %{prefix}/share/doc/packages/yast2-core
/usr/share/YaST2/data/devtools/bin/generateYCPWrappers
%changelog
+* Fri Jul 25 2008 aschnell(a)suse.de
+- fixed requires for yast2-core-devel
+- 2.17.6
+* Thu Jul 24 2008 mvidner(a)suse.cz
+- Better error message when an agent dies with errors (bnc#401706).
* Tue Jul 22 2008 lslezak(a)suse.cz
- added PolicyKit-devel and dbus-1-devel packages to
yast2-core-devel dependencies
++++++ yast2-core-2.17.5.tar.bz2 -> yast2-core-2.17.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.5/agent-modules/testsuite/tests/dir.scr new/yast2-core-2.17.6/agent-modules/testsuite/tests/dir.scr
--- old/yast2-core-2.17.5/agent-modules/testsuite/tests/dir.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.17.6/agent-modules/testsuite/tests/dir.scr 2008-06-11 15:46:58.000000000 +0200
@@ -0,0 +1,6 @@
+.
+
+`ag_modules(
+ `ModulesConf("tests/dir.in.test")
+)
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.5/agent-modules/testsuite/tests/missing.scr new/yast2-core-2.17.6/agent-modules/testsuite/tests/missing.scr
--- old/yast2-core-2.17.5/agent-modules/testsuite/tests/missing.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.17.6/agent-modules/testsuite/tests/missing.scr 2008-06-11 15:46:46.000000000 +0200
@@ -0,0 +1,6 @@
+.
+
+`ag_modules(
+ `ModulesConf("tests/missing.in.test")
+)
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.5/agent-modules/testsuite/tests/read1.scr new/yast2-core-2.17.6/agent-modules/testsuite/tests/read1.scr
--- old/yast2-core-2.17.5/agent-modules/testsuite/tests/read1.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.17.6/agent-modules/testsuite/tests/read1.scr 2008-06-11 15:46:55.000000000 +0200
@@ -0,0 +1,6 @@
+.
+
+`ag_modules(
+ `ModulesConf("tests/read1.in.test")
+)
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.5/agent-modules/testsuite/tests/write1.scr new/yast2-core-2.17.6/agent-modules/testsuite/tests/write1.scr
--- old/yast2-core-2.17.5/agent-modules/testsuite/tests/write1.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.17.6/agent-modules/testsuite/tests/write1.scr 2008-06-11 15:46:55.000000000 +0200
@@ -0,0 +1,6 @@
+.
+
+`ag_modules(
+ `ModulesConf("tests/write1.in.test")
+)
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.5/agent-modules/testsuite/tests/write2.scr new/yast2-core-2.17.6/agent-modules/testsuite/tests/write2.scr
--- old/yast2-core-2.17.5/agent-modules/testsuite/tests/write2.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.17.6/agent-modules/testsuite/tests/write2.scr 2008-06-11 15:46:56.000000000 +0200
@@ -0,0 +1,6 @@
+.
+
+`ag_modules(
+ `ModulesConf("tests/write2.in.test")
+)
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.5/agent-modules/testsuite/tests/write3.scr new/yast2-core-2.17.6/agent-modules/testsuite/tests/write3.scr
--- old/yast2-core-2.17.5/agent-modules/testsuite/tests/write3.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.17.6/agent-modules/testsuite/tests/write3.scr 2008-06-11 15:46:57.000000000 +0200
@@ -0,0 +1,6 @@
+.
+
+`ag_modules(
+ `ModulesConf("tests/write3.in.test")
+)
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.5/agents-perl/doc/ycp-pm-pod.html new/yast2-core-2.17.6/agents-perl/doc/ycp-pm-pod.html
--- old/yast2-core-2.17.5/agents-perl/doc/ycp-pm-pod.html 2008-07-21 17:16:52.000000000 +0200
+++ new/yast2-core-2.17.6/agents-perl/doc/ycp-pm-pod.html 2008-04-13 22:31:40.000000000 +0200
@@ -9,10 +9,8 @@
<body style="background-color: white">
-
-<!-- INDEX BEGIN -->
-<div name="index">
<p><a name="__index__"></a></p>
+<!-- INDEX BEGIN -->
<ul>
@@ -76,11 +74,9 @@
</ul>
</ul>
-
-<hr name="index" />
-</div>
<!-- INDEX END -->
+<hr />
<p>
</p>
<h1><a name="name">NAME</a></h1>
@@ -104,31 +100,31 @@
<p>A PerlYCPValue cannot represent a term but only a term is allowed
to initialize an agent in a .scr file. Therefore <a href="#parseterm">ParseTerm</a> is provided.</p>
<dl>
-<dt><strong><a name="string_integer_boolean" class="item">string, integer, boolean</a></strong>
+<dt><strong><a name="item_string_2c_integer_2c_boolean">string, integer, boolean</a></strong>
<dd>
<p>Stored as a scalar.</p>
</dd>
</li>
-<dt><strong><a name="list" class="item">list</a></strong>
+<dt><strong><a name="item_list">list</a></strong>
<dd>
<p>Stored as a reference to a list of PerlYCPValues.</p>
</dd>
</li>
-<dt><strong><a name="map" class="item">map</a></strong>
+<dt><strong><a name="item_map">map</a></strong>
<dd>
<p>Stored as a reference to a map of PerlYCPValues.</p>
</dd>
</li>
-<dt><strong><a name="path" class="item">path</a></strong>
+<dt><strong><a name="item_path">path</a></strong>
<dd>
-<p>Stored as a reference to a string (starting with a "." as expected).</p>
+<p>Stored as a reference to a string (starting with a ``.'' as expected).</p>
</dd>
</li>
-<dt><strong><a name="nil" class="item">nil (void)</a></strong>
+<dt><strong><a name="item_nil">nil (void)</a></strong>
<dd>
<p>Stored as an undef.</p>
@@ -145,7 +141,7 @@
<p>ParseComand $line</p>
<p><code>($command, $path, $arg) = ParseCommand ('Write (.moria.gate, "mellon")');</code></p>
<p>Parse a SCR command of the form Command (.some.path, optional_argument)</p>
-<p>Returns a three element list ("Command", ".some.path", $argument)
+<p>Returns a three element list (``Command'', ``.some.path'', $argument)
where the argument is a <a href="#perlycpvalue">PerlYCPValue</a> and will be undef
if it was not specified.
Note that the path is converted to a string.</p>
@@ -186,12 +182,12 @@
<p><code>Return (["arbitrarily", "complex", "data"]);</code></p>
<p>Sends a <a href="#perlycpvalue">PerlYCPValue</a> to the partner YCP component.</p>
<p>If there's just one argment, scalars are interpreted this way:
-"true" or "false" are sent as
+``true'' or ``false'' are sent as
booleans, integers or strings of digits are sent as integers, otherwise as
strings.
If a second argument exists and is true, all scalars are written as strings.
If a second argument exists and is false, all scalars are written as byteblocks.</p>
-<p>To send a list, call <code>Return(\@list)</code>, not <code>Return(@list)</code>.
+<p>To send a list, call Return(\@list), not Return(@list).
Similarly for a map. You can use references to anonymous lists [] and hashes {}.</p>
<p>The difference from <a href="#ycpreturn">ycpReturn</a> is that Return can return scalars directly,
strings are properly escaped if needeed and paths can be returned.</p>
@@ -204,9 +200,9 @@
and logging just works. In such case, you should not need to use ycp.pm at all.
Instead, <code>use YaST::YCP (":LOGGING")</code>.</p>
<p>The log output can now be redirected, which will be useful for test suites.
-If the first command-line option is "-l", the second argument is taken as
-the log file. A hyphen "-" designates standard output.</p>
-<p>Otherwise, <em class="file">/var/log/YaST2/y2log</em> and <em class="file">$HOME/.y2log</em> are tried, in that order.</p>
+If the first command-line option is ``-l'', the second argument is taken as
+the log file. A hyphen ``-'' designates standard output.</p>
+<p>Otherwise, <em>/var/log/YaST2/y2log</em> and <em>$HOME/.y2log</em> are tried, in that order.</p>
<p>
</p>
<h2><a name="y2debug">y2debug</a></h2>
@@ -216,7 +212,7 @@
y2error,
y2security,
y2internal</p>
-<p>Logs debug messages to <em class="file">/var/log/YaST2/y2log</em> or <em class="file">$HOME/.y2log</em></p>
+<p>Logs debug messages to <em>/var/log/YaST2/y2log</em> or <em>$HOME/.y2log</em></p>
<p>Note a <strong>semantic change</strong> in y2debug: now the environment variable
Y2DEBUG is honored so y2debug will not produce output unless this
variable is set. This is for compatibility with the logging system in libycp.</p>
@@ -231,11 +227,11 @@
<p>
</p>
<h2><a name="ycpargismap">ycpArgIsMap</a></h2>
-<p>Obsolete. Use (ref($arg) eq "HASH") instead.</p>
+<p>Obsolete. Use (ref($arg) eq ``HASH'') instead.</p>
<p>
</p>
<h2><a name="ycpargislist">ycpArgIsList</a></h2>
-<p>Obsolete. Use (ref($arg) eq "ARRAY") instead.</p>
+<p>Obsolete. Use (ref($arg) eq ``ARRAY'') instead.</p>
<p>
</p>
<h2><a name="ycpargisinteger">ycpArgIsInteger</a></h2>
@@ -251,7 +247,7 @@
<p>
</p>
<h2><a name="ycpargisnil">ycpArgIsNil</a></h2>
-<p>Obsolete. Use (ref($arg) eq "SCALAR" && $$arg eq "nil") instead.</p>
+<p>Obsolete. Use (ref($arg) eq ``SCALAR'' && $$arg eq ``nil'') instead.</p>
<p>
</p>
<h2><a name="ycpargisnone">ycpArgIsNone</a></h2>
@@ -259,23 +255,23 @@
<p>
</p>
<h2><a name="ycpcommandisdir">ycpCommandIsDir</a></h2>
-<p>Obsolete. Use ($command eq "Dir")</p>
+<p>Obsolete. Use ($command eq ``Dir'')</p>
<p>
</p>
<h2><a name="ycpcommandisread">ycpCommandIsRead</a></h2>
-<p>Obsolete. Use ($command eq "Read")</p>
+<p>Obsolete. Use ($command eq ``Read'')</p>
<p>
</p>
<h2><a name="ycpcommandiswrite">ycpCommandIsWrite</a></h2>
-<p>Obsolete. Use ($command eq "Write")</p>
+<p>Obsolete. Use ($command eq ``Write'')</p>
<p>
</p>
<h2><a name="ycpcommandisexecute">ycpCommandIsExecute</a></h2>
-<p>Obsolete. Use ($command eq "Execute")</p>
+<p>Obsolete. Use ($command eq ``Execute'')</p>
<p>
</p>
<h2><a name="ycpcommandisresult">ycpCommandIsResult</a></h2>
-<p>Obsolete. Use ($command eq "result"), note the lowercase 'r'.</p>
+<p>Obsolete. Use ($command eq ``result''), note the lowercase 'r'.</p>
<p>
</p>
<h2><a name="ycpgetcommand">ycpGetCommand</a></h2>
@@ -313,7 +309,7 @@
<p>
</p>
<h2><a name="ycpreturnskalarasboolean">ycpReturnSkalarAsBoolean</a></h2>
-<p>Obsolete. Use <a href="#return">Return</a>("true" or "false")</p>
+<p>Obsolete. Use <a href="#return">Return</a>(``true'' or ``false'')</p>
<p>
</p>
<h2><a name="ycpreturnskalarasstring">ycpReturnSkalarAsString</a></h2>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.5/configure new/yast2-core-2.17.6/configure
--- old/yast2-core-2.17.5/configure 2008-07-22 08:54:20.000000000 +0200
+++ new/yast2-core-2.17.6/configure 2008-07-25 10:41:14.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-core 2.17.4.
+# Generated by GNU Autoconf 2.61 for yast2-core 2.17.6.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-core'
PACKAGE_TARNAME='yast2-core'
-PACKAGE_VERSION='2.17.4'
-PACKAGE_STRING='yast2-core 2.17.4'
+PACKAGE_VERSION='2.17.6'
+PACKAGE_STRING='yast2-core 2.17.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1471,7 +1471,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-core 2.17.4 to adapt to many kinds of systems.
+\`configure' configures yast2-core 2.17.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1542,7 +1542,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-core 2.17.4:";;
+ short | recursive ) echo "Configuration of yast2-core 2.17.6:";;
esac
cat <<\_ACEOF
@@ -1659,7 +1659,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-core configure 2.17.4
+yast2-core configure 2.17.6
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1673,7 +1673,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-core $as_me 2.17.4, which was
+It was created by yast2-core $as_me 2.17.6, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2494,7 +2494,7 @@
# Define the identity of the package.
PACKAGE='yast2-core'
- VERSION='2.17.4'
+ VERSION='2.17.6'
cat >>confdefs.h <<_ACEOF
@@ -2722,7 +2722,7 @@
-VERSION="2.17.4"
+VERSION="2.17.6"
RPMNAME="yast2-core"
MAINTAINER="Martin Vidner <mvidner(a)suse.cz>"
@@ -24379,7 +24379,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-core $as_me 2.17.4, which was
+This file was extended by yast2-core $as_me 2.17.6, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24432,7 +24432,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-core config.status 2.17.4
+yast2-core config.status 2.17.6
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-core-2.17.5/configure.in new/yast2-core-2.17.6/configure.in
--- old/yast2-core-2.17.5/configure.in 2008-07-22 08:54:06.000000000 +0200
+++ new/yast2-core-2.17.6/configure.in 2008-07-25 10:40:44.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-core
dnl
-dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-core, 2.17.4, http://bugs.opensuse.org/, yast2-core)
+AC_INIT(yast2-core, 2.17.6, http://bugs.opensuse.org/, yast2-core)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.4"
+VERSION="2.17.6"
RPMNAME="yast2-core"
MAINTAINER="Martin Vidner <mvidner(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.5/liby2/src/Y2CCPlugin.cc new/yast2-core-2.17.6/liby2/src/Y2CCPlugin.cc
--- old/yast2-core-2.17.5/liby2/src/Y2CCPlugin.cc 2008-07-21 16:59:59.000000000 +0200
+++ new/yast2-core-2.17.6/liby2/src/Y2CCPlugin.cc 2008-07-23 10:44:47.000000000 +0200
@@ -105,12 +105,6 @@
regexec (&rxr3, name, 0, 0, 0) == 0)
tmp1 = tmp2 = "remote";
- if (strcmp (name, "ag_evms") == 0 ||
- strcmp (name, "ag_fdisk") == 0 ||
- strcmp (name, "ag_lvm") == 0 ||
- strcmp (name, "ag_md") == 0)
- tmp1 = "ag_storage";
-
// Look for the plugin and create component.
string filename = Y2PathSearch::findy2plugin (tmp1, level);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.5/liby2/src/Y2ProgramComponent.cc new/yast2-core-2.17.6/liby2/src/Y2ProgramComponent.cc
--- old/yast2-core-2.17.5/liby2/src/Y2ProgramComponent.cc 2008-07-21 16:59:59.000000000 +0200
+++ new/yast2-core-2.17.6/liby2/src/Y2ProgramComponent.cc 2008-07-24 10:49:06.000000000 +0200
@@ -355,7 +355,7 @@
if (c == NULL || c->isError())
{
- y2error ("External program returned invalid data.");
+ y2error ("External program %s returned invalid data. (No other error means no data at all)", bin_file.c_str ());
return YCPNull ();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.5/VERSION new/yast2-core-2.17.6/VERSION
--- old/yast2-core-2.17.5/VERSION 2008-07-22 09:47:44.000000000 +0200
+++ new/yast2-core-2.17.6/VERSION 2008-07-25 10:34:22.000000000 +0200
@@ -1 +1 @@
-2.17.5
+2.17.6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-ncurses-pkg
checked in at Fri Jul 25 12:59:17 CEST 2008.
--------
--- yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-07-21 15:36:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-07-25 10:54:26.203164000 +0200
@@ -1,0 +2,14 @@
+Wed Jul 23 16:55:55 CEST 2008 - kmachalkova(a)suse.cz
+
+- Added pkg search modes (contains, regexp etc.) selection (uses
+ zypp::PoolQuery)
+- Search view is now default (bnc#404694)
+- Reset info text area on switching to/from search filter
+
+-------------------------------------------------------------------
+Wed Jul 23 16:12:56 CEST 2008 ma(a)suse.de
+
+- Remove references to obsolete freshens dependencies.
+- 2.17.5
+
+-------------------------------------------------------------------
@@ -9 +23 @@
-- 2.17.4
+- 2.17.4
Old:
----
yast2-ncurses-pkg-2.17.4.tar.bz2
New:
----
yast2-ncurses-pkg-2.17.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ncurses-pkg.spec ++++++
--- /var/tmp/diff_new_pack.He4576/_old 2008-07-25 12:59:08.000000000 +0200
+++ /var/tmp/diff_new_pack.He4576/_new 2008-07-25 12:59:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ncurses-pkg (Version 2.17.4)
+# spec file for package yast2-ncurses-pkg (Version 2.17.5)
#
# 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-ncurses-pkg
-Version: 2.17.4
+Version: 2.17.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ncurses-pkg-2.17.4.tar.bz2
+Source0: yast2-ncurses-pkg-2.17.5.tar.bz2
Prefix: /usr
BuildRequires: dejagnu doxygen gcc-c++ yast2-core-devel yast2-devtools
BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel yast2-ncurses-devel
@@ -38,7 +38,7 @@
%prep
-%setup -n yast2-ncurses-pkg-2.17.4
+%setup -n yast2-ncurses-pkg-2.17.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -67,7 +67,16 @@
%{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so.*
%{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so
%doc %{prefix}/share/doc/packages/yast2-ncurses-pkg
+
%changelog
+* Wed Jul 23 2008 kmachalkova(a)suse.cz
+- Added pkg search modes (contains, regexp etc.) selection (uses
+ zypp::PoolQuery)
+- Search view is now default (bnc#404694)
+- Reset info text area on switching to/from search filter
+ Wed Jul 23 16:12:56 CEST 2008 ma(a)suse.de
+- Remove references to obsolete freshens dependencies.
+- 2.17.5
* Mon Jul 21 2008 kmachalkova(a)suse.cz
- Some look&feel fixes
* Show locale (language) description
++++++ yast2-ncurses-pkg-2.17.4.tar.bz2 -> yast2-ncurses-pkg-2.17.5.tar.bz2 ++++++
++++ 5370 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/configure.in new/yast2-ncurses-pkg-2.17.5/configure.in
--- old/yast2-ncurses-pkg-2.17.4/configure.in 2008-06-25 12:18:17.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.5/configure.in 2008-03-27 18:04:30.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-ncurses-pkg
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ncurses-pkg, 2.17.2, http://bugs.opensuse.org/, yast2-ncurses-pkg)
+AC_INIT(yast2-ncurses-pkg, 2.16.5, http://bugs.opensuse.org/, yast2-ncurses-pkg)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -14,11 +14,10 @@
AC_PREFIX_DEFAULT(/usr)
-dnl long filenames; we use GNU Make extensions and that's ok
-AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
+AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.17.2"
+VERSION="2.16.5"
RPMNAME="yast2-ncurses-pkg"
MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>"
@@ -108,7 +107,7 @@
dnl no need for AC_ARG_VAR
AC_PATH_PROG(XGETTEXT, xgettext)
if test -z "$XGETTEXT" ; then
- AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
+ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/COPYRIGHT.english new/yast2-ncurses-pkg-2.17.5/COPYRIGHT.english
--- old/yast2-ncurses-pkg-2.17.4/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ncurses-pkg-2.17.5/COPYRIGHT.english 2008-07-23 17:15:43.000000000 +0200
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/Makefile.am new/yast2-ncurses-pkg-2.17.5/Makefile.am
--- old/yast2-ncurses-pkg-2.17.4/Makefile.am 2008-06-25 12:18:18.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.5/Makefile.am 2008-03-27 18:04:30.000000000 +0100
@@ -23,14 +23,13 @@
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
-COPYRIGHT_files_gpl = README COPYING
+COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/README new/yast2-ncurses-pkg-2.17.5/README
--- old/yast2-ncurses-pkg-2.17.4/README 2008-07-21 16:04:55.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.5/README 2008-07-23 17:15:43.000000000 +0200
@@ -1,2 +1,2 @@
This program/library is part of YaST2
-See the file COPYING for license terms
+See the file COPYRIGHT.english for license terms
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/src/NCPackageSelector.cc new/yast2-ncurses-pkg-2.17.5/src/NCPackageSelector.cc
--- old/yast2-ncurses-pkg-2.17.4/src/NCPackageSelector.cc 2008-07-21 15:49:00.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.5/src/NCPackageSelector.cc 2008-07-23 16:55:22.000000000 +0200
@@ -722,6 +722,7 @@
}
}
+
///////////////////////////////////////////////////////////////////
//
// showPatchPackages
@@ -791,6 +792,15 @@
}
}
+void NCPackageSelector::clearInfoArea()
+{
+ if ( infoText )
+ infoText->setText("");
+ if ( versionsList )
+ versionsList->itemsCleared();
+
+ packageLabel->setText(".....................................");
+}
void NCPackageSelector::replaceFilter( FilterMode mode)
{
@@ -884,6 +894,7 @@
if (mode == Search)
{
pkgList->itemsCleared();
+ clearInfoArea();
}
else
{
@@ -1604,13 +1615,12 @@
filterMain = new NCPkgFilterMain (l, NCPkgStrings::Filter(), this );
replPoint = YUI::widgetFactory()->createReplacePoint( vv );
- YTableHeader *hhh = new YTableHeader();
- patternPopup = new NCPkgFilterPattern( replPoint, hhh, this );
+ //Search view is now default (#404694)
+ searchPopup = new NCPkgFilterSearch( replPoint, YD_VERT, this );
YAlignment *l1 = YUI::widgetFactory()->createLeft( vbox_left );
patternLabel = new NCLabel( l1, " " );
-
// add the package table
YTableHeader * tableHeader = new YTableHeader();
@@ -1636,33 +1646,33 @@
// set the pointer to the packager object
pkgList->setPackager( this );
- // HBox for Filter and Disk Space (both in additional HBoxes )
+ // label text + actions menu
YLayoutBox * hSplit2 = YUI::widgetFactory()->createHBox( v );
-
- // label text - keep it short
new NCLabel( hSplit2, NCPkgStrings::PackageName() );
packageLabel = YUI::widgetFactory()->createLabel ( hSplit2, "......................" );
-
new NCSpacing( hSplit2, YD_HORIZ, true, 0.5 );
-
actionMenu = new NCPkgMenuAction ( hSplit2, NCPkgStrings::Actions(), this );
+ //Search parameters resp. filter description
replPoint2 = YUI::widgetFactory()->createReplacePoint( hbox_bottom );
replPoint2->setWeight(YD_HORIZ, 1);
- filter_desc = new NCRichText( replPoint2, " " );
+ searchSet = new NCPkgSearchSettings( replPoint2, NCPkgStrings::SearchIn() );
+
+ //Package description resp. package version table
YLayoutBox * vSplit = YUI::widgetFactory()->createVBox( hbox_bottom );
vSplit->setWeight(YD_HORIZ, 2);
replacePoint = YUI::widgetFactory()->createReplacePoint( vSplit );
-
infoText = new NCPkgPackageDetails( replacePoint, " ", this );
YUI_CHECK_NEW( infoText );
+ //Bottom button bar
YAlignment *ll = YUI::widgetFactory()->createLeft( bottom_bar );
helpMenu = new NCPkgMenuHelp (ll, _("&Help"));
YUI_CHECK_NEW( helpMenu );
- YAlignment *r = YUI::widgetFactory()->createRight( bottom_bar );
- YLayoutBox * hSplit = YUI::widgetFactory()->createHBox( r );
+ //right-alignment for OK-Cancel
+ YAlignment *right = YUI::widgetFactory()->createRight( bottom_bar );
+ YLayoutBox * hSplit = YUI::widgetFactory()->createHBox( right );
// add the Cancel button
cancelButton = new NCPushButton( hSplit, _( "&Cancel" ) );
@@ -1695,6 +1705,7 @@
pkgList->setVisibleInfo(NCPkgTable::I_PatchDescr);
// show the patch description of the current item
pkgList->showInformation ();
+ pkgList->setKeyboardFocus();
break;
}
case NCPkgTable::T_Update: {
@@ -1709,21 +1720,15 @@
}
}
case NCPkgTable::T_Packages: {
-
+ //Search view is the default (#404694)
pkgList->setVisibleInfo(NCPkgTable::I_Technical);
- // update the pattern status which is available only after the initial
- // solver run
- patternPopup->updateTable();
- patternPopup->showPatternPackages();
- // show the package inforamtion of the current item
- pkgList->showInformation ();
+ searchField->setKeyboardFocus();
break;
}
default:
break;
}
- pkgList->setKeyboardFocus();
return true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/src/NCPackageSelector.h new/yast2-ncurses-pkg-2.17.5/src/NCPackageSelector.h
--- old/yast2-ncurses-pkg-2.17.4/src/NCPackageSelector.h 2008-06-11 18:24:26.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.5/src/NCPackageSelector.h 2008-07-23 16:55:22.000000000 +0200
@@ -306,6 +306,8 @@
* @return void
*/
void showInformation();
+
+ void clearInfoArea();
wrect deleteReplacePoint();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/src/NCPkgFilterMain.cc new/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterMain.cc
--- old/yast2-ncurses-pkg-2.17.4/src/NCPkgFilterMain.cc 2008-06-11 18:24:26.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterMain.cc 2008-07-23 16:55:22.000000000 +0200
@@ -53,6 +53,7 @@
items.push_back( repositories );
search = new YItem( _("Search") );
+ search->setSelected();
items.push_back( search );
inst_summary = new YItem( _("Installation Summary") );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/src/NCPkgFilterSearch.cc new/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterSearch.cc
--- old/yast2-ncurses-pkg-2.17.4/src/NCPkgFilterSearch.cc 2008-07-21 15:33:50.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterSearch.cc 2008-07-23 16:55:22.000000000 +0200
@@ -17,6 +17,7 @@
/-*/
#define YUILogComponent "ncurses-pkg"
#include <YUILog.h>
+#include <string>
#include <sstream>
#include <boost/format.hpp>
@@ -85,25 +86,35 @@
// add the input field (a editable combo box)
NCLayoutBox * vSplit = new NCLayoutBox ( frame0, YD_VERT);
- new NCSpacing( vSplit, YD_VERT, true, 0.5 );
+ //new NCSpacing( vSplit, YD_VERT, true, 0.5 );
searchExpr = new NCInputField( vSplit, NCPkgStrings::SearchPhrase() );
searchExpr->setStretchable( YD_HORIZ, true );
searchExpr->setReturnOnReturn( true );
packager->setSearchField( searchExpr );
- new NCSpacing( vSplit, YD_VERT, false, 0.5 );
+ //new NCSpacing( vSplit, YD_VERT, false, 0.5 );
if ( !packager->isYouMode() )
{
// add the checkBox ignore case
- NCAlignment *left = new NCAlignment( vSplit, YAlignBegin, YAlignUnchanged );
+ NCAlignment *left1 = new NCAlignment( vSplit, YAlignBegin, YAlignUnchanged );
- ignoreCase = new NCCheckBox( left, _( "&Ignore Case" ), true );
+ ignoreCase = new NCCheckBox( left1, _( "&Ignore Case" ), true );
new NCSpacing( vSplit, YD_VERT, true, 0.5 );
}
-
+
+ NCAlignment *left2 = new NCAlignment( vSplit, YAlignBegin, YAlignUnchanged );
+ searchMode = new NCComboBox (left2, _("Search &Mode"), false);
+
+ searchMode->addItem( _("Contains"), false);
+ searchMode->addItem( _("Begins with"), false);
+ searchMode->addItem( _("Exact Match"), false);
+ searchMode->addItem( _("Use Wildcards"), false);
+ searchMode->addItem( _("Use RegExp"), false);
+
+ new NCSpacing( vSplit, YD_VERT, true, 0.5 );
}
@@ -147,7 +158,7 @@
}
-bool NCPkgFilterSearch::fillSearchList( const string & expr,
+bool NCPkgFilterSearch::fillSearchList( string & expr,
bool ignoreCase,
bool checkName,
bool checkSummary,
@@ -166,6 +177,26 @@
packageList->itemsCleared ();
zypp::PoolQuery q;
+
+ switch ( searchMode->getCurrentItem() )
+ {
+ case Contains:
+ q.setMatchSubstring();
+ break;
+ case BeginsWith:
+ expr = '^' + expr;
+ q.setMatchRegex();
+ break;
+ case ExactMatch:
+ break;
+ case UseWildcard:
+ q.setMatchGlob();
+ break;
+ case UseRegexp:
+ q.setMatchRegex();
+ break;
+ }
+
q.addString( expr );
q.addKind( zypp::ResKind::package );
//no clue what this means, but it segfaults if it's not here :)
@@ -203,7 +234,10 @@
{
packageList->setCurrentItem( 0 );
packageList->showInformation();
+ packageList->setKeyboardFocus();
}
+ else
+ packager->clearInfoArea();
return true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/src/NCPkgFilterSearch.h new/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterSearch.h
--- old/yast2-ncurses-pkg-2.17.4/src/NCPkgFilterSearch.h 2008-06-11 18:24:26.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterSearch.h 2008-07-23 16:55:22.000000000 +0200
@@ -32,6 +32,7 @@
#include "NCLayoutBox.h"
#include "NCRichText.h"
#include "NCCheckBox.h"
+#include "NCComboBox.h"
#include "NCPushButton.h"
class NCPackageSelector;
@@ -49,8 +50,17 @@
private:
+ enum SearchMode {
+ Contains = 0,
+ BeginsWith,
+ ExactMatch,
+ UseWildcard,
+ UseRegexp
+ };
+
NCInputField * searchExpr;
NCCheckBox * ignoreCase;
+ NCComboBox * searchMode;
NCPackageSelector * packager; // connection to the package selector
@@ -70,7 +80,7 @@
virtual bool showSearchResultPackages();
bool match ( string s1, string s2, bool ignoreCase );
- bool fillSearchList( const string & expr,
+ bool fillSearchList( string & expr,
bool ignoreCase,
bool checkName,
bool checkSummary,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/src/NCPkgPackageDetails.cc new/yast2-ncurses-pkg-2.17.5/src/NCPkgPackageDetails.cc
--- old/yast2-ncurses-pkg-2.17.4/src/NCPkgPackageDetails.cc 2008-07-16 11:22:15.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.5/src/NCPkgPackageDetails.cc 2008-07-23 16:55:22.000000000 +0200
@@ -86,7 +86,7 @@
string NCPkgPackageDetails::commonHeader( ZyppObj pkgPtr )
{
string text;
- text += "<h3>" + pkgPtr->name() + " - ";
+ text += "<h3>" + pkgPtr->name() + " - ";
text += pkgPtr->summary() + "</h3>";
return text;
@@ -94,8 +94,8 @@
void NCPkgPackageDetails::longDescription ( ZyppObj pkgPtr )
{
- string text = "";
-
+ string text = "";
+
//text += commonHeader( pkgPtr );
text += pkgPtr->description();
@@ -108,12 +108,12 @@
string instVersion = "";
string version = "";
string text = "";
-
+
text += commonHeader( pkgPtr );
//text += " - ";
-
+
//text += pkgPtr->summary();
-
+
if ( slbPtr->hasBothObjects () )
{
ZyppObj io = slbPtr->installedObj ();
@@ -131,7 +131,7 @@
version += "-";
version += pkgPtr->edition().release();
}
-
+
text += NCPkgStrings::Version();
text += version;
if ( instVersion != "" )
@@ -141,12 +141,12 @@
text += instVersion;
}
text += "<br>";
-
+
// show the size
text += NCPkgStrings::Size();
text += pkgPtr->installsize().asString();
text += " ";
-
+
ZyppPkg package = tryCastToZyppPkg (pkgPtr);
if ( package )
{
@@ -157,18 +157,18 @@
sprintf( num, "%d", medianr );
text += num;
text += "<br>";
-
+
// the license
text += NCPkgStrings::License();
text += package->license();
text += " ";
text += "<br>";
-
+
// the rpm group
text += NCPkgStrings::RpmGroup();
text += package->group ();
text += "<br>";
-
+
//authors, in one line
text += NCPkgStrings::Authors();
list<string> authors = package->authors(); // zypp::Package
@@ -185,17 +185,17 @@
string text = "";
// the file list is available only for installed packages
ZyppPkg package = tryCastToZyppPkg (slbPtr->installedObj());
-
+
if ( package )
{
- text += commonHeader( slbPtr->theObj() );
+ text += commonHeader( slbPtr->theObj() );
text += NCPkgStrings::ListOfFiles();
// get the file list from the package manager/show the list
list<string> fileList = package->filenames();
text += createText( fileList, false ) ;
}
- else
+ else
text = _("<i>This information is available for installed packages only</i>");
setValue(text);
@@ -203,7 +203,7 @@
void NCPkgPackageDetails::dependencyList( ZyppObj pkgPtr, ZyppSel slbPtr )
{
- string text = commonHeader( pkgPtr );
+ string text = commonHeader( pkgPtr );
// show the relations, all of them except provides which is above
zypp::Dep deptypes[] = {
zypp::Dep::PROVIDES,
@@ -213,7 +213,6 @@
zypp::Dep::OBSOLETES,
zypp::Dep::RECOMMENDS,
zypp::Dep::SUGGESTS,
- zypp::Dep::FRESHENS,
zypp::Dep::ENHANCES,
zypp::Dep::SUPPLEMENTS,
};
@@ -231,7 +230,7 @@
}
setValue (text);
-
+
}
bool NCPkgPackageDetails::patchDescription( ZyppObj objPtr, ZyppSel selectable )
@@ -243,7 +242,7 @@
yuiError() << "Patch not valid" << endl;
return false;
}
-
+
string descr;
descr += "<p>";
descr += NCPkgStrings::Patch();
@@ -260,7 +259,7 @@
descr += NCPkgStrings::Version();
descr += patchPtr->edition().asString();
descr += "</p>";
-
+
if ( !selectable->installedEmpty()
&& selectable->installedObj().isBroken() )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/VERSION new/yast2-ncurses-pkg-2.17.5/VERSION
--- old/yast2-ncurses-pkg-2.17.4/VERSION 2008-07-21 16:03:02.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.5/VERSION 2008-07-23 16:55:22.000000000 +0200
@@ -1 +1 @@
-2.17.4
+2.17.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-mail
checked in at Fri Jul 25 12:58:49 CEST 2008.
--------
--- yast2-mail/yast2-mail.changes 2008-06-27 16:22:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-mail/yast2-mail.changes 2008-07-25 06:35:58.363348000 +0200
@@ -1,0 +2,5 @@
+Thu Jul 24 12:34:45 CEST 2008 - varkoly(a)suse.de
+
+- API changes in yast2-users and yast2-ldap
+
+-------------------------------------------------------------------
@@ -4 +9 @@
-- openldap do not contains /etc/openldap anymore
+- openldap do not contains /etc/openldap anymore
Old:
----
yast2-mail-2.16.6.tar.bz2
New:
----
yast2-mail-2.16.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-mail.spec ++++++
--- /var/tmp/diff_new_pack.FZ3900/_old 2008-07-25 12:58:41.000000000 +0200
+++ /var/tmp/diff_new_pack.FZ3900/_new 2008-07-25 12:58:41.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-mail (Version 2.16.6)
+# spec file for package yast2-mail (Version 2.16.7)
#
# 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-mail
-Version: 2.16.6
-Release: 5
+Version: 2.16.7
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-mail-2.16.6.tar.bz2
+Source0: yast2-mail-2.16.7.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite
BuildRequires: yast2-ldap-server yast2-network yast2-perl-bindings yast2-users
@@ -68,7 +68,7 @@
Peter Varkoly <varkoly(a)novell.com>
%prep
-%setup -n yast2-mail-2.16.6
+%setup -n yast2-mail-2.16.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -161,8 +161,9 @@
/usr/share/YaST2/modules/UsersPluginMail.pm
%dir /usr/share/YaST2/clients
/usr/share/YaST2/clients/users*
-
%changelog
+* Thu Jul 24 2008 varkoly(a)suse.de
+- API changes in yast2-users and yast2-ldap
* Fri Jun 27 2008 varkoly(a)suse.de
- openldap do not contains /etc/openldap anymore
* Thu Jun 05 2008 varkoly(a)suse.de
++++++ yast2-mail-2.16.6.tar.bz2 -> yast2-mail-2.16.7.tar.bz2 ++++++
++++ 11428 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.6/configure.in new/yast2-mail-2.16.7/configure.in
--- old/yast2-mail-2.16.6/configure.in 2007-11-22 10:47:28.000000000 +0100
+++ new/yast2-mail-2.16.7/configure.in 2008-07-24 12:51:25.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-mail
dnl
-dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-mail, 2.15.23, http://bugs.opensuse.org/, yast2-mail)
+AC_INIT(yast2-mail, 2.16.7, http://bugs.opensuse.org/, yast2-mail)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -14,10 +14,11 @@
AC_PREFIX_DEFAULT(/usr)
-AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
+dnl long filenames; we use GNU Make extensions and that's ok
+AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.15.23"
+VERSION="2.16.7"
RPMNAME="yast2-mail"
MAINTAINER="Peter Varkoly <varkoly(a)novell.com>"
@@ -107,7 +108,7 @@
dnl no need for AC_ARG_VAR
AC_PATH_PROG(XGETTEXT, xgettext)
if test -z "$XGETTEXT" ; then
- AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
+ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.6/COPYRIGHT.english new/yast2-mail-2.16.7/COPYRIGHT.english
--- old/yast2-mail-2.16.6/COPYRIGHT.english 2008-06-05 14:38:32.000000000 +0200
+++ new/yast2-mail-2.16.7/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.6/Makefile.am new/yast2-mail-2.16.7/Makefile.am
--- old/yast2-mail-2.16.6/Makefile.am 2007-11-22 10:47:28.000000000 +0100
+++ new/yast2-mail-2.16.7/Makefile.am 2008-07-24 12:51:25.000000000 +0200
@@ -23,13 +23,14 @@
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
-COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
+COPYRIGHT_files_gpl = README COPYING
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
+# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.6/src/mail-server_complex.ycp new/yast2-mail-2.16.7/src/mail-server_complex.ycp
--- old/yast2-mail-2.16.6/src/mail-server_complex.ycp 2008-05-05 22:59:13.000000000 +0200
+++ new/yast2-mail-2.16.7/src/mail-server_complex.ycp 2008-06-17 11:32:33.000000000 +0200
@@ -54,7 +54,7 @@
/* Progress stage 2/3 */
_("Choose LDAP and CA settings"),
/* Progress stage 3/3 */
- _("Configure LDAP server and CA managemant")
+ _("Configure LDAP server and CA management")
], [
/* Progress stage 0/7 */
_("Reading packages..."),
@@ -63,7 +63,7 @@
/* Progress stage 2/3 */
_("Choosing LDAP and CA settings..."),
/* Progress stage 3/3 */
- _("Configuring LDAP server and CA managemant..."),
+ _("Configuring LDAP server and CA management..."),
/* Progress finished */
_("Finished")
]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.6/src/mail-server_dialogs.ycp new/yast2-mail-2.16.7/src/mail-server_dialogs.ycp
--- old/yast2-mail-2.16.6/src/mail-server_dialogs.ycp 2008-05-26 19:14:48.000000000 +0200
+++ new/yast2-mail-2.16.7/src/mail-server_dialogs.ycp 2008-06-17 11:32:20.000000000 +0200
@@ -104,7 +104,7 @@
}
if( ca_mgm )
- { // Now we setup the ca managemant
+ { // Now we setup the ca management
args = add(args, "ca_mgm");
}
Progress::NextStage();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.6/src/MailServer.ycp new/yast2-mail-2.16.7/src/MailServer.ycp
--- old/yast2-mail-2.16.6/src/MailServer.ycp 2008-05-26 19:14:48.000000000 +0200
+++ new/yast2-mail-2.16.7/src/MailServer.ycp 2008-07-23 16:26:30.000000000 +0200
@@ -184,17 +184,17 @@
/* looking if a mail domain exist */
map searchmap = $[
"base_dn" : LDAPSettings["base_config_dn"]:"",
- "filter" : "objectclass=suseDnsConfiguration",
+ "filter" : "objectClass=suseDnsConfiguration",
"attrs" : ["suseDefaultBase"],
"not_found_ok": false,
"scope" : 2
];
list modulesDns = (list)SCR::Read (.ldap.search, searchmap);
- string dns_base = (string)modulesDns[0,"susedefaultbase",0]:"";
+ string dns_base = (string)modulesDns[0,"suseDefaultBase",0]:"";
searchmap = $[
"base_dn" : dns_base,
- "filter" : "(&(objectclass=dNSZone)(relativeDomainName=@))",
+ "filter" : "(&(objectClass=dNSZone)(relativeDomainName=@))",
"not_found_ok" : false,
"map" : true,
"scope" : 2
@@ -209,7 +209,7 @@
}
boolean is_main_domain = false;
foreach(string dn, map domain, (map<string,map>) domains, ``{
- if(domain["susemaildomaintype",0]:"" == "main" )
+ if(domain["suseMailDomainType",0]:"" == "main" )
{
is_main_domain = true;
break;
@@ -230,7 +230,7 @@
|| substring (((list)domain["zonename"]:[])[0]:"",
size (((list)domain["zonename"]:[])[0]:"") - size (".in-addr.arpa")) != ".in-addr.arpa")
{
- domain["objectclass"] = add(domain["objectclass"]:[], "suseMailDomain");
+ domain["objectClass"] = add(domain["objectClass"]:[], "suseMailDomain");
domain["suseMailDomainType"] = ["main"];
domain["suseMailDomainMasquerading"] = ["yes"];
lastDomain = domain;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.6/src/mail.ycp new/yast2-mail-2.16.7/src/mail.ycp
--- old/yast2-mail-2.16.6/src/mail.ycp 2008-05-20 18:10:54.000000000 +0200
+++ new/yast2-mail-2.16.7/src/mail.ycp 2008-06-25 12:32:14.000000000 +0200
@@ -12,7 +12,7 @@
* Martin Vidner <mvidner(a)suse.cz>
* Peter Varkoly <varkoly(a)novell.com>
*
- * $Id: mail.ycp 47723 2008-05-20 16:08:22Z varkoly $
+ * $Id: mail.ycp 48523 2008-06-25 10:29:36Z varkoly $
*
* Main file for mail configuration. Uses all other files.
*
@@ -52,8 +52,8 @@
// Translators: start dialog help, part 2 of 4
_("<P>This module will configure and start Postfix and, if necessary, the Cyrus IMAP server.</P>")+
// Translators: start dialog help, part 3 of 4
- _("<p><b>Warning:</b><p>
-Most home users can use the build-in
+ _("<P><B>Warning:</B></P>
+<P>Most home users can use the build-in
features of their email application to send and
receive e-mail. They do not need this module.</P>
")+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.6/src/YaPI/MailServer.pm new/yast2-mail-2.16.7/src/YaPI/MailServer.pm
--- old/yast2-mail-2.16.6/src/YaPI/MailServer.pm 2008-06-05 12:46:37.000000000 +0200
+++ new/yast2-mail-2.16.7/src/YaPI/MailServer.pm 2008-07-23 16:26:30.000000000 +0200
@@ -37,6 +37,7 @@
use POSIX; # Needed for setlocale()
use Data::Dumper;
+use Net::IMAP;
textdomain("mail");
our %TYPEINFO;
@@ -55,6 +56,11 @@
my $proposal_valid = 0;
##
+ # Some global variables for cyrus-imapd
+my $imapadm = "cyrus";
+my $imaphost = "localhost";
+
+##
# Write only, used during autoinstallation.
# Don't run services and SuSEconfig, it's all done at one place.
#
@@ -457,7 +463,7 @@
my %SearchMap = (
'base_dn' => $ldapMap->{'mail_config_dn'},
- 'filter' => "ObjectClass=suseCanonicalTable",
+ 'filter' => "objectClass=suseCanonicalTable",
'scope' => 2,
'map' => 1,
'attributes' => ['tableKey',
@@ -474,9 +480,9 @@
foreach my $dn (keys %{$ret})
{
my $Canonical = {};
- $Canonical->{'key'} = $ret->{$dn}->{'tablekey'}->[0];
- $Canonical->{'value'} = $ret->{$dn}->{'tablevalue'}->[0];
- $Canonical->{'type'} = $ret->{$dn}->{'valuetype'}->[0];
+ $Canonical->{'key'} = $ret->{$dn}->{'tableKey'}->[0];
+ $Canonical->{'value'} = $ret->{$dn}->{'tableValue'}->[0];
+ $Canonical->{'type'} = $ret->{$dn}->{'valueType'}->[0];
if( defined $ret->{$dn}->{'description'}->[0] )
{
$Canonical->{'description'} = $ret->{$dn}->{'description'}->[0];
@@ -659,7 +665,7 @@
my %SearchMap = (
'base_dn' => $ldapMap->{'mail_config_dn'},
- 'filter' => "ObjectClass=suseMailTransport",
+ 'filter' => "objectClass=suseMailTransport",
'scope' => 2,
'map' => 1,
'attributes' => ['suseMailTransportDestination',
@@ -674,14 +680,14 @@
foreach my $dn (keys %{$ret})
{
my $Transport = {};
- $Transport->{'Destination'} = $ret->{$dn}->{'susemailtransportdestination'}->[0];
- if( $ret->{$dn}->{'susemailtransportnexthop'}->[0] =~ /:/)
+ $Transport->{'Destination'} = $ret->{$dn}->{'suseMailTransportDestination'}->[0];
+ if( $ret->{$dn}->{'suseMailTransportNexthop'}->[0] =~ /:/)
{
- ($Transport->{'Transport'},$Transport->{'Nexthop'}) = split /:/,$ret->{$dn}->{'susemailtransportnexthop'}->[0];
+ ($Transport->{'Transport'},$Transport->{'Nexthop'}) = split /:/,$ret->{$dn}->{'suseMailTransportNexthop'}->[0];
}
else
{
- $Transport->{'Nexthop'} = $ret->{$dn}->{'susemailtransportnexthop'}->[0];
+ $Transport->{'Nexthop'} = $ret->{$dn}->{'suseMailTransportNexthop'}->[0];
}
push @{$MailTransports{'Transports'}}, $Transport;
if( $Transport->{'Nexthop'} =~ /\[(.*)\]/ )
@@ -722,8 +728,8 @@
# filling up our array
foreach my $dn (keys %{$ret})
{
- my $TLSMode = $ret->{$dn}->{'susetlspersitemode'}->[0] || "NONE";
- my $TLSSite = $ret->{$dn}->{'susetlspersitepeer'}->[0] ;
+ my $TLSMode = $ret->{$dn}->{'suseTLSPerSiteMode'}->[0] || "NONE";
+ my $TLSSite = $ret->{$dn}->{'suseTLSPerSitePeer'}->[0] ;
$MailTransports{'TLSSites'}->{$TLSSite} = $TLSMode;
}
@@ -814,10 +820,10 @@
# Search hash to find all the Transport Objects
my %SearchMap = (
'base_dn' => $ldapMap->{'mail_config_dn'},
- 'filter' => "objectclass=susemailtransport",
+ 'filter' => "objectClass=suseMailTransport",
'map' => 1,
'scope' => 2,
- 'attrs' => ['susemailtransportdestination' ]
+ 'attrs' => ['suseMailTransportDestination' ]
);
my $ret = SCR->Read('.ldap.search',\%SearchMap);
@@ -926,7 +932,7 @@
# Search hash to find all the TLSSites Objects
%SearchMap = (
'base_dn' => $ldapMap->{'mail_config_dn'},
- 'filter' => "objectclass=suseTLSPerSiteContainer",
+ 'filter' => "objectClass=suseTLSPerSiteContainer",
'map' => 1,
'scope' => 2,
'attrs' => []
@@ -1041,7 +1047,8 @@
'BasicProtection' => 'hard',
'RBLList' => [],
'AccessList' => [],
- 'VirusScanning' => 1
+ 'VirusScanning' => 1,
+ 'SpamLearning' => 1
);
AccessList is a pointer to an array of %AccessEntry hashes.
@@ -1086,7 +1093,8 @@
'BasicProtection' => 'hard',
'RBLList' => [],
'AccessList' => [],
- 'VirusScanning' => YaST::YCP::Boolean(0)
+ 'VirusScanning' => YaST::YCP::Boolean(0),
+ 'SpamLearning' => YaST::YCP::Boolean(0)
);
# Make LDAP Connection
@@ -1144,8 +1152,8 @@
foreach my $entry (@{$ret})
{
my $AccessEntry = {};
- $AccessEntry->{'MailClient'} = $entry->{'susemailclient'}->[0];
- $AccessEntry->{'MailAction'} = $entry->{'susemailaction'}->[0];
+ $AccessEntry->{'MailClient'} = $entry->{'suseMailClient'}->[0];
+ $AccessEntry->{'MailAction'} = $entry->{'suseMailAction'}->[0];
push @{$MailPrevention{'AccessList'}}, $AccessEntry;
}
@@ -1163,6 +1171,19 @@
$MailPrevention{'VirusScanning'} = YaST::YCP::Boolean(1);
}
}
+ # make IMAP connection
+ my $imap = new Net::IMAP($imaphost, Debug => 0);
+ if( $imap )
+ {
+ $ret = $imap->login($imapadm, $AdminPassword);
+ if($$ret{Status} eq "ok") {
+ $ret = $imap->select('NEWSPAM');
+ if( $ret->{Status} eq 'ok' )
+ {
+ $MailPrevention{'SpamLearning'} = YaST::YCP::Boolean(1);
+ }
+ }
+ }
return \%MailPrevention;
}
@@ -1276,7 +1297,7 @@
#Now we have a look on the access table
my %SearchMap = (
'base_dn' => $ldapMap->{'mail_config_dn'},
- 'filter' => "ObjectClass=suseMailAccess",
+ 'filter' => "objectClass=suseMailAccess",
'scope' => 2,
'map' => 1
);
@@ -1391,6 +1412,24 @@
SCR->Write('.mail.postfix.main',undef);
SCR->Write('.mail.postfix.mastercf',undef);
+ # make IMAP connection
+ my $imap = new Net::IMAP($imaphost, Debug => 0);
+ if( $imap )
+ {
+ my $ret = $imap->login($imapadm, $AdminPassword);
+ if($$ret{Status} eq "ok")
+ {
+ if( $MailPrevention->{'SpamLearning'} )
+ {
+ $ret = $imap->create('NewSpam');
+ $ret = $imap->create('NoSpam');
+ $ret = $imap->setacl('NewSpam', $imapadm, "lrswipkxtea");
+ $ret = $imap->setacl('NoSpam', $imapadm, "lrswipkxtea");
+ $ret = $imap->setacl('NewSpam', 'anyone', "lrswi");
+ $ret = $imap->setacl('NoSpam', 'anyone', "lsi");
+ }
+ }
+ }
return 1;
}
@@ -2084,11 +2123,11 @@
foreach(@{$ret})
{
my $domain = {};
- if( $_->{'zonename'}->[0] !~ /in-addr.arpa$/i)
+ if( $_->{'zoneName'}->[0] !~ /in-addr.arpa$/i)
{
- $domain->{'Name'} = $_->{'zonename'}->[0];
- $domain->{'Type'} = $_->{'susemaildomaintype'}->[0] || 'none';
- $domain->{'Masquerading'} = $_->{'susemaildomainmasquerading'}->[0] || 'yes';
+ $domain->{'Name'} = $_->{'zoneName'}->[0];
+ $domain->{'Type'} = $_->{'suseMailDomainType'}->[0] || 'none';
+ $domain->{'Masquerading'} = $_->{'suseMailDomainMasquerading'}->[0] || 'yes';
push @{$MailLocalDomains{'Domains'}}, $domain;
}
}
@@ -2139,15 +2178,15 @@
my $DN = "zoneName=$name,$ldapMap->{'dns_config_dn'}";
my $retVal = SCR->Read('.ldap.search',{
"base_dn" => $DN,
- "filter" => '(objectclass=dNSZone)',
+ "filter" => '(objectClass=dNSZone)',
"scope" => 0,
"not_found_ok" => 0
} );
- if( defined $retVal && defined $retVal->[0] && defined $retVal->[0]->{'objectclass'})
+ if( defined $retVal && defined $retVal->[0] && defined $retVal->[0]->{'objectClass'})
{
my $found = 0;
- foreach my $ojc ( @{$retVal->[0]->{'objectclass'}} )
+ foreach my $ojc ( @{$retVal->[0]->{'objectClass'}} )
{
if($ojc =~ /^suseMailDomain$/i) {
$found = 1;
@@ -2156,9 +2195,9 @@
}
if($found && $type eq 'none')
{
- # delete objectclass
+ # delete objectClass
- $Domains->{$DN}->{'objectclass'} = ['dNSZone'];
+ $Domains->{$DN}->{'objectClass'} = ['dNSZone'];
$Domains->{$DN}->{'suseMailDomainType'} = [];
$Domains->{$DN}->{'suseMailDomainMasquerading'} = [];
@@ -2180,7 +2219,7 @@
{
# modify
- $Domains->{$DN}->{'objectclass'} = ['dNSZone','suseMailDomain'];
+ $Domains->{$DN}->{'objectClass'} = ['dNSZone','suseMailDomain'];
$Domains->{$DN}->{'zoneName'} = $name;
$Domains->{$DN}->{'suseMailDomainType'} = $type;
$Domains->{$DN}->{'suseMailDomainMasquerading'} = $masquerading;
@@ -2312,7 +2351,7 @@
# read mail configuration data
$ldapret = SCR->Read(".ldap.search", {
"base_dn" => $ldapMap->{'base_config_dn'},
- "filter" => '(objectclass=suseMailConfiguration)',
+ "filter" => '(objectClass=suseMailConfiguration)',
"scope" => 2,
"not_found_ok" => 1,
"attrs" => [ 'suseDefaultBase' ]
@@ -2326,7 +2365,7 @@
}
if(@$ldapret > 0)
{
- $ldapMap->{'mail_config_dn'} = $ldapret->[0]->{'susedefaultbase'}->[0];
+ $ldapMap->{'mail_config_dn'} = $ldapret->[0]->{'suseDefaultBase'}->[0];
}
else
{
@@ -2366,7 +2405,7 @@
# check whether ou=Mailserver tree exists
$ldapret = SCR->Read(".ldap.search", {
"base_dn" => $ldapMap->{'ldap_domain'},
- "filter" => '(&(ou=Mailserver)(objectclass=organizationalUnit))',
+ "filter" => '(&(ou=Mailserver)(objectClass=organizationalUnit))',
"scope" => 2,
"not_found_ok" => 1,
"attrs" => [ 'ou' ]
@@ -2408,7 +2447,7 @@
# check whether mail plugin is already in the pluginlist
$ldapret = SCR->Read(".ldap.search", {
"base_dn" => $ldapMap->{'base_config_dn'},
- "filter" => '(objectclass=suseUserTemplate)',
+ "filter" => '(objectClass=suseUserTemplate)',
"scope" => 2,
"not_found_ok" => 1
});
@@ -2423,9 +2462,9 @@
{
#
my $foundplugin = 0;
- if( defined $ldapret->[0]->{'suseplugin'} )
+ if( defined $ldapret->[0]->{'susePlugin'} )
{
- foreach my $sp ( @{$ldapret->[0]->{'suseplugin'}} )
+ foreach my $sp ( @{$ldapret->[0]->{'susePlugin'}} )
{
$foundplugin = 1 if lc($sp) eq "userspluginmail";
}
@@ -2440,7 +2479,7 @@
description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'});
}
my $dn = "cn=userTemplate,".$ldapMap->{'base_config_dn'};
- my $pluginlist = $ldapret->[0]->{'suseplugin'};
+ my $pluginlist = $ldapret->[0]->{'susePlugin'};
push @$pluginlist, 'UsersPluginMail';
if( ! SCR->Write('.ldap.modify',
{ "dn" => $dn },
@@ -2464,7 +2503,7 @@
# now we search user base
$ldapret = SCR->Read(".ldap.search", {
"base_dn" => $ldapMap->{'base_config_dn'},
- "filter" => '(objectclass=suseUserConfiguration)',
+ "filter" => '(objectClass=suseUserConfiguration)',
"scope" => 2,
"not_found_ok" => 1,
"attrs" => [ 'suseDefaultBase' ]
@@ -2478,12 +2517,12 @@
}
if(@$ldapret > 0)
{
- $ldapMap->{'user_config_dn'} = $ldapret->[0]->{'susedefaultbase'}->[0];
+ $ldapMap->{'user_config_dn'} = $ldapret->[0]->{'suseDefaultBase'}->[0];
}
# now we search group base
$ldapret = SCR->Read(".ldap.search", {
"base_dn" => $ldapMap->{'base_config_dn'},
- "filter" => '(objectclass=suseGroupConfiguration)',
+ "filter" => '(objectClass=suseGroupConfiguration)',
"scope" => 2,
"not_found_ok" => 1,
"attrs" => [ 'suseDefaultBase' ]
@@ -2497,12 +2536,12 @@
}
if(@$ldapret > 0)
{
- $ldapMap->{'group_config_dn'} = $ldapret->[0]->{'susedefaultbase'}->[0];
+ $ldapMap->{'group_config_dn'} = $ldapret->[0]->{'suseDefaultBase'}->[0];
}
# now we search DNS base
$ldapret = SCR->Read(".ldap.search", {
"base_dn" => $ldapMap->{'base_config_dn'},
- "filter" => '(objectclass=suseDNSConfiguration)',
+ "filter" => '(objectClass=suseDNSConfiguration)',
"scope" => 2,
"not_found_ok" => 1,
"attrs" => [ 'suseDefaultBase' ]
@@ -2515,7 +2554,7 @@
code => "LDAP_SEARCH_FAILED");
}
if(@$ldapret > 0) {
- $ldapMap->{'dns_config_dn'} = $ldapret->[0]->{'susedefaultbase'}->[0];
+ $ldapMap->{'dns_config_dn'} = $ldapret->[0]->{'suseDefaultBase'}->[0];
}
else
{
@@ -2876,19 +2915,19 @@
my $changes = 0;
my %query_filter = (
- 'transport_maps' => '(&(objectclass=suseMailTransport)(suseMailTransportDestination=%s))',
- 'smtp_tls_per_site' => '(&(objectclass=suseMailTransport)(suseMailTransportDestination=%s))',
- 'access' => '(&(objectclass=suseMailAccess)(suseMailClient=%s))',
- 'local_recipient_maps'=> '(&(objectclass=suseMailRecipient)(|(suseMailAcceptAddress=%s)(uid=%s)))',
- 'alias_maps' => '(&(objectclass=suseMailRecipient)(cn=%s))',
- 'alias_maps_member' => '(&(objectclass=suseMailRecipient)(cn=%s)(suseDeliveryToMember=yes))',
- 'mynetworks' => '(&(objectclass=suseMailMyNetworks)(suseMailClient=%s))',
- 'masquerade_domains' => '(&(objectclass=suseMailDomain)(zoneName=%s)(suseMailDomainMasquerading=yes))',
- 'mydestination' => '(&(objectclass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(!(suseMailDomainType=virtual)))',
- 'virtual_alias_maps' => '(&(objectclass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(suseMailDomainType=virtual))',
- 'canonical_maps' => '(&(objectclass=suseCanonicalTable)(tableKey=%s)(valueType=both))',
- 'recipient_canonical_maps' => '(&(objectclass=suseCanonicalTable)(tableKey=%s)(valueType=recipient))',
- 'sender_canonical_maps' => '(&(objectclass=suseCanonicalTable)(tableKey=%s)(valueType=sender))'
+ 'transport_maps' => '(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))',
+ 'smtp_tls_per_site' => '(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))',
+ 'access' => '(&(objectClass=suseMailAccess)(suseMailClient=%s))',
+ 'local_recipient_maps'=> '(&(objectClass=suseMailRecipient)(|(suseMailAcceptAddress=%s)(uid=%s)))',
+ 'alias_maps' => '(&(objectClass=suseMailRecipient)(cn=%s))',
+ 'alias_maps_member' => '(&(objectClass=suseMailRecipient)(cn=%s)(suseDeliveryToMember=yes))',
+ 'mynetworks' => '(&(objectClass=suseMailMyNetworks)(suseMailClient=%s))',
+ 'masquerade_domains' => '(&(objectClass=suseMailDomain)(zoneName=%s)(suseMailDomainMasquerading=yes))',
+ 'mydestination' => '(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(!(suseMailDomainType=virtual)))',
+ 'virtual_alias_maps' => '(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(suseMailDomainType=virtual))',
+ 'canonical_maps' => '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=both))',
+ 'recipient_canonical_maps' => '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=recipient))',
+ 'sender_canonical_maps' => '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=sender))'
);
my %result_attribute = (
'transport_maps' => 'suseMailTransportNexthop',
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.6/users-plugin/users_plugin_mail_groups.ycp new/yast2-mail-2.16.7/users-plugin/users_plugin_mail_groups.ycp
--- old/yast2-mail-2.16.6/users-plugin/users_plugin_mail_groups.ycp 2007-07-18 15:41:20.000000000 +0200
+++ new/yast2-mail-2.16.7/users-plugin/users_plugin_mail_groups.ycp 2008-07-23 16:26:30.000000000 +0200
@@ -145,17 +145,17 @@
list<term> result = [];
integer i = 0;
- if( is(data["susemailforwardaddress"]:(any)"", string)
- && size (data["susemailforwardaddress"]:"") > 0 )
+ if( is(data["suseMailForwardAaddress"]:(any)"", string)
+ && size (data["suseMailForwardAaddress"]:"") > 0 )
{
result = [`item (`id (i),
- data["susemailforwardaddress"]:"")];
+ data["suseMailForwardAaddress"]:"")];
// transforming to list
- data["susemailforwardaddress"] = [data["susemailforwardaddress"]:""];
+ data["suseMailForwardAaddress"] = [data["suseMailForwardAaddress"]:""];
}
- else if ( is(data["susemailforwardaddress"]:(any)[], list) )
+ else if ( is(data["suseMailForwardAaddress"]:(any)[], list) )
{
- foreach (string element, data["susemailforwardaddress"]:[], ``{
+ foreach (string element, data["suseMailForwardAaddress"]:[], ``{
result = add (result, `item (`id (i), element));
i = i + 1;
});
@@ -169,16 +169,16 @@
string what = config["what"]:"user";
string action = data["what"]:"";
- if( data["susemailcommand"]:"" != "" ) {
+ if( data["suseMailCommand"]:"" != "" ) {
sharedfolder = true;
}
- if( data["susedeliverytomember"]:"no" == "yes" ) {
+ if( data["suseDeliveryToMember"]:"no" == "yes" ) {
deliverytomember = true;
sharedfolder = false;
}
map<string, any> tmp_data = $[];
- list<string> object_class = (list<string>)sort (data["objectclass"]:[]);
+ list<string> object_class = (list<string>)sort (data["objectClass"]:[]);
// if this plugin wasn't present in default plugin set, we have to call
// BeforeAdd/BeforeEdit e.g. to get object class!
@@ -188,8 +188,8 @@
data = UsersPluginMail::AddBefore (config, data);
else if (action == "edit_user" || action == "edit_group")
data = UsersPluginMail::EditBefore (config, data);
- object_class = (list<string>)sort (data["objectclass"]:[]);
- tmp_data["objectclass"] = object_class;
+ object_class = (list<string>)sort (data["objectClass"]:[]);
+ tmp_data["objectClass"] = object_class;
}
// helptext 1/3
@@ -233,10 +233,10 @@
term imap = `VBox();
term shared = `VBox();
- integer intimapquota = -1;
- if (haskey (data, "imapquota") && data["imapquota"]:"10000" != nil)
+ integer intimapQuota = -1;
+ if (haskey (data, "imapQuota") && data["imapQuota"]:"10000" != nil)
{
- intimapquota = tointeger ((string) data["imapquota"]:"-1" );
+ intimapQuota = tointeger ((string) data["imapQuota"]:"-1" );
}
shared = `Frame ( _("Delivery of group Mails"),
`VBox(
@@ -253,12 +253,12 @@
imap = `Frame ( _("IMAP Quota"),
`VBox(
`Left(`CheckBox( `id(`sharedfolder), `opt(`notify), _("Enable Shared Folder"), sharedfolder)),
- `Left(`CheckBox( `id(`enableImpapquota ), `opt(`notify), _("Enable IMAP Quota"), intimapquota >= 0)),
+ `Left(`CheckBox( `id(`enableImpapquota ), `opt(`notify), _("Enable IMAP Quota"), intimapQuota >= 0)),
`HBox(
- `IntField (`id(`imapquota), _("in kByte"), 1, 10000000, intimapquota >= 0 ? intimapquota : 10000),
+ `IntField (`id(`imapQuota), _("in kByte"), 1, 10000000, intimapQuota >= 0 ? intimapQuota : 10000),
`HStretch()
),
- `Left(`Label(sformat (_("IMAP quota already in use: %1 kByte"), data["imapquotaused"]:"0" != nil ? data["imapquotaused"]:"0":"0")))
+ `Left(`Label(sformat (_("IMAP quota already in use: %1 kByte"), data["imapQuotaused"]:"0" != nil ? data["imapQuotaused"]:"0":"0")))
)
);
}
@@ -311,17 +311,17 @@
UI::ChangeWidget(`id(`sharedfolder), `Enabled, true);
if( sharedfolder ) {
UI::ChangeWidget(`id(`enableImpapquota), `Enabled, true );
- UI::ChangeWidget(`id(`imapquota), `Enabled, enableImpapquota);
+ UI::ChangeWidget(`id(`imapQuota), `Enabled, enableImpapquota);
} else {
UI::ChangeWidget(`id(`enableImpapquota), `Enabled, false );
- UI::ChangeWidget(`id(`imapquota), `Enabled, false );
+ UI::ChangeWidget(`id(`imapQuota), `Enabled, false );
}
} else {
// If there is no cyrus, we have only delivery to member
deliverytomember = true;
UI::ChangeWidget(`id(`deliverytomember), `Value, deliverytomember);
UI::ChangeWidget(`id(`enableImpapquota), `Enabled, false );
- UI::ChangeWidget(`id(`imapquota), `Enabled, false );
+ UI::ChangeWidget(`id(`imapQuota), `Enabled, false );
}
ret = UI::UserInput();
@@ -334,13 +334,13 @@
{
if (check_mail_address (emailName))
{
- if (contains (data["susemailforwardaddress"]:[], emailName))
+ if (contains (data["suseMailForwardAaddress"]:[], emailName))
{
Popup::Error(_("Entry already exists."));
}
else
{
- data["susemailforwardaddress"] = add (data["susemailforwardaddress"]:[],
+ data["suseMailForwardAaddress"] = add (data["suseMailForwardAaddress"]:[],
emailName);
UI::ChangeWidget(`id(`table), `Items, getEMAILList ());
UI::ChangeWidget(`id(`id_emailname), `Value, "");
@@ -355,41 +355,41 @@
if (ret == `deleteEmail)
{
integer id = (integer) UI::QueryWidget (`id (`table), `CurrentItem);
- data["susemailforwardaddress"] = remove (data["susemailforwardaddress"]:[],
+ data["suseMailForwardAaddress"] = remove (data["suseMailForwardAaddress"]:[],
id);
UI::ChangeWidget(`id(`table), `Items, getEMAILList ());
}
if (ret == `editEmail)
{
integer id = (integer) UI::QueryWidget (`id (`table), `CurrentItem);
- string oldEMAIL = (string)((list) data["susemailforwardaddress"]:[])[id]:"";
+ string oldEMAIL = (string)((list) data["suseMailForwardAaddress"]:[])[id]:"";
string newEMAIL = editEMAIL (oldEMAIL);
- if (contains (data["susemailforwardaddress"]:[], newEMAIL))
+ if (contains (data["suseMailForwardAaddress"]:[], newEMAIL))
{
Popup::Error(_("Entry already exists."));
}
else
{
- data["susemailforwardaddress"] = remove (data["susemailforwardaddress"]:[], id);
- data["susemailforwardaddress"] = add (data["susemailforwardaddress"]:[], newEMAIL);
+ data["suseMailForwardAaddress"] = remove (data["suseMailForwardAaddress"]:[], id);
+ data["suseMailForwardAaddress"] = add (data["suseMailForwardAaddress"]:[], newEMAIL);
}
UI::ChangeWidget(`id(`table), `Items, getEMAILList ());
}
if ( ret == `next )
{
if((boolean) UI::QueryWidget (`id (`deliverytomember), `Value)){
- data["susedeliverytomember"] = "yes";
+ data["suseDeliveryToMember"] = "yes";
} else {
- data["susedeliverytomember"] = "no";
+ data["suseDeliveryToMember"] = "no";
}
// We put it everytime into the LDAP, and the ldap filter control if it is visible
- data["susemailcommand"] = "\"|/usr/bin/formail -I \\\"From \\\" |/usr/lib/cyrus/bin/deliver -r "+data["cn"]:""+" -a cyrus -m "+data["cn"]:""+"\"";
+ data["suseMailCommand"] = "\"|/usr/bin/formail -I \\\"From \\\" |/usr/lib/cyrus/bin/deliver -r "+data["cn"]:""+" -a cyrus -m "+data["cn"]:""+"\"";
// if( (boolean) UI::QueryWidget (`id (`sharedfolder), `Value)) {
-// data["susemailcommand"] = "\"|/usr/bin/formail -I \\\"From \\\" |/usr/lib/cyrus/bin/deliver -r "+data["cn"]:""+" -a cyrus -m "+data["cn"]:""+"\"";
+// data["suseMailCommand"] = "\"|/usr/bin/formail -I \\\"From \\\" |/usr/lib/cyrus/bin/deliver -r "+data["cn"]:""+" -a cyrus -m "+data["cn"]:""+"\"";
// } else {
-// if( data["susemailcommand"]:"" != "" ) {
-// data = remove (data, "susemailcommand");
+// if( data["suseMailCommand"]:"" != "" ) {
+// data = remove (data, "suseMailCommand");
// }
// }
string err = UsersPluginMail::Check ( config, (map<string,any>) union (data, tmp_data));
@@ -407,20 +407,20 @@
data["plugins"] = add (data["plugins"]:[],
"UsersPluginMail");
}
- if( size(data["susemailforwardaddress"]:[]) == 1 ) {
- data["susemailforwardaddress"] = ((list)data["susemailforwardaddress"]:[])[0]:"";
- } else if( size(data["susemailforwardaddress"]:[]) == 0 ) {
- remove(data,"susemailforwardaddress");
+ if( size(data["suseMailForwardAaddress"]:[]) == 1 ) {
+ data["suseMailForwardAaddress"] = ((list)data["suseMailForwardAaddress"]:[])[0]:"";
+ } else if( size(data["suseMailForwardAaddress"]:[]) == 0 ) {
+ remove(data,"suseMailForwardAaddress");
}
if(data["localdeliverytype"]:"local" == "cyrus" ) {
if ((boolean) UI::QueryWidget(`id(`enableImpapquota), `Value))
{
- data["imapquota"] = (integer) UI::QueryWidget(`id(`imapquota), `Value);
+ data["imapQuota"] = (integer) UI::QueryWidget(`id(`imapQuota), `Value);
}
else
{
- data["imapquota"] = -1;
+ data["imapQuota"] = -1;
}
}
if (data["what"]:"" == "edit_user")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.6/users-plugin/UsersPluginMail.pm new/yast2-mail-2.16.7/users-plugin/UsersPluginMail.pm
--- old/yast2-mail-2.16.6/users-plugin/UsersPluginMail.pm 2008-05-28 14:13:29.000000000 +0200
+++ new/yast2-mail-2.16.7/users-plugin/UsersPluginMail.pm 2008-07-23 16:26:30.000000000 +0200
@@ -170,7 +170,7 @@
my $data = shift;
y2internal ("PluginPresent Mail called");
- if ( grep /^suseMailRecipient$/i, @{$data->{'objectclass'}} ) {
+ if ( grep /^suseMailRecipient$/i, @{$data->{'objectClass'}} ) {
y2milestone( "MailPlugin: Plugin Present");
return 1;
} else {
@@ -194,8 +194,8 @@
# attribute conversion
my @required_attrs = ();
my @object_classes = ();
- if (defined $data->{"objectclass"} && ref ($data->{"objectclass"}) eq "ARRAY") {
- @object_classes = @{$data->{"objectclass"}};
+ if (defined $data->{"objectClass"} && ref ($data->{"objectClass"}) eq "ARRAY") {
+ @object_classes = @{$data->{"objectClass"}};
}
# get the attributes required for entry's object classes
@@ -269,7 +269,7 @@
$data->{'localdeliverytype'} = $MailLocalDelivery->{'Type'};
if($data->{'localdeliverytype'} eq 'cyrus' ) {
#setting default quota
- $data->{'suseimapquota'} = $ldapret->[0]->{'suseimapdefaultquota'}->[0];
+ $data->{'suseImapQuota'} = $ldapret->[0]->{'suseImapDefaultQuota'}->[0];
}
# looking for the main mail domain and returns
@@ -292,15 +292,15 @@
if( grep /^UsersPluginMail$/, @{$data->{'plugins_to_remove'}} ) {
my @updated_oc;
- foreach my $oc ( @{$data->{'objectclass'}} ) {
- if ( lc($oc) ne "susemailrecipient" ) {
+ foreach my $oc ( @{$data->{'objectClass'}} ) {
+ if ( lc($oc) ne "suseMailRecipient" ) {
push @updated_oc, $oc;
}
}
- delete( $data->{'suseimapquota'});
+ delete( $data->{'suseImapQuota'});
delete( $data->{'imapquotaused'});
- $data->{'objectclass'} = \@updated_oc;
+ $data->{'objectClass'} = \@updated_oc;
y2debug ("Removed Mail plugin");
y2debug ( Data::Dumper->Dump( [ $data ] ) );
return $data;
@@ -325,7 +325,7 @@
# Only change objectclasses if they are already present (sometimes EditBefore
# is called with an empty $data hash)
- if ( $data->{'objectclass'} ) {
+ if ( $data->{'objectClass'} ) {
$data = update_object_classes ($config, $data);
my $ldapret = get_LDAP_Config();
@@ -357,7 +357,7 @@
y2internal ("Edit Mail called");
y2debug(Dumper($data));
- if ( ! $data->{'suseimapquota'} ) {
+ if ( ! $data->{'suseImapQuota'} ) {
my $tmp_data = cond_IMAP_OP($config, $data, "getquota");
if( $tmp_data ) {
$data = $tmp_data;
@@ -366,15 +366,15 @@
# Has the plugin been removed?
if( grep /^UsersPluginMail$/, @{$data->{'plugins_to_remove'}} ) {
my @updated_oc;
- foreach my $oc ( @{$data->{'objectclass'}} ) {
- if ( lc($oc) ne "susemailrecipient" ) {
+ foreach my $oc ( @{$data->{'objectClass'}} ) {
+ if ( lc($oc) ne "suseMailRecipient" ) {
push @updated_oc, $oc;
}
}
- delete( $data->{'suseimapquota'});
+ delete( $data->{'suseImapQuota'});
delete( $data->{'imapquotaused'});
- $data->{'objectclass'} = \@updated_oc;
+ $data->{'objectClass'} = \@updated_oc;
y2milestone ("Removed Mail plugin");
y2debug ( Data::Dumper->Dump( [ $data ] ) );
@@ -484,7 +484,7 @@
elsif ( ($data->{'what'} =~ /^edit_/ ) && $self->PluginPresent($config, $data) )
{
# create Folder if plugin has been added
- if ( ! grep /^suseMailRecipient$/i, @{$data->{'org_user'}->{'objectclass'}} ) {
+ if ( ! grep /^suseMailRecipient$/i, @{$data->{'org_user'}->{'objectClass'}} ) {
y2milestone("creating INBOX");
cond_IMAP_OP($config, $data, "add") if $action eq "edited";
return;
@@ -520,9 +520,9 @@
# define the object class for new user/groupa
my @orig_object_class = ();
- if (defined $data->{"objectclass"} && ref $data->{"objectclass"} eq "ARRAY")
+ if (defined $data->{"objectClass"} && ref $data->{"objectClass"} eq "ARRAY")
{
- @orig_object_class = @{$data->{"objectclass"}};
+ @orig_object_class = @{$data->{"objectClass"}};
}
foreach my $oc (@default_object_class) {
if (!contains (\@orig_object_class, $oc, 1)) {
@@ -530,7 +530,7 @@
}
}
- $data->{"objectclass"} = \@orig_object_class;
+ $data->{"objectClass"} = \@orig_object_class;
return $data;
}
@@ -539,8 +539,8 @@
my $config = shift;
my $data = shift;
- if( ! contains( $data->{objectclass}, "susemailrecipient", 1) ) {
- push @{$data->{'objectclass'}}, "susemailrecipient";
+ if( ! contains( $data->{objectClass}, "suseMailRecipient", 1) ) {
+ push @{$data->{'objectClass'}}, "suseMailRecipient";
}
if( $config->{'what'} eq 'group' ) {
@@ -553,19 +553,19 @@
return $data;
}
my $mailaddress = $data->{'uid'}."\@".$data->{mainmaildomain};
- if( defined $data->{susemailacceptaddress} ) {
- if( ref($data->{susemailacceptaddress}) eq "ARRAY" &&
- ! contains( $data->{susemailacceptaddress}, $mailaddress, 1) ) {
- push @{$data->{'susemailacceptaddress'}}, $mailaddress;
- } elsif ( ref($data->{susemailacceptaddress}) ne "ARRAY" &&
- $data->{susemailacceptaddress} ne $mailaddress ) {
- my $tmp = $data->{'susemailacceptaddress'};
- $data->{'susemailacceptaddress'} = [];
- push @{$data->{'susemailacceptaddress'}}, $tmp;
- push @{$data->{'susemailacceptaddress'}}, $mailaddress;
+ if( defined $data->{suseMailAcceptAddress} ) {
+ if( ref($data->{suseMailAcceptAddress}) eq "ARRAY" &&
+ ! contains( $data->{suseMailAcceptAddress}, $mailaddress, 1) ) {
+ push @{$data->{'suseMailAcceptAddress'}}, $mailaddress;
+ } elsif ( ref($data->{suseMailAcceptAddress}) ne "ARRAY" &&
+ $data->{suseMailAcceptAddress} ne $mailaddress ) {
+ my $tmp = $data->{'suseMailAcceptAddress'};
+ $data->{'suseMailAcceptAddress'} = [];
+ push @{$data->{'suseMailAcceptAddress'}}, $tmp;
+ push @{$data->{'suseMailAcceptAddress'}}, $mailaddress;
}
} else {
- $data->{susemailacceptaddress} = $mailaddress;
+ $data->{suseMailAcceptAddress} = $mailaddress;
}
return $data;
@@ -577,7 +577,7 @@
# Read mail specific ldapconfig object
my $ldapret = SCR->Read(".ldap.search", {
"base_dn" => $ldapMap->{'base_config_dn'},
- "filter" => '(objectclass=suseMailConfiguration)',
+ "filter" => '(objectClass=suseMailConfiguration)',
"scope" => 2,
"not_found_ok" => 1,
"attrs" => [ 'suseImapServer', 'suseImapAdmin', 'suseImapDefaultQuota' ]
@@ -598,7 +598,7 @@
# read dns configuration data
my $ret = SCR->Read(".ldap.search", {
"base_dn" => $ldapMap->{'base_config_dn'},
- "filter" => '(objectclass=suseDnsConfiguration)',
+ "filter" => '(objectClass=suseDnsConfiguration)',
"scope" => 2,
"not_found_ok" => 1,
"attrs" => [ 'suseDefaultBase' ]
@@ -609,7 +609,7 @@
return undef;
}
if(@$ret > 0) {
- $ldapMap->{'dns_config_dn'} = $ret->[0]->{'susedefaultbase'}->[0];
+ $ldapMap->{'dns_config_dn'} = $ret->[0]->{'suseDefaultBase'}->[0];
} else {
my $ldapERR = SCR->Read(".ldap.error");
$error = "DNS Setup Error: ".$ldapERR->{'code'}." : ".$ldapERR->{'msg'};
@@ -641,7 +641,7 @@
$error = "There are defined more then one main mail domain. Please fix it!";
return undef;
} else {
- $domain = $ret->[0]->{'zonename'}->[0];
+ $domain = $ret->[0]->{'zoneName'}->[0];
}
$data->{'mainmaildomain'} = $domain;
return $data;
@@ -663,13 +663,13 @@
my $ldapret = get_LDAP_Config();
if(@$ldapret > 0) {
- $imapadm = $ldapret->[0]->{'suseimapadmin'}->[0];
- $imaphost = $ldapret->[0]->{'suseimapserver'}->[0];
- #$imapquota = $ldapret->[0]->{'suseimapdefaultquota'}->[0];
+ $imapadm = $ldapret->[0]->{'suseImapAdmin'}->[0];
+ $imaphost = $ldapret->[0]->{'suseImapServer'}->[0];
+ #$imapquota = $ldapret->[0]->{'suseImapDefaultQuota'}->[0];
}
- if ( $data->{'suseimapquota'} ) {
- $imapquota = $data->{'suseimapquota'};
+ if ( $data->{'suseImapQuota'} ) {
+ $imapquota = $data->{'suseImapQuota'};
}
# we need to ensure, that imapadmpw == rootdnpw!
@@ -909,8 +909,8 @@
$proxy_imap->logout();
}
} else {
- if( defined $data->{'suseimapquota'} && $data->{'suseimapquota'} > 0 ) {
- $ret = $imap->setquota($fname, ("STORAGE", $data->{'suseimapquota'} ) );
+ if( defined $data->{'suseImapQuota'} && $data->{'suseImapQuota'} > 0 ) {
+ $ret = $imap->setquota($fname, ("STORAGE", $data->{'suseImapQuota'} ) );
if($$ret{Status} ne "ok") {
y2internal("setquota failed: Serverresponse:$$ret{Status} => $$ret{Text}\n");
$error = "setquota failed: Serverresponse:$$ret{Status} => $$ret{Text}";
@@ -933,7 +933,7 @@
my $self = shift;
my $resp = shift;
- $data->{'suseimapquota'} = $resp->limit("STORAGE");
+ $data->{'suseImapQuota'} = $resp->limit("STORAGE");
$data->{'imapquotaused'} = $resp->usage("STORAGE");
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.6/users-plugin/users_plugin_mail.ycp new/yast2-mail-2.16.7/users-plugin/users_plugin_mail.ycp
--- old/yast2-mail-2.16.6/users-plugin/users_plugin_mail.ycp 2008-05-26 19:14:48.000000000 +0200
+++ new/yast2-mail-2.16.7/users-plugin/users_plugin_mail.ycp 2008-07-23 16:26:30.000000000 +0200
@@ -143,17 +143,17 @@
list<term> result = [];
integer i = 0;
- if( is(data["susemailacceptaddress"]:(any)"", string)
- && size (data["susemailacceptaddress"]:"") > 0 )
+ if( is(data["suseMailAcceptAddress"]:(any)"", string)
+ && size (data["suseMailAcceptAddress"]:"") > 0 )
{
result = [`item (`id (i),
- data["susemailacceptaddress"]:"")];
+ data["suseMailAcceptAddress"]:"")];
// transforming to list
- data["susemailacceptaddress"] = [data["susemailacceptaddress"]:""];
+ data["suseMailAcceptAddress"] = [data["suseMailAcceptAddress"]:""];
}
- else if ( is(data["susemailacceptaddress"]:(any)[], list) )
+ else if ( is(data["suseMailAcceptAddress"]:(any)[], list) )
{
- foreach (string element, data["susemailacceptaddress"]:[], ``{
+ foreach (string element, data["suseMailAcceptAddress"]:[], ``{
result = add (result, `item (`id (i), element));
i = i + 1;
});
@@ -182,7 +182,7 @@
string action = data["what"]:"";
map<string, any> tmp_data = $[];
- list<string> object_class = (list<string>)sort (data["objectclass"]:[]);
+ list<string> object_class = (list<string>)sort (data["objectClass"]:[]);
// if this plugin wasn't present in default plugin set, we have to call
// BeforeAdd/BeforeEdit e.g. to get object class!
@@ -192,8 +192,8 @@
data = UsersPluginMail::AddBefore (config, data);
else if (action == "edit_user" || action == "edit_group")
data = UsersPluginMail::EditBefore (config, data);
- object_class = (list<string>)sort (data["objectclass"]:[]);
- tmp_data["objectclass"] = object_class;
+ object_class = (list<string>)sort (data["objectClass"]:[]);
+ tmp_data["objectClass"] = object_class;
}
// helptext 1/3
@@ -243,10 +243,10 @@
term imap = `VBox();
integer intimapquota = -1;
- if (haskey (data, "suseimapquota")
- && data["suseimapquota"]:"10000" != nil)
+ if (haskey (data, "suseImapQuota")
+ && data["suseImapQuota"]:"10000" != nil)
{
- intimapquota = tointeger ((string) data["suseimapquota"]:"10000" );
+ intimapquota = tointeger ((string) data["suseImapQuota"]:"10000" );
}
if(data["localdeliverytype"]:"local" == "cyrus" ) {
@@ -306,13 +306,13 @@
{
if (check_mail_address (emailName))
{
- if (contains (data["susemailacceptaddress"]:[], emailName))
+ if (contains (data["suseMailAcceptAddress"]:[], emailName))
{
Popup::Error(_("Entry already exists."));
}
else
{
- data["susemailacceptaddress"] = add (data["susemailacceptaddress"]:[],
+ data["suseMailAcceptAddress"] = add (data["suseMailAcceptAddress"]:[],
emailName);
UI::ChangeWidget(`id(`table), `Items, getEMAILList ());
UI::ChangeWidget(`id(`id_emailname), `Value, "");
@@ -327,25 +327,25 @@
if (ret == `deleteEmail)
{
integer id = (integer) UI::QueryWidget (`id (`table), `CurrentItem);
- data["susemailacceptaddress"] = remove (data["susemailacceptaddress"]:[],
+ data["suseMailAcceptAddress"] = remove (data["suseMailAcceptAddress"]:[],
id);
UI::ChangeWidget(`id(`table), `Items, getEMAILList ());
}
if (ret == `editEmail)
{
integer id = (integer) UI::QueryWidget (`id (`table), `CurrentItem);
- string oldEMAIL = (string)((list) data["susemailacceptaddress"]:[])[id]:"";
+ string oldEMAIL = (string)((list) data["suseMailAcceptAddress"]:[])[id]:"";
string newEMAIL = editEMAIL (oldEMAIL);
- if (contains (data["susemailacceptaddress"]:[], newEMAIL))
+ if (contains (data["suseMailAcceptAddress"]:[], newEMAIL))
{
Popup::Error(_("Entry already exists."));
}
else
{
- data["susemailacceptaddress"] = remove (data["susemailacceptaddress"]:[],
+ data["suseMailAcceptAddress"] = remove (data["suseMailAcceptAddress"]:[],
id);
- data["susemailacceptaddress"] = add (data["susemailacceptaddress"]:[],
+ data["suseMailAcceptAddress"] = add (data["suseMailAcceptAddress"]:[],
newEMAIL);
}
UI::ChangeWidget(`id(`table), `Items, getEMAILList ());
@@ -370,20 +370,20 @@
data["plugins"] = add (data["plugins"]:[],
"UsersPluginMail");
}
- if( size(data["susemailacceptaddress"]:[]) == 1 ) {
- data["susemailacceptaddress"] = ((list)data["susemailacceptaddress"]:[])[0]:"";
- } else if( size(data["susemailacceptaddress"]:[]) == 0 ) {
- remove(data,"susemailacceptaddress");
+ if( size(data["suseMailAcceptAddress"]:[]) == 1 ) {
+ data["suseMailAcceptAddress"] = ((list)data["suseMailAcceptAddress"]:[])[0]:"";
+ } else if( size(data["suseMailAcceptAddress"]:[]) == 0 ) {
+ remove(data,"suseMailAcceptAddress");
}
if(data["localdeliverytype"]:"local" == "cyrus" ) {
if ((boolean) UI::QueryWidget(`id(`enableImpapquota), `Value))
{
- data["suseimapquota"] = (integer) UI::QueryWidget(`id(`imapquota), `Value);
+ data["suseImapQuota"] = (integer) UI::QueryWidget(`id(`imapquota), `Value);
}
else
{
- data["suseimapquota"] = -1;
+ data["suseImapQuota"] = -1;
}
}
if (data["what"]:"" == "edit_user")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.16.6/VERSION new/yast2-mail-2.16.7/VERSION
--- old/yast2-mail-2.16.6/VERSION 2008-06-05 14:36:21.000000000 +0200
+++ new/yast2-mail-2.16.7/VERSION 2008-07-24 12:35:26.000000000 +0200
@@ -1 +1 @@
-2.16.6
+2.16.7
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 pure-ftpd
checked in at Fri Jul 25 12:58:13 CEST 2008.
--------
--- pure-ftpd/pure-ftpd.changes 2008-04-01 16:19:36.000000000 +0200
+++ /mounts/work_src_done/STABLE/pure-ftpd/pure-ftpd.changes 2008-07-22 12:20:54.544522000 +0200
@@ -1,0 +2,6 @@
+Mon Jul 21 16:34:26 CEST 2008 - hvogel(a)suse.de
+
+- do not use tcp send/receive buffer optimization. Might lead to
+ strange side effects when allocating too much stack. [bnc#407363]
+
+-------------------------------------------------------------------
New:
----
pure-ftpd-1.0.2-default_tcp_sedrcv_buffer_size.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pure-ftpd.spec ++++++
--- /var/tmp/diff_new_pack.qo2175/_old 2008-07-25 12:58:02.000000000 +0200
+++ /var/tmp/diff_new_pack.qo2175/_new 2008-07-25 12:58:02.000000000 +0200
@@ -14,7 +14,7 @@
Name: pure-ftpd
BuildRequires: mysql-devel openldap2-devel pam-devel postgresql-devel
Version: 1.0.21
-Release: 130
+Release: 154
Url: http://www.pureftpd.org
Source: ftp://ftp.pureftpd.org/pub/%{name}/releases/%{name}-%version.tar.bz2
Source1: %{name}.init
@@ -28,6 +28,7 @@
Patch4: %{name}-1.0.20_config_minuid.patch
Patch5: %{name}-1.0.20_ftpwho_path.patch
Patch6: pure-ftpd-1.0.21-ldap_schema.patch
+Patch7: pure-ftpd-1.0.2-default_tcp_sedrcv_buffer_size.patch
Group: Productivity/Networking/Ftp/Servers
License: BSD 3-Clause
Provides: ftp-server pureftpd
@@ -56,6 +57,7 @@
%patch4
%patch5
%patch6
+%patch7
%build
CFLAGS="%{optflags} -DLDAP_DEPRECATED -fstack-protector"
@@ -142,6 +144,9 @@
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%name
%changelog
+* Mon Jul 21 2008 hvogel(a)suse.de
+- do not use tcp send/receive buffer optimization. Might lead to
+ strange side effects when allocating too much stack. [bnc#407363]
* Tue Apr 01 2008 mkoenig(a)suse.de
- remove dir /usr/share/omc/svcinfo.d as it is provided now
by filesystem
++++++ pure-ftpd-1.0.2-default_tcp_sedrcv_buffer_size.patch ++++++
--- configure
+++ configure
@@ -21772,141 +21772,13 @@
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:$LINENO: checking default TCP send buffer size" >&5
-echo $ECHO_N "checking default TCP send buffer size... $ECHO_C" >&6
-if test "$cross_compiling" = yes; then
- CONF_TCP_SO_SNDBUF=65536
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-int main(void)
-{
- int fd,val=0,len=sizeof(int);
- if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) return 1;
- if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &val, &len) < 0) return 1;
- if (val <= 0) return 1;
- fprintf (fopen("conftestval", "w"), "%d\n", val);
- return 0;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- CONF_TCP_SO_SNDBUF=`cat conftestval`
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-CONF_TCP_SO_SNDBUF=65536
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $CONF_TCP_SO_SNDBUF" >&5
-echo "${ECHO_T}$CONF_TCP_SO_SNDBUF" >&6
-
-
cat >>confdefs.h <<_ACEOF
-#define CONF_TCP_SO_SNDBUF $CONF_TCP_SO_SNDBUF
+#define CONF_TCP_SO_SNDBUF 65536
_ACEOF
-echo "$as_me:$LINENO: checking default TCP receive buffer size" >&5
-echo $ECHO_N "checking default TCP receive buffer size... $ECHO_C" >&6
-if test "$cross_compiling" = yes; then
- CONF_TCP_SO_RCVBUF=65536
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-int main(void)
-{
- int fd,val=0,len=sizeof(int);
- if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) return 1;
- if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &val, &len) < 0) return 1;
- if (val <= 0) return 1;
- fprintf (fopen("conftestval", "w"), "%d\n", val);
- return 0;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- CONF_TCP_SO_RCVBUF=`cat conftestval`
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-CONF_TCP_SO_RCVBUF=65536
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $CONF_TCP_SO_RCVBUF" >&5
-echo "${ECHO_T}$CONF_TCP_SO_RCVBUF" >&6
-
-
cat >>confdefs.h <<_ACEOF
-#define CONF_TCP_SO_RCVBUF $CONF_TCP_SO_RCVBUF
+#define CONF_TCP_SO_RCVBUF 65536
_ACEOF
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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