November 2012 - openSUSE Commits - openSUSE Mailing Lists

commit samba for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '12

12 Nov '12

Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at 2012-11-12 07:06:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/samba (Old) and /work/SRC/openSUSE:Factory/.samba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "samba", Maintainer is "samba-maintainers(a)SuSE.de" Changes: -------- --- /work/SRC/openSUSE:Factory/samba/samba.changes 2012-10-07 20:05:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2012-11-12 07:06:39.000000000 +0100 @@ -1,0 +2,73 @@ +Wed Oct 31 16:48:12 UTC 2012 - lmuelle(a)suse.com + +- Only execute the run_permissions macro on pre-12.3 systems. + +------------------------------------------------------------------- +Mon Oct 29 19:48:51 UTC 2012 - lmuelle(a)suse.com + +- Ensure adding the winbind group never can fail. + +------------------------------------------------------------------- +Mon Oct 29 16:59:09 UTC 2012 - lmuelle(a)suse.com + +- Create ntadmin group only if it doesn't yet exist. + +------------------------------------------------------------------- +Mon Oct 29 12:10:41 UTC 2012 - lmuelle(a)suse.com + +- Update to 3.6.9. + + When setting a non-default ACL, don't forget to apply masks to + SMB_ACL_USER and SMB_ACL_GROUP entries; (bso#9236). + + Winbind can't fetch user or group info from AD via LDAP; (bso#9147). + + Fix segfault in smbd if user specified ports out for range; (bso#9218). + +------------------------------------------------------------------- +Mon Oct 29 12:03:21 UTC 2012 - lmuelle(a)suse.com + +- quota: Don't force the block size to 512; (bso#3272). +- Fix poll replacement to become a msleep replacement; (bso#8107). +- Fix wrong test == syntax in configure; (bso#8146). +- Fix --with(out)-sendfile-support option handling in autoconf; (bso#8344). +- Fix builtin forms order to match Windows again; (bso#8632). +- Fix RAW printing for normal users; (bso#8769). +- Initialise ticket to ensure we do not invalid memory; (bso#8788). +- Fix 'net rpc share allowedusers' to work with 2008r2; (bso#8966). +- Fix crash on null pam change pw response; (bso#9013). +- Connection to outbound trusted domain goes offline; (bso#9016). +- Increase debug level for info that the db is empty; (bso#9112). +- 'smbclient' can't connect to a Windows 7 server using NTLMv2; (bso#9117). +- Winbind can't fetch user or group info from AD via LDAP; (bso#9147). +- Open printers with the right access mask; (bso#9154). +- Fix makerpms.sh on RHEL; (bso#9165). +- Remove non-existent option '-Y' from winbindd manpage; (bso#9171). +- Add quota support for gfs2; (bso#9172). +- Make SMB2 compound request create/delete_on_close/close work as Windows; + (bso#9173). +- Empty SPNEGO packet can cause smbd to crash; (bso#9174). +- pam_winbind: Match more return codes when wbcGetPwnam has failed; + (bso#9177). +- Fix crash bug in idmap_hash; (bso#9188). +- SMB2 Create doesn't return correct MAX ACCESS access mask in blob; + (bso#9189). +- Fix service control for non-internal services; (bso#9192). +- Don't take 'state->te' as indication for "was_deferred"; (bso#9196). +- Parse of invalid SMB2 create blob can cause smbd crash; (bso#9209). +- Bad ASN.1 NegTokenInit packet can cause invalid free; (bso#9213). +- Fix segfault in smbd if user specified ports out for range; (bso#9218). +- Signing cannot be disabled for SMB2 by design, so fix the documentation + instead; (bso#9222). +- Fix NT_STATUS_IO_TIMEOUT during slow import of printers into registry; + (bso#9231). +- When setting a non-default ACL, don't forget to apply masks to SMB_ACL_USER + and SMB_ACL_GROUP entries; (bso#9236). +- lib-addns: ensure that allocated buffer are pre set to 0; (bso#9259). +- Make tdb robust against shrinking tdbs and improper CLEAR_IF_FIRST restart; + (bso#9268). +- Add support for reloading systemd services; (bso#9280). + +------------------------------------------------------------------- +Fri Oct 26 17:40:15 UTC 2012 - lmuelle(a)suse.com + +- Warn via the smbd log if AppArmor and "wide links" are in use; (bnc#783719). + +------------------------------------------------------------------- Old: ---- samba-3.6.8.tar.bz2 New: ---- samba-3.6.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.dBJfoN/_old 2012-11-12 07:06:42.000000000 +0100 +++ /var/tmp/diff_new_pack.dBJfoN/_new 2012-11-12 07:06:42.000000000 +0100 @@ -93,7 +93,7 @@ BuildRequires: libtdb-devel BuildRequires: libtevent-devel %endif -%define samba_ver 3.6.8 +%define samba_ver 3.6.9 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -117,7 +117,7 @@ %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -Version: 3.6.8 +Version: 3.6.9 Release: 1 %define ldapsmb_ver 1.34b Url: http://www.samba.org/ @@ -267,7 +267,7 @@ product_suffix="${product_suffix}-%{_build_arch}" # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file mv VERSION VERSION.orig -sed -e s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/ VERSION.orig >VERSION +sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/" VERSION.orig >VERSION %endif %build samba-%{samba_ver_full} @@ -462,7 +462,7 @@ the man pages. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.dBJfoN/_old 2012-11-12 07:06:42.000000000 +0100 +++ /var/tmp/diff_new_pack.dBJfoN/_new 2012-11-12 07:06:42.000000000 +0100 @@ -93,7 +93,7 @@ BuildRequires: libtdb-devel BuildRequires: libtevent-devel %endif -%define samba_ver 3.6.8 +%define samba_ver 3.6.9 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -117,7 +117,7 @@ %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -Version: 3.6.8 +Version: 3.6.9 Release: 1 %define ldapsmb_ver 1.34b License: GPL-3.0+ @@ -224,8 +224,8 @@ how to. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %package client License: GPL-3.0+ @@ -265,8 +265,8 @@ how to. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -285,8 +285,8 @@ develop programs which make use of Samba. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 @@ -310,8 +310,8 @@ the man pages. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %endif @@ -331,8 +331,8 @@ A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %if %{make_utils} @@ -347,8 +347,8 @@ Some of the debug-tools for developpers. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %endif @@ -380,8 +380,8 @@ This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -406,15 +406,15 @@ %description -n libsmbclient -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %else %description -n libsmbclient0 -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %endif This package includes the libsmbclient library. @@ -452,8 +452,8 @@ develop programs which make use of the smbclient programming interface. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %package -n libnetapi0 License: GPL-3.0+ @@ -465,8 +465,8 @@ This package includes the netapi library. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %package -n libnetapi-devel License: GPL-3.0+ @@ -484,8 +484,8 @@ develop programs which make use of the netapi programming interface. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -505,15 +505,15 @@ %description -n libsmbsharemodes -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %else %description -n libsmbsharemodes0 -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %endif This package includes the smbsharemodes library. @@ -538,8 +538,8 @@ develop programs which make use of the smbsharemodes programming interface. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %package -n libwbclient0 License: LGPL-3.0+ @@ -551,8 +551,8 @@ This package includes the wbclient library. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %package -n libwbclient-devel License: LGPL-3.0+ @@ -570,8 +570,8 @@ develop programs which make use of the wbclient programming interface. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %if 0%{?suse_version} && 0%{?suse_version} < 1211 @@ -587,8 +587,8 @@ This package includes the talloc library. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %package -n libtalloc-devel Version: %{libtalloc_ver} @@ -608,8 +608,8 @@ develop programs which make use of the talloc programming interface. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %package -n libtdb1 Version: %{libtdb_ver} @@ -623,8 +623,8 @@ This package includes the tdb library. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %package -n libtdb-devel Version: %{libtdb_ver} @@ -640,8 +640,8 @@ develop programs which make use of the tdb programming interface. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %package -n libtevent0 Version: %{libtevent_ver} @@ -655,8 +655,8 @@ This package includes the tevent library. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %package -n libtevent-devel Version: %{libtevent_ver} @@ -677,8 +677,8 @@ develop programs which make use of the tevent programming interface. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %package -n libldb1 Version: %{libldb_ver} @@ -693,8 +693,8 @@ This package includes the ldb library. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %package -n libldb-devel Version: %{libldb_ver} @@ -714,8 +714,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %endif @@ -734,8 +734,8 @@ Controller that uses the ldapsam passdb backend. -Source Timestamp: 2843 -Branch : 3.6.8 +Source Timestamp: 2851 +Branch : 3.6.9 %endif @@ -815,7 +815,7 @@ product_suffix="${product_suffix}-%{_build_arch}" # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file mv VERSION VERSION.orig -sed -e s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/ VERSION.orig >VERSION +sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/" VERSION.orig >VERSION %build %if 0%{?suse_version} && 0%{?suse_version} < 911 @@ -1264,7 +1264,7 @@ %endif %pre -/usr/sbin/groupadd -g 71 -o -r ntadmin 2>/dev/null || : +getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || : %preun %{?stop_on_removal:%{stop_on_removal smb nmb}} @@ -1379,7 +1379,9 @@ if test ${1:-0} -eq 1 -a -d %{cups_lib_dir}/backend; then ln -fs %{_bindir}/get_printing_ticket %{cups_lib_dir}/backend/smb fi +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1221 %{?run_permissions:%{run_permissions}} +%endif %postun krb-printing if test ${1:-0} -eq 0 -a -e %{_bindir}/smbspool -a -d %{cups_lib_dir}/backend; then @@ -1393,8 +1395,7 @@ %pre winbind # we need this group for squid (ntlmauth) # read access to /var/lib/samba/winbindd_privileged -%{_bindir}/getent group winbind >/dev/null || \ - %{_sbindir}/groupadd -r winbind +getent group winbind >/dev/null || groupadd -r winbind || : %post winbind /sbin/ldconfig ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.dBJfoN/_old 2012-11-12 07:06:42.000000000 +0100 +++ /var/tmp/diff_new_pack.dBJfoN/_new 2012-11-12 07:06:42.000000000 +0100 @@ -1,2 +1,2 @@ -2843 -Branch : 3.6.8 +2851 +Branch : 3.6.9 ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/fix-pam_sm_authenticate-segv.diff new/patches/suse/fix-pam_sm_authenticate-segv.diff --- old/patches/suse/fix-pam_sm_authenticate-segv.diff 2012-09-17 12:40:35.000000000 +0200 +++ new/patches/suse/fix-pam_sm_authenticate-segv.diff 2012-10-29 13:43:57.000000000 +0100 @@ -15,7 +15,7 @@ =================================================================== --- nsswitch/pam_winbind.c.orig +++ nsswitch/pam_winbind.c -@@ -2732,9 +2732,10 @@ out: +@@ -2735,9 +2735,10 @@ out: _pam_free_data_info3(pamh); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/missing-pkgconfig.diff new/patches/suse/missing-pkgconfig.diff --- old/patches/suse/missing-pkgconfig.diff 2012-09-17 12:40:35.000000000 +0200 +++ new/patches/suse/missing-pkgconfig.diff 2012-10-29 13:43:57.000000000 +0100 @@ -26,7 +26,7 @@ =================================================================== --- source3/configure.in.orig +++ source3/configure.in -@@ -7144,6 +7144,7 @@ AC_OUTPUT(Makefile +@@ -7164,6 +7164,7 @@ AC_OUTPUT(Makefile pkgconfig/wbclient.pc pkgconfig/netapi.pc pkgconfig/smbsharemodes.pc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/net-kdc-lookup.diff new/patches/suse/net-kdc-lookup.diff --- old/patches/suse/net-kdc-lookup.diff 2012-09-17 12:40:35.000000000 +0200 +++ new/patches/suse/net-kdc-lookup.diff 2012-10-29 13:43:56.000000000 +0100 @@ -96,7 +96,7 @@ static int net_lookup_kdc(struct net_context *c, int argc, const char **argv) { #ifdef HAVE_KRB5 -@@ -445,6 +528,7 @@ int net_lookup(struct net_context *c, in +@@ -449,6 +532,7 @@ int net_lookup(struct net_context *c, in {"DC", net_lookup_dc}, {"PDC", net_lookup_pdc}, {"MASTER", net_lookup_master}, ++++++ samba-3.6.8.tar.bz2 -> samba-3.6.9.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/samba/samba-3.6.8.tar.bz2 /work/SRC/openSUSE:Factory/.samba.new/samba-3.6.9.tar.bz2 differ: char 11, line 1 ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2012-09-26 20:18:17.000000000 +0200 +++ new/vendor-files/tools/package-data 2012-10-31 18:00:31.000000000 +0100 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2843" +SAMBA_PACKAGE_SVN_VERSION="2851" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/update-apparmor-samba-profile new/vendor-files/tools/update-apparmor-samba-profile --- old/vendor-files/tools/update-apparmor-samba-profile 2012-09-17 12:40:15.000000000 +0200 +++ new/vendor-files/tools/update-apparmor-samba-profile 2012-10-26 20:05:22.000000000 +0200 @@ -2,10 +2,10 @@ # update apparmor profile sniplet based on samba configuration # -# This script creates and updates a profile sniplet with permissions for all +# This script creates and updates a profile sniplet with permissions for all # samba shares, except # - paths with variables (anything containing a % sign) -# - "/" - if someone is insane enough to share his complete filesystem, he'll have +# - "/" - if someone is insane enough to share his complete filesystem, he'll have # to modify the apparmor profile himself # (c) Christian Boltz 2011 @@ -43,6 +43,12 @@ test -r "$loadedprofiles" || verboseexit "no read permissions for $loadedprofiles - not running as root?" grep -q '^/usr/sbin/smbd (' /sys/kernel/security/apparmor/profiles || silentexit "smbd profile not loaded" +widelinks=$(testparm -s --parameter-name "wide links" 2>/dev/null) +test "$widelinks" == "Yes" && { + echo "[$(date '+%Y/%m/%d %T')] $(basename $0)" + echo ' WARNING: "wide links" enabled. You might need to modify the smbd apparmor profile manually.' +} >> /var/log/samba/log.smbd + grep -q "$versionstring" "$profilesniplet" && { test "$smbconf" -nt "$profilesniplet" || silentexit "smb.conf is older than the AppArmor profile sniplet" } @@ -61,7 +67,7 @@ echo "Updating AppArmor profile for Samba..." -mv -f "$tmp_profilesniplet" "$profilesniplet" +mv -f "$tmp_profilesniplet" "$profilesniplet" # reload profile "$aaparser" -r "$smbd_profile" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-selenium-webdriver for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '12

12 Nov '12

Hello community, here is the log from the commit of package rubygem-selenium-webdriver for openSUSE:Factory checked in at 2012-11-12 07:06:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-selenium-webdriver (Old) and /work/SRC/openSUSE:Factory/.rubygem-selenium-webdriver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-selenium-webdriver", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-selenium-webdriver/rubygem-selenium-webdriver.changes 2012-08-05 15:22:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-selenium-webdriver.new/rubygem-selenium-webdriver.changes 2012-11-12 07:06:28.000000000 +0100 @@ -1,0 +2,18 @@ +Sat Nov 3 08:01:32 UTC 2012 - coolo(a)suse.com + +- updated to version 2.26.0 + Firefox: + * Added support for native events for Firefox 15 and 16. + * Modified FirefoxDriver to use atoms to switch between frames. + * FIXED: 4309: 'Could not convert Native argument arg 0' error with Firefox. + * FIXED: 4375: Executing javascript hangs Firefox. + * FIXED: 4165: WebDriver fails on a machine with no IP address. + Safari: + * Fixed SafariDriver to allow calling .quit() consecutively without error. + * FIXED: 4676: Unable to fire javascript events into SVG's. + * FIXED: 3969: SafariDriver should auto-dismiss alerts. + IE: + * FIXED: 4535: Hover still does not work perfectly in IE. + * FIXED: 4593: Alert.accept() Cancels the Resend Alert/Dialog Box. + +------------------------------------------------------------------- Old: ---- selenium-webdriver-2.25.0.gem New: ---- selenium-webdriver-2.26.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-selenium-webdriver.spec ++++++ --- /var/tmp/diff_new_pack.Uv7Cf8/_old 2012-11-12 07:06:29.000000000 +0100 +++ /var/tmp/diff_new_pack.Uv7Cf8/_new 2012-11-12 07:06:29.000000000 +0100 @@ -17,37 +17,20 @@ Name: rubygem-selenium-webdriver -Version: 2.25.0 +Version: 2.26.0 Release: 0 %define mod_name selenium-webdriver %define mod_full_name %{mod_name}-%{version} -# -# -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: rubygems_with_buildroot_patch -%rubygems_requires -Provides: %{name}-2 -# multi_json ~> 1.0 -BuildRequires: rubygem-multi_json-1 >= 1.0 -Requires: rubygem-multi_json-1 >= 1.0 -# rubyzip >= 0 -BuildRequires: rubygem-rubyzip >= 0 -Requires: rubygem-rubyzip >= 0 -# childprocess >= 0.2.5 -BuildRequires: rubygem-childprocess >= 0.2.5 -Requires: rubygem-childprocess >= 0.2.5 -# libwebsocket ~> 0.1.3 -BuildRequires: rubygem-libwebsocket-0_1 >= 0.1.3 -Requires: rubygem-libwebsocket-0_1 >= 0.1.3 -# -ExclusiveArch: %ix86 x86_64 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: ruby-macros >= 1 Url: http://selenium.googlecode.com Source: %{mod_full_name}.gem -# -Summary: The next generation developer focused tool for automated testing of webapps +Summary: The next generation developer focused tool for automated testing of License: Apache-2.0 Group: Development/Languages/Ruby +# MANUAL +ExclusiveArch: %ix86 x86_64 %description WebDriver is a tool for writing automated tests of websites. It aims to mimic @@ -64,10 +47,14 @@ Usually in RDoc and RI formats. %prep +#gem_unpack +#if you need patches, apply them here and replace the # with a % sign in the surrounding lines +#gem_build + %build -%install -%gem_install %{S:0} +%install +%gem_install -f # Remove Firefox addin for non-matching architectures to avoid autodeps on glibc for each arch: %ifarch %ix86 rm %{buildroot}%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/lib/selenium/webdriver/firefox/native/linux/amd64/x_ignore_nofocus.so @@ -76,9 +63,6 @@ rm %{buildroot}%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/lib/selenium/webdriver/firefox/native/linux/x86/x_ignore_nofocus.so %endif -%clean -%{__rm} -rf %{buildroot} - %files %defattr(-,root,root,-) %{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_full_name}.gem -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-passenger for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '12

12 Nov '12

Hello community, here is the log from the commit of package rubygem-passenger for openSUSE:Factory checked in at 2012-11-12 07:06:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-passenger (Old) and /work/SRC/openSUSE:Factory/.rubygem-passenger.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-passenger", Maintainer is "JMassaguerPla(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-passenger/rubygem-passenger.changes 2012-08-31 09:59:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-passenger.new/rubygem-passenger.changes 2012-11-12 07:06:20.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Oct 31 08:16:11 UTC 2012 - coolo(a)suse.com + +- updated to version 3.0.18 + * Fixed compilation problems on Fedora 17. + * Fixed Union Station compatibility with Rails 3.2. + * Phusion Passenger Enterprise Standalone now supports rolling + restarts and deployment error resistance. + +------------------------------------------------------------------- Old: ---- passenger-3.0.17.gem New: ---- passenger-3.0.18.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-passenger.spec ++++++ --- /var/tmp/diff_new_pack.mzNtmy/_old 2012-11-12 07:06:21.000000000 +0100 +++ /var/tmp/diff_new_pack.mzNtmy/_new 2012-11-12 07:06:21.000000000 +0100 @@ -17,7 +17,7 @@ Name: rubygem-passenger -Version: 3.0.17 +Version: 3.0.18 Release: 0 %define mod_name passenger %define mod_full_name %{mod_name}-%{version} ++++++ rubygem-passenger-3.0.12_boost_threads.patch ++++++ --- /var/tmp/diff_new_pack.mzNtmy/_old 2012-11-12 07:06:21.000000000 +0100 +++ /var/tmp/diff_new_pack.mzNtmy/_new 2012-11-12 07:06:21.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- ext/boost/config/stdlib/libstdcpp3.hpp.orig +++ ext/boost/config/stdlib/libstdcpp3.hpp -@@ -39,17 +39,14 @@ +@@ -40,17 +40,14 @@ // while others do not... // # define BOOST_HAS_THREADS @@ -15,7 +15,7 @@ // disable thread support if the std lib was built single threaded: -# define BOOST_DISABLE_THREADS #endif - + -#if (defined(linux) || defined(__linux) || defined(__linux__)) && defined(__arm__) && defined(_GLIBCPP_HAVE_GTHR_DEFAULT) +#if (defined(linux) || defined(__linux) || defined(__linux__)) // linux on arm apparently doesn't define _REENTRANT -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-mocha for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '12

12 Nov '12

Hello community, here is the log from the commit of package rubygem-mocha for openSUSE:Factory checked in at 2012-11-12 07:06:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-mocha (Old) and /work/SRC/openSUSE:Factory/.rubygem-mocha.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-mocha", Maintainer is "JMassaguerPla(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-mocha/rubygem-mocha.changes 2012-10-11 11:24:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-mocha.new/rubygem-mocha.changes 2012-11-12 07:06:14.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Nov 3 10:41:56 UTC 2012 - coolo(a)suse.com + +- updated to version 0.12.7 + * Officially support minitest v4.1.0 (still monkey-patching). + +------------------------------------------------------------------- Old: ---- mocha-0.12.6.gem New: ---- mocha-0.12.7.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-mocha.spec ++++++ --- /var/tmp/diff_new_pack.XNCn0O/_old 2012-11-12 07:06:15.000000000 +0100 +++ /var/tmp/diff_new_pack.XNCn0O/_new 2012-11-12 07:06:15.000000000 +0100 @@ -17,7 +17,7 @@ Name: rubygem-mocha -Version: 0.12.6 +Version: 0.12.7 Release: 0 %define mod_name mocha %define mod_full_name %{mod_name}-%{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-flog for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '12

12 Nov '12

Hello community, here is the log from the commit of package rubygem-flog for openSUSE:Factory checked in at 2012-11-12 07:06:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-flog (Old) and /work/SRC/openSUSE:Factory/.rubygem-flog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-flog", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-flog/rubygem-flog.changes 2012-09-01 10:33:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-flog.new/rubygem-flog.changes 2012-11-12 07:06:08.000000000 +0100 @@ -1,0 +2,35 @@ +Sat Nov 3 07:55:51 UTC 2012 - coolo(a)suse.com + +- updated to version 3.0.0 + * 1 minor enhancement: + + * Added a timeout handler to skip when RubyParser times out on a large file + + * 1 bug fix: + + * Fixed handling of plain literals in masgn in args. + + * 4 minor enhancements: + + * Added .rake as a supported extension. + * Create a new parser for every file, preventing state barkification + * Extended DSL support to include hash args (eg task :blah => :dep). + * Extended DSL support to report nested names (eg namespace(blah)::task#woot) + + * 1 bug fix: + + * Fix for sexp structure changes (no arglists). + + * 4 minor enhancements: + + * Added --18 and --19 flags to specify parser. Defaults to hybrid. + * Explicitly use Ruby18Parser to remove deprecation warnings. + * Modified processor to deal with cleaner sexps from RP 3.x. + * Use File.binread (File.read in 1.8) to bypass encoding errors + + * 2 bug fixes: + + * Cleaned up some 1.9 warnings. + * Fixed failing tests against ruby_parser 3 + +------------------------------------------------------------------- Old: ---- flog-2.5.3.gem New: ---- flog-3.0.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-flog.spec ++++++ --- /var/tmp/diff_new_pack.SyHEaL/_old 2012-11-12 07:06:09.000000000 +0100 +++ /var/tmp/diff_new_pack.SyHEaL/_new 2012-11-12 07:06:09.000000000 +0100 @@ -17,7 +17,7 @@ Name: rubygem-flog -Version: 2.5.3 +Version: 3.0.0 Release: 0 %define mod_name flog %define mod_full_name %{mod_name}-%{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit roundcubemail for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '12

12 Nov '12

Hello community, here is the log from the commit of package roundcubemail for openSUSE:Factory checked in at 2012-11-12 07:05:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/roundcubemail (Old) and /work/SRC/openSUSE:Factory/.roundcubemail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "roundcubemail", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/roundcubemail/roundcubemail.changes 2012-11-02 17:31:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.roundcubemail.new/roundcubemail.changes 2012-11-12 07:05:59.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Nov 10 21:12:16 UTC 2012 - wr(a)rosenauer.org + +- Update to version 0.8.3 + * This update adds small bug fixes and improvements to the 0.8 + stable series. It also fixes a possible, although unintended, + DoS to the webserver running Roundcube. See the included + CHANGELOG file for details. + +------------------------------------------------------------------- Old: ---- roundcubemail-0.8.2.tar.gz New: ---- roundcubemail-0.8.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ roundcubemail.spec ++++++ --- /var/tmp/diff_new_pack.spZQdP/_old 2012-11-12 07:06:01.000000000 +0100 +++ /var/tmp/diff_new_pack.spZQdP/_new 2012-11-12 07:06:01.000000000 +0100 @@ -21,7 +21,7 @@ License: GPL-3.0+ and GPL-2.0 and BSD-3-Clause Group: Productivity/Networking/Email/Clients Url: http://www.roundcube.net/ -Version: 0.8.2 +Version: 0.8.3 Release: 0 BuildRequires: apache2-devel BuildRequires: fdupes ++++++ roundcubemail-0.8.2.tar.gz -> roundcubemail-0.8.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/CHANGELOG new/roundcubemail-0.8.3/CHANGELOG --- old/roundcubemail-0.8.2/CHANGELOG 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/CHANGELOG 2012-11-10 15:15:21.000000000 +0100 @@ -1,6 +1,21 @@ CHANGELOG Roundcube Webmail =========================== +RELEASE 0.8.3 +------------- +- Fix AREA links handling (#1488792) +- Fix possible HTTP DoS on error in keep-alive requests (#1488782) +- Fix compatybility with MDB2 2.5.0b4 (#1488779) +- Fix a bug where saving a message in INBOX wasn't possible +- Fix HTML part detection in messages with attachments (#1488769) +- Fix bug where wrong words were highlighted on spell-before-send check +- Fix scrolling quirk in email preview frame using Opera 12 (#1488763) +- Fix displaying of multipart/alternative messages with empty parts (#1488750) +- Fix Warning: htmlspecialchars(): charset `RCMAIL_CHARSET' not supported warning in Installer (#1488744) +- Fix threaded list sorting on PHP < 5.2.9 (#1488748) + +RELEASE 0.8.2 +------------- - Fix XSS vulnerability from HTTP User-Agent header (#1488737) - Force fonts in compose fields to be all the same (#1488690) - Add full headers view in message preview window (#1488538) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/index.php new/roundcubemail-0.8.3/index.php --- old/roundcubemail-0.8.2/index.php 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/index.php 2012-11-10 15:15:21.000000000 +0100 @@ -2,7 +2,7 @@ /* +-------------------------------------------------------------------------+ | Roundcube Webmail IMAP Client | - | Version 0.8.2 | + | Version 0.8.3 | | | | Copyright (C) 2005-2012, The Roundcube Dev Team | | | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/installer/index.php new/roundcubemail-0.8.3/installer/index.php --- old/roundcubemail-0.8.2/installer/index.php 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/installer/index.php 2012-11-10 15:15:21.000000000 +0100 @@ -44,6 +44,7 @@ define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/'); define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); +define('RCMAIL_CHARSET', 'UTF-8'); $include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR; $include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/installer/rcube_install.php new/roundcubemail-0.8.3/installer/rcube_install.php --- old/roundcubemail-0.8.2/installer/rcube_install.php 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/installer/rcube_install.php 2012-11-10 15:15:21.000000000 +0100 @@ -524,7 +524,7 @@ '0.5-beta', '0.5', '0.5.1', '0.6-beta', '0.6', '0.7-beta', '0.7', '0.7.1', '0.7.2', '0.7.3', - '0.8-beta', '0.8-rc', '0.8.0', '0.8.1', + '0.8-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2', )); return $select; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/Changelog new/roundcubemail-0.8.3/plugins/managesieve/Changelog --- old/roundcubemail-0.8.2/plugins/managesieve/Changelog 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/Changelog 2012-11-10 15:15:21.000000000 +0100 @@ -1,3 +1,4 @@ +- Fixed filter activation/deactivation confirmation message (#1488765) - Fixed issue with DBMail bug [http://pear.php.net/bugs/bug.php?id=19077] (#1488594) * version 5.2 [2012-07-24] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/bs_BA.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/bs_BA.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/bs_BA.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/bs_BA.inc 2012-11-10 15:15:20.000000000 +0100 @@ -138,8 +138,8 @@ $labels['setcreated'] = 'Set filtera je uspješno kreiran.'; $labels['activateerror'] = 'Nije moguće omogućiti označene filtere. Desila se serverska greška.'; $labels['deactivateerror'] = 'Nije moguće onemogućiti označene filtere. Desila se serverska greška.'; -$labels['activated'] = 'Filteri su uspješno onemogućeni.'; -$labels['deactivated'] = 'Filteri su uspješno omogućeni.'; +$labels['deactivated'] = 'Filteri su uspješno onemogućeni.'; +$labels['activated'] = 'Filteri su uspješno omogućeni.'; $labels['moved'] = 'Filteri su uspješno premješteni.'; $labels['moveerror'] = 'Nije moguće premjestiti označeni filter. Desila se serverska greška.'; $labels['nametoolong'] = 'Ime je predugo.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/ca_ES.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/ca_ES.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/ca_ES.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/ca_ES.inc 2012-11-10 15:15:20.000000000 +0100 @@ -138,8 +138,8 @@ $labels['setcreated'] = 'S\'ha creat correctament el conjunt de filtres.'; $labels['activateerror'] = 'No s\'ha pogut habilitar el(s) filtre(s) seleccionat(s). Hi ha hagut un error al servidor.'; $labels['deactivateerror'] = 'No s\'ha pogut deshabilitar el(s) filtre(s) seleccionat(s). Hi ha hagut un error al servidor.'; -$labels['activated'] = 'Filtre(s) deshabilitat(s) correctament.'; -$labels['deactivated'] = 'Filtre(s) habilitat(s) correctament.'; +$labels['deactivated'] = 'Filtre(s) deshabilitat(s) correctament.'; +$labels['activated'] = 'Filtre(s) habilitat(s) correctament.'; $labels['moved'] = 'S\'ha mogut correctament el filtre.'; $labels['moveerror'] = 'No s\'ha pogut moure el filtre seleccionat. Hi ha hagut un error al servidor.'; $labels['nametoolong'] = 'El nom és massa llarg.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/cs_CZ.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/cs_CZ.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/cs_CZ.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/cs_CZ.inc 2012-11-10 15:15:20.000000000 +0100 @@ -139,8 +139,8 @@ $labels['setcreated'] = 'Sada filtrů úspěšně vytvořena.'; $labels['activateerror'] = 'Nelze zapnout vybrané filtr/y. Došlo k chybě serveru.'; $labels['deactivateerror'] = 'Nelze vypnout vybrané filtr/y. Došlo k chybě serveru.'; -$labels['activated'] = 'Filtr/y úspěšne vypnuty.'; -$labels['deactivated'] = 'Filtr/y úspěšně zapnuty.'; +$labels['deactivated'] = 'Filtr/y úspěšne vypnuty.'; +$labels['activated'] = 'Filtr/y úspěšně zapnuty.'; $labels['moved'] = 'Filtr byl úspěšně přesunut.'; $labels['moveerror'] = 'Nelze přesunout vybraný filtr. Došlo k chybě na serveru.'; $labels['nametoolong'] = 'Příliš dlouhý název.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/cy_GB.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/cy_GB.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/cy_GB.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/cy_GB.inc 2012-11-10 15:15:20.000000000 +0100 @@ -138,8 +138,8 @@ $labels['setcreated'] = 'Crëuwyd y set hidlydd yn llwyddiannus.'; $labels['activateerror'] = 'Methwyd galluogi y hidlydd(ion) dewiswyd. Cafwyd gwall gweinydd.'; $labels['deactivateerror'] = 'Methwyd analluogi y hidlydd(ion) dewiswyd. Cafwyd gwall gweinydd.'; -$labels['activated'] = 'Analluogwyd y hidlydd(ion) yn llwyddiannus.'; -$labels['deactivated'] = 'Galluogwyd y hidlydd(ion) yn llwyddiannus.'; +$labels['deactivated'] = 'Analluogwyd y hidlydd(ion) yn llwyddiannus.'; +$labels['activated'] = 'Galluogwyd y hidlydd(ion) yn llwyddiannus.'; $labels['moved'] = 'Symudwyd y hidlydd yn llwyddiannus.'; $labels['moveerror'] = 'Methwyd symud y hidlydd dewiswyd. Cafwyd gwall gweinydd.'; $labels['nametoolong'] = 'Enw yn rhy hir.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/da_DK.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/da_DK.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/da_DK.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/da_DK.inc 2012-11-10 15:15:20.000000000 +0100 @@ -138,8 +138,8 @@ $labels['setcreated'] = 'Filter sæt oprettet.'; $labels['activateerror'] = 'Kan ikek aktivere valgt filter sæt. Server fejl.'; $labels['deactivateerror'] = 'Kan ikke deaktivere valgt filter sæt. Server fejl.'; -$labels['activated'] = 'Filter(filtre) deaktiveret.'; -$labels['deactivated'] = 'Filter(filtre) aktiveret.'; +$labels['deactivated'] = 'Filter(filtre) deaktiveret.'; +$labels['activated'] = 'Filter(filtre) aktiveret.'; $labels['moved'] = 'Filter flyttet.'; $labels['moveerror'] = 'Kan ikke flytte valgt filter. Server fejl.'; $labels['nametoolong'] = 'Navn er for langt.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/de_CH.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/de_CH.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/de_CH.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/de_CH.inc 2012-11-10 15:15:20.000000000 +0100 @@ -139,8 +139,8 @@ $labels['setcreated'] = 'Filter erfolgreich erstellt.'; $labels['activateerror'] = 'Filter kann nicht aktiviert werden. Serverfehler.'; $labels['deactivateerror'] = 'Filter kann nicht deaktiviert werden. Serverfehler.'; -$labels['activated'] = 'Filter erfolgreich deaktiviert.'; -$labels['deactivated'] = 'Filter erfolgreich aktiviert.'; +$labels['deactivated'] = 'Filter erfolgreich deaktiviert.'; +$labels['activated'] = 'Filter erfolgreich aktiviert.'; $labels['moved'] = 'Filter erfolgreich verschoben.'; $labels['moveerror'] = 'Filter kann nicht verschoben werden. Serverfehler.'; $labels['nametoolong'] = 'Filtersatz kann nicht erstellt werden. Name zu lang.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/en_US.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/en_US.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/en_US.inc 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/en_US.inc 2012-11-10 15:15:21.000000000 +0100 @@ -136,8 +136,8 @@ $messages['setcreated'] = 'Filters set created successfully.'; $messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.'; $messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.'; -$messages['activated'] = 'Filter(s) disabled successfully.'; -$messages['deactivated'] = 'Filter(s) enabled successfully.'; +$messages['deactivated'] = 'Filter(s) disabled successfully.'; +$messages['activated'] = 'Filter(s) enabled successfully.'; $messages['moved'] = 'Filter moved successfully.'; $messages['moveerror'] = 'Unable to move selected filter. Server error occured.'; $messages['nametoolong'] = 'Name too long.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/es_ES.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/es_ES.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/es_ES.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/es_ES.inc 2012-11-10 15:15:20.000000000 +0100 @@ -139,8 +139,8 @@ $labels['setcreated'] = 'Conjunto de filtros creado satisfactoriamente'; $labels['activateerror'] = 'No se ha podido habilitar el filtro(s) seleccionado. Se ha producido un error de servidor.'; $labels['deactivateerror'] = 'No se ha podido deshabilitar el filtro(s) seleccionado. Se ha producido un error de servidor.'; -$labels['activated'] = 'Filtro(s) deshabilitado(s) correctamente.'; -$labels['deactivated'] = 'Filtro(s) habilitado(s) correctamente.'; +$labels['deactivated'] = 'Filtro(s) deshabilitado(s) correctamente.'; +$labels['activated'] = 'Filtro(s) habilitado(s) correctamente.'; $labels['moved'] = 'Filtro movido correctamente'; $labels['moveerror'] = 'No se ha podido mover el filtro seleccionado. Ha ocurrido un error de servidor.'; $labels['nametoolong'] = 'Imposible crear el conjunto de filtros. Nombre demasiado largo'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/et_EE.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/et_EE.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/et_EE.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/et_EE.inc 2012-11-10 15:15:20.000000000 +0100 @@ -130,8 +130,8 @@ $labels['ruleexist'] = 'Määratud nimega filter on juba olemas'; $labels['activateerror'] = 'Valitud filtrite lubamine nurjus. Ilmnes serveri tõrge.'; $labels['deactivateerror'] = 'Valitud filtrite keelamine nurjus. Ilmnes serveri tõrge.'; -$labels['activated'] = 'Filter edukalt keelatud.'; -$labels['deactivated'] = 'Filter edukalt lubatud.'; +$labels['deactivated'] = 'Filter edukalt keelatud.'; +$labels['activated'] = 'Filter edukalt lubatud.'; $labels['moved'] = 'Filter edukalt liigutatud.'; $labels['moveerror'] = 'Valitud filtri liigutamine nurjus. Ilmnes serveri tõrge.'; $labels['nametoolong'] = 'Nimi on liiga pikk.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/fa_IR.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/fa_IR.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/fa_IR.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/fa_IR.inc 2012-11-10 15:15:20.000000000 +0100 @@ -138,8 +138,8 @@ $labels['setcreated'] = 'مجموعه صافی‌ها با موفقیت ایجاد شد.'; $labels['activateerror'] = 'ناتوانی در فعال کردن صافی(های) انتخاب شده. خطای سرور رخ داد.'; $labels['deactivateerror'] = 'ناتوانی در غیرفعال کردن صافی(های) انتخاب شده. خطای سرور رخ داد.'; -$labels['activated'] = 'صافی(ها) با موفقیت غیرفعال شدند.'; -$labels['deactivated'] = 'صافی(ها) با موفقیت فعال شدند.'; +$labels['deactivated'] = 'صافی(ها) با موفقیت غیرفعال شدند.'; +$labels['activated'] = 'صافی(ها) با موفقیت فعال شدند.'; $labels['moved'] = 'صافی با موفقیت منتقل شد.'; $labels['moveerror'] = 'ناتوانی در انتقال صافی انتخاب شده. خطای سرور رخ داد.'; $labels['nametoolong'] = 'نام خیلی بلند.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/fi_FI.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/fi_FI.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/fi_FI.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/fi_FI.inc 2012-11-10 15:15:20.000000000 +0100 @@ -139,8 +139,8 @@ $labels['setcreated'] = 'Suodatinlistan luonti onnistui.'; $labels['activateerror'] = 'Suodatinlistan päälle kytkeminen epäonnistui. Palvelin virhe.'; $labels['deactivateerror'] = 'Suodatinlistan pois päältä kytkeminen epäonnistui. Palvelin virhe.'; -$labels['activated'] = 'Suodatinlista(t) kytketty pois päältä onnistuneesti.'; -$labels['deactivated'] = 'Suodatinlista(t) kytketty päälle onnistuneesti.'; +$labels['deactivated'] = 'Suodatinlista(t) kytketty pois päältä onnistuneesti.'; +$labels['activated'] = 'Suodatinlista(t) kytketty päälle onnistuneesti.'; $labels['moved'] = 'Suodatin siirretty onnistuneesti.'; $labels['moveerror'] = 'Valitun suodattimen siirto epäonnistui palvelinvirheen vuoksi.'; $labels['nametoolong'] = 'Nimi on liian pitkä.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/fr_FR.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/fr_FR.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/fr_FR.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/fr_FR.inc 2012-11-10 15:15:20.000000000 +0100 @@ -139,8 +139,8 @@ $labels['setcreated'] = 'Le groupe de filtres a bien été créé.'; $labels['activateerror'] = 'Impossible d\'activer le(s) filtre(s) sélectionné(s). Une erreur serveur s\'est produite.'; $labels['deactivateerror'] = 'Impossible de désactiver le(s) filtre(s) sélectionné(s). Une erreur serveur s\'est produite.'; -$labels['activated'] = 'Filtre(s) désactivé(s) avec succès'; -$labels['deactivated'] = 'Filtre(s) activé(s) avec succès'; +$labels['deactivated'] = 'Filtre(s) désactivé(s) avec succès'; +$labels['activated'] = 'Filtre(s) activé(s) avec succès'; $labels['moved'] = 'Filtre déplacé avec succès.'; $labels['moveerror'] = 'Déplacement du filtre sélectionné impossible. Le serveur a renvoyé une erreur.'; $labels['nametoolong'] = 'Nom trop long.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/he_IL.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/he_IL.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/he_IL.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/he_IL.inc 2012-11-10 15:15:20.000000000 +0100 @@ -138,8 +138,8 @@ $labels['setcreated'] = 'ערכת המסננים נוצרה בהצלחה.'; $labels['activateerror'] = 'לא ניתן להפעיל את המסננים הנבחרים. אירעה שגיאה בצד השרת.'; $labels['deactivateerror'] = 'לא ניתן לנטרל את המסננים הנבחרים. אירעה שגיאה בצד השרת.'; -$labels['activated'] = 'המסננים נוטרלו בהצלחה.'; -$labels['deactivated'] = 'המסננים הופעלו בהצלחה.'; +$labels['deactivated'] = 'המסננים נוטרלו בהצלחה.'; +$labels['activated'] = 'המסננים הופעלו בהצלחה.'; $labels['moved'] = 'המסנן הועבר בהצלחה.'; $labels['moveerror'] = 'לא ניתן להעביר את המסנן הנבחר. אירעה שגיאה בצד השרת.'; $labels['nametoolong'] = 'השם ארוך מדי.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/hr_HR.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/hr_HR.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/hr_HR.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/hr_HR.inc 2012-11-10 15:15:20.000000000 +0100 @@ -139,8 +139,8 @@ $labels['setcreated'] = 'Grupa filtera je uspješno stvorena'; $labels['activateerror'] = 'Nije moguće omogućiti odabrani filter(e). Greška poslužitelja.'; $labels['deactivateerror'] = 'Nije moguće onemogučiti odabrane filter(e). Greška poslužitelja.'; -$labels['activated'] = 'Filter(i) onemogućen(i) uspješno.'; -$labels['deactivated'] = 'Filter(i) omogućen(i) uspješno.'; +$labels['deactivated'] = 'Filter(i) onemogućen(i) uspješno.'; +$labels['activated'] = 'Filter(i) omogućen(i) uspješno.'; $labels['moved'] = 'Filter uspješno premješten.'; $labels['moveerror'] = 'Nije moguće premjestiti odabrani filter. Greška poslužitelja.'; $labels['nametoolong'] = 'Nemoguće napraviti grupu filtera. Naziv je predugačak'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/hu_HU.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/hu_HU.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/hu_HU.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/hu_HU.inc 2012-11-10 15:15:20.000000000 +0100 @@ -139,8 +139,8 @@ $labels['setcreated'] = 'A szűrő készlet sikeresen létrejött.'; $labels['activateerror'] = 'Nem sikerült engedélyezni a kiválasztott szűrö(k)et. Szerver hiba történt.'; $labels['deactivateerror'] = 'Nem sikerült kikapcsolni a kiválasztott szűrő(ke)t. Szerver hiba történt.'; -$labels['activated'] = 'Szűrő(k) sikeresen kikapcsolva.'; -$labels['deactivated'] = 'Szűrő(k) sikeresen bekapcsolva.'; +$labels['deactivated'] = 'Szűrő(k) sikeresen kikapcsolva.'; +$labels['activated'] = 'Szűrő(k) sikeresen bekapcsolva.'; $labels['moved'] = 'A szűrő sikeresen áthelyezve.'; $labels['moveerror'] = 'Az áthelyezés nem sikerült. Szerver hiba történt.'; $labels['nametoolong'] = 'Túll hosszu név'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/hy_AM.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/hy_AM.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/hy_AM.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/hy_AM.inc 2012-11-10 15:15:20.000000000 +0100 @@ -138,8 +138,8 @@ $labels['setcreated'] = 'Զտիչների համալիրը ստեղծված է։'; $labels['activateerror'] = 'Սերվերի սխալ։ Նշված զտիչի միացման ձախողում։'; $labels['deactivateerror'] = 'Սերվերի սխալ։ Նշված զտիչի անջատման ձախողում։'; -$labels['activated'] = 'Զտիչի անջատված է։'; -$labels['deactivated'] = 'Զտիչի միացված է։'; +$labels['deactivated'] = 'Զտիչի անջատված է։'; +$labels['activated'] = 'Զտիչի միացված է։'; $labels['moved'] = 'Զտիչի տեղափոխված է։'; $labels['moveerror'] = 'Սերվերի սխալ։ Նշված զտիչի տեղափոխման ձախողում։'; $labels['nametoolong'] = 'Անունը չափազանց երկար է։'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/id_ID.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/id_ID.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/id_ID.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/id_ID.inc 2012-11-10 15:15:20.000000000 +0100 @@ -139,8 +139,8 @@ $labels['setcreated'] = 'Kumpulan penyaringan berhasul dibuat.'; $labels['activateerror'] = 'Tidak bisa menghidupkan penyaringan terpilih. terjadi galat pada server.'; $labels['deactivateerror'] = 'Tidak bisa mematikan penyaringan terpilih. Terjadi galat pada server.'; -$labels['activated'] = 'Berhasil mematikan penyaringan.'; -$labels['deactivated'] = 'Berhasil menghidupkan penyaringan.'; +$labels['deactivated'] = 'Berhasil mematikan penyaringan.'; +$labels['activated'] = 'Berhasil menghidupkan penyaringan.'; $labels['moved'] = 'Berhasil memindahkan penyaringan.'; $labels['moveerror'] = 'Tidak bisa memindahkan penyaringan terpilih. Terjadi galat pada server.'; $labels['nametoolong'] = 'Kepanjangan nama.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/it_IT.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/it_IT.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/it_IT.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/it_IT.inc 2012-11-10 15:15:20.000000000 +0100 @@ -139,8 +139,8 @@ $labels['setcreated'] = 'Gruppo di filtri creato'; $labels['activateerror'] = 'impossibile selezionare il filtro (server error)'; $labels['deactivateerror'] = 'impossibile disabilitare il filtro (server error)'; -$labels['activated'] = 'filtro disabilitato'; -$labels['deactivated'] = 'filtro abilitato'; +$labels['deactivated'] = 'filtro disabilitato'; +$labels['activated'] = 'filtro abilitato'; $labels['moved'] = 'filtro spostato'; $labels['moveerror'] = 'impossibile spostare il filtro (server error)'; $labels['nametoolong'] = 'Impossibile creare il gruppo: Nome troppo lungo'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/ja_JP.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/ja_JP.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/ja_JP.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/ja_JP.inc 2012-11-10 15:15:20.000000000 +0100 @@ -138,8 +138,8 @@ $labels['setcreated'] = 'フィルターセットを作成しました。'; $labels['activateerror'] = '選択したフィルターを有効にできませんでした。サーバーでエラーが発生しました。'; $labels['deactivateerror'] = '選択したフィルターを無効にできませんでした。サーバーでエラーが発生しました。'; -$labels['activated'] = 'フィルターを無効にしました。'; -$labels['deactivated'] = 'フィルターを有効にしました。'; +$labels['deactivated'] = 'フィルターを無効にしました。'; +$labels['activated'] = 'フィルターを有効にしました。'; $labels['moved'] = 'フィルターを移動しました。'; $labels['moveerror'] = '選択したフィルターを移動できませんでした。サーバーでエラーが発生しました。'; $labels['nametoolong'] = '名前が長すぎます。'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/ko_KR.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/ko_KR.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/ko_KR.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/ko_KR.inc 2012-11-10 15:15:20.000000000 +0100 @@ -120,8 +120,8 @@ $labels['setcreated'] = '필터 묶음을 성공적으로 생성 함.'; $labels['activateerror'] = '선택한 필터(들)을 동작하게 할 수 없음. 서버 에러 발생 함.'; $labels['deactivateerror'] = '선택한 필터(들)을 동작하지 않게 할 수 없음. 서버 에러 발생 함.'; -$labels['activated'] = '필터(들)을 동작하지 않게 하는데 성공하였음.'; -$labels['deactivated'] = '필터(들)을 동작하게 하는데 성공하였음.'; +$labels['deactivated'] = '필터(들)을 동작하지 않게 하는데 성공하였음.'; +$labels['activated'] = '필터(들)을 동작하게 하는데 성공하였음.'; $labels['moved'] = '필터를 이동하는 데 성공하였음.'; $labels['moveerror'] = '선택한 필터를 이동할 수 없음. 서버 에러 발생 함.'; $labels['nametoolong'] = '이름이 너무 김.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/ml_IN.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/ml_IN.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/ml_IN.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/ml_IN.inc 2012-11-10 15:15:20.000000000 +0100 @@ -138,8 +138,8 @@ $labels['setcreated'] = 'അരിപ്പകളുടെ കൂട്ടത്തെ വിജയകരമായി നിര്‍മ്മിച്ചു.'; $labels['activateerror'] = 'അരിപ്പ (കള്‍) പ്രവര്‍ത്തനസജ്ജം ആക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം!'; $labels['deactivateerror'] = 'അരിപ്പ (കള്‍) നിര്‍വീര്യം ആക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം!'; -$labels['activated'] = 'അരിപ്പകള്‍ നിര്‍വീര്യം ആക്കപ്പെട്ടിരിക്കുന്നു'; -$labels['deactivated'] = 'അരിപ്പ വിജകരമായി പ്രവര്‍ത്തനസജ്ജമാക്കി.'; +$labels['deactivated'] = 'അരിപ്പകള്‍ നിര്‍വീര്യം ആക്കപ്പെട്ടിരിക്കുന്നു'; +$labels['activated'] = 'അരിപ്പ വിജകരമായി പ്രവര്‍ത്തനസജ്ജമാക്കി.'; $labels['moved'] = 'അരിപ്പ വിജകരമായി മാറ്റി.'; $labels['moveerror'] = 'തെരഞ്ഞെടുത്ത അരിപ്പ മാറ്റാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.'; $labels['nametoolong'] = 'പേരിന് നീളം കൂടുതല്‍.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/nb_NO.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/nb_NO.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/nb_NO.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/nb_NO.inc 2012-11-10 15:15:20.000000000 +0100 @@ -138,8 +138,8 @@ $labels['setcreated'] = 'Filtersett opprettet.'; $labels['activateerror'] = 'Kunne ikke skru på valgte filter. Det oppsto en tjenerfeil.'; $labels['deactivateerror'] = 'Kunne ikke skru av valgte filter. Det oppsto en tjenerfeil.'; -$labels['activated'] = 'Filter skrudd av.'; -$labels['deactivated'] = 'Filter ble skrudd på.'; +$labels['deactivated'] = 'Filter skrudd av.'; +$labels['activated'] = 'Filter ble skrudd på.'; $labels['moved'] = 'Filter ble flyttet.'; $labels['moveerror'] = 'Kunne ikke flytte valgte filter. Det oppsto en tjenerfeil.'; $labels['nametoolong'] = 'Navnet er for langt.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/nl_NL.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/nl_NL.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/nl_NL.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/nl_NL.inc 2012-11-10 15:15:20.000000000 +0100 @@ -139,8 +139,8 @@ $labels['setcreated'] = 'Filterverzameling succesvol aangemaakt.'; $labels['activateerror'] = 'Geselecteerde filter(s) konden niet ingeschakeld worden. Er trad een serverfout op.'; $labels['deactivateerror'] = 'Geselecteerde filter(s) konden niet uitgeschakeld worden. Er trad een serverfout op.'; -$labels['activated'] = 'Filter(s) succesvol uitgeschakeld.'; -$labels['deactivated'] = 'Filter(s) succesvol ingeschakeld.'; +$labels['deactivated'] = 'Filter(s) succesvol uitgeschakeld.'; +$labels['activated'] = 'Filter(s) succesvol ingeschakeld.'; $labels['moved'] = 'Filter succesvol verplaatst.'; $labels['moveerror'] = 'Geselecteerde filter(s) konden niet verplaatst worden. Er trad een serverfout op.'; $labels['nametoolong'] = 'Naam is te lang.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/pl_PL.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/pl_PL.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/pl_PL.inc 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/pl_PL.inc 2012-11-10 15:15:21.000000000 +0100 @@ -149,8 +149,8 @@ $labels['setcreated'] = 'Zbiór filtrów został utworzony pomyślnie.'; $labels['activateerror'] = 'Nie można włączyć wybranych filtrów. Błąd serwera.'; $labels['deactivateerror'] = 'Nie można wyłączyć wybranych filtrów. Błąd serwera.'; -$labels['activated'] = 'Filtr(y) wyłączono pomyślnie.'; -$labels['deactivated'] = 'Filtr(y) włączono pomyślnie.'; +$labels['deactivated'] = 'Filtr(y) wyłączono pomyślnie.'; +$labels['activated'] = 'Filtr(y) włączono pomyślnie.'; $labels['moved'] = 'Filter został przeniesiony pomyślnie.'; $labels['moveerror'] = 'Nie można przenieść wybranego filtra. Błąd serwera.'; $labels['nametoolong'] = 'Zbyt długa nazwa.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/pt_BR.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/pt_BR.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/pt_BR.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/pt_BR.inc 2012-11-10 15:15:20.000000000 +0100 @@ -139,8 +139,8 @@ $labels['setcreated'] = 'Conjunto de filtros criado com sucesso.'; $labels['activateerror'] = 'Não foi possível habilitar o(s) filtro(s) selecionado(s). Ocorreu um erro no servidor.'; $labels['deactivateerror'] = 'Não foi possível desabilitar o(s) filtro(s) selecionado(s). Ocorreu um erro no servidor.'; -$labels['activated'] = 'Filtro(s) desabilitado(s) com sucesso.'; -$labels['deactivated'] = 'Filtro(s) habilitado(s) com sucesso.'; +$labels['deactivated'] = 'Filtro(s) desabilitado(s) com sucesso.'; +$labels['activated'] = 'Filtro(s) habilitado(s) com sucesso.'; $labels['moved'] = 'Filtro movido com sucesso.'; $labels['moveerror'] = 'Não foi possível mover o filtro selecionado. Ocorreu um erro no servidor.'; $labels['nametoolong'] = 'Nome muito longo.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/pt_PT.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/pt_PT.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/pt_PT.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/pt_PT.inc 2012-11-10 15:15:20.000000000 +0100 @@ -139,8 +139,8 @@ $labels['setcreated'] = 'Conjunto de filtros criado com sucesso.'; $labels['activateerror'] = 'Não foi possível ativar os filtros selecionados. Ocorreu um erro no servidor.'; $labels['deactivateerror'] = 'Não foi possível desativar os filtros selecionados. Ocorreu um erro no servidor.'; -$labels['activated'] = 'Filtro(s) desativado(s) com sucesso.'; -$labels['deactivated'] = 'Filtro(s) ativado(s) com sucesso.'; +$labels['deactivated'] = 'Filtro(s) desativado(s) com sucesso.'; +$labels['activated'] = 'Filtro(s) ativado(s) com sucesso.'; $labels['moved'] = 'Filtro movido com sucesso.'; $labels['moveerror'] = 'Não foi possível mover o filtro selecionado. Ocorreu um erro no servidor.'; $labels['nametoolong'] = 'Nome demasiado longo.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/ro_RO.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/ro_RO.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/ro_RO.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/ro_RO.inc 2012-11-10 15:15:20.000000000 +0100 @@ -139,8 +139,8 @@ $labels['setcreated'] = 'Setul de filtre creat cu succes.'; $labels['activateerror'] = 'Nu am putut activa filtrele selectate. S-a produs o eroare la server.'; $labels['deactivateerror'] = 'Nu am putut dezactiva filtrele selectate. S-a produs o eroare la server.'; -$labels['activated'] = 'Filtrele au fost dezactivate cu succes.'; -$labels['deactivated'] = 'Filtrele au fost activate cu succes.'; +$labels['deactivated'] = 'Filtrele au fost dezactivate cu succes.'; +$labels['activated'] = 'Filtrele au fost activate cu succes.'; $labels['moved'] = 'Filtrele au fost mutate cu succes.'; $labels['moveerror'] = 'Nu am putut muta filtreele selectate. S-a produs o eroare la server.'; $labels['nametoolong'] = 'Numele este prea lung.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/ru_RU.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/ru_RU.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/ru_RU.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/ru_RU.inc 2012-11-10 15:15:20.000000000 +0100 @@ -138,8 +138,8 @@ $labels['setcreated'] = 'Набор фильтров успешно создан.'; $labels['activateerror'] = 'Невозможно включить выбранный(е) фильтр(ы). Ошибка сервера.'; $labels['deactivateerror'] = 'Невозможно выключить выбранный(е) фильтр(ы). Ошибка сервера.'; -$labels['activated'] = 'Фильтр(ы) успешно отключен(ы).'; -$labels['deactivated'] = 'Фильтр(ы) успешно включен(ы).'; +$labels['deactivated'] = 'Фильтр(ы) успешно отключен(ы).'; +$labels['activated'] = 'Фильтр(ы) успешно включен(ы).'; $labels['moved'] = 'Фильтр успешно перемещён.'; $labels['moveerror'] = 'Невозможно переместить фильтр. Ошибка сервера.'; $labels['nametoolong'] = 'Невозможно создать набор фильтров. Название слишком длинное.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/sk_SK.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/sk_SK.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/sk_SK.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/sk_SK.inc 2012-11-10 15:15:20.000000000 +0100 @@ -139,8 +139,8 @@ $labels['setcreated'] = 'Sada filtrov bola vytvorená'; $labels['activateerror'] = 'Nepodarilo sa povoliť vybraný filter(e). Chyba servera.'; $labels['deactivateerror'] = 'Nepodarilo sa vypnúť vybraný filter(e). Chyba servera.'; -$labels['activated'] = 'Filter(e) úspešne vypnutý.'; -$labels['deactivated'] = 'Filter(e) povolený.'; +$labels['deactivated'] = 'Filter(e) úspešne vypnutý.'; +$labels['activated'] = 'Filter(e) povolený.'; $labels['moved'] = 'Filter presunutý.'; $labels['moveerror'] = 'Nemôžem presunúť zvolený filter. Chyba servera.'; $labels['nametoolong'] = 'Názov sady filtrov je príliš dlhý'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/sl_SI.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/sl_SI.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/sl_SI.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/sl_SI.inc 2012-11-10 15:15:20.000000000 +0100 @@ -138,8 +138,8 @@ $labels['setcreated'] = 'Filter je bil uspešno ustvarjen.'; $labels['activateerror'] = 'Izbranega/ih filtra/ov ni bilo mogoče vključiti. Prišlo je do napake na strežniku.'; $labels['deactivateerror'] = 'Izbranega/ih fitra/ov ni bilo mogoče izključiti. Prišlo je do napake na strežniku.'; -$labels['activated'] = 'Filtri so bili uspešno onemogočeni.'; -$labels['deactivated'] = 'Filtri so bili uspešno omogočeni.'; +$labels['deactivated'] = 'Filtri so bili uspešno onemogočeni.'; +$labels['activated'] = 'Filtri so bili uspešno omogočeni.'; $labels['moved'] = 'Filter je bil uspešno premaknjen.'; $labels['moveerror'] = 'Izbranega filtra ni bilo mogoče premakniti. Prišlo je do napake na strežniku.'; $labels['nametoolong'] = 'Ime je predolgo.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/sv_SE.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/sv_SE.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/sv_SE.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/sv_SE.inc 2012-11-10 15:15:20.000000000 +0100 @@ -139,8 +139,8 @@ $labels['setcreated'] = 'Filtergruppen har lagts till'; $labels['activateerror'] = 'Kunde inte aktivera filter på grund av serverfel.'; $labels['deactivateerror'] = 'Kunde inte deaktivera filter på grund av serverfel.'; -$labels['activated'] = 'Filter deaktiverat.'; -$labels['deactivated'] = 'Filter aktiverat.'; +$labels['deactivated'] = 'Filter deaktiverat.'; +$labels['activated'] = 'Filter aktiverat.'; $labels['moved'] = 'Filter flyttat.'; $labels['moveerror'] = 'Kunde inte flytta filter på grund av serverfel.'; $labels['nametoolong'] = 'Filtergruppen kan inte läggas till med för långt namn'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/tr_TR.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/tr_TR.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/tr_TR.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/tr_TR.inc 2012-11-10 15:15:20.000000000 +0100 @@ -138,8 +138,8 @@ $labels['setcreated'] = 'Filtre setleri başarıyla oluşturuldu.'; $labels['activateerror'] = 'Seçilen filtre(ler) etkinleştirilemedi. Sunucuda hata oluştu.'; $labels['deactivateerror'] = 'Seçilen filtre(ler) pasifleştirilemedi. Sunucuda hata oluştu.'; -$labels['activated'] = 'Filtre(ler) başarıyla iptal edildi.'; -$labels['deactivated'] = 'Filtre(ler) başarıyla etkinleştirildi.'; +$labels['deactivated'] = 'Filtre(ler) başarıyla iptal edildi.'; +$labels['activated'] = 'Filtre(ler) başarıyla etkinleştirildi.'; $labels['moved'] = 'Filtre başarıyla taşındı.'; $labels['moveerror'] = 'Seçilen filtre(ler) taşınamadı. Sunucuda hata oluştu.'; $labels['nametoolong'] = 'İsim çok uzun.'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/vi_VN.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/vi_VN.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/vi_VN.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/vi_VN.inc 2012-11-10 15:15:20.000000000 +0100 @@ -138,8 +138,8 @@ $labels['setcreated'] = 'Thiết lập bộ lọc được tạo thành công'; $labels['activateerror'] = 'Không thể khởi động bộ lọc được chọn. Có lỗi xuất hiện ở máy chủ'; $labels['deactivateerror'] = 'Không thể tắt bộ lọc đã chọn. Có lỗi xuất hiện ở máy chủ'; -$labels['activated'] = 'Bộ lọc được tắt thành công'; -$labels['deactivated'] = 'Bộ lọc được khởi động thành công'; +$labels['deactivated'] = 'Bộ lọc được tắt thành công'; +$labels['activated'] = 'Bộ lọc được khởi động thành công'; $labels['moved'] = 'Bộ lọc được chuyển đi thành công'; $labels['moveerror'] = 'Không thể chuyển bộc lọc đã chọn. Có lỗi xuất hiện ở máy chủ'; $labels['nametoolong'] = 'Tên quá dài'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/zh_CN.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/zh_CN.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/zh_CN.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/zh_CN.inc 2012-11-10 15:15:20.000000000 +0100 @@ -138,8 +138,8 @@ $labels['setcreated'] = '过滤器成功创建。'; $labels['activateerror'] = '无法启用选中的过滤器，因为服务器发生错误。'; $labels['deactivateerror'] = '无法禁用选中的过滤器，因为服务器发生错误。'; -$labels['activated'] = '禁用过滤器成功。'; -$labels['deactivated'] = '启用过滤器成功。'; +$labels['deactivated'] = '禁用过滤器成功。'; +$labels['activated'] = '启用过滤器成功。'; $labels['moved'] = '过滤器移动成功。'; $labels['moveerror'] = '无法移动选中的过滤器，因为服务器发生错误。'; $labels['nametoolong'] = '名称太长。'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/plugins/managesieve/localization/zh_TW.inc new/roundcubemail-0.8.3/plugins/managesieve/localization/zh_TW.inc --- old/roundcubemail-0.8.2/plugins/managesieve/localization/zh_TW.inc 2012-10-05 19:14:21.000000000 +0200 +++ new/roundcubemail-0.8.3/plugins/managesieve/localization/zh_TW.inc 2012-11-10 15:15:20.000000000 +0100 @@ -126,8 +126,8 @@ $labels['setcreated'] = '篩選器集合成功建立'; $labels['activateerror'] = '無法啟用選擇的篩選器。伺服器錯誤'; $labels['deactivateerror'] = '無法停用選擇的篩選器。伺服器錯誤'; -$labels['activated'] = '篩選器已停用'; -$labels['deactivated'] = '篩選器已啟用'; +$labels['deactivated'] = '篩選器已停用'; +$labels['activated'] = '篩選器已啟用'; $labels['moved'] = '篩選器已移動'; $labels['moveerror'] = '無法移動選擇的篩選器。伺服器錯誤'; $labels['nametoolong'] = '無法建立篩選器集合。名稱太長'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/include/iniset.php new/roundcubemail-0.8.3/program/include/iniset.php --- old/roundcubemail-0.8.2/program/include/iniset.php 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/program/include/iniset.php 2012-11-10 15:15:21.000000000 +0100 @@ -42,7 +42,7 @@ } // application constants -define('RCMAIL_VERSION', '0.8.2'); +define('RCMAIL_VERSION', '0.8.3'); define('RCMAIL_CHARSET', 'UTF-8'); define('JS_OBJECT_NAME', 'rcmail'); define('RCMAIL_START', microtime(true)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/include/rcube_imap.php new/roundcubemail-0.8.3/program/include/rcube_imap.php --- old/roundcubemail-0.8.2/program/include/rcube_imap.php 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/program/include/rcube_imap.php 2012-11-10 15:15:21.000000000 +0100 @@ -2212,6 +2212,10 @@ $folder = $this->folder; } + if (!$this->check_connection()) { + return false; + } + // make sure folder exists if ($this->folder_exists($folder)) { if ($is_file) { @@ -4032,6 +4036,11 @@ return $this->delete_folder($folder); } + function clear_mailbox($folder = null) + { + return $this->clear_folder($folder); + } + public function mailbox_exists($folder, $subscription=false) { return $this->folder_exists($folder, $subscription); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/include/rcube_imap_generic.php new/roundcubemail-0.8.3/program/include/rcube_imap_generic.php --- old/roundcubemail-0.8.2/program/include/rcube_imap_generic.php 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/program/include/rcube_imap_generic.php 2012-11-10 15:15:21.000000000 +0100 @@ -3590,6 +3590,10 @@ */ static function uncompressMessageSet($messages) { + if (empty($messages)) { + return array(); + } + $result = array(); $messages = explode(',', $messages); @@ -3598,7 +3602,7 @@ $max = max($items[0], $items[1]); for ($x=$items[0]; $x<=$max; $x++) { - $result[] = $x; + $result[] = (int)$x; } unset($messages[$idx]); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/include/rcube_ldap.php new/roundcubemail-0.8.3/program/include/rcube_ldap.php --- old/roundcubemail-0.8.2/program/include/rcube_ldap.php 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/program/include/rcube_ldap.php 2012-11-10 15:15:21.000000000 +0100 @@ -803,24 +803,26 @@ for ($i = 0; $i < $entries['count']; $i++) { $rec = $this->_ldap2result($entries[$i]); - foreach (array('email', 'name') as $f) { - $val = mb_strtolower($rec[$f]); - switch ($mode) { - case 1: - $got = ($val == $search); - break; - case 2: - $got = ($search == substr($val, 0, strlen($search))); - break; - default: - $got = (strpos($val, $search) !== false); - break; - } + foreach ($fields as $f) { + foreach ((array)$rec[$f] as $val) { + $val = mb_strtolower($val); + switch ($mode) { + case 1: + $got = ($val == $search); + break; + case 2: + $got = ($search == substr($val, 0, strlen($search))); + break; + default: + $got = (strpos($val, $search) !== false); + break; + } - if ($got) { - $this->result->add($rec); - $this->result->count++; - break; + if ($got) { + $this->result->add($rec); + $this->result->count++; + break 2; + } } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/include/rcube_mdb2.php new/roundcubemail-0.8.3/program/include/rcube_mdb2.php --- old/roundcubemail-0.8.2/program/include/rcube_mdb2.php 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/program/include/rcube_mdb2.php 2012-11-10 15:15:21.000000000 +0100 @@ -288,7 +288,7 @@ else { $params = (array)$params; $q = $this->db_handle->prepare($query, null, $mode=='w' ? MDB2_PREPARE_MANIP : null); - if ($this->db_handle->isError($q)) { + if (MDB2::isError($q)) { $this->db_error = true; $this->db_error_msg = $q->userinfo; @@ -369,7 +369,7 @@ $id = $this->db_handle->lastInsertID($table); - return $this->db_handle->isError($id) ? null : $id; + return MDB2::isError($id) ? null : $id; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/include/rcube_message.php new/roundcubemail-0.8.3/program/include/rcube_message.php --- old/roundcubemail-0.8.2/program/include/rcube_message.php 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/program/include/rcube_message.php 2012-11-10 15:15:21.000000000 +0100 @@ -211,7 +211,18 @@ // HTML part can be on the lower level, if not... if (count($level) > 1) { // It can be an alternative or related message part - $parent = $this->mime_parts[0]; + // find parent part + $parent = null; + foreach ($this->mime_parts as $part) { + if ($part->mime_id == $level[0]) { + $parent = $part; + } + } + + if (!$parent) { + continue; + } + if ($parent->mimetype != 'multipart/alternative' && $parent->mimetype != 'multipart/related') { continue; } @@ -364,6 +375,11 @@ foreach ($structure->parts as $p => $sub_part) { $sub_mimetype = $sub_part->mimetype; + // skip empty text parts + if (!$sub_part->size && preg_match('#^text/(plain|html|enriched)$#', $sub_mimetype)) { + continue; + } + // check if sub part is if ($sub_mimetype == 'text/plain') $plain_part = $p; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/include/rcube_result_thread.php new/roundcubemail-0.8.3/program/include/rcube_result_thread.php --- old/roundcubemail-0.8.2/program/include/rcube_result_thread.php 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/program/include/rcube_result_thread.php 2012-11-10 15:15:21.000000000 +0100 @@ -478,16 +478,18 @@ $items = explode(self::SEPARATOR_ITEM, $elem); $root = (int) array_shift($items); - $result[$elem] = $elem; - foreach ($items as $item) { - list($lv, $id) = explode(self::SEPARATOR_LEVEL, $item); + if ($root) { + $result[$root] = $root; + foreach ($items as $item) { + list($lv, $id) = explode(self::SEPARATOR_LEVEL, $item); $result[$id] = $root; + } } } // get only unique roots $result = array_filter($result); // make sure there are no nulls - $result = array_unique($result, SORT_NUMERIC); + $result = array_unique($result); // Re-sort raw data $result = array_fill_keys($result, null); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/js/app.js new/roundcubemail-0.8.3/program/js/app.js --- old/roundcubemail-0.8.2/program/js/app.js 2012-10-05 19:14:31.000000000 +0200 +++ new/roundcubemail-0.8.3/program/js/app.js 2012-11-10 15:15:39.000000000 +0100 @@ -207,12 +207,13 @@ "purge","expunge","select-all","select-none","sort","expand-all","expand-unread","collapse-all",!1)),this.message_list&&this.triggerEvent("listupdate",{folder:this.env.mailbox,rowcount:this.message_list.rowcount}));break;case "check-recent":case "getunread":case "search":this.env.qsearch=null;case "list":if("mail"==this.task){if(this.enable_command("show","expunge","select-all","select-none","sort",0<this.env.messagecount),this.enable_command("purge",this.purge_mailbox_test()),this.enable_command("expand-all", "expand-unread","collapse-all",this.env.threading&&this.env.messagecount),("list"==a.action||"search"==a.action)&&this.message_list)this.msglist_select(this.message_list),this.triggerEvent("listupdate",{folder:this.env.mailbox,rowcount:this.message_list.rowcount})}else if("addressbook"==this.task&&(this.enable_command("export",this.contact_list&&0<this.contact_list.rowcount),"list"==a.action||"search"==a.action))this.enable_command("search-create",""==this.env.source),this.enable_command("search-delete", this.env.search_id),this.update_group_commands(),this.triggerEvent("listupdate",{folder:this.env.source,rowcount:this.contact_list.rowcount})}a.unlock&&this.hide_message(a.unlock);this.triggerEvent("responseafter",{response:a});this.triggerEvent("responseafter"+a.action,{response:a})}};this.http_error=function(a,b,d,e,f){d=a.statusText;this.set_busy(!1,null,e);a.abort();this.unload||(a.status&&d?this.display_message(this.get_label("servererror")+" ("+d+")","error"):"timeout"==b?this.display_message(this.get_label("requesttimedout"), -"error"):0==a.status&&"abort"!=b&&this.display_message(this.get_label("servererror")+" (No connection)","error"),"keep-alive"==f?setTimeout(function(){j.keep_alive()},3E4):"check-recent"==f&&setTimeout(function(){j.check_for_recent(!1)},3E4))};this.async_upload_form=function(a,b,d){var e=(new Date).getTime(),f="rcmupload"+e;if(this.env.upload_progress_name){var g=this.env.upload_progress_name,h=$("input[name="+g+"]",a);h.length||(h=$("<input>").attr({type:"hidden",name:g}),h.prependTo(a));h.val(e)}document.all? -document.body.insertAdjacentHTML("BeforeEnd",'<iframe name="'+f+'" src="program/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>'):(g=document.createElement("iframe"),g.name=f,g.style.border="none",g.style.width=0,g.style.height=0,g.style.visibility="hidden",document.body.appendChild(g));$(f).bind("load",{ts:e},d);$(a).attr({target:f,action:this.url(b,{_id:this.env.compose_id||"",_uploadid:e}),method:"POST"}).attr(a.encoding?"encoding":"enctype","multipart/form-data").submit();return f}; -this.start_keepalive=function(){this.env.keep_alive&&!this.env.framed&&(this._int&&clearInterval(this._int),"mail"==this.task&&this.gui_objects.mailboxlist?this._int=setInterval(function(){j.check_for_recent(!1)},1E3*this.env.keep_alive):"login"!=this.task&&"print"!=this.env.action&&(this._int=setInterval(function(){j.keep_alive()},1E3*this.env.keep_alive)))};this.keep_alive=function(){this.busy||this.http_request("keep-alive")};this.check_for_recent=function(a){if(!this.busy){var b,d="_mbox="+urlencode(this.env.mailbox); -a&&(b=this.set_busy(!0,"checkingmail"),d+="&_refresh=1",this.start_keepalive());this.gui_objects.messagelist&&(d+="&_list=1");this.gui_objects.quotadisplay&&(d+="&_quota=1");this.env.search_request&&(d+="&_search="+this.env.search_request);this.http_request("check-recent",d,b)}};this.get_single_uid=function(){return this.env.uid?this.env.uid:this.message_list?this.message_list.get_single_selection():null};this.get_single_cid=function(){return this.env.cid?this.env.cid:this.contact_list?this.contact_list.get_single_selection(): -null};this.get_caret_pos=function(a){if(void 0!==a.selectionEnd)return a.selectionEnd;if(document.selection&&document.selection.createRange){var b=document.selection.createRange();if(b.parentElement()!=a)return 0;var d=b.duplicate();"TEXTAREA"==a.tagName?d.moveToElementText(a):d.expand("textedit");d.setEndPoint("EndToStart",b);b=d.text.length;return b<=a.value.length?b:-1}return a.value.length};this.set_caret_pos=function(a,b){if(a.setSelectionRange)a.setSelectionRange(b,b);else if(a.createTextRange){var d= -a.createTextRange();d.collapse(!0);d.moveEnd("character",b);d.moveStart("character",b);d.select()}};this.lock_form=function(a,b){if(a&&a.elements){var d,e,f;b&&(this.disabled_form_elements=[]);d=0;for(e=a.elements.length;d<e;d++)if(f=a.elements[d],"hidden"!=f.type)if(b&&f.disabled)this.disabled_form_elements.push(f);else if(b||this.disabled_form_elements&&0>$.inArray(f,this.disabled_form_elements))f.disabled=b}};this.mailto_handler_uri=function(){return location.href.split("?")[0]+"?_task=mail&_action=compose&_to=%s"}; -this.register_protocol_handler=function(a){try{window.navigator.registerProtocolHandler("mailto",this.mailto_handler_uri(),a)}catch(b){}};this.check_protocol_handler=function(a,b){var d=window.navigator;!d||"function"!=typeof d.registerProtocolHandler||"function"==typeof d.isProtocolHandlerRegistered&&"registered"==d.isProtocolHandlerRegistered("mailto",this.mailto_handler_uri())?$(b).addClass("disabled"):$(b).click(function(){rcmail.register_protocol_handler(a);return!1})}} -rcube_webmail.long_subject_title=function(j,t){if(!j.title){var a=$(j);a.width()+15*t>a.parent().width()&&(j.title=a.html())}};rcube_webmail.long_subject_title_ie=function(j,t){if(!j.title){var a=$(j),b=$.trim(a.text()),d=$("<span>").text(b).css({position:"absolute","float":"left",visibility:"hidden","font-size":a.css("font-size"),"font-weight":a.css("font-weight")}).appendTo($("body")),e=d.width();d.remove();e+15*t>a.width()&&(j.title=b)}};rcube_webmail.prototype.addEventListener=rcube_event_engine.prototype.addEventListener; -rcube_webmail.prototype.removeEventListener=rcube_event_engine.prototype.removeEventListener;rcube_webmail.prototype.triggerEvent=rcube_event_engine.prototype.triggerEvent; +"error"):0==a.status&&"abort"!=b&&this.display_message(this.get_label("servererror")+" (No connection)","error"),a=a.getResponseHeader("Location"),""!=a&&this.redirect(a),"keep-alive"==f?setTimeout(function(){j.keep_alive();j.start_keepalive()},3E4):"check-recent"==f&&setTimeout(function(){j.check_for_recent(!1);j.start_keepalive()},3E4))};this.async_upload_form=function(a,b,d){var e=(new Date).getTime(),f="rcmupload"+e;if(this.env.upload_progress_name){var g=this.env.upload_progress_name,h=$("input[name="+ +g+"]",a);h.length||(h=$("<input>").attr({type:"hidden",name:g}),h.prependTo(a));h.val(e)}document.all?document.body.insertAdjacentHTML("BeforeEnd",'<iframe name="'+f+'" src="program/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>'):(g=document.createElement("iframe"),g.name=f,g.style.border="none",g.style.width=0,g.style.height=0,g.style.visibility="hidden",document.body.appendChild(g));$(f).bind("load",{ts:e},d);$(a).attr({target:f,action:this.url(b,{_id:this.env.compose_id||"", +_uploadid:e}),method:"POST"}).attr(a.encoding?"encoding":"enctype","multipart/form-data").submit();return f};this.start_keepalive=function(){this.env.keep_alive&&!this.env.framed&&(this._int&&clearInterval(this._int),"mail"==this.task&&this.gui_objects.mailboxlist?this._int=setInterval(function(){j.check_for_recent(!1)},1E3*this.env.keep_alive):"login"!=this.task&&"print"!=this.env.action&&(this._int=setInterval(function(){j.keep_alive()},1E3*this.env.keep_alive)))};this.keep_alive=function(){this.busy|| +this.http_request("keep-alive")};this.check_for_recent=function(a){if(!this.busy){var b,d="_mbox="+urlencode(this.env.mailbox);a&&(b=this.set_busy(!0,"checkingmail"),d+="&_refresh=1",this.start_keepalive());this.gui_objects.messagelist&&(d+="&_list=1");this.gui_objects.quotadisplay&&(d+="&_quota=1");this.env.search_request&&(d+="&_search="+this.env.search_request);this.http_request("check-recent",d,b)}};this.get_single_uid=function(){return this.env.uid?this.env.uid:this.message_list?this.message_list.get_single_selection(): +null};this.get_single_cid=function(){return this.env.cid?this.env.cid:this.contact_list?this.contact_list.get_single_selection():null};this.get_caret_pos=function(a){if(void 0!==a.selectionEnd)return a.selectionEnd;if(document.selection&&document.selection.createRange){var b=document.selection.createRange();if(b.parentElement()!=a)return 0;var d=b.duplicate();"TEXTAREA"==a.tagName?d.moveToElementText(a):d.expand("textedit");d.setEndPoint("EndToStart",b);b=d.text.length;return b<=a.value.length?b: +-1}return a.value.length};this.set_caret_pos=function(a,b){if(a.setSelectionRange)a.setSelectionRange(b,b);else if(a.createTextRange){var d=a.createTextRange();d.collapse(!0);d.moveEnd("character",b);d.moveStart("character",b);d.select()}};this.lock_form=function(a,b){if(a&&a.elements){var d,e,f;b&&(this.disabled_form_elements=[]);d=0;for(e=a.elements.length;d<e;d++)if(f=a.elements[d],"hidden"!=f.type)if(b&&f.disabled)this.disabled_form_elements.push(f);else if(b||this.disabled_form_elements&&0>$.inArray(f, +this.disabled_form_elements))f.disabled=b}};this.mailto_handler_uri=function(){return location.href.split("?")[0]+"?_task=mail&_action=compose&_to=%s"};this.register_protocol_handler=function(a){try{window.navigator.registerProtocolHandler("mailto",this.mailto_handler_uri(),a)}catch(b){}};this.check_protocol_handler=function(a,b){var d=window.navigator;!d||"function"!=typeof d.registerProtocolHandler||"function"==typeof d.isProtocolHandlerRegistered&&"registered"==d.isProtocolHandlerRegistered("mailto", +this.mailto_handler_uri())?$(b).addClass("disabled"):$(b).click(function(){rcmail.register_protocol_handler(a);return!1})}}rcube_webmail.long_subject_title=function(j,t){if(!j.title){var a=$(j);a.width()+15*t>a.parent().width()&&(j.title=a.html())}}; +rcube_webmail.long_subject_title_ie=function(j,t){if(!j.title){var a=$(j),b=$.trim(a.text()),d=$("<span>").text(b).css({position:"absolute","float":"left",visibility:"hidden","font-size":a.css("font-size"),"font-weight":a.css("font-weight")}).appendTo($("body")),e=d.width();d.remove();e+15*t>a.width()&&(j.title=b)}};rcube_webmail.prototype.addEventListener=rcube_event_engine.prototype.addEventListener;rcube_webmail.prototype.removeEventListener=rcube_event_engine.prototype.removeEventListener; +rcube_webmail.prototype.triggerEvent=rcube_event_engine.prototype.triggerEvent; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/js/app.js.src new/roundcubemail-0.8.3/program/js/app.js.src --- old/roundcubemail-0.8.2/program/js/app.js.src 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/program/js/app.js.src 2012-11-10 15:15:21.000000000 +0100 @@ -6141,11 +6141,16 @@ else if (request.status == 0 && status != 'abort') this.display_message(this.get_label('servererror') + ' (No connection)', 'error'); + // redirect to url specified in location header if not empty + var location_url = request.getResponseHeader("Location"); + if (location_url != '') + this.redirect(location_url); + // re-send keep-alive requests after 30 seconds if (action == 'keep-alive') - setTimeout(function(){ ref.keep_alive(); }, 30000); + setTimeout(function(){ ref.keep_alive(); ref.start_keepalive(); }, 30000); else if (action == 'check-recent') - setTimeout(function(){ ref.check_for_recent(false); }, 30000); + setTimeout(function(){ ref.check_for_recent(false); ref.start_keepalive(); }, 30000); }; // post the given form to a hidden iframe diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/lib/washtml.php new/roundcubemail-0.8.3/program/lib/washtml.php --- old/roundcubemail-0.8.2/program/lib/washtml.php 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/program/lib/washtml.php 2012-11-10 15:15:21.000000000 +0100 @@ -102,7 +102,7 @@ 'cellpadding', 'valign', 'bgcolor', 'color', 'border', 'bordercolorlight', 'bordercolordark', 'face', 'marginwidth', 'marginheight', 'axis', 'border', 'abbr', 'char', 'charoff', 'clear', 'compact', 'coords', 'vspace', 'hspace', - 'cellborder', 'size', 'lang', 'dir', 'usemap', + 'cellborder', 'size', 'lang', 'dir', 'usemap', 'shape', // attributes of form elements 'type', 'rows', 'cols', 'disabled', 'readonly', 'checked', 'multiple', 'value' ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/steps/addressbook/save.inc new/roundcubemail-0.8.3/program/steps/addressbook/save.inc --- old/roundcubemail-0.8.2/program/steps/addressbook/save.inc 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/program/steps/addressbook/save.inc 2012-11-10 15:15:21.000000000 +0100 @@ -183,18 +183,24 @@ $insert_id = $plugin['result']; if ($insert_id) { + $CONTACTS->reset(); + // add new contact to the specified group if ($CONTACTS->groups && $CONTACTS->group_id) { $plugin = $RCMAIL->plugins->exec_hook('group_addmembers', array( 'group_id' => $CONTACTS->group_id, 'ids' => $insert_id, 'source' => $source)); + $counts = $CONTACTS->count(); + if (!$plugin['abort']) { - if (($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($CONTACTS->count()->count + 1 > $maxnum)) + if (($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($counts->count + 1 > $maxnum)) $OUTPUT->show_message('maxgroupmembersreached', 'warning', array('max' => $maxnum)); $CONTACTS->add_to_group($gid, $plugin['ids']); } } + else + $counts = $CONTACTS->count(); if ((string)$source === (string)$orig_source) { // add contact row or jump to the page where it should appear @@ -206,7 +212,7 @@ // update record count display $CONTACTS->reset(); - $OUTPUT->command('parent.set_rowcount', rcmail_get_rowcount_text()); + $OUTPUT->command('parent.set_rowcount', rcmail_get_rowcount_text($counts)); } else { // re-set iframe diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/steps/mail/compose.inc new/roundcubemail-0.8.3/program/steps/mail/compose.inc --- old/roundcubemail-0.8.2/program/steps/mail/compose.inc 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/program/steps/mail/compose.inc 2012-11-10 15:15:21.000000000 +0100 @@ -415,11 +415,11 @@ else if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) { // get drafted headers if ($header=='to' && !empty($MESSAGE->headers->to)) - $fvalue = $MESSAGE->get_header('to'); + $fvalue = $MESSAGE->get_header('to', true); else if ($header=='cc' && !empty($MESSAGE->headers->cc)) - $fvalue = $MESSAGE->get_header('cc'); + $fvalue = $MESSAGE->get_header('cc', true); else if ($header=='bcc' && !empty($MESSAGE->headers->bcc)) - $fvalue = $MESSAGE->get_header('bcc'); + $fvalue = $MESSAGE->get_header('bcc', true); else if ($header=='replyto' && !empty($MESSAGE->headers->others['mail-reply-to'])) $fvalue = $MESSAGE->get_header('mail-reply-to'); else if ($header=='replyto' && !empty($MESSAGE->headers->replyto)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/steps/mail/func.inc new/roundcubemail-0.8.3/program/steps/mail/func.inc --- old/roundcubemail-0.8.2/program/steps/mail/func.inc 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/program/steps/mail/func.inc 2012-11-10 15:15:21.000000000 +0100 @@ -1234,7 +1234,7 @@ // modify HTML links to open a new window if clicked $GLOBALS['rcmail_html_container_id'] = $container_id; - $body = preg_replace_callback('/<(a|link)\s+([^>]+)>/Ui', 'rcmail_alter_html_link', $body); + $body = preg_replace_callback('/<(a|link|area)\s+([^>]+)>/Ui', 'rcmail_alter_html_link', $body); unset($GLOBALS['rcmail_html_container_id']); $body = preg_replace(array( @@ -1347,7 +1347,11 @@ $attrib['target'] = '_blank'; } - return "<$tag" . html::attrib_string($attrib, array('href','name','target','onclick','id','class','style','title','rel','type','media')) . $end; + // allowed attributes for a|link|area tags + $allow = array('href','name','target','onclick','id','class','style','title', + 'rel','type','media','alt','coords','nohref','hreflang','shape'); + + return "<$tag" . html::attrib_string($attrib, $allow) . $end; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/program/steps/mail/sendmail.inc new/roundcubemail-0.8.3/program/steps/mail/sendmail.inc --- old/roundcubemail-0.8.2/program/steps/mail/sendmail.inc 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/program/steps/mail/sendmail.inc 2012-11-10 15:15:22.000000000 +0100 @@ -75,13 +75,18 @@ // get identity record function rcmail_get_identity($id) { - global $RCMAIL, $OUTPUT; + global $RCMAIL, $message_charset; if ($sql_arr = $RCMAIL->user->get_identity($id)) { $out = $sql_arr; + + if ($message_charset != RCMAIL_CHARSET) { + foreach ($out as $k => $v) + $out[$k] = rcube_charset_convert($v, RCMAIL_CHARSET, $message_charset); + } + $out['mailto'] = $sql_arr['email']; - $out['string'] = format_email_recipient($sql_arr['email'], - rcube_charset_convert($sql_arr['name'], RCMAIL_CHARSET, $OUTPUT->get_charset())); + $out['string'] = format_email_recipient($sql_arr['email'], $sql_arr['name']); return $out; } @@ -100,7 +105,7 @@ */ function rcmail_fix_emoticon_paths(&$mime_message) { - global $CONFIG; + global $RCMAIL; $body = $mime_message->getHTMLBody(); @@ -125,8 +130,9 @@ if (! in_array($image_name, $included_images)) { // add the image to the MIME message - if (! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name)) - $OUTPUT->show_message("emoticonerror", 'error'); + if (!$mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name)) { + $RCMAIL->output->show_message("emoticonerror", 'error'); + } array_push($included_images, $image_name); } @@ -428,6 +434,7 @@ if ($CONFIG['spellcheck_before_send'] && $CONFIG['enable_spellcheck'] && empty($COMPOSE['spell_checked']) && !empty($message_body) ) { + $message_body = str_replace("\r\n", "\n", $message_body); $spellchecker = new rcube_spellchecker(get_input_value('_lang', RCUBE_INPUT_GPC)); $spell_result = $spellchecker->check($message_body, $isHtml); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roundcubemail-0.8.2/skins/classic/mail.css new/roundcubemail-0.8.3/skins/classic/mail.css --- old/roundcubemail-0.8.2/skins/classic/mail.css 2012-10-05 19:14:22.000000000 +0200 +++ new/roundcubemail-0.8.3/skins/classic/mail.css 2012-11-10 15:15:22.000000000 +0100 @@ -299,7 +299,6 @@ bottom: 0px; border: 1px solid #999999; background-color: #F9F9F9; - overflow: hidden; } #messagecontframe @@ -359,7 +358,6 @@ bottom: 0; border: 1px solid #999; background-color: #F9F9F9; - overflow: hidden; } #mailboxlist ++++++ roundcubemail-config-dir.patch ++++++ --- /var/tmp/diff_new_pack.spZQdP/_old 2012-11-12 07:06:01.000000000 +0100 +++ /var/tmp/diff_new_pack.spZQdP/_new 2012-11-12 07:06:01.000000000 +0100 @@ -1,5 +1,5 @@ diff --git a/installer/index.php b/installer/index.php -index bb1b1ba..572ef80 100644 +index 4c94fea..204cdf4 100644 --- a/installer/index.php +++ b/installer/index.php @@ -43,7 +43,7 @@ ini_set('error_reporting', E_ALL&~E_NOTICE); @@ -8,27 +8,19 @@ define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/'); -define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); +define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail'); + define('RCMAIL_CHARSET', 'UTF-8'); $include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR; - $include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR; diff --git a/program/include/iniset.php b/program/include/iniset.php -index f223b0d..630001f 100644 +index 3809479..5004448 100644 --- a/program/include/iniset.php +++ b/program/include/iniset.php -@@ -46,15 +46,12 @@ define('RCMAIL_VERSION', '0.8.1'); - define('RCMAIL_CHARSET', 'UTF-8'); - define('JS_OBJECT_NAME', 'rcmail'); - define('RCMAIL_START', microtime(true)); -+define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail'); - - if (!defined('INSTALL_PATH')) { - define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/'); +@@ -52,7 +52,7 @@ if (!defined('INSTALL_PATH')) { } --if (!defined('RCMAIL_CONFIG_DIR')) { + if (!defined('RCMAIL_CONFIG_DIR')) { - define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); --} -- ++ define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail'); + } + // make sure path_separator is defined - if (!defined('PATH_SEPARATOR')) { - define('PATH_SEPARATOR', (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') ? ';' : ':'); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rhythmbox for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '12

12 Nov '12

Hello community, here is the log from the commit of package rhythmbox for openSUSE:Factory checked in at 2012-11-12 07:05:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rhythmbox (Old) and /work/SRC/openSUSE:Factory/.rhythmbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rhythmbox", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/rhythmbox/rhythmbox.changes 2012-10-17 07:22:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rhythmbox.new/rhythmbox.changes 2012-11-12 07:05:57.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Oct 31 20:33:36 UTC 2012 - dimstar(a)opensuse.org + +- Disable webkit support (define with_webkit 0) (bnc#787216, + bnc#783923). + Based on the defines, we conditionally: + + Enable pkgconfig(webkitgtk-3.0) BuildRequires (with_webkit 1). + + Enable packaging of the context pane plugin (with_webkit 1). + + Pass --without-webkit to configure (with_webkit 0). +- Add rhythmbox-no-webkit-no-context-pane.patch: if webkit support + is disabled, the context pane plugin should not be built (as it + can't work without webkit). +- Add gnome-common BuildRequires and call to autogen.sh, as above + patch touches the build system. + +------------------------------------------------------------------- New: ---- rhythmbox-no-webkit-no-context-pane.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rhythmbox.spec ++++++ --- /var/tmp/diff_new_pack.CFGp01/_old 2012-11-12 07:05:59.000000000 +0100 +++ /var/tmp/diff_new_pack.CFGp01/_new 2012-11-12 07:05:59.000000000 +0100 @@ -16,15 +16,22 @@ # +# Build without webkit support for now, as this results in gstreamer 1.0 and +# gstreamer 0.10 being linked together. +%define with_webkit 0 + Name: rhythmbox Version: 2.98 Release: 0 # FIXME: Re-enable clutter-gst BuildRequires and visualizer plugin. +# FIXME: Re-enable webkit support Summary: GNOME Music Management Application License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players Url: http://www.gnome.org/projects/rhythmbox/ Source: http://download.gnome.org/sources/rhythmbox/2.98/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM rhythmbox-no-webkit-no-context-pane.patch bgo#685945 dimstar(a)opensuse.org -- Disable context pane plugin when building without webkit support. +Patch0: rhythmbox-no-webkit-no-context-pane.patch BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel BuildRequires: intltool @@ -32,6 +39,8 @@ %if 0%{?suse_version} >= 1140 BuildRequires: libdmapsharing-devel %endif +# Required for patch0 +BuildRequires: gnome-common BuildRequires: lirc-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files @@ -65,7 +74,9 @@ BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(tdb) BuildRequires: pkgconfig(totem-plparser) >= 3.2.0 +%if %{with_webkit} BuildRequires: pkgconfig(webkitgtk-3.0) +%endif Requires: gstreamer010-plugins-base Requires: gstreamer010-plugins-good # For python plugins @@ -96,15 +107,21 @@ %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build +# Needed for patch0 +NOCONFIGURE=1 ./autogen.sh export MOZILLA_PLUGINDIR=%{_libdir}/browser-plugins %configure\ --disable-static\ --disable-scrollkeeper\ --enable-lirc\ --enable-python\ +%if ! %{with_webkit} + --without-webkit \ +%endif --enable-vala %__make %{?_smp_mflags} V=1 @@ -165,7 +182,9 @@ %{_libdir}/rhythmbox/plugins/audiocd/ %{_libdir}/rhythmbox/plugins/audioscrobbler/ %{_libdir}/rhythmbox/plugins/cd-recorder/ +%if %{with_webkit} %{_libdir}/rhythmbox/plugins/context/ +%endif %{_libdir}/rhythmbox/plugins/daap/ %{_libdir}/rhythmbox/plugins/dbus-media-server/ %{_libdir}/rhythmbox/plugins/fmradio/ ++++++ rhythmbox-no-webkit-no-context-pane.patch ++++++ >From 64c6837921f2a03cb49772d8ea2e130fd5b55088 Mon Sep 17 00:00:00 2001 From: Kalev Lember <kalevlember(a)gmail.com> Date: Thu, 11 Oct 2012 08:59:16 +0000 Subject: Disable the context pane plugin when webkit isn't available https://bugzilla.gnome.org/show_bug.cgi?id=685945 --- diff --git a/plugins/Makefile.am b/plugins/Makefile.am index e4f6e69..3a9ea03 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -14,7 +14,6 @@ SUBDIRS = \ if ENABLE_PYTHON SUBDIRS += \ artsearch \ - context \ im-status \ lyrics \ magnatune \ @@ -24,8 +23,12 @@ SUBDIRS += \ sendto \ rb +if WITH_WEBKIT +SUBDIRS += context endif +endif # ENABLE_PYTHON + if WITH_LIRC SUBDIRS += lirc endif -- cgit v0.9.0.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rep-gtk for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '12

12 Nov '12

Hello community, here is the log from the commit of package rep-gtk for openSUSE:Factory checked in at 2012-11-12 07:05:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rep-gtk (Old) and /work/SRC/openSUSE:Factory/.rep-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rep-gtk", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- New Changes file: --- /dev/null 2012-10-22 00:44:18.403455820 +0200 +++ /work/SRC/openSUSE:Factory/.rep-gtk.new/rep-gtk.changes 2012-11-12 07:05:37.000000000 +0100 @@ -0,0 +1,95 @@ +------------------------------------------------------------------- +Sat Nov 3 01:54:28 UTC 2012 - toganm(a)opensuse.org + +- remove unneeded *.la files + +------------------------------------------------------------------- +Mon Jul 2 15:47:14 UTC 2012 - toganm(a)opensuse.org + +- Update to 0.90.8.1: + + fixed bug that prevented uninstallation of rep-gtk +- spec cleanup + + BuildRequires xz if openSUSE 12.1 or older + + backported 0001-fix-address-of-FSF.patch +------------------------------------------------------------------- +Wed Apr 11 10:10:18 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.90.8: + + fixed building on ARM +- Changes from version 0.90.7: + + re-arranged tree (all new widget-definitons in + widgets/<widget>) + + add new API wrappers, fix some API wrappers, stop wrapping some + deprecated API (see NEWS for details) +- Changes from version 0.90.6: + + updated for changes in installation-paths in librep 0.92.0 + + combined gtk and gtk-types modules + + build fixes +- Changes from version 0.90.5: + + build fixes +- Changes from version 0.90.4: + + add new API wrappers, fix some API wrappers (see NEWS for + details) + + updated documentation +- Changes from version 0.90.3: + + SCM_CDR/SCM_CAR >> rep_CDR/rep_CAR + + add new API wrappers, fix some API wrappers (see NEWS for + details) +- Drop rep-gtk-fix-binding.patch: fixed upstream. + +------------------------------------------------------------------- +Fri Jan 15 11:39:38 CET 2010 - vuntz(a)opensuse.org + +- Update to version 0.90.2: + + install header to $includedir/rep-gtk + + autotools (Makefile & Co.) rework + + add support for many GTK+ API +- Remove call to autogen.sh: not needed anymore since we have a + configure script now. +- Add rep-gtk-fix-binding.patch to fix some obvious errors. + +------------------------------------------------------------------- +Mon Dec 28 02:50:13 CET 2009 - vuntz(a)opensuse.org + +- Fix build on x86_64: files were moved from libexecdir to libdir, + because of librep 0.90.4. + +------------------------------------------------------------------- +Sat Dec 19 13:50:49 CET 2009 - vuntz(a)opensuse.org + +- Update to version 0.90.1: + + Add GtkUiManager support. + + Add GtkAction support. + + Add support for a few others API. + + Build system fixes. + +------------------------------------------------------------------- +Thu Sep 10 00:25:29 CEST 2009 - vuntz(a)opensuse.org + +- Update to version 0.90.0: + + GError support + + Basic GtkBuilder support + + Many API added + + Removed deprecated API: + - GtkPreview* + - GtkSignalRunType + - GtkSubMenuDirection + - GtkSubMenuPlacement + +------------------------------------------------------------------- +Fri Jul 31 13:06:23 CEST 2009 - vuntz(a)novell.com + +- Update to version 0.18.6: + + fixup %files section in .spec + + add --libdir=%{_libdir} to configure flags in .spec + + require gtk2 instead of gtk+ in .spec +- Add call to ./autogen.sh since the tarball is missing the + configure script. + +------------------------------------------------------------------- +Sun Jun 14 18:01:04 CEST 2009 - vuntz(a)novell.com + +- Clean up package. +- Update to 0.18.5: + + note that the libglade and GNOME bindings have been removed. + New: ---- 0001-fix-address-of-FSF.patch rep-gtk-0.90.8.1.tar.xz rep-gtk.changes rep-gtk.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rep-gtk.spec ++++++ # # spec file for package rep-gtk # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007 Jan Nieuwenhuizen <jnieuwenhuizen(a)novell.com> # Copyright (c) 2000 John Harper <john(a)dcs.warwick.ac.uk> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: rep-gtk Version: 0.90.8.1 Release: 0 Summary: GTK+ binding for librep Lisp environment License: GPL-2.0+ Group: Development/Libraries/GNOME Url: http://sawfish.wikia.com/wiki/Rep-GTK Source: http://download.tuxfamily.org/librep/rep-gtk/%{name}-%{version}.tar.xz BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.23.0 BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.0 BuildRequires: pkgconfig(librep) >= 0.92.1 %if 0%{?suse_version} <= 1210 BuildRequires: xz %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build # PATCH-FIX-UPSTREAM 0001-fix-address-of-FSF.patch toganm(a)opensuse.org --backported Patch0: 0001-fix-address-of-FSF.patch %description This is a binding of GTK+ for the rep Lisp system. It is based on Marius Vollmer's guile-gtk binding (initially version 0.15, updated to 0.17), with a new glue-code generator. %package devel Summary: GTK+ binding for librep Lisp environment - Development Files Group: Development/Libraries/GNOME Requires: %{name} = %{version} Requires: pkgconfig(gtk+-2.0) >= 2.24.0 Requires: pkgconfig(librep) >= 0.92.1 %description devel This is a binding of GTK+ for the rep Lisp system. It is based on Marius Vollmer's guile-gtk binding (initially version 0.15, updated to 0.17), with a new glue-code generator. %prep %setup -q %patch0 -p1 chmod -x examples/*.jl %build %configure %__make %{_smp_mflags} %install %make_install find %{buildroot}%{_libdir} -name "*.la" -delete %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING examples/ NEWS README README.gtk-defs README.guile-gtk TODO *.defs %{_libdir}/rep/gui/ %files devel %defattr(-,root,root) %{_includedir}/rep-gtk/ %{_libdir}/pkgconfig/rep-gtk.pc %changelog ++++++ 0001-fix-address-of-FSF.patch ++++++ >From 968e01133b63e12e747caf2c31ce66f4695d8600 Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek <nano(a)tuxfamily.org> Date: Thu, 5 Jul 2012 20:37:43 +0200 Subject: [PATCH] fix address of FSF Signed-off-by: Togan Muftuoglu <toganm(a)opensuse.org> --- COPYING | 2 +- rep-gtk.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/COPYING b/COPYING index eeb586b..09e0e67 100644 --- a/COPYING +++ b/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/rep-gtk.h b/rep-gtk.h index acf4946..2a0026a 100644 --- a/rep-gtk.h +++ b/rep-gtk.h @@ -15,7 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * the Free Software Foundation,51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #ifndef REP_GTK_H -- 1.7.7 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qrencode for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '12

12 Nov '12

Hello community, here is the log from the commit of package qrencode for openSUSE:Factory checked in at 2012-11-12 07:05:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qrencode (Old) and /work/SRC/openSUSE:Factory/.qrencode.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qrencode", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/qrencode/qrencode.changes 2012-10-16 21:33:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qrencode.new/qrencode.changes 2012-11-12 07:05:25.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Nov 8 18:07:12 UTC 2012 - cgiboudeaux(a)gmx.com + +- Update to 3.4.1 + * A bug that mutual exclusion was not performed has been fixed + * Colored QR Code support + * SVG, UTF8, and ANSIUTF8 output supports have been added to the command line tool. + +------------------------------------------------------------------- Old: ---- qrencode-3.3.1.tar.bz2 New: ---- qrencode-3.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qrencode.spec ++++++ --- /var/tmp/diff_new_pack.ygpL6J/_old 2012-11-12 07:05:26.000000000 +0100 +++ /var/tmp/diff_new_pack.ygpL6J/_new 2012-11-12 07:05:26.000000000 +0100 @@ -17,13 +17,13 @@ Name: qrencode -Version: 3.3.1 +Version: 3.4.1 Release: 0 Summary: C library for encoding data in a QR Code symbol License: LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://fukuchi.org/works/qrencode/index.en.html -Source: %{name}-%{version}.tar.bz2 +Source: http://fukuchi.org/works/qrencode/%{name}-%{version}.tar.bz2 BuildRequires: pkgconfig(libpng) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,9 +66,6 @@ %postun -n libqrencode3 -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc README TODO NEWS COPYING ChangeLog ++++++ qrencode-3.3.1.tar.bz2 -> qrencode-3.4.1.tar.bz2 ++++++ ++++ 5438 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-wxWidgets-2_9 for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '12

12 Nov '12

Hello community, here is the log from the commit of package python-wxWidgets-2_9 for openSUSE:Factory checked in at 2012-11-12 07:05:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-wxWidgets-2_9 (Old) and /work/SRC/openSUSE:Factory/.python-wxWidgets-2_9.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-wxWidgets-2_9", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-10-22 00:44:18.403455820 +0200 +++ /work/SRC/openSUSE:Factory/.python-wxWidgets-2_9.new/python-wxWidgets-2_9.changes 2012-11-12 07:05:14.000000000 +0100 @@ -0,0 +1,734 @@ +------------------------------------------------------------------- +Mon Oct 29 18:20:03 CET 2012 - sbrabec(a)suse.cz + +- Branch new package for the new version: python-wxWidgets-2_9. +- Update to version 2.9.4.0. + * New branch. + * Compatible with wxWidgets-2_9-2.9.4. + * See CHANGES.txt for details. +- Copy wxWidgets includes in python-wxWidgets-2_9-extract-source. + +------------------------------------------------------------------- +Fri Oct 26 16:33:02 CEST 2012 - sbrabec(a)suse.cz + +- Recommend lang package instead of Requires. + +------------------------------------------------------------------- +Mon Apr 2 14:01:14 CEST 2012 - sbrabec(a)suse.cz + +- Update to version 2.8.12.1: + * Compatible with wxWidgets-2.8.12 (bnc#740950). + * Added ToolTipString property to wx.Window. + * Bug and typo fixes. +- Require exact version of wxWidgets for build and runtime + (bnc#740950). + +------------------------------------------------------------------- +Fri Mar 4 12:58:56 CET 2011 - sbrabec(a)suse.cz + +- Provide symbol wxPython2.8-gtk2-unicode that is required by some + third party packages. + +------------------------------------------------------------------- +Wed Feb 16 14:32:34 CET 2011 - sbrabec(a)suse.cz + +- Provide symbol wxPython as package did in past. + +------------------------------------------------------------------- +Tue Dec 21 19:01:28 CET 2010 - sbrabec(a)suse.cz + +- Rename package to python-wxWidgets to follow upstream base name. +- Split wxPython to a separate package. +- Spec file completely rewritten. + +------------------------------------------------------------------- +Sun Aug 15 00:15:52 UTC 2010 - termim(a)gmail.com + +- Updated to version 2.8.11.0 + Adds Python 2.7 builds, PySlices, new pubsub implementation, + lots of updates to AGW, and lots of bugs fixed. +- Removed wxGTK-GSocket-clash.patch and wxGTK-editra-ebmlib.patch + as already fixed. + +------------------------------------------------------------------- +Tue Jun 15 16:15:11 CEST 2010 - sbrabec(a)suse.cz + +- Added --enable-graphics_ctx to fix Editra (bnc#580060). +- Added ebmlib file required by Editra (bnc#580060, + patch from Salix). + +------------------------------------------------------------------- +Mon Feb 22 14:58:36 UTC 2010 - crrodriguez(a)opensuse.org + +- build with PIC + +------------------------------------------------------------------- +Thu Jan 28 17:17:47 CET 2010 - sbrabec(a)suse.cz + +- Enabled media libraries (bnc#565039). + +------------------------------------------------------------------- +Fri Sep 25 17:53:00 CEST 2009 - sbrabec(a)suse.cz + +- Disabled STL (bnc#530027). See also + http://lists.opensuse.org/opensuse-factory/2009-09/msg00386.html +- Removed obsolete RPATH. +- The GSocket symbol clash fix replaced by the upstream one. + +------------------------------------------------------------------- +Thu Sep 17 18:33:20 CEST 2009 - matejcik(a)suse.cz + +- fixed pth file to point to platlib + +------------------------------------------------------------------- +Sat Sep 5 11:52:46 CEST 2009 - sbrabec(a)suse.cz + +- Fixed for the latest python package. + +------------------------------------------------------------------- +Fri Aug 7 16:51:39 CEST 2009 - sbrabec(a)suse.cz + +- Updated to version 2.8.10.1: + * Incompatible change in wxTreeCtrl behaviour! + * Added several functions forward compatible with wxWidgets 3.0. + * Add wxBU_EXACTFIT support to wxToggleButton XRC handler. + * wxHashMap::insert() doesn't update the value if it didn't + insert the element any more. + * Correct bug in wxTimeSpan::Format() for negative spans. + * Correct several bugs in wxList using end() iterators. + * Translation updates. + * Fix wxURL::GetInputStream() for URLs with special characters in + credentials. + * Fix wxURI::GetUser() for URIs without password. + * Correct wxDateTime DST computation for 2006 and later. + * wxRTC: fixed a problem with HTML list generation. + * wxRTC: no longer deletes a character when content is selected + before pressing Delete. + * wxRTC: fixed inability to select no superscript and no + subscript in formatting dialog. + * wxRTC: fixed centering and right-justification when combined + with left indentation. + * wxRTC: fixed lack of right margin when centering or + right-justifying. + * wxRTC: fixed wrong descent when wrapping lines with different + font sizes. + * wxRTC: fixed wrapping problem for long lines. + * wxRTC: all buffer margins now respected. + * wxRTC: Added wxRE_CENTRE_CARET to centre the caret line + vertically. + * Fixed wxHTML's pagebreaks computation in tables. + * Fixed wxHtmlWindow::SelectionToText() to correctly insert + newlines after single-cell paragraphs. + * Fixed wxHTML's line breaks handling in <pre> blocks. + * wxHTML: don't include extra whitespace in table cells. + * Implemented wxWindow::DragAcceptFiles() on all platforms. + * Added wxAUI_MGR_LIVE_RESIZE flag to wxAuiManager. + * Use bitmap mask in wxSplashScreen. + * Translate "(c)" and "(C)" to the real copyright sign in + wxAboutBox. + * Fix painting of highlight border for merged cells in wxGrid. + * Fix handling of long lines in wxGridCellAutoWrapStringRenderer. + * Return false from wxSingleInstanceChecker::IsAnotherRunning() + if an error occurred while opening or reading the lock file. + * Fixed printing to use fonts sizes adjustment consistent with + wxMSW. + * Make colours used by list, tree and status bar controls more + consistent with the system theme settings. + * Worked around bug in GTK+ < 2.14 where enabling some controls + such as wxButton didn't re-enable sensitivity until the mouse + was moved. + +------------------------------------------------------------------- +Thu Jun 18 19:16:27 CEST 2009 - sbrabec(a)suse.cz + +- Worked-around GSocket name conflict with GIO. + +------------------------------------------------------------------- +Tue Feb 17 17:29:57 CET 2009 - crrodriguez(a)suse.de + +- build require libexpat-devel so we dont use the bundled one + +------------------------------------------------------------------- +Wed Feb 4 13:58:35 CET 2009 - pth(a)suse.de + +- Disable the use of precompiled headers as the way wxWidgets uses + them is not supported by current GCC. + +------------------------------------------------------------------- +Tue Feb 3 13:03:20 CET 2009 - pth(a)suse.de + +- Update to 2.8.9.1: + * Optimize wxString::Replace() for single character arguments. + * Updated Hindi translation. + * Use tr1::unordered_{map,set} for wxHash{Map,Set} implementation if available + in STL build; in particular do not use deprecated hash_{map,set} which + results in a lot of warnings from newer g++. + * Added support for reading alpha channel in BMP format. + * Fixed help viewer bug whereby the splitter sash in wxHtmlHelpWindow could + go underneath the left-hand pane, permanently, after resizing the + help window. + * Fixed wxHTML default font size for printing to be 12pt regardless of the + platform, instead of depending on GUI toolkit's screen configuration. + * Support wxDP_ALLOWNONE style in generic wxDatePickerCtrl version. + * Set wxKeyEvent::m_uniChar correctly in the events generated by generic + wxListCtrl. + * Fix changing size of merged cells in wxGrid. + * Fixed wrapping bug in wxRichTextCtrl when there were images present; + now sets the cursor to the next line after pressing Shift+Enter. + * Fixed Cmd+Back, Cmd+Del word deletion behaviour in wxRichTextCtrl. + * Fix crash when reading malformed PCX images. + * Fix bug with wrong transparency in GIF animations. + * Store palette information for XPM images in wxImage. + * Fixed selection bugs and auto list numbering in wxRichTextCtrl. + * Significantly optimize wxGrid::BlockToDeviceRect() for large grids. + * Introduced new wxAuiToolBar class for better integration and look-and-feel. + * Fix a crash in wxAuiFrameManager when Update() was called in between mouse-up + and mouse-down events + * wxAUI: added various NULL-ptr asserts. + * Fixed problem with Floatable(false) not working in wxAuiFrameManager. + * Fixed maximize bug in wxAUI. + * Allow period in link anchors in wxHTML. + * Fixed memory corruption in wxHTML when parsing "&;" in the markup. + * Fixed event type in EVT_GRID_CMD_COL_MOVE and EVT_GRID_COL_MOVE. + * wxGrid doesn't steal focus when hiding editor any more. + * MIME types reading fixed when running under GNOME, reading .desktop + files and also the default application list. + * Added filesys.no-mimetypesmanager system option so that applications that + must load an XRC file at program startup don't have to incur the ++++ 537 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.python-wxWidgets-2_9.new/python-wxWidgets-2_9.changes New: ---- pre_checkin.sh python-wxWidgets-2_9-extract-source python-wxWidgets-2_9.changes python-wxWidgets-2_9.spec rpmlintrc wxPython-2.9.4.0.tar.bz2 wxPython-platlib.patch wxPython-src-2.9.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-wxWidgets-2_9.spec ++++++ # # spec file for package python-wxWidgets # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: python-wxWidgets-2_9 %define srcname wxPython BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: python-devel BuildRequires: python-xml BuildRequires: wxWidgets-2_9-devel Version: 2.9.4.0 Release: 0 %define wx_version %(echo %{version} | sed 's/\.[0-9][0-9]*\.[0-9][0-9]*$//') %define wx_release %(echo %{version} | sed 's/\.[0-9][0-9]*$//') Summary: Python Bindings for wxWidgets License: GPL-2.0+ Group: System/Libraries # Trick: OSC checks for the first one, RPM for the second one. %if 0 # Source from http://www.wxpython.org/ contains complete wxWidgets # source tree and proprietary Microsoft Visual Studio DLLs. # We will repackage only a needed subset of files. Source: http://downloads.sourceforge.net/wxpython/%{srcname}-src-%{version}.tar.bz2 %else # WARNING: This is not a comment, but the real command to repack souce: #%(sh %{_sourcedir}/%{name}-extract-source %{srcname}-src-%{version}.tar.bz2) Source: %{srcname}-%{version}.tar.bz2 %endif Source1: rpmlintrc Source2: %{name}-extract-source Url: http://www.wxpython.org/ # Used up to openSUSE 11.3: Provides: python-wxGTK = %{version} Obsoletes: python-wxGTK < %{version} # Upstream name, never used in SUSE: Provides: wxPython = %{version} # Third party packages name, never used in SUSE: Provides: wxPython%{wx_version}-gtk2-unicode = %{version} # In fact it should be >= %{version} but only version < 3.1 Recommends: python-wxWidgets-2_9-lang = %{version} Provides: python-wxWidgets = %{version} Conflicts: python-wxWidgets < %{version} # Stable name of this branch will be 3.0: Provides: python-wxWidgets-3_0 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build # PATCH-FIX-UPSTREAM wxPython-platlib.patch widgets#14779 jmatejek(a)suse.cz -- Do not expect platform dependent and platform independent paths being equal. http://trac.wxwidgets.org/ticket/14779 Patch10: wxPython-platlib.patch %py_requires %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires %description wxWidgets is a free C++ library for cross-platform GUI. This package contains python bindings for wxWidgets. %package devel Summary: Everything needed for development with wxGTK Group: Development/Libraries/GNOME Provides: python-wxWidgets-devel = %{version} Conflicts: python-wxWidgets-devel < %{version} # Stable name of this branch will be 3.0: Provides: python-wxWidgets-3_0-devel = %{version} %description devel wxWidgets is a free C++ library for cross-platform GUI development. With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. This package contains all files needed for developing with python bindings for wxGTK. %package lang # We cannot use %%lang_package here. Editra translations use noarch incompatible path. Summary: Languages for package python-wxWidgets Group: System/Localization Requires: %{name} = %{version} Provides: %{name}-lang-all = %{version} Supplements: packageand(bundle-lang-other:%{name}) %description lang Provides translations to the package %{name} %prep # osc does not support BuildRequires with exact version defined by macro. Check it now. if test "`rpm -q --queryformat=%{VERSION} wxWidgets-2_9-devel`" != "%{wx_release}" ; then echo "To compile %{name} = %{version}, you need wxWidgets-2_9-devel = %{wx_version}" # exit 1 fi %setup -q -n %{srcname}-src-%{version} %patch10 cp %{S:1} . %build cd wxPython python setup.py\ build %install # python-wxWidgets requires exact release of wxWidgets (bnc#740950). cat >pywx_requires <<EOF #!/bin/sh %wx_requires | while read ; do case "\$REPLY" in libwx_* ) echo "\$REPLY" = %{wx_release} ;; * ) echo "\$REPLY" ;; esac done EOF chmod +x pywx_requires %define __find_requires %{_builddir}/%{srcname}-src-%{version}/pywx_requires cd wxPython python setup.py\ install\ --prefix=%{_prefix}\ --root=$RPM_BUILD_ROOT cd .. # Create %%lang tags for mo files in non-standard path: echo "%%defattr(-, root, root)" >Editra.lang for LNG_DIR in $RPM_BUILD_ROOT%{py_sitedir}/wx*/wx/tools/Editra/locale/* ; do LNG=${LNG_DIR##*/} echo "%%lang($LNG) %%{py_sitedir}${LNG_DIR#$RPM_BUILD_ROOT%{py_sitedir}}" >>Editra.lang done %fdupes $RPM_BUILD_ROOT%{_libdir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) %doc wxPython/docs/*.txt wxPython/docs/*.html wxPython/docs/screenshots wxPython/licence %{_bindir}/* %if %suse_version > 1110 %{python_sitearch}/* %{python_sitelib}/* %exclude %{python_sitearch}/wx*/wx/tools/Editra/locale/* %else %{py_sitedir}/* %exclude %{py_sitedir}/wx*/wx/tools/Editra/locale/* %endif %files lang -f Editra.lang %files devel %defattr(-, root, root) %{_includedir}/wx-%{wx_version}/wx/wxPython %changelog ++++++ pre_checkin.sh ++++++ #!/bin/sh for i in wxPython-src-*tar.bz2 ; do bash python-wxWidgets-2_9-extract-source $i done ++++++ python-wxWidgets-2_9-extract-source ++++++ #!/bin/bash # Upstream wxPython-src contain complete wxWidgets sources plus several # legally questionable files. That is why we repackage it here. set -x REMOVE_DIRS=( contrib/samples/applet/monitors.c "wxPython/distrib/msw/*.DLL" "wxPython/distrib/msw/*.dll" ) set -o errexit CMDNAME=${0##*/} SOURCEDIR=${0%$CMDNAME} BASENAME=${1%.tar.bz2} NEWNAME=${BASENAME/-src/}.tar.bz2 if ! test -f "$1" ; then exit 0 fi if test -f "$NEWNAME" ; then if test "$1" -ot "$NEWNAME" ; then if test $CMDNAME -ot "$NEWNAME" ; then exit 0 fi fi fi cd "$SOURCEDIR" trap "cd .. ; rm -rf $PWD/tmp$$.python-wxWidgets-extract-source" ERR rm -rf tmp$$.python-wxWidgets-extract-source mkdir tmp$$.python-wxWidgets-extract-source cd tmp$$.python-wxWidgets-extract-source tar -jxf "../$1" cd "$BASENAME" eval rm -rf "${REMOVE_DIRS[@]}" # wxpython now requires private headers that are not installed in the wxWidgets installation: mv include/wx/* wxPython/include/wx/ rmdir include/wx rmdir include for ITEM in * ; do case "$ITEM" in wxPython | docs ) continue ;; * ) rm -r "$ITEM" esac done cd .. tar -jcf "$NEWNAME" "$BASENAME" mv "$NEWNAME" .. cd .. rm -r tmp$$.python-wxWidgets-extract-source ++++++ rpmlintrc ++++++ # Yes, editra has test files in the main package. addFilter("devel-file-in-non-devel-package") # We distribute files as upstream does. addFilter("non-executable-script") # We distribute files as upstream does. addFilter("script-without-shebang") # python-wxWidgets-lang does not need python-base addFilter("no-dependency-on") # python-wxWidgets-extract-source is definitely not a spec file. rpmlint seems to be broken and checks it as spec file. addFilter("specfile-error") ++++++ wxPython-platlib.patch ++++++ --- wxPython/config.py +++ wxPython/config.py @@ -48,6 +48,8 @@ import distutils.command.clean from cfg_version import * +import distutils.sysconfig + #---------------------------------------------------------------------- # flags and values that affect this script #---------------------------------------------------------------------- @@ -691,7 +693,7 @@ def getExtraPath(shortVer=True, addOpts= if FLAVOUR: ep += "-" + FLAVOUR - return ep + return os.path.join(distutils.sysconfig.get_python_lib(True), ep) def getoutput(cmd): @@ -724,7 +726,6 @@ def getVisCVersion(): # the -arch and -isysroot args provided by Python. import distutils.unixccompiler -import distutils.sysconfig from distutils.errors import DistutilsExecError, CompileError def _darwin_compiler_fixup(compiler_so, cc_args): -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0