openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
October 2007
- 1 participants
- 1159 discussions
Hello community,
here is the log from the commit of package soprano
checked in at Wed Oct 31 01:16:47 CET 2007.
--------
--- soprano/soprano.changes 2007-10-16 17:29:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/soprano/soprano.changes 2007-10-30 15:23:50.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Oct 30 15:23:43 CET 2007 - dmueller(a)suse.de
+
+- enable cluclene based indexing backend
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ soprano.spec ++++++
--- /var/tmp/diff_new_pack.PB3991/_old 2007-10-31 01:16:25.000000000 +0100
+++ /var/tmp/diff_new_pack.PB3991/_new 2007-10-31 01:16:25.000000000 +0100
@@ -12,15 +12,16 @@
Name: soprano
Url: http://soprano.sourceforge.net/
BuildRequires: cmake kde4-filesystem libqt4-devel libraptor-devel
+BuildRequires: clucene-core-devel doxygen raptor
%if %suse_version > 1020
BuildRequires: fdupes
%endif
-License: GPL v2 or later; LGPL v2 or later
+License: GPL v2 or later; LGPL v2.1 or later
Group: Development/Libraries/C and C++
Summary: C++/Qt based interface library for RDF
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Version: 1.95.0
-Release: 6
+Release: 15
Source: %name-%{version}-beta2.tar.bz2
%description
@@ -42,7 +43,8 @@
Summary: C++/Qt based interface library for RDF
Requires: libsoprano4 = %version
Requires: libqt4-devel >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-devel`)
-Requires: cmake libraptor-devel
+Requires: clucene-core-devel >= %( echo `rpm -q --queryformat '%{VERSION}' clucene-core-devel`)
+Requires: libraptor-devel
%description -n libsoprano-devel
Soprano is a RDF QT/C++ interface library using redland as a backend
@@ -118,16 +120,21 @@
%_libdir/libsopranoserver.so.1.0.0
%_libdir/libsoprano.so.4
%_libdir/libsoprano.so.4.0.0
+%_libdir/libsopranoindex.so.1
+%_libdir/libsopranoindex.so.1.0.0
%files -n libsoprano-devel
%defattr(-,root,root)
/usr/include/soprano
/usr/include/Soprano
%_libdir/libsoprano.so
+%_libdir/libsopranoindex.so
%_libdir/libsopranoclient.so
%_libdir/libsopranoserver.so
%_libdir/pkgconfig/soprano.pc
%changelog
+* Tue Oct 30 2007 - dmueller(a)suse.de
+- enable cluclene based indexing backend
* Tue Oct 16 2007 - dmueller(a)suse.de
- remove fdupes for older distributions
* Wed Oct 10 2007 - dmueller(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package sax2
checked in at Wed Oct 31 01:16:19 CET 2007.
--------
--- sax2/sax2.changes 2007-10-17 10:47:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2007-10-30 18:25:46.577700000 +0100
@@ -1,0 +2,11 @@
+Tue Oct 30 15:18:43 CET 2007 - ms(a)suse.de
+
+- disabled profiles logitech-Gaming, logitech-MediaPlay
+ logitech-mxlaser and logitech-optical (#337822)
+
+-------------------------------------------------------------------
+Tue Oct 30 13:21:28 CET 2007 - ms(a)suse.de
+
+- don't add xfree86 as variant. use basic if no variant is set (#337513)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sax2.spec ++++++
--- /var/tmp/diff_new_pack.W31715/_old 2007-10-31 01:14:31.000000000 +0100
+++ /var/tmp/diff_new_pack.W31715/_new 2007-10-31 01:14:31.000000000 +0100
@@ -45,7 +45,7 @@
%endif
Summary: SuSE advanced X Window System-configuration
Version: 8.1
-Release: 270
+Release: 282
Group: System/X11/Utilities
License: GPL v2 or later
Source: sax2.tar.bz2
@@ -487,6 +487,11 @@
%{_prefix}/%{_lib}/sax/plugins/SaX.so
%endif
%changelog
+* Tue Oct 30 2007 - ms(a)suse.de
+- disabled profiles logitech-Gaming, logitech-MediaPlay
+ logitech-mxlaser and logitech-optical (#337822)
+* Tue Oct 30 2007 - ms(a)suse.de
+- don't add xfree86 as variant. use basic if no variant is set (#337513)
* Wed Oct 17 2007 - ms(a)suse.de
- really added HorizScrollDelta to synaptics profile (#223827)
* Tue Oct 16 2007 - ms(a)suse.de
++++++ sax2.tar.bz2 ++++++
sax2/sax2.tar.bz2 /mounts/work_src_done/STABLE/sax2/sax2.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gnome-phone-manager
checked in at Wed Oct 31 01:13:49 CET 2007.
--------
--- GNOME/gnome-phone-manager/gnome-phone-manager.changes 2007-10-26 20:51:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-phone-manager/gnome-phone-manager.changes 2007-10-30 15:49:40.659196000 +0100
@@ -1,0 +2,12 @@
+Tue Oct 30 15:48:58 CET 2007 - jpr(a)suse.de
+
+- Update to 0.30
+ * More fixes for sending and receiving text messages with international
+ characters that don't fit in the default GSM alphabet
+ * Warn when a phone or driver doesn't support getting the state
+ of the power source (such as the nk6510)
+ * Add the --config flag to dump a gnokiirc file for debugging
+ * Add the --debug/-d flag to enable gnokii debugging
+ * Add the Sagem myX-7 and Nokia 3110 to the supported phones
+
+-------------------------------------------------------------------
Old:
----
gnome-phone-manager-0.20.tar.bz2
New:
----
gnome-phone-manager-0.30.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-phone-manager.spec ++++++
--- /var/tmp/diff_new_pack.Y29679/_old 2007-10-31 01:13:26.000000000 +0100
+++ /var/tmp/diff_new_pack.Y29679/_new 2007-10-31 01:13:26.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-phone-manager (Version 0.20)
+# spec file for package gnome-phone-manager (Version 0.30)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,8 +12,8 @@
Name: gnome-phone-manager
BuildRequires: evolution-data-server-devel fdupes gnokii-devel gnome-icon-theme gstreamer010-devel intltool libgnomebt-devel libgnomeui-devel librsvg-devel update-desktop-files
-Version: 0.20
-Release: 2
+Version: 0.30
+Release: 1
Url: http://usefulinc.com/software/phonemgr
Group: Hardware/Mobile
License: GPL v2 or later
@@ -90,6 +90,15 @@
%files lang -f %{name}.lang
%changelog
+* Tue Oct 30 2007 - jpr(a)suse.de
+- Update to 0.30
+ * More fixes for sending and receiving text messages with international
+ characters that don't fit in the default GSM alphabet
+ * Warn when a phone or driver doesn't support getting the state
+ of the power source (such as the nk6510)
+ * Add the --config flag to dump a gnokiirc file for debugging
+ * Add the --debug/-d flag to enable gnokii debugging
+ * Add the Sagem myX-7 and Nokia 3110 to the supported phones
* Fri Oct 26 2007 - jpr(a)suse.de
- Link icons into place to pass brp-desktop check
* Fri Oct 26 2007 - jpr(a)suse.de
++++++ gnome-phone-manager-0.20.tar.bz2 -> gnome-phone-manager-0.30.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-phone-manager-0.20/ChangeLog new/gnome-phone-manager-0.30/ChangeLog
--- old/gnome-phone-manager-0.20/ChangeLog 2007-10-18 00:51:28.000000000 +0200
+++ new/gnome-phone-manager-0.30/ChangeLog 2007-10-29 16:08:35.000000000 +0100
@@ -1,3 +1,79 @@
+============ Version 0.30
+
+2007-10-29 Bastien Nocera <hadess(a)hadess.net>
+
+ * NEWS: upd
+ * configure.in: 0.30
+
+2007-10-29 Bastien Nocera <hadess(a)hadess.net>
+
+ * libgsm/phonemgr-listener.c: (phonemgr_listener_queue_message):
+ Fix sending texts that don't fit in the default GSM alphabet,
+ gnokii expects UTF-8, and will convert to UCS-2 itself
+
+2007-10-29 Bastien Nocera <hadess(a)hadess.net>
+
+ * libgsm/phonemgr-listener.c: (phonemgr_listener_queue_message):
+ Zero-out the SMS data after having sent the message
+
+2007-10-29 Bastien Nocera <hadess(a)hadess.net>
+
+ * libgsm/phonemgr-listener.c: (phonemgr_listener_emit_message),
+ (phonemgr_listener_connect), (phonemgr_listener_queue_message):
+ When receiving texts, they will be in GSM alphabet if it fits
+ in the alphabet (fixes receiving SMS from ISO8859-1 texts),
+ Don't send texts as UCS-2 when they fit in the default GSM alphabet
+ by not forgetting to convert to ISO8859-1 first
+ (Closes: #490471)
+
+ Sending as UCS-2 doesn't work though
+
+2007-10-26 Bastien Nocera <hadess(a)hadess.net>
+
+ * libgsm/phonemgr-listener.c: (phonemgr_listener_emit_message),
+ (phonemgr_listener_init), (phonemgr_listener_connect),
+ (phonemgr_listener_battery_poll): Call GN_OP_GetBatteryLevel first,
+ as it's what most drivers implement, also warn when the driver
+ doesn't support
+
+2007-10-26 Bastien Nocera <hadess(a)hadess.net>
+
+ * libgsm/glibgsmtest.c: (main):
+ * libgsm/phonemgr-listener.c: (phonemgr_listener_get_property),
+ (phonemgr_listener_set_property), (phonemgr_listener_class_init),
+ (phonemgr_listener_emit_message), (phonemgr_listener_new),
+ (phonemgr_listener_connect), (phonemgr_listener_battery_poll):
+ * libgsm/phonemgr-listener.h:
+ * libgsm/phonemgr-utils.c: (phonemgr_utils_connect),
+ (phonemgr_utils_tell_driver), (phonemgr_utils_write_gnokii_config):
+ * libgsm/phonemgr-utils.h:
+ * src/main.c: (main): Add "-d/--debug" option, to allow enabling
+ debugging gnokii
+
+2007-10-26 Bastien Nocera <hadess(a)hadess.net>
+
+ * libgsm/phonemgr-listener.c:
+ (phonemgr_listener_set_sms_notification):
+ * libgsm/phonemgr-utils.c: (phonemgr_utils_get_channel),
+ (phonemgr_utils_config_append_debug),
+ (phonemgr_utils_driver_for_model),
+ (phonemgr_utils_driver_for_device), (phonemgr_utils_guess_driver),
+ (phonemgr_utils_tell_driver), (phonemgr_utils_write_gnokii_config):
+ * libgsm/phonemgr-utils.h:
+ * src/main.c: (main): Add --config flag to gnome-phone-manager
+ to dump a gnokii configuration file, to the best of g-p-m's
+ knowledge, useful for debugging
+
+2007-10-21 Bastien Nocera <hadess(a)hadess.net>
+
+ * libgsm/phones.xml: Add Sagem myX-7 to the list
+ (Closes: #479563)
+
+2007-10-21 Bastien Nocera <hadess(a)hadess.net>
+
+ * libgsm/phones.xml: Add the Nokia 3110 to the list
+ (Closes: #488836)
+
============ Version 0.20
2007-10-17 Bastien Nocera <hadess(a)hadess.net>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-phone-manager-0.20/configure new/gnome-phone-manager-0.30/configure
--- old/gnome-phone-manager-0.20/configure 2007-10-18 00:51:44.000000000 +0200
+++ new/gnome-phone-manager-0.30/configure 2007-10-29 16:08:50.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for GNOME Phone Manager 0.20.
+# Generated by GNU Autoconf 2.61 for GNOME Phone Manager 0.30.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-phone-manager>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='GNOME Phone Manager'
PACKAGE_TARNAME='gnome-phone-manager'
-PACKAGE_VERSION='0.20'
-PACKAGE_STRING='GNOME Phone Manager 0.20'
+PACKAGE_VERSION='0.30'
+PACKAGE_STRING='GNOME Phone Manager 0.30'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-phone-manager'
ac_unique_file="src/main.c"
@@ -1456,7 +1456,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GNOME Phone Manager 0.20 to adapt to many kinds of systems.
+\`configure' configures GNOME Phone Manager 0.30 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1526,7 +1526,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNOME Phone Manager 0.20:";;
+ short | recursive ) echo "Configuration of GNOME Phone Manager 0.30:";;
esac
cat <<\_ACEOF
@@ -1646,7 +1646,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNOME Phone Manager configure 0.20
+GNOME Phone Manager configure 0.30
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1660,7 +1660,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNOME Phone Manager $as_me 0.20, which was
+It was created by GNOME Phone Manager $as_me 0.30, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2377,7 +2377,7 @@
# Define the identity of the package.
PACKAGE='gnome-phone-manager'
- VERSION='0.20'
+ VERSION='0.30'
cat >>confdefs.h <<_ACEOF
@@ -23538,7 +23538,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNOME Phone Manager $as_me 0.20, which was
+This file was extended by GNOME Phone Manager $as_me 0.30, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23591,7 +23591,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-GNOME Phone Manager config.status 0.20
+GNOME Phone Manager config.status 0.30
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-phone-manager-0.20/configure.in new/gnome-phone-manager-0.30/configure.in
--- old/gnome-phone-manager-0.20/configure.in 2007-10-18 00:51:03.000000000 +0200
+++ new/gnome-phone-manager-0.30/configure.in 2007-10-29 16:08:11.000000000 +0100
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
-AC_INIT([GNOME Phone Manager],[0.20],[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-phon…])
+AC_INIT([GNOME Phone Manager],[0.30],[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-phon…])
AC_CONFIG_SRCDIR(src/main.c)
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-phone-manager-0.20/libgsm/glibgsmtest.c new/gnome-phone-manager-0.30/libgsm/glibgsmtest.c
--- old/gnome-phone-manager-0.20/libgsm/glibgsmtest.c 2007-09-24 13:42:59.000000000 +0200
+++ new/gnome-phone-manager-0.30/libgsm/glibgsmtest.c 2007-10-26 19:37:00.000000000 +0200
@@ -76,7 +76,7 @@
g_thread_init (NULL);
g_type_init ();
- listener = phonemgr_listener_new ();
+ listener = phonemgr_listener_new (TRUE);
if (!listener)
g_error ("Couldn't make listener");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-phone-manager-0.20/libgsm/phonemgr-listener.c new/gnome-phone-manager-0.30/libgsm/phonemgr-listener.c
--- old/gnome-phone-manager-0.20/libgsm/phonemgr-listener.c 2007-10-03 13:35:43.000000000 +0200
+++ new/gnome-phone-manager-0.30/libgsm/phonemgr-listener.c 2007-10-29 15:51:38.000000000 +0100
@@ -80,9 +80,12 @@
guint connected : 1;
guint terminated : 1;
+ guint debug : 1;
/* Whether the driver supports GN_OP_OnSMS */
guint supports_sms_notif : 1;
+ /* Whether or not the driver supports GN_OP_GetPowersource */
+ guint supports_power_source : 1;
};
static void phonemgr_listener_class_init (PhonemgrListenerClass *klass);
@@ -101,11 +104,54 @@
LAST_SIGNAL
};
+enum {
+ PROP_0,
+ PROP_DEBUG,
+};
+
static int phonemgr_listener_signals[LAST_SIGNAL] = { 0 } ;
G_DEFINE_TYPE (PhonemgrListener, phonemgr_listener, G_TYPE_OBJECT)
static void
+phonemgr_listener_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ PhonemgrListener *l;
+
+ l = PHONEMGR_LISTENER (object);
+
+ switch (property_id) {
+ case PROP_DEBUG:
+ g_value_set_boolean (value, l->debug != FALSE);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+phonemgr_listener_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ PhonemgrListener *l;
+
+ l = PHONEMGR_LISTENER (object);
+
+ switch (property_id) {
+ case PROP_DEBUG:
+ l->debug = g_value_get_boolean (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
phonemgr_listener_class_init (PhonemgrListenerClass *klass)
{
GObjectClass *object_class;
@@ -113,6 +159,8 @@
parent_class = g_type_class_ref (G_TYPE_OBJECT);
object_class = (GObjectClass*) klass;
+ object_class->set_property = phonemgr_listener_set_property;
+ object_class->get_property = phonemgr_listener_get_property;
phonemgr_listener_signals[MESSAGE_SIGNAL] =
g_signal_new ("message",
@@ -158,6 +206,11 @@
2,
G_TYPE_INT, G_TYPE_BOOLEAN);
+ g_object_class_install_property (object_class,
+ PROP_DEBUG,
+ g_param_spec_boolean ("debug", NULL, NULL,
+ FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
object_class->finalize = phonemgr_listener_finalize;
klass->message = NULL;
@@ -211,9 +264,24 @@
text = NULL;
/* The data should be in whatever the locale's encoding is,
+ * if it doesn't fit the default GSM alphabet (roughly ISO8859-1)
* as a design decision in gnokii */
origtext = (char *) message->user_data[0].u.text;
- if (g_utf8_validate (origtext, -1, NULL) == FALSE) {
+
+ if (gn_char_def_alphabet (origtext)) {
+ GError *err = NULL;
+
+ text = g_convert (origtext, -1,
+ "UTF-8", "ISO8859-1",
+ NULL, NULL, &err);
+
+ if (err != NULL) {
+ g_warning ("Conversion error from GSM default alphabet: %d %s", err->code, err->message);
+ g_error_free (err);
+ g_free (text);
+ text = g_strdup (origtext);
+ }
+ } else if (g_utf8_validate (origtext, -1, NULL) == FALSE) {
GError *err = NULL;
text = g_locale_to_utf8 (origtext, -1, NULL, NULL, &err);
@@ -221,6 +289,7 @@
if (err != NULL) {
g_warning ("Conversion error: %d %s", err->code, err->message);
g_error_free (err);
+ g_free (text);
text = g_strdup (origtext);
}
}
@@ -240,9 +309,9 @@
}
PhonemgrListener *
-phonemgr_listener_new (void)
+phonemgr_listener_new (gboolean debug)
{
- return PHONEMGR_LISTENER (g_object_new (PHONEMGR_TYPE_LISTENER, NULL));
+ return PHONEMGR_LISTENER (g_object_new (PHONEMGR_TYPE_LISTENER, "debug", debug, NULL));
}
#ifndef DUMMY
@@ -253,6 +322,7 @@
l->mutex = g_mutex_new ();
l->driver = NULL;
l->batterylevel = 1;
+ l->supports_power_source = TRUE;
l->powersource = GN_PS_BATTERY;
}
@@ -294,7 +364,7 @@
}
}
- l->phone_state = phonemgr_utils_connect (device, NULL, channel, error);
+ l->phone_state = phonemgr_utils_connect (device, NULL, channel, l->debug, error);
if (l->phone_state == NULL) {
//FIXME
return FALSE;
@@ -310,7 +380,7 @@
if (strcmp (l->driver, PHONEMGR_DEFAULT_DRIVER) != 0) {
phonemgr_utils_disconnect (l->phone_state);
phonemgr_utils_free (l->phone_state);
- l->phone_state = phonemgr_utils_connect (device, l->driver, channel, error);
+ l->phone_state = phonemgr_utils_connect (device, l->driver, channel, l->debug, error);
if (l->phone_state == NULL) {
//FIXME
return FALSE;
@@ -488,14 +558,20 @@
(&l->phone_state->data)->power_source = &powersource;
(&l->phone_state->data)->battery_unit = &battery_unit;
- if (gn_sm_functions(GN_OP_GetPowersource, &l->phone_state->data, &l->phone_state->state) != GN_ERR_NONE)
- powersource = GN_PS_BATTERY;
-
- /* Some drivers will use the same function for battery level and power source, so optimise */
- if (batterylevel == -1)
- if (gn_sm_functions(GN_OP_GetBatteryLevel, &l->phone_state->data, &l->phone_state->state) != GN_ERR_NONE)
- return;
+ /* Some drivers will use the same function for battery level and power source, so optimise.
+ * Make sure to get the battery level first, as most drivers implement only this one */
+ if (gn_sm_functions(GN_OP_GetBatteryLevel, &l->phone_state->data, &l->phone_state->state) != GN_ERR_NONE)
+ return;
+ if (powersource == -1 && l->supports_power_source != FALSE) {
+ if (gn_sm_functions(GN_OP_GetPowersource, &l->phone_state->data, &l->phone_state->state) != GN_ERR_NONE) {
+ g_message ("driver or phone doesn't support getting the power source");
+ l->supports_power_source = FALSE;
+ powersource = GN_PS_BATTERY;
+ }
+ } else if (l->supports_power_source == FALSE) {
+ powersource = GN_PS_BATTERY;
+ }
if (batterylevel != l->batterylevel || powersource != l->powersource) {
AsyncSignal *signal;
@@ -529,9 +605,9 @@
l->phone_state->data.callback_data = l;
if (gn_sm_functions (GN_OP_OnSMS, &l->phone_state->data, &l->phone_state->state) == GN_ERR_NONE) {
l->supports_sms_notif = TRUE;
- g_message ("driver supports sms notifications");
+ g_message ("driver and phone support sms notifications");
} else {
- g_message ("driver doesn't support sms notifications");
+ g_message ("driver or phone doesn't support sms notifications");
}
} else {
if (l->supports_sms_notif == FALSE)
@@ -629,7 +705,7 @@
phonemgr_listener_queue_message (PhonemgrListener *l,
const char *number, const char *message)
{
- char *mstr;
+ char *mstr, *iso;
GError *err = NULL;
gn_sms sms;
gn_error error;
@@ -643,20 +719,32 @@
gn_data_clear(&l->phone_state->data);
gn_sms_default_submit(&sms);
+ /* Default GSM alphabet is a subset of ISO8859-1,
+ * so try that */
+ iso = g_convert (message, -1,
+ "ISO8859-1", "UTF-8",
+ NULL, NULL, &err);
+ if (err != NULL) {
+ g_clear_error (&err);
+ g_free (iso);
+ iso = NULL;
+ }
+
/* If the message contains characters not in the
- * default GSM alaphabet, we convert it to UCS-2 encoding instead */
- if (gn_char_def_alphabet((unsigned char *) message)) {
- mstr = g_strdup (message);
+ * default GSM alaphabet, we pass it as UTF-8 encoding instead */
+ if (iso && gn_char_def_alphabet((unsigned char *) iso)) {
+ mstr = iso;
sms.dcs.u.general.alphabet = GN_SMS_DCS_DefaultAlphabet;
} else {
- mstr = g_convert (message, strlen (message),
- "UCS-2", "UTF-8",
- NULL, NULL, &err);
+ g_free (iso);
+ /* gnokii will convert to UCS-2 itself, but we pass UTF-8 */
+ mstr = g_strdup (message);
sms.dcs.u.general.alphabet = GN_SMS_DCS_UCS2;
}
if (err != NULL) {
g_warning ("Conversion error: %d %s", err->code, err->message);
+ g_free (mstr);
g_error_free (err);
g_mutex_unlock (l->mutex);
return;
@@ -690,6 +778,9 @@
/* Actually send the message */
error = gn_sms_send (&l->phone_state->data, &l->phone_state->state);
+ /* Remove the reference to SMS */
+ l->phone_state->data.sms = NULL;
+
/* Unlock the phone */
g_mutex_unlock (l->mutex);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-phone-manager-0.20/libgsm/phonemgr-listener.h new/gnome-phone-manager-0.30/libgsm/phonemgr-listener.h
--- old/gnome-phone-manager-0.20/libgsm/phonemgr-listener.h 2007-09-24 13:44:38.000000000 +0200
+++ new/gnome-phone-manager-0.30/libgsm/phonemgr-listener.h 2007-10-26 15:19:29.000000000 +0200
@@ -66,7 +66,7 @@
GQuark phonemgr_listener_error_quark (void) G_GNUC_CONST;
GType phonemgr_listener_get_type (void);
-PhonemgrListener* phonemgr_listener_new (void);
+PhonemgrListener* phonemgr_listener_new (gboolean debug);
gboolean phonemgr_listener_connect (PhonemgrListener *listener,
char *device,
GError **error);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-phone-manager-0.20/libgsm/phonemgr-utils.c new/gnome-phone-manager-0.30/libgsm/phonemgr-utils.c
--- old/gnome-phone-manager-0.20/libgsm/phonemgr-utils.c 2007-10-14 15:50:57.000000000 +0200
+++ new/gnome-phone-manager-0.30/libgsm/phonemgr-utils.c 2007-10-26 15:38:04.000000000 +0200
@@ -41,6 +41,8 @@
* match */
static GHashTable *driver_model = NULL;
+static void phonemgr_utils_init_hash_tables (void);
+
void
phonemgr_utils_gn_statemachine_clear (struct gn_statemachine *state)
{
@@ -178,7 +180,7 @@
}
int
-phonemgr_utils_get_channel (char *device)
+phonemgr_utils_get_channel (const char *device)
{
bdaddr_t src, dst;
int channel;
@@ -218,11 +220,23 @@
}
}
+char *
+phonemgr_utils_config_append_debug (const char *config)
+{
+ return g_strdup_printf ("%s\n"
+ "[logging]\n"
+ "debug = on\n",
+ config);
+}
+
static char *
phonemgr_utils_driver_for_model (const char *model, const char *device)
{
char *driver;
+ if (driver_model == NULL)
+ phonemgr_utils_init_hash_tables ();
+
driver = g_hash_table_lookup (driver_model, model);
if (driver == NULL) {
g_warning ("Model %s not supported natively", model);
@@ -250,6 +264,9 @@
if (phonemgr_utils_is_bluetooth (device) == FALSE)
return NULL;
+ if (driver_device == NULL)
+ phonemgr_utils_init_hash_tables ();
+
driver = g_hash_table_lookup (driver_device, device);
return driver;
@@ -362,8 +379,6 @@
char *driver;
gn_error err;
- phonemgr_utils_init_hash_tables ();
-
driver = phonemgr_utils_driver_for_device (device);
if (driver != NULL)
return driver;
@@ -389,7 +404,7 @@
}
PhonemgrState *
-phonemgr_utils_connect (const char *device, const char *driver, int channel, GError **error)
+phonemgr_utils_connect (const char *device, const char *driver, int channel, gboolean debug, GError **error)
{
PhonemgrState *phone_state = NULL;
char *config, **lines;
@@ -405,8 +420,17 @@
}
config = phonemgr_utils_write_config (driver ? driver : PHONEMGR_DEFAULT_DRIVER, device, channel);
- lines = g_strsplit (config, "\n", -1);
- g_free (config);
+ if (debug != FALSE) {
+ char *debug;
+
+ debug = phonemgr_utils_config_append_debug (config);
+ g_free (config);
+ lines = g_strsplit (debug, "\n", -1);
+ g_free (debug);
+ } else {
+ lines = g_strsplit (config, "\n", -1);
+ g_free (config);
+ }
if (gn_cfg_memory_read ((const char **)lines) < 0) {
g_warning ("gn_cfg_memory_read");
@@ -460,10 +484,11 @@
GError *error = NULL;
PhonemgrState *phone_state;
const char *model;
+ char *driver;
int channel;
channel = phonemgr_utils_get_channel (addr);
- phone_state = phonemgr_utils_connect (addr, NULL, channel, &error);
+ phone_state = phonemgr_utils_connect (addr, NULL, channel, FALSE, &error);
if (phone_state == NULL) {
g_warning ("Couldn't connect to the '%s' phone: %s", addr, PHONEMGR_CONDERR_STR(error));
if (error != NULL)
@@ -474,6 +499,44 @@
model = gn_lib_get_phone_model (&phone_state->state);
g_print ("model: '%s'\n", model);
+ driver = phonemgr_utils_driver_for_model (model, addr);
+ g_print ("guessed driver: '%s'\n", driver);
+ g_free (driver);
+
+ phonemgr_utils_disconnect (phone_state);
+ phonemgr_utils_free (phone_state);
+}
+
+void
+phonemgr_utils_write_gnokii_config (const char *addr)
+{
+ GError *error = NULL;
+ PhonemgrState *phone_state;
+ char *driver, *config, *debug;
+ int channel;
+
+ channel = phonemgr_utils_get_channel (addr);
+ phone_state = phonemgr_utils_connect (addr, NULL, channel, FALSE, &error);
+ if (phone_state == NULL) {
+ g_warning ("Couldn't connect to the '%s' phone: %s", addr, PHONEMGR_CONDERR_STR(error));
+ if (error != NULL)
+ g_error_free (error);
+ return;
+ }
+
+ driver = phonemgr_utils_guess_driver (phone_state, addr, NULL);
+
+ config = phonemgr_utils_write_config (driver, addr, channel);
+ g_free (driver);
+ debug = phonemgr_utils_config_append_debug (config);
+ g_free (config);
+ if (g_file_set_contents ("gnokiirc", debug, -1, NULL) == FALSE) {
+ g_warning ("Couldn't write gnokiirc file in the current directory");
+ } else {
+ g_print ("Configuration file written in the current directory\n");
+ g_print ("Move gnokiirc to ~/.gnokiirc to start debugging with gnokii\n");
+ }
+ g_free (debug);
phonemgr_utils_disconnect (phone_state);
phonemgr_utils_free (phone_state);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-phone-manager-0.20/libgsm/phonemgr-utils.h new/gnome-phone-manager-0.30/libgsm/phonemgr-utils.h
--- old/gnome-phone-manager-0.20/libgsm/phonemgr-utils.h 2007-09-24 13:49:53.000000000 +0200
+++ new/gnome-phone-manager-0.30/libgsm/phonemgr-utils.h 2007-10-26 15:32:41.000000000 +0200
@@ -48,19 +48,27 @@
};
gboolean phonemgr_utils_is_bluetooth (const char *addr);
-int phonemgr_utils_get_channel (char *device);
-char *phonemgr_utils_write_config (const char *driver, const char *addr, int channel);
+int phonemgr_utils_get_channel (const char *device);
+char *phonemgr_utils_write_config (const char *driver,
+ const char *addr,
+ int channel);
char *phonemgr_utils_guess_driver (PhonemgrState *phone_state,
- const char *device, GError **error);
+ const char *device,
+ GError **error);
void phonemgr_utils_gn_statemachine_clear (struct gn_statemachine *state);
const char *phonemgr_utils_gn_error_to_string (gn_error error,
PhoneMgrError *perr);
-PhonemgrState *phonemgr_utils_connect (const char *device, const char *driver,
- int channel, GError **error);
+PhonemgrState *phonemgr_utils_connect (const char *device,
+ const char *driver,
+ int channel,
+ gboolean debug,
+ GError **error);
void phonemgr_utils_disconnect (PhonemgrState *phone_state);
void phonemgr_utils_free (PhonemgrState *phone_state);
void phonemgr_utils_tell_driver (const char *addr);
+void phonemgr_utils_write_gnokii_config (const char *addr);
+char *phonemgr_utils_config_append_debug (const char *config);
gboolean phonemgr_utils_connection_is_supported (PhonemgrConnectionType type);
time_t gn_timestamp_to_gtime (gn_timestamp stamp);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-phone-manager-0.20/libgsm/phones.xml new/gnome-phone-manager-0.30/libgsm/phones.xml
--- old/gnome-phone-manager-0.20/libgsm/phones.xml 2007-08-19 23:41:34.000000000 +0200
+++ new/gnome-phone-manager-0.30/libgsm/phones.xml 2007-10-21 21:13:21.000000000 +0200
@@ -15,5 +15,11 @@
<phone_entry
identifier="Nokia 6300"
driver="6510" />
+ <phone_entry
+ identifier="Nokia 3110c"
+ driver="3110" />
+ <phone_entry
+ identifier="myX-7 GPRS"
+ driver="AT" />
</phone_entries>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-phone-manager-0.20/NEWS new/gnome-phone-manager-0.30/NEWS
--- old/gnome-phone-manager-0.20/NEWS 2007-10-18 00:44:04.000000000 +0200
+++ new/gnome-phone-manager-0.30/NEWS 2007-10-29 16:07:59.000000000 +0100
@@ -1,7 +1,22 @@
+gnome-phone-manager 0.30
+========================
+
+ * More fixes for sending and receiving text messages with international
+ characters that don't fit in the default GSM alphabet
+
+ * Warn when a phone or driver doesn't support getting the state
+ of the power source (such as the nk6510)
+
+ * Add the --config flag to dump a gnokiirc file for debugging
+
+ * Add the --debug/-d flag to enable gnokii debugging
+
+ * Add the Sagem myX-7 and Nokia 3110 to the supported phones
+
gnome-phone-manager 0.20
========================
- * Fix sending on receiving messages with non-ASCII characters
+ * Fix sending or receiving messages with non-ASCII characters
* Really fix connecting to Sony Ericsson phones (and a lot of other
models and makes of phones)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-phone-manager-0.20/po/ChangeLog new/gnome-phone-manager-0.30/po/ChangeLog
--- old/gnome-phone-manager-0.20/po/ChangeLog 2007-09-18 16:53:15.000000000 +0200
+++ new/gnome-phone-manager-0.30/po/ChangeLog 2007-10-29 12:52:49.000000000 +0100
@@ -1,3 +1,7 @@
+2007-10-28 Daniel Nylander <po(a)danielnylander.se>
+
+ * sv.po: Updated Swedish translation.
+
2007-09-15 Andre Klapper <a9016009(a)gmx.de>
* LINGUAS: Added sk.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-phone-manager-0.20/po/sv.po new/gnome-phone-manager-0.30/po/sv.po
--- old/gnome-phone-manager-0.20/po/sv.po 2007-07-25 15:17:08.000000000 +0200
+++ new/gnome-phone-manager-0.30/po/sv.po 2007-10-29 12:52:49.000000000 +0100
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: phonemgr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-25 10:50+0200\n"
-"PO-Revision-Date: 2007-07-25 11:00+0100\n"
+"POT-Creation-Date: 2007-10-28 10:09+0100\n"
+"PO-Revision-Date: 2007-10-28 10:10+0100\n"
"Last-Translator: Daniel Nylander <po(a)danielnylander.se>\n"
"Language-Team: Swedish <tp-sv(a)listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@
#. translators: the '%s' will be substituted with '/dev/ttyS0'
#. or similar
-#: ../src/connection.c:92
+#: ../src/connection.c:112
#, c-format
msgid "Connected to device on %s"
msgstr "Ansluten till enhet på %s"
@@ -28,13 +28,23 @@
#. bother changing the icon ourselves at this point
#. translators: the '%s' will be substituted with '/dev/ttyS0'
#. or similar
-#: ../src/connection.c:98
+#: ../src/connection.c:118
#, c-format
msgid "Failed connection to device on %s"
msgstr "Anslutning till enhet på %s misslyckades"
+#: ../src/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf-fel: %s"
+
+#: ../src/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "Alla ytterligare fel visas endast på terminalen."
+
#: ../src/gnome-phone-manager.desktop.in.h:1
-#: ../src/menu.c:28
+#: ../src/menu.c:49
+#: ../src/menu.c:51
msgid "Phone Manager"
msgstr "Telefonhanterare"
@@ -42,31 +52,39 @@
msgid "Receive and send text messages from your mobile phone"
msgstr "Mottag och skicka textmeddelanden från din mobiltelefon"
-#: ../src/icon.c:37
+#: ../src/icon.c:57
msgid "Message arrived"
msgstr "Meddelande ankom"
-#: ../src/icon.c:40
+#: ../src/icon.c:60
msgid "Connected"
msgstr "Ansluten"
-#: ../src/icon.c:44
+#: ../src/icon.c:64
msgid "Connecting to phone"
msgstr "Ansluter till telefon"
-#: ../src/icon.c:48
+#: ../src/icon.c:68
msgid "Not connected"
msgstr "Inte ansluten"
-#: ../src/main.c:14
+#: ../src/main.c:36
msgid "Show model name of a specific device"
msgstr "Visa modellnamn för en specifik enhet"
-#: ../src/main.c:29
+#: ../src/main.c:37
+msgid "Write the configuration file for gnokii debugging"
+msgstr "Skriv konfigurationsfilen för gnokii-felsökning"
+
+#: ../src/main.c:38
+msgid "Enable debug"
+msgstr "Aktivera felsökning"
+
+#: ../src/main.c:53
msgid "- Manage your mobile phone"
msgstr "- Hantera din mobiltelefon"
-#: ../src/menu.c:20
+#: ../src/menu.c:40
msgid "translator_credits"
msgstr ""
"Daniel Nylander\n"
@@ -75,19 +93,24 @@
"Skicka synpunkter på översättningen till\n"
"tp-sv(a)listor.tp-sv.se"
-#: ../src/menu.c:24
+#: ../src/menu.c:44
msgid "Send and receive messages from your mobile phone."
msgstr "Skicka och mottag meddelanden från din mobiltelefon."
-#: ../src/menu.c:32
+#: ../src/menu.c:56
msgid "Phone Manager website"
msgstr "Webbplatsen för Telefonhanterare"
-#: ../src/menu.c:63
+#: ../src/menu.c:87
msgid "_Send Message"
msgstr "_Skicka meddelande"
-#: ../src/ui.c:313
+#: ../src/phonemgr-chooser-button.c:80
+#: ../src/phonemgr-chooser-button.c:190
+msgid "Click to select device..."
+msgstr "Klicka för att välja enhet..."
+
+#: ../src/ui.c:333
msgid "Message too long!"
msgstr "Meddelandet är för långt!"
@@ -235,6 +258,54 @@
msgid "message body"
msgstr "meddelandetext"
+#: ../ui/gnome-phone-manager.schemas.in.h:1
+msgid "Bluetooth address of the device to connect to"
+msgstr "Blåtandsadress för enheten att ansluta till"
+
+#: ../ui/gnome-phone-manager.schemas.in.h:2
+msgid "Bluetooth address of the device to connect to. Requires connection_type to be 1 to be used."
+msgstr "Blåtandsadress för enheten att ansluta till. Kräver att connection_type är 1 för att användas."
+
+#: ../ui/gnome-phone-manager.schemas.in.h:3
+msgid "The connection type used by gnome-phone-manager"
+msgstr "Anslutningstypen som används av gnome-phone-manager"
+
+#: ../ui/gnome-phone-manager.schemas.in.h:4
+msgid "The connection type used by gnome-phone-manager: Bluetooth is 0 Serial 1 is 1 Serial 2 is 2 IrDa is 3 Other connection types are 4"
+msgstr "Anslutningstypen som används av gnome-phone-manager: Bluetooth är 0, Seriell 1 är 1, Seriell 2 är 2, Infrarött är 3, övriga anslutningstyper är 4"
+
+#: ../ui/gnome-phone-manager.schemas.in.h:5
+msgid "The device node for the serial device to connect to"
+msgstr "Enhetsnoden för serieenheten att ansluta till"
+
+#: ../ui/gnome-phone-manager.schemas.in.h:6
+msgid "The device node for the serial device to connect to. Requires connection_type to be 4 to be used."
+msgstr "Enhetsnoden för serieenheten att ansluta till. Kräver att connection_type är 4 för att användas."
+
+#: ../ui/gnome-phone-manager.schemas.in.h:7
+msgid "Whether to play a sound alert when a new message comes in"
+msgstr "Huruvida ett ljud ska spelas upp när ett nytt meddelande tas emot"
+
+#: ../ui/gnome-phone-manager.schemas.in.h:8
+msgid "Whether to play a sound alert when a new message comes in."
+msgstr "Huruvida ett ljud ska spelas upp när ett nytt meddelande tas emot."
+
+#: ../ui/gnome-phone-manager.schemas.in.h:9
+msgid "Whether to popup new messages on the desktop"
+msgstr "Huruvida nya meddelanden ska visas i en popupruta på skrivbordet"
+
+#: ../ui/gnome-phone-manager.schemas.in.h:10
+msgid "Whether to popup new messages on the desktop as soon as they're received, as opposed to showing them when clicking on the tray icon."
+msgstr "Huruvida nya meddelanden ska visas i en popupruta på skrivbordet så snart som de tas emot, i motsats till att visa dem vid klickning på brickikonen."
+
+#: ../ui/gnome-phone-manager.schemas.in.h:11
+msgid "Whether to retry connecting to the mobile phone"
+msgstr "Huruvida nya försök att ansluta till mobiltelefonen ska göras"
+
+#: ../ui/gnome-phone-manager.schemas.in.h:12
+msgid "Whether to retry connecting to the mobile phone if the connection fails at some point."
+msgstr "Huruvida nya försök att ansluta till mobiltelefonen ska göras om anslutningen förloras."
+
#: ../src/e-contact-entry.c:153
#, c-format
msgid "Cannot get contact: %s"
@@ -330,68 +401,6 @@
msgid "An unknown error occurred."
msgstr "Ett okänt fel inträffade."
-#: ../src/gconf-bridge.c:1218
-#, c-format
-msgid "GConf error: %s"
-msgstr "GConf-fel: %s"
-
-#: ../src/gconf-bridge.c:1228
-msgid "All further errors shown only on terminal."
-msgstr "Alla ytterligare fel visas endast på terminalen."
-
-#: ../src/phonemgr-chooser-button.c:79
-#: ../src/phonemgr-chooser-button.c:189
-msgid "Click to select device..."
-msgstr "Klicka för att välja enhet..."
-
-#: ../ui/gnome-phone-manager.schemas.in.h:1
-msgid "Bluetooth address of the device to connect to"
-msgstr "Blåtandsadress för enheten att ansluta till"
-
-#: ../ui/gnome-phone-manager.schemas.in.h:2
-msgid "Bluetooth address of the device to connect to. Requires connection_type to be 1 to be used."
-msgstr "Blåtandsadress för enheten att ansluta till. Kräver att connection_type är 1 för att användas."
-
-#: ../ui/gnome-phone-manager.schemas.in.h:3
-msgid "The connection type used by gnome-phone-manager"
-msgstr "Anslutningstypen som används av gnome-phone-manager"
-
-#: ../ui/gnome-phone-manager.schemas.in.h:4
-msgid "The connection type used by gnome-phone-manager: Bluetooth is 0 Serial 1 is 1 Serial 2 is 2 IrDa is 3 Other connection types are 4"
-msgstr "Anslutningstypen som används av gnome-phone-manager: Bluetooth är 0, Seriell 1 är 1, Seriell 2 är 2, Infrarött är 3, övriga anslutningstyper är 4"
-
-#: ../ui/gnome-phone-manager.schemas.in.h:5
-msgid "The device node for the serial device to connect to"
-msgstr "Enhetsnoden för serieenheten att ansluta till"
-
-#: ../ui/gnome-phone-manager.schemas.in.h:6
-msgid "The device node for the serial device to connect to. Requires connection_type to be 4 to be used."
-msgstr "Enhetsnoden för serieenheten att ansluta till. Kräver att connection_type är 4 för att användas."
-
-#: ../ui/gnome-phone-manager.schemas.in.h:7
-msgid "Whether to play a sound alert when a new message comes in"
-msgstr "Huruvida ett ljud ska spelas upp när ett nytt meddelande tas emot"
-
-#: ../ui/gnome-phone-manager.schemas.in.h:8
-msgid "Whether to play a sound alert when a new message comes in."
-msgstr "Huruvida ett ljud ska spelas upp när ett nytt meddelande tas emot."
-
-#: ../ui/gnome-phone-manager.schemas.in.h:9
-msgid "Whether to popup new messages on the desktop"
-msgstr "Huruvida nya meddelanden ska visas i en popupruta på skrivbordet"
-
-#: ../ui/gnome-phone-manager.schemas.in.h:10
-msgid "Whether to popup new messages on the desktop as soon as they're received, as opposed to showing them when clicking on the tray icon."
-msgstr "Huruvida nya meddelanden ska visas i en popupruta på skrivbordet så snart som de tas emot, i motsats till att visa dem vid klickning på brickikonen."
-
-#: ../ui/gnome-phone-manager.schemas.in.h:11
-msgid "Whether to retry connecting to the mobile phone"
-msgstr "Huruvida nya försök att ansluta till mobiltelefonen ska göras"
-
-#: ../ui/gnome-phone-manager.schemas.in.h:12
-msgid "Whether to retry connecting to the mobile phone if the connection fails at some point."
-msgstr "Huruvida nya försök att ansluta till mobiltelefonen ska göras om anslutningen förloras."
-
#~ msgid "Selection mode"
#~ msgstr "Markeringsläge"
#~ msgid "The selection mode"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-phone-manager-0.20/src/main.c new/gnome-phone-manager-0.30/src/main.c
--- old/gnome-phone-manager-0.20/src/main.c 2007-09-24 13:46:39.000000000 +0200
+++ new/gnome-phone-manager-0.30/src/main.c 2007-10-26 15:27:52.000000000 +0200
@@ -28,10 +28,14 @@
#include "phonemgr-object.h"
#include "app.h"
-static char *bdaddr = NULL;
+static char *bdaddr_ident = NULL;
+static char *bdaddr_config = NULL;
+static gboolean debug = FALSE;
const GOptionEntry options[] = {
- {"identify", '\0', 0, G_OPTION_ARG_STRING, &bdaddr, N_("Show model name of a specific device"), NULL},
+ { "identify", '\0', 0, G_OPTION_ARG_STRING, &bdaddr_ident, N_("Show model name of a specific device"), NULL },
+ { "config", '\0', 0, G_OPTION_ARG_STRING, &bdaddr_config, N_("Write the configuration file for gnokii debugging"), NULL },
+ { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug, N_("Enable debug"), NULL},
{ NULL }
};
@@ -58,8 +62,12 @@
return 1;
}
- if (bdaddr != NULL) {
- phonemgr_utils_tell_driver (bdaddr);
+ if (bdaddr_ident != NULL) {
+ phonemgr_utils_tell_driver (bdaddr_ident);
+ return 0;
+ }
+ if (bdaddr_config != NULL) {
+ phonemgr_utils_write_gnokii_config (bdaddr_config);
return 0;
}
@@ -73,7 +81,7 @@
GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
/* Setup the listener */
- app->listener = phonemgr_listener_new ();
+ app->listener = phonemgr_listener_new (debug);
initialise_connection (app);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gnokii
checked in at Wed Oct 31 01:13:19 CET 2007.
--------
--- gnokii/gnokii.changes 2007-10-09 11:00:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnokii/gnokii.changes 2007-10-30 14:11:10.000000000 +0100
@@ -1,0 +2,65 @@
+Tue Oct 30 14:02:09 CET 2007 - prusnak(a)suse.cz
+
+- updated to 0.6.20
+
+ * libgnokii updates
+ o add support for Nokia 6070 and 2630
+ o add a driver for PC/SC SIM card readers using libpcsclite;
+ see Docs/README-PCSC for details
+ o add two new phonebook memory types: SD for "Service Dialing
+ Numbers" and BD for "Barred Dialing Numbers"
+ o improve error messages while parsing config file
+ o enhance error handling for parsing config
+ o remove gn_file_text_save() from API
+ o remove getline() replacement from compat.c
+ o add gn_sms2mbox() function that converts SMS to mbox
+ compliant format
+ o add sanity checking for fwrite()/write() calls
+ o make incoming buffer size for atbus link driver dynamically
+ allocatable (was fixed size)
+ o prevent strip_slashes() from stripping non-slashes
+ * build system updates
+ o add FAQ, KNOWN_BUGS and README-DKU2 to the list of files
+ installed with "make install-docs" and remove
+ gnokii-hackers-howto, gettext-howto and packaging-howto from
+ that list
+ o simplify Makefiles, remove obsolete targets
+ o don't fail on parallel builds
+ o fix compilation warnings
+ o use standard paths for docdir and localedir
+ * gnokii updates
+ o add error handling for security commands
+ o getprofile requires ringtone_list being allocated (Pawel Kot)
+ o replace gn_file_text_save() with local writefile()
+ o add getline() replacement to gnokii-utils.c
+ o gnokii --getsms new --append-file/-a switch to append SMS
+ to an existing file
+ o gnokii --getsms -f/-F/-a use now mbox compliant format for
+ stored sms, all sms read are stored in the same file
+ o write more messages to stderr; the rule is that diagnostics
+ indicating success or failure go to stderr, while information
+ read from the phone goes to stdout
+ o add sanity checking for fwrite()/write() calls
+ * at driver updates
+ o fix buffer size calculating in AT_WritePhonebook
+ o fix SMS-SUBMIT parsing
+ o calculate phonebook size for SonyEricsson: they don't answer
+ with memory stats to AT+CPBS, calculate it by reading and
+ counting entries (which is fast)
+ o fix SetDateTime for Sony Ericsson, which requires timezone
+ to be added
+ * documentation updates
+ o update Docs/protocol/nk6110.txt with another error code for
+ "Get code status err"
+ * nk6100 driver updates
+ o add error code GN_ERR_SIMPROBLEM for --changesecuritycode
+ * xgnokii updates
+ o when exporting the phonebook to a file in raw format handle
+ backslashes as escapes like in gnokii --getphonebook
+ * link layer updates
+ o make DKU-5 connection initialisation working again
+ * translation updates
+ o updated Italian translation and fixed Content-Type to match
+ actual encoding of text which was UTF-8
+
+-------------------------------------------------------------------
Old:
----
gnokii-0.6.19.tar.bz2
New:
----
gnokii-0.6.20.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnokii.spec ++++++
--- /var/tmp/diff_new_pack.V27635/_old 2007-10-31 01:12:40.000000000 +0100
+++ /var/tmp/diff_new_pack.V27635/_new 2007-10-31 01:12:40.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package gnokii (Version 0.6.19)
+# spec file for package gnokii (Version 0.6.20)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,7 +12,7 @@
Name: gnokii
BuildRequires: bluez-libs gtk2-devel libical-devel libusb-devel mysql-devel postgresql-devel update-desktop-files
-Version: 0.6.19
+Version: 0.6.20
Release: 1
PreReq: permissions
Requires: bluez-libs
@@ -191,6 +191,67 @@
%{_includedir}/gnokii.h
%{_includedir}/gnokii
%changelog
+* Tue Oct 30 2007 - prusnak(a)suse.cz
+- updated to 0.6.20
+ * libgnokii updates
+ o add support for Nokia 6070 and 2630
+ o add a driver for PC/SC SIM card readers using libpcsclite;
+ see Docs/README-PCSC for details
+ o add two new phonebook memory types: SD for "Service Dialing
+ Numbers" and BD for "Barred Dialing Numbers"
+ o improve error messages while parsing config file
+ o enhance error handling for parsing config
+ o remove gn_file_text_save() from API
+ o remove getline() replacement from compat.c
+ o add gn_sms2mbox() function that converts SMS to mbox
+ compliant format
+ o add sanity checking for fwrite()/write() calls
+ o make incoming buffer size for atbus link driver dynamically
+ allocatable (was fixed size)
+ o prevent strip_slashes() from stripping non-slashes
+ * build system updates
+ o add FAQ, KNOWN_BUGS and README-DKU2 to the list of files
+ installed with "make install-docs" and remove
+ gnokii-hackers-howto, gettext-howto and packaging-howto from
+ that list
+ o simplify Makefiles, remove obsolete targets
+ o don't fail on parallel builds
+ o fix compilation warnings
+ o use standard paths for docdir and localedir
+ * gnokii updates
+ o add error handling for security commands
+ o getprofile requires ringtone_list being allocated (Pawel Kot)
+ o replace gn_file_text_save() with local writefile()
+ o add getline() replacement to gnokii-utils.c
+ o gnokii --getsms new --append-file/-a switch to append SMS
+ to an existing file
+ o gnokii --getsms -f/-F/-a use now mbox compliant format for
+ stored sms, all sms read are stored in the same file
+ o write more messages to stderr; the rule is that diagnostics
+ indicating success or failure go to stderr, while information
+ read from the phone goes to stdout
+ o add sanity checking for fwrite()/write() calls
+ * at driver updates
+ o fix buffer size calculating in AT_WritePhonebook
+ o fix SMS-SUBMIT parsing
+ o calculate phonebook size for SonyEricsson: they don't answer
+ with memory stats to AT+CPBS, calculate it by reading and
+ counting entries (which is fast)
+ o fix SetDateTime for Sony Ericsson, which requires timezone
+ to be added
+ * documentation updates
+ o update Docs/protocol/nk6110.txt with another error code for
+ "Get code status err"
+ * nk6100 driver updates
+ o add error code GN_ERR_SIMPROBLEM for --changesecuritycode
+ * xgnokii updates
+ o when exporting the phonebook to a file in raw format handle
+ backslashes as escapes like in gnokii --getphonebook
+ * link layer updates
+ o make DKU-5 connection initialisation working again
+ * translation updates
+ o updated Italian translation and fixed Content-Type to match
+ actual encoding of text which was UTF-8
* Tue Oct 09 2007 - prusnak(a)suse.cz
- updated to 0.6.19
* libgnokii updates
++++++ gnokii-0.6.19.tar.bz2 -> gnokii-0.6.20.tar.bz2 ++++++
++++ 20821 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package cyrus-imapd
checked in at Wed Oct 31 01:11:23 CET 2007.
--------
--- cyrus-imapd/cyrus-imapd.changes 2007-05-23 14:27:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/cyrus-imapd/cyrus-imapd.changes 2007-10-30 13:11:47.000000000 +0100
@@ -1,0 +2,31 @@
+Tue Oct 30 13:06:28 CET 2007 - rhafer(a)suse.de
+
+- update to 2.3.10. Most imporant changes:
+ * Added support for "delayed" delete, in which mailboxes are renamed
+ to a special admin-only "deleted" hierarchy at the time of the
+ DELETE (hiding them from the client), rather than immediately
+ removing them from the filesystem.
+ * Fixed the special case of RENAMEing an Inbox, so that it doesn't
+ keep the same mailbox uniqueid, thus allowing it to replicate
+ properly (seen state is still preserved).
+ * Disabled Nagle's algorithm in sync_client and sync_server to
+ increase the throughput of the replication protocol. -- courtesy of
+ Wes Craig.
+ * Added support for a shared \Seen flag on messages (must be enabled
+ on a per-mailbox basis with the /vendor/cmu/cyrus-imapd/sharedseen
+ mailbox annotation.
+ * Added -u and -U options to reconstruct -- courtesy of David Carter.
+ * Added SETUIDVALIDITY command to the replication protocol --
+ courtesy of David Carter.
+ * Changed message GUIDs used by replication to be the SHA1 hash of
+ the messages -- based on work of David Carter and Fastmail.fm.
+ * Improve the performance of commands that operate on sequence-sets.
+ The sequence-set is now parsed only once, and the commands operate
+ on a sorted list of seq-ranges.
+ * Added new cyr_synclog utility for adding events to the replication
+ log -- courtesy of Fastmail.fm.
+ * Added support for disabling duplicate delivery suppression on a
+ per-folder basis with the /vendor/cmu/cyrus-imapd/duplicatedeliver
+ mailbox annotation -- courtesy of Fastmail.fm.
+
+-------------------------------------------------------------------
Old:
----
allow_auth_plain_proxying.patch
cyrus-imapd-2.1.12-stdarg.patch
cyrus-imapd-2.3.8-autocreate-0.10-0.diff
cyrus-imapd-2.3.8.tar.bz2
cyrus-imapd-bdb45.patch
gcc-warnings.patch
New:
----
cyrus-imapd-2.3.10.tar.bz2
cyrus-imapd-2.3.9-autocreate-0.10-0.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cyrus-imapd.spec ++++++
--- /var/tmp/diff_new_pack.L21562/_old 2007-10-31 01:09:47.000000000 +0100
+++ /var/tmp/diff_new_pack.L21562/_new 2007-10-31 01:09:47.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package cyrus-imapd (Version 2.3.8)
+# spec file for package cyrus-imapd (Version 2.3.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,46 +12,45 @@
Name: cyrus-imapd
BuildRequires: cyrus-sasl-devel db-devel drac ed krb5-devel openslp-devel openssl-devel opie tcpd-devel
-URL: http://cyrusimap.web.cmu.edu/
-License: BSD License and BSD-like
+Url: http://cyrusimap.web.cmu.edu/
+License: BSD 3-Clause
Group: Productivity/Networking/Email/Servers
Requires: perl-Cyrus-IMAP perl-Cyrus-SIEVE-managesieve
Conflicts: imap courier-imap
-Autoreqprov: on
+AutoReqProv: on
Summary: An IMAP and POP Mail Server
-Version: 2.3.8
-Release: 19
+Version: 2.3.10
+Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: cyrus-imapd-rc.tar.gz
-Patch1: cyrus-imapd-2.3.8-autocreate-0.10-0.diff
+Patch1: cyrus-imapd-2.3.9-autocreate-0.10-0.diff
Patch2: authid_normalize.patch
-Patch3: allow_auth_plain_proxying.patch
Patch4: luser_relay.patch
Patch5: cyrus-imapd-perl.patch
-Patch7: cyrus-imapd-2.1.12-stdarg.patch
Patch8: tail-1-fix.patch
Patch10: cyrus-imapd-openslp.patch
Patch12: pie.patch
Patch14: impl_decl.patch
Patch15: cyrus-imapd-strip.patch
-Patch16: gcc-warnings.patch
-Patch17: cyrus-imapd-bdb45.patch
Patch18: cyrus-imapd-perl-path.patch
-Prereq: /usr/sbin/useradd %insserv_prereq %fillup_prereq /bin/sed /bin/awk /bin/grep /bin/cat /usr/bin/find /usr/bin/db_verify sh-utils fileutils cyrus-sasl netcfg /usr/bin/strings
+PreReq: /usr/sbin/useradd /usr/sbin/usermod %insserv_prereq %fillup_prereq /bin/sed /bin/awk /bin/grep /bin/cat /usr/bin/find /usr/bin/db_verify sh-utils fileutils cyrus-sasl netcfg /usr/bin/strings
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
%package -n perl-Cyrus-IMAP
Summary: Cyrus IMAP Perl Module
Requires: perl = %{perl_version}
-Autoreqprov: on
+AutoReqProv: on
Group: Development/Libraries/Perl
+
%package -n perl-Cyrus-SIEVE-managesieve
Summary: A Perl Module for Cyrus SIEVE
Requires: perl = %{perl_version}
-Autoreqprov: on
+AutoReqProv: on
Group: Development/Libraries/Perl
+
%package -n cyrus-imapd-devel
Summary: Libraries and Includes for Cyrus IMAPd
-Autoreqprov: on
+AutoReqProv: on
Group: Development/Libraries/C and C++
%description
@@ -63,7 +62,6 @@
--------
Office of Technology Transfer Carnegie Mellon University <tech-transfer(a)andrew.cmu.edu>
-
%description -n perl-Cyrus-IMAP
A Cyrus IMAP Perl module for the Cyrus IMAPD.
@@ -73,7 +71,6 @@
--------
Office of Technology Transfer Carnegie Mellon University <tech-transfer(a)andrew.cmu.edu>
-
%description -n perl-Cyrus-SIEVE-managesieve
A Perl module for Cyrus SIEVE.
@@ -83,7 +80,6 @@
--------
Office of Technology Transfer Carnegie Mellon University <tech-transfer(a)andrew.cmu.edu>
-
%description -n cyrus-imapd-devel
This package provides the libraries and include files for Cyrus IMAPd.
@@ -99,17 +95,13 @@
patch -s -p0 < contrib/drac_auth.patch
%patch1 -p1
%patch2
-%patch3
%patch4
%patch5
-%patch7
%patch8
%patch10
%patch12 -p1
%patch14 -p1
%patch15
-%patch16 -p1
-%patch17
%patch18
%build
@@ -153,15 +145,12 @@
make
%install
-rm -rf $RPM_BUILD_ROOT
/usr/sbin/useradd -r -o -g mail -u %{cyrus_uid} -s /bin/bash -c "User for cyrus-imapd" -d /usr/lib/cyrus cyrus 2> /dev/null || :
mkdir -p $RPM_BUILD_ROOT/etc/init.d
-%if %suse_version > 920
mkdir -p $RPM_BUILD_ROOT/etc/pam.d
install -m 644 SuSE/imap $RPM_BUILD_ROOT/etc/pam.d/imap
install -m 644 SuSE/pop $RPM_BUILD_ROOT/etc/pam.d/pop
install -m 644 SuSE/sieve $RPM_BUILD_ROOT/etc/pam.d/sieve
-%endif
mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
mkdir -p $RPM_BUILD_ROOT/sbin
mkdir -p $RPM_BUILD_ROOT/var/adm
@@ -171,6 +160,7 @@
rm -f tools/config2*
rm -rf tools/CVS
rm -rf contrib
+chmod 644 doc/internal/*.html
mkdir -p $RPM_BUILD_ROOT/usr/lib/cyrus/tools/
install -m 755 tools/* $RPM_BUILD_ROOT/usr/lib/cyrus/tools/
#*****************************************************************************
@@ -234,28 +224,11 @@
%pre
/usr/sbin/useradd -r -o -g mail -u %{cyrus_uid} -s /bin/bash -c "User for cyrus-imapd" -d /usr/lib/cyrus cyrus 2> /dev/null || :
/usr/sbin/usermod -d /usr/lib/cyrus cyrus || :
-%if %suse_version > 920
-if [ ${1:-0} -gt 1 ] && [ -f usr/lib/cyrus/bin/imapd ] &&
- /usr/bin/strings usr/lib/cyrus/bin/imapd | \
- grep "^Sleepycat Software: Berkeley DB 4\.2\." 2>&1 > /dev/null;
-then
- if [ "$(echo var/lib/imap/db/*)" != "var/lib/imap/db/*" ]; then
- touch var/lib/imap/BDB_UPDATE_NEEDED
- fi
-fi
-%endif
%preun
%stop_on_removal cyrus
%post
-%if %suse_version > 920
-if [ -f var/lib/imap/BDB_UPDATE_NEEDED ] ; then
- echo "Removing old incompatible bdb4.2 data /var/lib/imap/db"
- rm -f var/lib/imap/db/*
- rm -f var/lib/imap/BDB_UPDATE_NEEDED
-fi
-%endif
test -e var/lib/imap/mailboxes.db && {
db_verify var/lib/imap/mailboxes.db 2> /dev/null && {
echo "Converting mailboxes.db to skiplist backend"
@@ -318,9 +291,7 @@
%files
%defattr(-,root,root)
-%if %suse_version > 920
%config /etc/pam.d/*
-%endif
%config /etc/cron.daily/suse.de-cyrus-imapd
%config(noreplace) /etc/imapd.conf
%config(noreplace) /etc/cyrus.conf
@@ -373,8 +344,35 @@
%{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve
/var/adm/perl-modules/perl-Cyrus-SIEVE-managesieve
%doc %{_mandir}/man3/Cyrus::SIEVE::managesieve.3pm.gz
-
%changelog
+* Tue Oct 30 2007 - rhafer(a)suse.de
+- update to 2.3.10. Most imporant changes:
+ * Added support for "delayed" delete, in which mailboxes are renamed
+ to a special admin-only "deleted" hierarchy at the time of the
+ DELETE (hiding them from the client), rather than immediately
+ removing them from the filesystem.
+ * Fixed the special case of RENAMEing an Inbox, so that it doesn't
+ keep the same mailbox uniqueid, thus allowing it to replicate
+ properly (seen state is still preserved).
+ * Disabled Nagle's algorithm in sync_client and sync_server to
+ increase the throughput of the replication protocol. -- courtesy of
+ Wes Craig.
+ * Added support for a shared \Seen flag on messages (must be enabled
+ on a per-mailbox basis with the /vendor/cmu/cyrus-imapd/sharedseen
+ mailbox annotation.
+ * Added -u and -U options to reconstruct -- courtesy of David Carter.
+ * Added SETUIDVALIDITY command to the replication protocol --
+ courtesy of David Carter.
+ * Changed message GUIDs used by replication to be the SHA1 hash of
+ the messages -- based on work of David Carter and Fastmail.fm.
+ * Improve the performance of commands that operate on sequence-sets.
+ The sequence-set is now parsed only once, and the commands operate
+ on a sorted list of seq-ranges.
+ * Added new cyr_synclog utility for adding events to the replication
+ log -- courtesy of Fastmail.fm.
+ * Added support for disabling duplicate delivery suppression on a
+ per-folder basis with the /vendor/cmu/cyrus-imapd/duplicatedeliver
+ mailbox annotation -- courtesy of Fastmail.fm.
* Wed May 23 2007 - rhafer(a)suse.de
- enabled replication feature (Bug #264293)
- Fixed rpmlint errors
++++++ cyrus-imapd-2.3.8.tar.bz2 -> cyrus-imapd-2.3.10.tar.bz2 ++++++
++++ 35057 lines of diff (skipped)
++++++ cyrus-imapd-2.3.8-autocreate-0.10-0.diff -> cyrus-imapd-2.3.9-autocreate-0.10-0.diff ++++++
--- cyrus-imapd/cyrus-imapd-2.3.8-autocreate-0.10-0.diff 2007-02-21 18:15:13.000000000 +0100
+++ /mounts/work_src_done/STABLE/cyrus-imapd/cyrus-imapd-2.3.9-autocreate-0.10-0.diff 2007-10-30 11:23:26.000000000 +0100
@@ -1,6 +1,7 @@
-diff -Naur cyrus-imapd-2.3.8/README.autocreate cyrus-imapd-2.3.8-autocreate.uncompiled/README.autocreate
---- cyrus-imapd-2.3.8/README.autocreate 1970-01-01 02:00:00.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/README.autocreate 2007-02-13 14:05:07.000000000 +0200
+Index: cyrus-imapd-2.3.10/README.autocreate
+===================================================================
+--- /dev/null
++++ cyrus-imapd-2.3.10/README.autocreate
@@ -0,0 +1,211 @@
+Cyrus IMAP autocreate Inbox patch
+----------------------------------
@@ -213,28 +214,20 @@
+
+For more information and updates please visit http://email.uoa.gr/projects/cyrus/autocreate
+
-diff -Naur cyrus-imapd-2.3.8/imap/Makefile.in cyrus-imapd-2.3.8-autocreate.uncompiled/imap/Makefile.in
---- cyrus-imapd-2.3.8/imap/Makefile.in 2007-01-09 19:41:35.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/imap/Makefile.in 2007-02-14 10:16:04.000000000 +0200
-@@ -101,7 +101,7 @@
+Index: cyrus-imapd-2.3.10/imap/Makefile.in
+===================================================================
+--- cyrus-imapd-2.3.10.orig/imap/Makefile.in
++++ cyrus-imapd-2.3.10/imap/Makefile.in
+@@ -102,7 +102,7 @@ LOBJS= append.o mailbox.o mboxlist.o mup
convert_code.o duplicate.o saslclient.o saslserver.o signals.o \
annotate.o search_engines.o squat.o squat_internal.o mbdump.o \
imapparse.o telemetry.o user.o notify.o protocol.o idle.o quota_db.o \
-- sync_log.o $(SEEN) mboxkey.o backend.o tls.o
-+ sync_log.o autosieve.o $(SEEN) mboxkey.o backend.o tls.o
+- sync_log.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o
++ sync_log.o autosieve.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o
IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o version.o
-@@ -117,7 +117,7 @@
- fud smmapd reconstruct quota mbpath ipurge cyr_dbtool \
- cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \
- ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \
-- unexpunge @IMAP_PROGS@
-+ unexpunge compile_sieve @IMAP_PROGS@
-
- BUILTSOURCES = imap_err.c imap_err.h pushstats.c pushstats.h \
- lmtpstats.c lmtpstats.h xversion.h mupdate_err.c mupdate_err.h \
-@@ -183,9 +183,9 @@
+@@ -183,9 +183,9 @@ mupdate_err.c: mupdate_err.et
mupdate_err.h: mupdate_err.c
### Services
@@ -246,12 +239,12 @@
lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
-@@ -199,151 +199,156 @@
+@@ -199,158 +199,162 @@ lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS)
$(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
--imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
-+imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
+-imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
++imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o imapd \
$(SERVICE) $(IMAPDOBJS) mutex_fake.o \
- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
@@ -268,8 +261,8 @@
+imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
$(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
$(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
-- $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) $(DRAC_LIBS)
-+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) $(DRAC_LIBS)
+- $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
++ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
- libimap.a $(DEPLIBS)
@@ -290,7 +283,7 @@
pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
- $(DEPLIBS) $(SERVICE)
-+ $(DEPLIBS) $(SIEVE_LIBS) $(SERVICE)
++ $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \
- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
+ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
@@ -337,6 +330,12 @@
- libimap.a $(DEPLIBS) $(LIBS)
+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
+-cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS)
++cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS)
+ $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \
+- libimap.a $(DEPLIBS) $(LIBS)
++ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
+
-cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS)
+cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS)
$(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
@@ -444,6 +443,11 @@
+make_md5: make_md5.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS)
+ $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
+-make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
++make_sha1: make_sha1.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS)
++ $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
+
sync_client: sync_client.o sync_support.o \
- backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS)
+ backend.o tls.o imapparse.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS)
@@ -463,13 +467,13 @@
+compile_sieve: compile_sieve.o libimap.a $(DEPLIBS) $(SIEVE_LIBS)
+ $(CC) $(LDFLAGS) -o compile_sieve compile_sieve.o $(CLIOBJS) \
+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-+
### Other Misc Targets
-diff -Naur cyrus-imapd-2.3.8/imap/autosieve.c cyrus-imapd-2.3.8-autocreate.uncompiled/imap/autosieve.c
---- cyrus-imapd-2.3.8/imap/autosieve.c 1970-01-01 02:00:00.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/imap/autosieve.c 2007-02-13 14:05:07.000000000 +0200
+Index: cyrus-imapd-2.3.10/imap/autosieve.c
+===================================================================
+--- /dev/null
++++ cyrus-imapd-2.3.10/imap/autosieve.c
@@ -0,0 +1,587 @@
+#include <stdio.h>
+#include <stdlib.h>
@@ -564,13 +568,13 @@
+ /* Find the dir path where the sieve scripts of the user will reside */
+ if (config_virtdomains && domain) {
+ if(snprintf(sieve_script_dir, buflen, "%s%s%c/%s/%c/%s/",
-+ sieve_dir, FNAME_DOMAINDIR, dir_hash_c(domain), domain, dir_hash_c(user), user) >= buflen) {
++ sieve_dir, FNAME_DOMAINDIR, dir_hash_c(domain, config_fulldirhash), domain, dir_hash_c(user,config_fulldirhash), user) >= buflen) {
+ free(user);
+ return 1;
+ }
+ } else {
+ if(snprintf(sieve_script_dir, buflen, "%s/%c/%s/",
-+ sieve_dir, dir_hash_c(user), user) >= buflen)
++ sieve_dir, dir_hash_c(user,config_fulldirhash), user) >= buflen)
+ return 1;
+ }
+
@@ -1058,9 +1062,10 @@
+ * Pavlos. Author of cyrusmaster. So consider this patch as his birthday present
+ */
+
-diff -Naur cyrus-imapd-2.3.8/imap/compile_sieve.c cyrus-imapd-2.3.8-autocreate.uncompiled/imap/compile_sieve.c
---- cyrus-imapd-2.3.8/imap/compile_sieve.c 1970-01-01 02:00:00.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/imap/compile_sieve.c 2007-02-13 14:05:07.000000000 +0200
+Index: cyrus-imapd-2.3.10/imap/compile_sieve.c
+===================================================================
+--- /dev/null
++++ cyrus-imapd-2.3.10/imap/compile_sieve.c
@@ -0,0 +1,364 @@
+/* This tool compiles the sieve script from a command
+line so that it can be used wby the autoadd patch */
@@ -1426,10 +1431,11 @@
+
+
+
-diff -Naur cyrus-imapd-2.3.8/imap/imapd.c cyrus-imapd-2.3.8-autocreate.uncompiled/imap/imapd.c
---- cyrus-imapd-2.3.8/imap/imapd.c 2007-02-05 20:49:55.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/imap/imapd.c 2007-02-13 14:05:07.000000000 +0200
-@@ -204,6 +204,7 @@
+Index: cyrus-imapd-2.3.10/imap/imapd.c
+===================================================================
+--- cyrus-imapd-2.3.10.orig/imap/imapd.c
++++ cyrus-imapd-2.3.10/imap/imapd.c
+@@ -216,6 +216,7 @@ static const int max_monthdays[] = {
void motd_file(int fd);
void shut_down(int code);
void fatal(const char *s, int code);
@@ -1437,7 +1443,7 @@
void cmdloop(void);
void cmd_login(char *tag, char *user);
-@@ -1909,6 +1910,43 @@
+@@ -1985,6 +1986,43 @@ void cmdloop()
}
/*
@@ -1481,7 +1487,7 @@
* Perform a LOGIN command
*/
void cmd_login(char *tag, char *user)
-@@ -2077,6 +2115,9 @@
+@@ -2157,6 +2195,9 @@ void cmd_login(char *tag, char *user)
strcspn(imapd_userid, "@") : 0);
freebuf(&passwdbuf);
@@ -1491,7 +1497,7 @@
return;
}
-@@ -2233,6 +2274,8 @@
+@@ -2320,6 +2361,8 @@ cmd_authenticate(char *tag, char *authty
config_virtdomains ?
strcspn(imapd_userid, "@") : 0);
@@ -1500,10 +1506,11 @@
return;
}
-diff -Naur cyrus-imapd-2.3.8/imap/lmtpd.c cyrus-imapd-2.3.8-autocreate.uncompiled/imap/lmtpd.c
---- cyrus-imapd-2.3.8/imap/lmtpd.c 2007-02-05 20:41:47.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/imap/lmtpd.c 2007-02-13 14:05:07.000000000 +0200
-@@ -117,6 +117,8 @@
+Index: cyrus-imapd-2.3.10/imap/lmtpd.c
+===================================================================
+--- cyrus-imapd-2.3.10.orig/imap/lmtpd.c
++++ cyrus-imapd-2.3.10/imap/lmtpd.c
+@@ -117,6 +117,8 @@ void shut_down(int code);
static FILE *spoolfile(message_data_t *msgdata);
static void removespool(message_data_t *msgdata);
@@ -1512,7 +1519,7 @@
/* current namespace */
static struct namespace lmtpd_namespace;
-@@ -949,6 +951,86 @@
+@@ -956,6 +958,86 @@ void shut_down(int code)
exit(code);
}
@@ -1599,7 +1606,7 @@
static int verify_user(const char *user, const char *domain, char *mailbox,
long quotacheck, struct auth_state *authstate)
{
-@@ -992,6 +1074,15 @@
+@@ -999,6 +1081,15 @@ static int verify_user(const char *user,
*/
r = mlookup(namebuf, &server, &acl, NULL);
@@ -1615,7 +1622,7 @@
if (r == IMAP_MAILBOX_NONEXISTENT && !user &&
config_getswitch(IMAPOPT_LMTP_FUZZY_MAILBOX_MATCH) &&
/* see if we have a mailbox whose name is close */
-@@ -1018,6 +1109,7 @@
+@@ -1025,6 +1116,7 @@ static int verify_user(const char *user,
aclcheck, (quotacheck < 0)
|| config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA) ?
quotacheck : 0);
@@ -1623,12 +1630,13 @@
}
}
-diff -Naur cyrus-imapd-2.3.8/imap/mboxlist.c cyrus-imapd-2.3.8-autocreate.uncompiled/imap/mboxlist.c
---- cyrus-imapd-2.3.8/imap/mboxlist.c 2007-02-05 20:41:47.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/imap/mboxlist.c 2007-02-13 14:05:07.000000000 +0200
-@@ -83,6 +83,12 @@
- #include "mboxlist.h"
+Index: cyrus-imapd-2.3.10/imap/mboxlist.c
+===================================================================
+--- cyrus-imapd-2.3.10.orig/imap/mboxlist.c
++++ cyrus-imapd-2.3.10/imap/mboxlist.c
+@@ -84,6 +84,12 @@
#include "quota.h"
+ #include "sync_log.h"
+#ifdef USE_SIEVE
+extern int autoadd_sieve(char *userid,
@@ -1639,7 +1647,7 @@
#define DB config_mboxlist_db
#define SUBDB config_subscription_db
-@@ -100,11 +106,29 @@
+@@ -101,11 +107,29 @@ static int mboxlist_rmquota(const char *
static int mboxlist_changequota(const char *name, int matchlen, int maycreate,
void *rock);
@@ -1669,9 +1677,9 @@
#define FNAME_SUBSSUFFIX ".sub"
/*
-@@ -3261,3 +3285,349 @@
-
- return DB->abort(mbdb, tid);
+@@ -3399,3 +3423,349 @@ int mboxlist_in_deletedhierarchy(const c
+ return ((!strncmp(mailboxname + domainlen, deletedprefix, deletedprefix_len) &&
+ mailboxname[domainlen + deletedprefix_len] == '.') ? 1 : 0);
}
+
+/*
@@ -2019,10 +2027,11 @@
+ return r;
+}
+
-diff -Naur cyrus-imapd-2.3.8/imap/mboxlist.h cyrus-imapd-2.3.8-autocreate.uncompiled/imap/mboxlist.h
---- cyrus-imapd-2.3.8/imap/mboxlist.h 2006-11-30 19:11:19.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/imap/mboxlist.h 2007-02-13 14:05:07.000000000 +0200
-@@ -204,4 +204,10 @@
+Index: cyrus-imapd-2.3.10/imap/mboxlist.h
+===================================================================
+--- cyrus-imapd-2.3.10.orig/imap/mboxlist.h
++++ cyrus-imapd-2.3.10/imap/mboxlist.h
+@@ -210,6 +210,10 @@ void mboxlist_done(void);
int mboxlist_commit(struct txn *tid);
int mboxlist_abort(struct txn *tid);
@@ -2030,13 +2039,14 @@
+ char *userid,
+ struct auth_state *auth_state,
+ char *mailboxname, int autocreatequota);
-+
-+
+ int mboxlist_delayed_delete_isenabled(void);
+ int mboxlist_in_deletedhierarchy(const char *mailboxname);
#endif
-diff -Naur cyrus-imapd-2.3.8/imap/pop3d.c cyrus-imapd-2.3.8-autocreate.uncompiled/imap/pop3d.c
---- cyrus-imapd-2.3.8/imap/pop3d.c 2007-02-05 20:41:48.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/imap/pop3d.c 2007-02-13 14:05:07.000000000 +0200
-@@ -158,6 +158,8 @@
+Index: cyrus-imapd-2.3.10/imap/pop3d.c
+===================================================================
+--- cyrus-imapd-2.3.10.orig/imap/pop3d.c
++++ cyrus-imapd-2.3.10/imap/pop3d.c
+@@ -163,6 +163,8 @@ static void bitpipe(void);
static char popd_apop_chal[45 + MAXHOSTNAMELEN + 1]; /* <rand.time@hostname> */
static void cmd_apop(char *response);
@@ -2045,7 +2055,7 @@
static void cmd_auth(char *arg);
static void cmd_capa(void);
static void cmd_pass(char *pass);
-@@ -1226,6 +1228,7 @@
+@@ -1235,6 +1237,7 @@ void cmd_user(char *user)
popd_userid = xstrdup(userbuf);
prot_printf(popd_out, "+OK Name is a valid mailbox\r\n");
}
@@ -2053,7 +2063,7 @@
}
void cmd_pass(char *pass)
-@@ -1500,6 +1503,43 @@
+@@ -1533,6 +1536,43 @@ void cmd_auth(char *arg)
}
/*
@@ -2097,7 +2107,7 @@
* Complete the login process by opening and locking the user's inbox
*/
int openinbox(void)
-@@ -1528,6 +1568,12 @@
+@@ -1561,6 +1601,12 @@ int openinbox(void)
if (!r) r = mboxlist_detail(inboxname, &type, NULL, NULL,
&server, &acl, NULL);
@@ -2110,10 +2120,11 @@
if (!r && (config_popuseacl = config_getswitch(IMAPOPT_POPUSEACL)) &&
(!acl ||
!((myrights = cyrus_acl_myrights(popd_authstate, acl)) & ACL_READ))) {
-diff -Naur cyrus-imapd-2.3.8/lib/auth.c cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth.c
---- cyrus-imapd-2.3.8/lib/auth.c 2006-11-30 19:11:22.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth.c 2007-02-13 14:05:07.000000000 +0200
-@@ -117,3 +117,11 @@
+Index: cyrus-imapd-2.3.10/lib/auth.c
+===================================================================
+--- cyrus-imapd-2.3.10.orig/lib/auth.c
++++ cyrus-imapd-2.3.10/lib/auth.c
+@@ -117,3 +117,11 @@ struct auth_state *auth_state;
auth->freestate(auth_state);
}
@@ -2125,10 +2136,11 @@
+ return auth->auth_canonuser(auth_state);
+}
+
-diff -Naur cyrus-imapd-2.3.8/lib/auth.h cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth.h
---- cyrus-imapd-2.3.8/lib/auth.h 2006-11-30 19:11:22.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth.h 2007-02-13 14:05:07.000000000 +0200
-@@ -54,6 +54,7 @@
+Index: cyrus-imapd-2.3.10/lib/auth.h
+===================================================================
+--- cyrus-imapd-2.3.10.orig/lib/auth.h
++++ cyrus-imapd-2.3.10/lib/auth.h
+@@ -54,6 +54,7 @@ struct auth_mech {
const char *identifier);
struct auth_state *(*newstate)(const char *identifier);
void (*freestate)(struct auth_state *auth_state);
@@ -2136,17 +2148,18 @@
};
extern struct auth_mech *auth_mechs[];
-@@ -76,5 +77,6 @@
+@@ -76,5 +77,6 @@ int auth_memberof(struct auth_state *aut
const char *identifier);
struct auth_state *auth_newstate(const char *identifier);
void auth_freestate(struct auth_state *auth_state);
+char *auth_canonuser(struct auth_state *auth_state);
#endif /* INCLUDED_AUTH_H */
-diff -Naur cyrus-imapd-2.3.8/lib/auth_krb.c cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth_krb.c
---- cyrus-imapd-2.3.8/lib/auth_krb.c 2006-11-30 19:11:22.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth_krb.c 2007-02-13 14:05:07.000000000 +0200
-@@ -338,6 +338,15 @@
+Index: cyrus-imapd-2.3.10/lib/auth_krb.c
+===================================================================
+--- cyrus-imapd-2.3.10.orig/lib/auth_krb.c
++++ cyrus-imapd-2.3.10/lib/auth_krb.c
+@@ -338,6 +338,15 @@ struct auth_state *auth_state;
free((char *)auth_state);
}
@@ -2162,7 +2175,7 @@
#else /* HAVE_KRB */
static int mymemberof(
-@@ -366,6 +375,13 @@
+@@ -369,6 +378,13 @@ static void myfreestate(
fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG);
}
@@ -2176,16 +2189,17 @@
#endif
struct auth_mech auth_krb =
-@@ -376,4 +392,5 @@
+@@ -379,4 +395,5 @@ struct auth_mech auth_krb =
&mymemberof,
&mynewstate,
&myfreestate,
+ &mycanonuser,
};
-diff -Naur cyrus-imapd-2.3.8/lib/auth_krb5.c cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth_krb5.c
---- cyrus-imapd-2.3.8/lib/auth_krb5.c 2006-11-30 19:11:22.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth_krb5.c 2007-02-13 14:05:07.000000000 +0200
-@@ -197,6 +197,14 @@
+Index: cyrus-imapd-2.3.10/lib/auth_krb5.c
+===================================================================
+--- cyrus-imapd-2.3.10.orig/lib/auth_krb5.c
++++ cyrus-imapd-2.3.10/lib/auth_krb5.c
+@@ -197,6 +197,14 @@ static void myfreestate(struct auth_stat
free(auth_state);
}
@@ -2200,7 +2214,7 @@
#else /* HAVE_GSSAPI_H */
static int mymemberof(
-@@ -225,6 +233,12 @@
+@@ -228,6 +236,12 @@ static void myfreestate(
fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
}
@@ -2213,16 +2227,17 @@
#endif
struct auth_mech auth_krb5 =
-@@ -235,4 +249,5 @@
+@@ -238,4 +252,5 @@ struct auth_mech auth_krb5 =
&mymemberof,
&mynewstate,
&myfreestate,
+ &mycanonuser,
};
-diff -Naur cyrus-imapd-2.3.8/lib/auth_pts.c cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth_pts.c
---- cyrus-imapd-2.3.8/lib/auth_pts.c 2007-02-05 20:43:26.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth_pts.c 2007-02-13 14:05:07.000000000 +0200
-@@ -511,6 +511,14 @@
+Index: cyrus-imapd-2.3.10/lib/auth_pts.c
+===================================================================
+--- cyrus-imapd-2.3.10.orig/lib/auth_pts.c
++++ cyrus-imapd-2.3.10/lib/auth_pts.c
+@@ -511,6 +511,14 @@ static void myfreestate(struct auth_stat
free(auth_state);
}
@@ -2237,16 +2252,17 @@
struct auth_mech auth_pts =
{
"pts", /* name */
-@@ -519,4 +527,5 @@
+@@ -519,4 +527,5 @@ struct auth_mech auth_pts =
&mymemberof,
&mynewstate,
&myfreestate,
+ &mycanonuser,
};
-diff -Naur cyrus-imapd-2.3.8/lib/auth_unix.c cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth_unix.c
---- cyrus-imapd-2.3.8/lib/auth_unix.c 2006-11-30 19:11:22.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/lib/auth_unix.c 2007-02-13 14:05:07.000000000 +0200
-@@ -264,6 +264,16 @@
+Index: cyrus-imapd-2.3.10/lib/auth_unix.c
+===================================================================
+--- cyrus-imapd-2.3.10.orig/lib/auth_unix.c
++++ cyrus-imapd-2.3.10/lib/auth_unix.c
+@@ -317,6 +317,16 @@ struct auth_state *auth_state;
free((char *)auth_state);
}
@@ -2263,16 +2279,17 @@
struct auth_mech auth_unix =
{
-@@ -273,4 +283,5 @@
+@@ -326,4 +336,5 @@ struct auth_mech auth_unix =
&mymemberof,
&mynewstate,
&myfreestate,
+ &mycanonuser,
};
-diff -Naur cyrus-imapd-2.3.8/lib/imapoptions cyrus-imapd-2.3.8-autocreate.uncompiled/lib/imapoptions
---- cyrus-imapd-2.3.8/lib/imapoptions 2007-02-07 20:58:07.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/lib/imapoptions 2007-02-13 14:05:07.000000000 +0200
-@@ -177,6 +177,55 @@
+Index: cyrus-imapd-2.3.10/lib/imapoptions
+===================================================================
+--- cyrus-imapd-2.3.10.orig/lib/imapoptions
++++ cyrus-imapd-2.3.10/lib/imapoptions
+@@ -177,6 +177,55 @@ are listed with ``<none>''.
/* Number of seconds to wait before returning a timeout failure when
performing a client connection (e.g. in a murder environment) */
@@ -2328,10 +2345,11 @@
{ "configdirectory", NULL, STRING }
/* The pathname of the IMAP configuration directory. This field is
required. */
-diff -Naur cyrus-imapd-2.3.8/notifyd/Makefile.in cyrus-imapd-2.3.8-autocreate.uncompiled/notifyd/Makefile.in
---- cyrus-imapd-2.3.8/notifyd/Makefile.in 2006-11-30 19:11:23.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/notifyd/Makefile.in 2007-02-13 14:05:07.000000000 +0200
-@@ -69,10 +69,11 @@
+Index: cyrus-imapd-2.3.10/notifyd/Makefile.in
+===================================================================
+--- cyrus-imapd-2.3.10.orig/notifyd/Makefile.in
++++ cyrus-imapd-2.3.10/notifyd/Makefile.in
+@@ -69,10 +69,11 @@ NOTIFYD_LIBS = @NOTIFYD_LIBS@
SERVICE=../master/service.o
IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
@@ -2344,10 +2362,11 @@
PURIFY=/usr/local/bin/purify
PUREOPT=-best-effort
-diff -Naur cyrus-imapd-2.3.8/notifyd/notifyd.c cyrus-imapd-2.3.8-autocreate.uncompiled/notifyd/notifyd.c
---- cyrus-imapd-2.3.8/notifyd/notifyd.c 2006-11-30 19:11:23.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/notifyd/notifyd.c 2007-02-13 14:05:07.000000000 +0200
-@@ -97,7 +97,7 @@
+Index: cyrus-imapd-2.3.10/notifyd/notifyd.c
+===================================================================
+--- cyrus-imapd-2.3.10.orig/notifyd/notifyd.c
++++ cyrus-imapd-2.3.10/notifyd/notifyd.c
+@@ -97,7 +97,7 @@ char *fetch_arg(char *head, char* tail)
#define NOTIFY_MAXSIZE 8192
@@ -2356,10 +2375,11 @@
{
struct sockaddr_un sun_data;
socklen_t sunlen = sizeof(sun_data);
-diff -Naur cyrus-imapd-2.3.8/ptclient/Makefile.in cyrus-imapd-2.3.8-autocreate.uncompiled/ptclient/Makefile.in
---- cyrus-imapd-2.3.8/ptclient/Makefile.in 2006-11-30 19:11:24.000000000 +0200
-+++ cyrus-imapd-2.3.8-autocreate.uncompiled/ptclient/Makefile.in 2007-02-13 14:05:07.000000000 +0200
-@@ -57,10 +57,11 @@
+Index: cyrus-imapd-2.3.10/ptclient/Makefile.in
+===================================================================
+--- cyrus-imapd-2.3.10.orig/ptclient/Makefile.in
++++ cyrus-imapd-2.3.10/ptclient/Makefile.in
+@@ -57,10 +57,11 @@ CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(
AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@
AFS_LIBS = @AFS_LIBS@
IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
++++++ cyrus-imapd-rc.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSE/cron.daily.cyrus new/SuSE/cron.daily.cyrus
--- old/SuSE/cron.daily.cyrus 2003-05-05 09:55:30.000000000 +0200
+++ new/SuSE/cron.daily.cyrus 2007-10-30 11:23:58.000000000 +0100
@@ -1,3 +1,4 @@
+#!/bin/bash
#
# Copyright (c) 2003 SuSE Linux AG. Nuernberg, Germany.
#
++++++ impl_decl.patch ++++++
--- /var/tmp/diff_new_pack.L21562/_old 2007-10-31 01:09:51.000000000 +0100
+++ /var/tmp/diff_new_pack.L21562/_new 2007-10-31 01:09:51.000000000 +0100
@@ -1,7 +1,7 @@
-Index: cyrus-imapd-2.2.12/lib/auth_unix.c
+Index: cyrus-imapd-2.3.10/lib/auth_unix.c
===================================================================
---- cyrus-imapd-2.2.12.orig/lib/auth_unix.c
-+++ cyrus-imapd-2.2.12/lib/auth_unix.c
+--- cyrus-imapd-2.3.10.orig/lib/auth_unix.c
++++ cyrus-imapd-2.3.10/lib/auth_unix.c
@@ -48,6 +48,7 @@
#include <stdlib.h>
#include <pwd.h>
@@ -10,16 +10,60 @@
#include <ctype.h>
#include <string.h>
-Index: cyrus-imapd-2.2.12/perl/sieve/managesieve/managesieve.xs
+Index: cyrus-imapd-2.3.10/perl/sieve/managesieve/managesieve.xs
===================================================================
---- cyrus-imapd-2.2.12.orig/perl/sieve/managesieve/managesieve.xs
-+++ cyrus-imapd-2.2.12/perl/sieve/managesieve/managesieve.xs
-@@ -67,6 +67,8 @@ static char *globalerr = NULL;
-
- #include "xmalloc.h"
+--- cyrus-imapd-2.3.10.orig/perl/sieve/managesieve/managesieve.xs
++++ cyrus-imapd-2.3.10/perl/sieve/managesieve/managesieve.xs
+@@ -73,6 +73,8 @@ void fatal(const char *s, int t)
+ exit(-1);
+ }
+#include "util.h"
+
static int
- not_here(s)
- char *s;
+ perlsieve_getpass(conn, context, id, psecret)
+ sasl_conn_t *conn;
+Index: cyrus-imapd-2.3.10/imap/autosieve.c
+===================================================================
+--- cyrus-imapd-2.3.10.orig/imap/autosieve.c
++++ cyrus-imapd-2.3.10/imap/autosieve.c
+@@ -2,9 +2,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+-#endif
+
+ #include <errno.h>
+ #include <sys/types.h>
+@@ -22,6 +20,8 @@
+ #include "mailbox.h"
+ #include "imap_err.h"
+ #include "sieve_interface.h"
++#include "xstrlcpy.h"
++
+ #include "script.h"
+
+ #define TIMSIEVE_FAIL -1
+@@ -438,7 +438,7 @@ int autoadd_sieve(char *userid, const ch
+ return 0;
+ }
+
+-static void fatal(const char *s, int code)
++void fatal(const char *s, int code)
+ {
+ printf("Fatal error: %s (%d)\r\n", s, code);
+ exit(1);
+Index: cyrus-imapd-2.3.10/imap/index.c
+===================================================================
+--- cyrus-imapd-2.3.10.orig/imap/index.c
++++ cyrus-imapd-2.3.10/imap/index.c
+@@ -82,6 +82,7 @@
+
+ #include "index.h"
+ #include "sync_log.h"
++#include "message_guid.h"
+
+ extern void printastring (const char *s);
+
++++++ pie.patch ++++++
--- /var/tmp/diff_new_pack.L21562/_old 2007-10-31 01:09:51.000000000 +0100
+++ /var/tmp/diff_new_pack.L21562/_new 2007-10-31 01:09:51.000000000 +0100
@@ -1,7 +1,8 @@
-diff -urN cyrus-imapd-2.2.12/configure.in cyrus-imapd-2.2.12.pie/configure.in
---- cyrus-imapd-2.2.12/configure.in 2005-07-06 15:29:26.000000000 +0200
-+++ cyrus-imapd-2.2.12.pie/configure.in 2005-07-11 16:08:16.000000000 +0200
-@@ -1057,6 +1057,27 @@
+Index: cyrus-imapd-2.3.10/configure.in
+===================================================================
+--- cyrus-imapd-2.3.10.orig/configure.in
++++ cyrus-imapd-2.3.10/configure.in
+@@ -1093,6 +1093,27 @@ AC_SUBST(PERL_SUBDIRS)
AC_SUBST(PERL_DEPSUBDIRS)
AC_SUBST(PERL)
@@ -27,26 +28,13 @@
+AC_SUBST(PIE_LDFLAGS)
+
AH_TOP([
- /* $Id: configure.in,v 1.290 2005/01/18 23:46:00 shadow Exp $ */
+ /* $Id: configure.in,v 1.303 2007/10/18 18:14:47 murch Exp $ */
/*
-diff -urN cyrus-imapd-2.2.12/et/Makefile.in cyrus-imapd-2.2.12.pie/et/Makefile.in
---- cyrus-imapd-2.2.12/et/Makefile.in 2001-11-27 03:24:56.000000000 +0100
-+++ cyrus-imapd-2.2.12.pie/et/Makefile.in 2005-07-11 17:18:06.000000000 +0200
-@@ -55,8 +55,8 @@
- CPPFLAGS = @CPPFLAGS@
- LIBS = @LIBS@
-
--CFLAGS = @CFLAGS@
--LDFLAGS = @LDFLAGS@
-+CFLAGS = @CFLAGS@ @PIE_CFLAGS@
-+LDFLAGS = @LDFLAGS@ @PIE_LDFLAGS@
-
- SHELL = /bin/sh
-
-diff -urN cyrus-imapd-2.2.12/imap/Makefile.in cyrus-imapd-2.2.12.pie/imap/Makefile.in
---- cyrus-imapd-2.2.12/imap/Makefile.in 2005-07-06 15:28:54.000000000 +0200
-+++ cyrus-imapd-2.2.12.pie/imap/Makefile.in 2005-07-06 15:31:26.000000000 +0200
-@@ -73,8 +73,8 @@
+Index: cyrus-imapd-2.3.10/imap/Makefile.in
+===================================================================
+--- cyrus-imapd-2.3.10.orig/imap/Makefile.in
++++ cyrus-imapd-2.3.10/imap/Makefile.in
+@@ -70,8 +70,8 @@ DRAC_LIBS = @DRACLIBS@
LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
@@ -57,10 +45,11 @@
SHELL = /bin/sh
MAKEDEPEND = @MAKEDEPEND@
-diff -urN cyrus-imapd-2.2.12/lib/Makefile.in cyrus-imapd-2.2.12.pie/lib/Makefile.in
---- cyrus-imapd-2.2.12/lib/Makefile.in 2004-05-28 20:03:04.000000000 +0200
-+++ cyrus-imapd-2.2.12.pie/lib/Makefile.in 2005-07-11 17:22:22.000000000 +0200
-@@ -62,8 +62,8 @@
+Index: cyrus-imapd-2.3.10/lib/Makefile.in
+===================================================================
+--- cyrus-imapd-2.3.10.orig/lib/Makefile.in
++++ cyrus-imapd-2.3.10/lib/Makefile.in
+@@ -62,8 +62,8 @@ CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPF
LIBS = @LIBS@
MAKEDEPEND_CFLAGS = @CFLAGS@
@@ -71,10 +60,11 @@
SHELL = /bin/sh
MAKEDEPEND = @MAKEDEPEND@
-diff -urN cyrus-imapd-2.2.12/master/Makefile.in cyrus-imapd-2.2.12.pie/master/Makefile.in
---- cyrus-imapd-2.2.12/master/Makefile.in 2005-07-06 15:29:26.000000000 +0200
-+++ cyrus-imapd-2.2.12.pie/master/Makefile.in 2005-07-06 15:32:00.000000000 +0200
-@@ -57,8 +57,8 @@
+Index: cyrus-imapd-2.3.10/master/Makefile.in
+===================================================================
+--- cyrus-imapd-2.3.10.orig/master/Makefile.in
++++ cyrus-imapd-2.3.10/master/Makefile.in
+@@ -57,8 +57,8 @@ DEFS = @DEFS@ @LOCALDEFS@
CPPFLAGS = -I.. -I$(srcdir)/../lib -I$(srcdir)/../imap @CPPFLAGS@ @COM_ERR_CPPFLAGS@
DEPLIBS = @DEPLIBS@
@@ -85,10 +75,11 @@
LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@ @SLPLIBS@
SHELL = /bin/sh
-diff -urN cyrus-imapd-2.2.12/netnews/Makefile.in cyrus-imapd-2.2.12.pie/netnews/Makefile.in
---- cyrus-imapd-2.2.12/netnews/Makefile.in 2003-11-12 05:02:08.000000000 +0100
-+++ cyrus-imapd-2.2.12.pie/netnews/Makefile.in 2005-07-06 15:31:26.000000000 +0200
-@@ -53,8 +53,8 @@
+Index: cyrus-imapd-2.3.10/netnews/Makefile.in
+===================================================================
+--- cyrus-imapd-2.3.10.orig/netnews/Makefile.in
++++ cyrus-imapd-2.3.10/netnews/Makefile.in
+@@ -53,8 +53,8 @@ CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/
LIBS = @IMAP_LIBS@ @LIB_RT@
DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
@@ -99,10 +90,11 @@
SHELL = /bin/sh
MAKEDEPEND = @MAKEDEPEND@
-diff -urN cyrus-imapd-2.2.12/notifyd/Makefile.in cyrus-imapd-2.2.12.pie/notifyd/Makefile.in
---- cyrus-imapd-2.2.12/notifyd/Makefile.in 2004-05-28 20:03:06.000000000 +0200
-+++ cyrus-imapd-2.2.12.pie/notifyd/Makefile.in 2005-07-06 15:31:26.000000000 +0200
-@@ -54,8 +54,8 @@
+Index: cyrus-imapd-2.3.10/notifyd/Makefile.in
+===================================================================
+--- cyrus-imapd-2.3.10.orig/notifyd/Makefile.in
++++ cyrus-imapd-2.3.10/notifyd/Makefile.in
+@@ -54,8 +54,8 @@ CYRUS_GROUP=@cyrus_group@
DEFS = @DEFS@ @LOCALDEFS@
CPPFLAGS = -I.. -I$(srcdir)/../sieve -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
@@ -113,10 +105,11 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
-diff -urN cyrus-imapd-2.2.12/perl/sieve/lib/Makefile.in cyrus-imapd-2.2.12.pie/perl/sieve/lib/Makefile.in
---- cyrus-imapd-2.2.12/perl/sieve/lib/Makefile.in 2004-05-28 20:03:07.000000000 +0200
-+++ cyrus-imapd-2.2.12.pie/perl/sieve/lib/Makefile.in 2005-07-11 17:40:25.000000000 +0200
-@@ -57,7 +57,7 @@
+Index: cyrus-imapd-2.3.10/perl/sieve/lib/Makefile.in
+===================================================================
+--- cyrus-imapd-2.3.10.orig/perl/sieve/lib/Makefile.in
++++ cyrus-imapd-2.3.10/perl/sieve/lib/Makefile.in
+@@ -57,7 +57,7 @@ IMAP_LIBS = @IMAP_LIBS@
DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
MAKEDEPEND_CFLAGS = @CFLAGS@
@@ -125,11 +118,12 @@
LDFLAGS = @LDFLAGS@
SHELL = /bin/sh
-diff -urN cyrus-imapd-2.2.12/sieve/Makefile.in cyrus-imapd-2.2.12.pie/sieve/Makefile.in
---- cyrus-imapd-2.2.12/sieve/Makefile.in 2004-05-28 20:03:09.000000000 +0200
-+++ cyrus-imapd-2.2.12.pie/sieve/Makefile.in 2005-07-06 15:31:26.000000000 +0200
-@@ -40,8 +40,8 @@
- DEFS = @DEFS@
+Index: cyrus-imapd-2.3.10/sieve/Makefile.in
+===================================================================
+--- cyrus-imapd-2.3.10.orig/sieve/Makefile.in
++++ cyrus-imapd-2.3.10/sieve/Makefile.in
+@@ -41,8 +41,8 @@ COMPILE_ET = @COMPILE_ET@
+ DEFS = @DEFS@ @LOCALDEFS@
CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
MAKEDEPEND_CFLAGS = @CFLAGS@
-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
@@ -139,10 +133,11 @@
MAKEDEPEND = @MAKEDEPEND@
-diff -urN cyrus-imapd-2.2.12/syslog/Makefile.in cyrus-imapd-2.2.12.pie/syslog/Makefile.in
---- cyrus-imapd-2.2.12/syslog/Makefile.in 2000-05-23 22:56:48.000000000 +0200
-+++ cyrus-imapd-2.2.12.pie/syslog/Makefile.in 2005-07-06 15:31:26.000000000 +0200
-@@ -54,8 +54,8 @@
+Index: cyrus-imapd-2.3.10/syslog/Makefile.in
+===================================================================
+--- cyrus-imapd-2.3.10.orig/syslog/Makefile.in
++++ cyrus-imapd-2.3.10/syslog/Makefile.in
+@@ -54,8 +54,8 @@ DEFS = @DEFS@
CPPFLAGS = @CPPFLAGS@
LIBS = @LIBS@
@@ -153,10 +148,11 @@
SHELL = /bin/sh
MAKEDEPEND = @MAKEDEPEND@
-diff -urN cyrus-imapd-2.2.12/timsieved/Makefile.in cyrus-imapd-2.2.12.pie/timsieved/Makefile.in
---- cyrus-imapd-2.2.12/timsieved/Makefile.in 2004-05-28 20:03:10.000000000 +0200
-+++ cyrus-imapd-2.2.12.pie/timsieved/Makefile.in 2005-07-06 15:31:26.000000000 +0200
-@@ -54,8 +54,8 @@
+Index: cyrus-imapd-2.3.10/timsieved/Makefile.in
+===================================================================
+--- cyrus-imapd-2.3.10.orig/timsieved/Makefile.in
++++ cyrus-imapd-2.3.10/timsieved/Makefile.in
+@@ -54,8 +54,8 @@ CYRUS_GROUP=@cyrus_group@
DEFS = @DEFS@ @LOCALDEFS@
CPPFLAGS = -I.. -I$(srcdir)/../sieve -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
@@ -167,3 +163,18 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
+Index: cyrus-imapd-2.3.10/com_err/et/Makefile.in
+===================================================================
+--- cyrus-imapd-2.3.10.orig/com_err/et/Makefile.in
++++ cyrus-imapd-2.3.10/com_err/et/Makefile.in
+@@ -55,8 +55,8 @@ DEFS = @DEFS@
+ CPPFLAGS = @CPPFLAGS@
+ LIBS = @LIBS@
+
+-CFLAGS = @CFLAGS@
+-LDFLAGS = @LDFLAGS@
++CFLAGS = @CFLAGS@ @PIE_CFLAGS@
++LDFLAGS = @LDFLAGS@ @PIE_LDFLAGS@
+
+ SHELL = /bin/sh
+
++++++ tail-1-fix.patch ++++++
--- /var/tmp/diff_new_pack.L21562/_old 2007-10-31 01:09:51.000000000 +0100
+++ /var/tmp/diff_new_pack.L21562/_new 2007-10-31 01:09:51.000000000 +0100
@@ -1,8 +1,13 @@
---- imap/xversion.sh.orig 2003-04-07 13:09:34.000000000 +0200
-+++ imap/xversion.sh 2003-04-07 13:11:05.000000000 +0200
-@@ -22,4 +22,4 @@
+Index: imap/xversion.sh
+===================================================================
+--- imap/xversion.sh.orig
++++ imap/xversion.sh
+@@ -23,7 +23,7 @@ find .. -name '*.[chly]' -print | \
match ($0, pattern) {
printf "\"%s\"\n", substr($0, RSTART, RLENGTH)
}' pattern="$DATEPAT $TIMEPAT" | \
-- sort | tail -1 >> xversion.h
-+ sort | tail -n 1 >> xversion.h
+- sort | tail -1 >> $TMPF
++ sort | tail -n 1 >> $TMPF
+
+ if [ -f xversion.h ] && cmp -s $TMPF xversion.h
+ then
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package crash
checked in at Wed Oct 31 01:08:58 CET 2007.
--------
--- crash/crash.changes 2007-10-27 10:35:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/crash/crash.changes 2007-10-30 21:46:49.548232000 +0100
@@ -1,0 +2,26 @@
+Tue Oct 30 21:52:19 CET 2007 - bwalle(a)suse.de
+
+- update to crash 4.0-4.8
+ o support for kernels configured with CONFIG_SLUB
+ o SIAL interpreter extension module has been updated to support
+ the ia64, ppc64, s390 and s390x architectures.
+ o Fixed a bug in the CONFIG_SPARSEMEM patch
+ o Fixed the "mach" command in CONFIG_SLUB kernels
+ o Fix for missing NODE header
+ o Fix for the chronology of the contents of the kernel message
+ buffer output by the "log" command.
+ o Display a WARNING message if a PT_LOAD segment in an ELF-style
+ dumpfile advertises a memory segment that would go beyond the
+ end of the dumpfile.
+- set maximum number of CPUs to 4096 to sync with upstream
+ (dropping crash-ia64-increase-nr-cpu)
+- crash-fetch-registers-from-lkcd.patch, crash-check-filesize,
+ crash-sial-fix-ia64: dropped (now mainline)
+
+-------------------------------------------------------------------
+Tue Oct 30 14:32:05 CET 2007 - bwalle(a)suse.de
+
+- crash-fix-other-lkcd-versions: fix for
+ crash-fetch-registers-from-lkcd.patch for older LKCD versions
+
+-------------------------------------------------------------------
Old:
----
crash-4.0-4.7.tar.bz2
crash-check-filesize
crash-fetch-registers-from-lkcd.patch
crash-ia64-increase-nr-cpu
crash-sial-fix-ia64
New:
----
crash-4.0-4.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crash.spec ++++++
--- /var/tmp/diff_new_pack.a19255/_old 2007-10-31 01:08:03.000000000 +0100
+++ /var/tmp/diff_new_pack.a19255/_new 2007-10-31 01:08:03.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package crash (Version 4.0.4.7)
+# spec file for package crash (Version 4.0.4.8)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,15 +11,15 @@
# norootforbuild
Name: crash
-%ifarch %{x86} x86_64 ia64
-%define build_sial 1
-%else
+%ifarch ppc
%define build_sial 0
+%else
+%define build_sial 1
%endif
Url: http://people.redhat.com/anderson/
Summary: Crash utility for live systems; netdump, diskdump, LKCD or mcore dumpfiles
-Version: 4.0.4.7
-Release: 6
+Version: 4.0.4.8
+Release: 1
%define crash_version %(echo %{version} | cut -d . -f 1-2)
%define crash_subversion %(echo %{version} | cut -d . -f 3-4)
%define whitepaper_version 2003
@@ -33,13 +33,9 @@
Source99: rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch0: crash-make-emacs-default.diff
-Patch1: crash-fetch-registers-from-lkcd.patch
-Patch2: crash-lkcd-use-kernel-start-address.patch
-Patch3: crash-sles9-quirk.patch
-Patch4: crash-check-filesize
-Patch5: crash-sial-fix-ia64
-Patch6: crash-ia64-increase-nr-cpu
-Patch7: crash-search-also-in-lib-crash
+Patch1: crash-lkcd-use-kernel-start-address.patch
+Patch2: crash-sles9-quirk.patch
+Patch3: crash-search-also-in-lib-crash
BuildRequires: bison flex ncurses-devel zlib-devel
%description
@@ -98,10 +94,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
cp %{S:3} .
%build
@@ -156,6 +148,26 @@
%dir %{_libdir}/crash
%endif
%changelog
+* Tue Oct 30 2007 - bwalle(a)suse.de
+- update to crash 4.0-4.8
+ o support for kernels configured with CONFIG_SLUB
+ o SIAL interpreter extension module has been updated to support
+ the ia64, ppc64, s390 and s390x architectures.
+ o Fixed a bug in the CONFIG_SPARSEMEM patch
+ o Fixed the "mach" command in CONFIG_SLUB kernels
+ o Fix for missing NODE header
+ o Fix for the chronology of the contents of the kernel message
+ buffer output by the "log" command.
+ o Display a WARNING message if a PT_LOAD segment in an ELF-style
+ dumpfile advertises a memory segment that would go beyond the
+ end of the dumpfile.
+- set maximum number of CPUs to 4096 to sync with upstream
+ (dropping crash-ia64-increase-nr-cpu)
+- crash-fetch-registers-from-lkcd.patch, crash-check-filesize,
+ crash-sial-fix-ia64: dropped (now mainline)
+* Tue Oct 30 2007 - bwalle(a)suse.de
+- crash-fix-other-lkcd-versions: fix for
+ crash-fetch-registers-from-lkcd.patch for older LKCD versions
* Sat Oct 27 2007 - bwalle(a)suse.de
- move sial.so to /usr/lib{,64} (because of shared library policy)
- add /usr/lib{,64} to the search path for the "extend" command
++++++ crash-4.0-4.7.tar.bz2 -> crash-4.0-4.8.tar.bz2 ++++++
crash/crash-4.0-4.7.tar.bz2 /mounts/work_src_done/STABLE/crash/crash-4.0-4.8.tar.bz2 differ: byte 11, line 1
++++++ crash-lkcd-use-kernel-start-address.patch ++++++
--- /var/tmp/diff_new_pack.a19255/_old 2007-10-31 01:08:04.000000000 +0100
+++ /var/tmp/diff_new_pack.a19255/_new 2007-10-31 01:08:04.000000000 +0100
@@ -9,7 +9,7 @@
--- a/defs.h
+++ b/defs.h
-@@ -3841,6 +3841,7 @@ int fix_addr_v8(struct _dump_header_asm_
+@@ -3874,6 +3874,7 @@ int fix_addr_v8(struct _dump_header_asm_
int lkcd_dump_init_v8_arch(struct _dump_header_s *dh);
int fix_addr_v7(int);
int get_lkcd_regs_for_cpu_arch(int cpu, ulong *eip, ulong *esp);
@@ -17,14 +17,14 @@
/*
* lkcd_v8.c
-@@ -4111,6 +4112,7 @@ int lkcd_load_dump_page_header(void *, u
+@@ -4144,6 +4145,7 @@ int lkcd_load_dump_page_header(void *, u
void lkcd_dumpfile_complaint(uint32_t, uint32_t, int);
int set_mb_benchmark(ulong);
ulonglong fix_lkcd_address(ulonglong);
+int lkcd_get_kernel_start(ulong *addr);
+ int get_lkcd_regs_for_cpu(struct bt_info *bt, ulong *eip, ulong *esp);
/*
- * lkcd_v1.c
--- a/ia64.c
+++ b/ia64.c
@@ -3810,7 +3810,16 @@ ia64_calc_phys_start(void)
++++++ crash-search-also-in-lib-crash ++++++
--- /var/tmp/diff_new_pack.a19255/_old 2007-10-31 01:08:04.000000000 +0100
+++ /var/tmp/diff_new_pack.a19255/_new 2007-10-31 01:08:04.000000000 +0100
@@ -18,7 +18,7 @@
--- a/defs.h
+++ b/defs.h
-@@ -3208,6 +3208,7 @@ void dump_symbol_table(void);
+@@ -3241,6 +3241,7 @@ void dump_symbol_table(void);
void dump_struct_table(ulong);
void dump_offset_table(char *, ulong);
int is_elf_file(char *);
@@ -48,7 +48,7 @@
--- a/symbols.c
+++ b/symbols.c
-@@ -2495,6 +2495,28 @@ is_elf_file(char *s)
+@@ -2496,6 +2496,28 @@ is_elf_file(char *s)
return(is_bfd_format(s));
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package compiz
checked in at Wed Oct 31 01:07:41 CET 2007.
--------
--- compiz/compiz.changes 2007-09-06 19:48:02.000000000 +0200
+++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2007-10-30 18:33:38.165217000 +0100
@@ -1,0 +2,8 @@
+Tue Oct 30 18:32:10 CET 2007 - btimothy(a)suse.de
+
+- Fix gnome-xgl-info to parse the primary vga controller
+ properly when mulitple devices are outputted from
+ `hwinfo --gfxcard`. Also fixes leading zero problem
+ with device indexes. #335445
+
+-------------------------------------------------------------------
New:
----
gnome-xgl-settings-hwinfo-primary-display-bno335445.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.h15615/_old 2007-10-31 01:05:59.000000000 +0100
+++ /var/tmp/diff_new_pack.h15615/_new 2007-10-31 01:05:59.000000000 +0100
@@ -24,14 +24,14 @@
%if 0%{suse_version} >= 01020
BuildRequires: fuse-devel
%endif
-URL: http://www.go-compiz.org
-License: GPL v2 or later, LGPL v2 or later, Most of the code is MIT licensed, some code is instead licensed
+Url: http://www.go-compiz.org
+License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
Group: System/GUI/Other
PreReq: %fillup_prereq
Enhances: xgl >= git_070104
-Autoreqprov: on
+AutoReqProv: on
Version: 0.5.4
-Release: 12
+Release: 47
Requires: compiz-decorator = %{version}
Summary: OpenGL window and compositing manager.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -55,6 +55,8 @@
Patch33: gnome-xgl-settings-266157-driver-check.diff
Patch34: gnome-xgl-settings-0.9-compiz-0.5.4-update.diff
Patch35: gnome-xgl-settings-strict-aliasing.diff
+# PATCH-FIX-OPENSUSE gnome-xgl-settings-hwinfo-primary-display-bno335445.patch bnc335445
+Patch36: gnome-xgl-settings-hwinfo-primary-display-bno335445.patch
Patch60: Mesa-x86_64-fixes.diff
%if "%(xft-config --prefix)" == "/usr"
%define xorg_prefix %_prefix
@@ -68,7 +70,6 @@
%define gnome_etc /etc%gnome_prefix
%endif
%define kde_prefix %(kde-config --prefix)
-
%gconf_schemas_prereq
%description
@@ -89,7 +90,7 @@
Requires: gnome-desktop control-center2 xgl-hardware-list >= 060526 3ddiag freeglut pciutils %name = %version
Requires: metacity >= 2.15.1
Provides: compiz-decorator = %version
-Autoreqprov: on
+AutoReqProv: on
%description gnome
This package contains Gnome based configuration utilities for the
@@ -106,7 +107,7 @@
Group: System/GUI/KDE
Requires: kdebase3 %name = %version
Provides: compiz-decorator = %version
-Autoreqprov: on
+AutoReqProv: on
%description kde
This package contains the KDE window decorator for the Compiz
@@ -134,7 +135,7 @@
%if 0%{suse_version} >= 01020
Requires: fuse-devel
%endif
-Autoreqprov: on
+AutoReqProv: on
%description devel
Compiz is an OpenGL compositing manager that use
@@ -171,6 +172,7 @@
%patch33 -p1
%patch34
%patch35 -p1
+%patch36 -p1
sed -i -e "s@/opt/gnome/@%gnome_prefix/@g" ./xgl-settings/switch.c ./xgl-settings/gnome-xgl-switch
cd -
cd Mesa-*
@@ -249,11 +251,9 @@
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-
%posttrans -f %name.schemas_posttrans
%clean
-
%__rm -rf %{buildroot}
%files -f %name.schemas_list
@@ -330,8 +330,12 @@
%_libdir/compiz/libkconfig.so
%kde_prefix/share/config/compizrc
%kde_prefix/share/config.kcfg/compiz-*
-
%changelog
+* Tue Oct 30 2007 - btimothy(a)suse.de
+- Fix gnome-xgl-info to parse the primary vga controller
+ properly when mulitple devices are outputted from
+ `hwinfo --gfxcard`. Also fixes leading zero problem
+ with device indexes. #335445
* Thu Sep 06 2007 - dreveman(a)suse.de
- Fix plugin load crash in gnome-xgl-settings. #296701
* Mon Aug 27 2007 - cyberorg(a)cyberorg.info
++++++ gnome-xgl-settings-hwinfo-primary-display-bno335445.patch ++++++
On some systems, `hwinfo --gfxcard` outputs multiple devices that aren't
necessarily 0300 VGA compatible controllers. Without this patch, when
that happened, the array of variables being built would not pick up
the non-VGA items, so when the final "print" statement was called, some
of the variables were set to come from the wrong device.
Added "0*" to the regex also to remove any leading zeros in the device
number since the primary display of < 10 doesn't put a leading zero.
The following bug contains sample output from `hwinfo --gfxcard` where
the problem exists:
https://bugzilla.novell.com/show_bug.cgi?id=335445#c3
Index: gnome-xgl-settings-0.9/xgl-settings/gnome-xgl-info
===================================================================
--- gnome-xgl-settings-0.9.orig/xgl-settings/gnome-xgl-info
+++ gnome-xgl-settings-0.9/xgl-settings/gnome-xgl-info
@@ -20,7 +20,7 @@ xgl_opts=""
card_status=""
card_info=$(/usr/sbin/hwinfo --gfxcard | \
- awk '/0300 VGA compatible controller/ { dev = gensub(/^([^:]*):.*/, "\\1", "g"); } \
+ awk '/03[08]0 .* controller/ { dev = gensub(/^0*([^:]*):.*/, "\\1", "g"); } \
/^ Vendor:/ { vendor[dev] = gensub(/.*pci 0x(....).*/, "\\1", "g"); \
name[dev] = gensub(/^.* "(.*)"$/, "\\1", "g"); } \
/^ Device:/ { device[dev] = gensub(/.*pci 0x(....).*/, "\\1", "g"); \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package alsa
checked in at Wed Oct 31 01:05:51 CET 2007.
--------
--- alsa/alsa.changes 2007-10-29 09:23:27.000000000 +0100
+++ /mounts/work_src_done/STABLE/alsa/alsa.changes 2007-10-30 12:22:54.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Oct 30 14:32:59 CET 2007 - tiwai(a)suse.de
+
+- re-add assert.h to asoundlib.h since some packages got broken
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa.spec ++++++
--- /var/tmp/diff_new_pack.q14309/_old 2007-10-31 01:05:35.000000000 +0100
+++ /var/tmp/diff_new_pack.q14309/_new 2007-10-31 01:05:35.000000000 +0100
@@ -21,7 +21,7 @@
AutoReqProv: on
Summary: Advanced Linux Sound Architecture
Version: 1.0.15
-Release: 3
+Release: 5
Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
Source8: 40-alsa.rules
Source11: alsasound
@@ -248,6 +248,8 @@
%{_libdir}/alsa-lib
%{_datadir}/alsa
%changelog
+* Tue Oct 30 2007 - tiwai(a)suse.de
+- re-add assert.h to asoundlib.h since some packages got broken
* Mon Oct 29 2007 - tiwai(a)suse.de
- remove unneeded assert from public header files
- remove assert calls in debug routines
++++++ alsa-lib-hg-fixes.diff ++++++
--- /var/tmp/diff_new_pack.q14309/_old 2007-10-31 01:05:35.000000000 +0100
+++ /var/tmp/diff_new_pack.q14309/_new 2007-10-31 01:05:35.000000000 +0100
@@ -42,17 +42,6 @@
fi
dnl Temporary directory
-diff -r 9e2f117f24b9 include/asoundlib-head.h
---- a/include/asoundlib-head.h Mon Oct 15 10:36:46 2007 +0200
-+++ b/include/asoundlib-head.h Fri Oct 26 02:01:39 2007 +0200
-@@ -33,7 +33,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <fcntl.h>
--#include <assert.h>
- #include <endian.h>
- #include <sys/poll.h>
- #include <errno.h>
diff -r 9e2f117f24b9 include/control.h
--- a/include/control.h Mon Oct 15 10:36:46 2007 +0200
+++ b/include/control.h Fri Oct 26 02:01:39 2007 +0200
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-printer
checked in at Wed Oct 31 01:05:10 CET 2007.
--------
--- yast2-printer/yast2-printer.changes 2007-10-29 16:33:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2007-10-30 15:57:17.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Oct 30 15:55:17 CET 2007 - mzugec(a)suse.cz
+
+- let the user accept even non-compliant PPDs - (#310177)
+- 2.16.2
+
+-------------------------------------------------------------------
Old:
----
yast2-printer-2.16.1.tar.bz2
New:
----
yast2-printer-2.16.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.q11691/_old 2007-10-31 01:04:54.000000000 +0100
+++ /var/tmp/diff_new_pack.q11691/_new 2007-10-31 01:04:54.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-printer (Version 2.16.1)
+# spec file for package yast2-printer (Version 2.16.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-printer
-Version: 2.16.1
+Version: 2.16.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.16.1.tar.bz2
+Source0: yast2-printer-2.16.2.tar.bz2
Prefix: /usr
BuildRequires: blocxx-devel cups-devel cups-drivers cups-drivers-stp docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite zlib-devel
Requires: yast2 netcat zlib blocxx
@@ -29,12 +29,12 @@
Summary: YaST2 - Printer Configuration
%package devel-doc
-Version: 2.16.1
+Version: 2.16.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.16.1.tar.bz2
+Source0: yast2-printer-2.16.2.tar.bz2
Prefix: /usr
BuildRequires: cups-devel yast2-core-devel zlib-devel
Summary: YaST2 - Developer documentation for yast2-printer
@@ -51,7 +51,7 @@
%prep
-%setup -n yast2-printer-2.16.1
+%setup -n yast2-printer-2.16.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -130,6 +130,9 @@
%exclude %{prefix}/share/doc/packages/yast2-printer/COPYING
%exclude %{prefix}/share/doc/packages/yast2-printer/README
%changelog
+* Tue Oct 30 2007 - mzugec(a)suse.cz
+- let the user accept even non-compliant PPDs - (#310177)
+- 2.16.2
* Mon Oct 29 2007 - mzugec(a)suse.cz
- "unknown" queue appears in the installation - (#308107)
- use [Accept] instead of [Finish] during installation - (#308102)
++++++ yast2-printer-2.16.1.tar.bz2 -> yast2-printer-2.16.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.16.1/src/modules/Printerdb.ycp new/yast2-printer-2.16.2/src/modules/Printerdb.ycp
--- old/yast2-printer-2.16.1/src/modules/Printerdb.ycp 2007-10-29 10:01:58.000000000 +0100
+++ new/yast2-printer-2.16.2/src/modules/Printerdb.ycp 2007-10-30 15:56:08.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain <jsrain(a)suse.cz> 2002
*
- * $Id: Printerdb.ycp 37847 2007-05-07 11:05:14Z mzugec $
+ * $Id: Printerdb.ycp 41644 2007-10-30 14:56:08Z mzugec $
*
*/
@@ -764,20 +764,24 @@
term text = `VBox ();
if (log_text != "" && log_text != nil)
text = `RichText (`opt (`plainText), log_text);
- UI::OpenDialog(`opt ( `decorated ),
- `VBox (`HSpacing(75),
- // heading
- `Heading(_("Error: No Suitable PPD File Downloaded")),
- text,
- `PushButton( `id(`ok), `opt(`default),
- Label::OKButton ())
- )
- );
-
- UI::SetFocus(`id(`ok) );
- any r = UI::UserInput();
- UI::CloseDialog();
- return false;
+
+ UI::OpenDialog(`opt ( `decorated ),
+ `VBox (`HSpacing(75),
+ // heading
+ `Heading(_("Error: Detected Error in PPD File")),
+ text,
+ `HBox (
+ `PushButton( `id(`continue),
+ Label::ContinueButton ()),
+ `PushButton( `id(`cancel), `opt(`default),
+ Label::CancelButton ())
+ )
+ )
+ );
+ UI::SetFocus( `id(`cancel) );
+ any r = UI::UserInput();
+ UI::CloseDialog();
+ if (`cancel == r) return false;
}
integer count = tointeger (SCR::Read (.target.string, dir + "/count"));
if (count != nil)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.16.1/tools/process_ppd_files new/yast2-printer-2.16.2/tools/process_ppd_files
--- old/yast2-printer-2.16.1/tools/process_ppd_files 2007-10-29 10:01:59.000000000 +0100
+++ new/yast2-printer-2.16.2/tools/process_ppd_files 2007-10-30 15:35:05.000000000 +0100
@@ -13,7 +13,8 @@
#set -x
COPIED=0;
-EXIT=1;
+PASSED=0;
+EXIT=0;
LOG_OUT=$3;
@@ -65,14 +66,12 @@
#check files and copy them to the appropriate location
for I in `find -iname '*.ppd'` ; do
- echo "Checking file \"$I\"" >>$LOG_OUT; \
- /usr/bin/cupstestppd "$I" >>$LOG_OUT \
- && echo "file $I is ok" >>$LOG_OUT \
- && cp "$I" $TARGET_DIR \
- && COPIED=$(($COPIED+1)) \
- && EXIT=0 ;
+ echo "Checking file \"$I\"" >>$LOG_OUT
+ /usr/bin/cupstestppd "$I" >>$LOG_OUT && { echo "file $I is ok" >>$LOG_OUT ; PASSED=$(($PASSED+1)) ; } || EXIT=1
+ cp "$I" $TARGET_DIR && COPIED=$(($COPIED+1)) || EXIT=1
done
-echo "$COPIED files passed" >>$LOG_OUT;
+echo "$PASSED files passed" >>$LOG_OUT;
echo "$COPIED" >./count;
exit $EXIT;
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.16.1/VERSION new/yast2-printer-2.16.2/VERSION
--- old/yast2-printer-2.16.1/VERSION 2007-10-29 12:35:11.000000000 +0100
+++ new/yast2-printer-2.16.2/VERSION 2007-10-30 15:55:15.000000000 +0100
@@ -1 +1 @@
-2.16.1
+2.16.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-ncurses
checked in at Wed Oct 31 01:04:47 CET 2007.
--------
--- yast2-ncurses/yast2-ncurses.changes 2007-10-24 16:02:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2007-10-30 13:58:58.564837000 +0100
@@ -1,0 +2,7 @@
+Tue Oct 30 13:52:59 CET 2007 - kmachalkova(a)suse.cz
+
+- Explicitely set foreground (font) color to white for rxvt theme
+ (do not display black font on black background) (#336060)
+- 2.16.1
+
+-------------------------------------------------------------------
@@ -6 +13 @@
-- 2.16.0
+- 2.16.0
Old:
----
yast2-ncurses-2.16.0.tar.bz2
New:
----
yast2-ncurses-2.16.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ncurses.spec ++++++
--- /var/tmp/diff_new_pack.zC6860/_old 2007-10-31 01:01:42.000000000 +0100
+++ /var/tmp/diff_new_pack.zC6860/_new 2007-10-31 01:01:42.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ncurses (Version 2.16.0)
+# spec file for package yast2-ncurses (Version 2.16.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-ncurses
-Version: 2.16.0
+Version: 2.16.1
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ncurses-2.16.0.tar.bz2
+Source0: yast2-ncurses-2.16.1.tar.bz2
Prefix: /usr
BuildRequires: dejagnu doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools
BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel
@@ -44,7 +44,7 @@
%prep
-%setup -n yast2-ncurses-2.16.0
+%setup -n yast2-ncurses-2.16.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -79,6 +79,10 @@
/usr/share/YaST2/data/you_layout.ycp
%doc %{prefix}/share/doc/packages/yast2-ncurses
%changelog
+* Tue Oct 30 2007 - kmachalkova(a)suse.cz
+- Explicitely set foreground (font) color to white for rxvt theme
+ (do not display black font on black background) (#336060)
+- 2.16.1
* Tue Oct 23 2007 - kmachalkova(a)suse.cz
- Added missing includes to compile with gcc 4.3
- Removed sources of gcc 4.3 operator priority warnings
++++++ yast2-ncurses-2.16.0.tar.bz2 -> yast2-ncurses-2.16.1.tar.bz2 ++++++
++++ 4571 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.16.0/configure.in new/yast2-ncurses-2.16.1/configure.in
--- old/yast2-ncurses-2.16.0/configure.in 2007-07-19 13:11:11.000000000 +0200
+++ new/yast2-ncurses-2.16.1/configure.in 2007-10-29 12:40:36.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-ncurses
dnl
-dnl -- This file is generated by y2autoconf 2.15.1 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ncurses, 2.15.20, http://bugs.opensuse.org/, yast2-ncurses)
+AC_INIT(yast2-ncurses, 2.16.0, http://bugs.opensuse.org/, yast2-ncurses)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.20"
+VERSION="2.16.0"
RPMNAME="yast2-ncurses"
MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.16.0/Makefile.am new/yast2-ncurses-2.16.1/Makefile.am
--- old/yast2-ncurses-2.16.0/Makefile.am 2007-07-19 13:11:11.000000000 +0200
+++ new/yast2-ncurses-2.16.1/Makefile.am 2007-10-29 12:40:36.000000000 +0100
@@ -30,7 +30,7 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
@@ -210,8 +210,7 @@
# For po/ modules
checkpo:
- test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
-# test ! -d $(srcdir)/po \
-# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
+# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# Contents of ./SUBDIRS
SUBDIRS = src doc testsuite
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.16.0/src/NCstyle.rxvt.h new/yast2-ncurses-2.16.1/src/NCstyle.rxvt.h
--- old/yast2-ncurses-2.16.0/src/NCstyle.rxvt.h 2007-06-14 11:26:38.000000000 +0200
+++ new/yast2-ncurses-2.16.1/src/NCstyle.rxvt.h 2007-10-30 13:49:16.000000000 +0100
@@ -79,7 +79,11 @@
attrset->setAttr( NCstyle::ListActiveSelLabel, 7936 );
attrset->setAttr( NCstyle::ListActiveSelData, 7936|A_BOLD );
attrset->setAttr( NCstyle::ListActiveSelHint, 6144|A_BOLD );
- attrset->setAttr( NCstyle::RichTextPlain, 0 );
+ attrset->setAttr( NCstyle::RichTextPlain, 1792 );
+ //Need to set foreground color explicitely, otherwise urxvt will display
+ //black font on black background. This solution sucks, but cannot find
+ //any better (#336060)
+ attrset->setFg ( NCstyle::RichTextPlain, 7 );
attrset->setAttr( NCstyle::RichTextTitle, 512 );
attrset->setAttr( NCstyle::RichTextLink, 768 );
attrset->setAttr( NCstyle::RichTextArmedlink, 768|A_BOLD );
@@ -143,6 +147,7 @@
attrset->setAttr( NCstyle::ListActiveSelData, 0|A_BOLD );
attrset->setAttr( NCstyle::ListActiveSelHint, 0|A_BOLD );
attrset->setAttr( NCstyle::RichTextPlain, 0 );
+ attrset->setFg ( NCstyle::RichTextPlain, 7 );
attrset->setAttr( NCstyle::RichTextTitle, 15360|A_BOLD );
attrset->setAttr( NCstyle::RichTextLink, 768 );
attrset->setAttr( NCstyle::RichTextArmedlink, 768|A_BOLD );
@@ -206,6 +211,7 @@
attrset->setAttr( NCstyle::ListActiveSelData, 0|A_BOLD );
attrset->setAttr( NCstyle::ListActiveSelHint, 0|A_BOLD );
attrset->setAttr( NCstyle::RichTextPlain, 0 );
+ attrset->setFg ( NCstyle::RichTextPlain, 7 );
attrset->setAttr( NCstyle::RichTextTitle, 15360|A_BOLD );
attrset->setAttr( NCstyle::RichTextLink, 768 );
attrset->setAttr( NCstyle::RichTextArmedlink, 768|A_BOLD );
@@ -269,6 +275,7 @@
attrset->setAttr( NCstyle::ListActiveSelData, 1536|A_BOLD );
attrset->setAttr( NCstyle::ListActiveSelHint, 1536|A_BOLD );
attrset->setAttr( NCstyle::RichTextPlain, 0 );
+ attrset->setFg ( NCstyle::RichTextPlain, 7 );
attrset->setAttr( NCstyle::RichTextTitle, 15360|A_BOLD );
attrset->setAttr( NCstyle::RichTextLink, 768 );
attrset->setAttr( NCstyle::RichTextArmedlink, 768|A_BOLD );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.16.0/VERSION new/yast2-ncurses-2.16.1/VERSION
--- old/yast2-ncurses-2.16.0/VERSION 2007-10-23 15:36:20.000000000 +0200
+++ new/yast2-ncurses-2.16.1/VERSION 2007-10-30 13:56:11.000000000 +0100
@@ -1 +1 @@
-2.16.0
+2.16.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0