November 2010 - openSUSE Commits - openSUSE Mailing Lists

commit at-spi2-core for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package at-spi2-core for openSUSE:Factory checked in at Sat Nov 20 12:36:52 CET 2010. -------- --- GNOME/at-spi2-core/at-spi2-core.changes 2010-09-28 01:53:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/at-spi2-core/at-spi2-core.changes 2010-11-18 10:21:45.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 18 10:21:07 CET 2010 - vuntz(a)opensuse.org + +- Update to version 0.4.1: + + Have the desktop object return ROLE_DESKTOP_FRAME. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- at-spi2-core-0.4.0.tar.bz2 New: ---- at-spi2-core-0.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at-spi2-core.spec ++++++ --- /var/tmp/diff_new_pack.tkwvja/_old 2010-11-20 12:36:48.000000000 +0100 +++ /var/tmp/diff_new_pack.tkwvja/_new 2010-11-20 12:36:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package at-spi2-core (Version 0.4.0) +# spec file for package at-spi2-core (Version 0.4.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: at-spi2-core -Version: 0.4.0 +Version: 0.4.1 Release: 1 Summary: Assistive Technology Service Provider Interface - D-Bus based implementation License: GPLv2+ ++++++ at-spi2-core-0.4.0.tar.bz2 -> at-spi2-core-0.4.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.4.0/configure new/at-spi2-core-0.4.1/configure --- old/at-spi2-core-0.4.0/configure 2010-09-28 00:08:19.000000000 +0200 +++ new/at-spi2-core-0.4.1/configure 2010-11-16 00:27:08.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for at-spi2-core 0.4.0. +# Generated by GNU Autoconf 2.65 for at-spi2-core 0.4.1. # # Report bugs to <accessibility-atspi(a)lists.linux-foundation.org>. # @@ -701,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='at-spi2-core' PACKAGE_TARNAME='at-spi2-core' -PACKAGE_VERSION='0.4.0' -PACKAGE_STRING='at-spi2-core 0.4.0' +PACKAGE_VERSION='0.4.1' +PACKAGE_STRING='at-spi2-core 0.4.1' PACKAGE_BUGREPORT='accessibility-atspi(a)lists.linux-foundation.org' PACKAGE_URL='' @@ -1457,7 +1457,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 at-spi2-core 0.4.0 to adapt to many kinds of systems. +\`configure' configures at-spi2-core 0.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1531,7 +1531,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of at-spi2-core 0.4.0:";; + short | recursive ) echo "Configuration of at-spi2-core 0.4.1:";; esac cat <<\_ACEOF @@ -1649,7 +1649,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -at-spi2-core configure 0.4.0 +at-spi2-core configure 0.4.1 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2020,7 +2020,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by at-spi2-core $as_me 0.4.0, which was +It was created by at-spi2-core $as_me 0.4.1, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2848,7 +2848,7 @@ # Define the identity of the package. PACKAGE='at-spi2-core' - VERSION='0.4.0' + VERSION='0.4.1' cat >>confdefs.h <<_ACEOF @@ -12700,7 +12700,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by at-spi2-core $as_me 0.4.0, which was +This file was extended by at-spi2-core $as_me 0.4.1, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12766,7 +12766,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -at-spi2-core config.status 0.4.0 +at-spi2-core config.status 0.4.1 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.4.0/configure.ac new/at-spi2-core-0.4.1/configure.ac --- old/at-spi2-core-0.4.0/configure.ac 2010-09-28 00:08:02.000000000 +0200 +++ new/at-spi2-core-0.4.1/configure.ac 2010-11-16 00:25:25.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([at-spi2-core], [0.4.0], [accessibility-atspi(a)lists.linux-foundation.org]) +AC_INIT([at-spi2-core], [0.4.1], [accessibility-atspi(a)lists.linux-foundation.org]) AC_PREREQ([2.59]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.4.0/registryd/registry.c new/at-spi2-core-0.4.1/registryd/registry.c --- old/at-spi2-core-0.4.0/registryd/registry.c 2010-08-17 00:19:15.000000000 +0200 +++ new/at-spi2-core-0.4.1/registryd/registry.c 2010-11-16 00:25:08.000000000 +0100 @@ -679,7 +679,7 @@ impl_GetRole (DBusConnection * bus, DBusMessage * message, void * user_data) { DBusMessage *reply; - dbus_uint32_t rv = 0; + dbus_uint32_t rv = 14; /* TODO: Get DESKTOP_FRAME from somewhere */ reply = dbus_message_new_method_return (message); dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv, DBUS_TYPE_INVALID); @@ -691,7 +691,7 @@ DBusMessage * message, void *user_data) { DBusMessage *reply; - const char *role_name = "unknown"; + const char *role_name = "desktop frame"; reply = dbus_message_new_method_return (message); dbus_message_append_args (reply, DBUS_TYPE_STRING, &role_name, @@ -705,7 +705,7 @@ { /* TODO - Localize this */ DBusMessage *reply; - const char *role_name = "unknown"; + const char *role_name = "desktop frame"; reply = dbus_message_new_method_return (message); dbus_message_append_args (reply, DBUS_TYPE_STRING, &role_name, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit cyrus-imapd for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package cyrus-imapd for openSUSE:Factory checked in at Sat Nov 20 12:36:48 CET 2010. -------- --- cyrus-imapd/cyrus-imapd.changes 2010-09-30 11:37:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/cyrus-imapd/cyrus-imapd.changes 2010-11-19 09:57:34.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Nov 19 08:56:19 UTC 2010 - rhafer(a)novell.com + +- Fixed cronjob to include the correct path to ctl_mboxlist + (bnc#650919) + +------------------------------------------------------------------- +Wed Oct 27 15:37:35 UTC 2010 - rhafer(a)novell.com + +- removed unneeded authid_normalize.patch the same functionality + is already available through "username_tolower" since quite some + time. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- authid_normalize.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cyrus-imapd.spec ++++++ --- /var/tmp/diff_new_pack.ogD76k/_old 2010-11-20 12:36:42.000000000 +0100 +++ /var/tmp/diff_new_pack.ogD76k/_new 2010-11-20 12:36:42.000000000 +0100 @@ -57,14 +57,13 @@ %endif Summary: The Cyrus IMAP and POP Mail Server Version: 2.3.16 -Release: 10 +Release: 11 Source: %{prjname}-%{version}.tar.bz2 Source1: cyrus-imapd-rc.tar.gz Source2: DB_CONFIG # The autocreate Patchset is maintained at: # http://email.uoa.gr/projects/cyrus/autocreate/ Patch1: cyrus-imapd-2.3.16-autocreate-0.10-0.drac.diff -Patch2: authid_normalize.patch Patch3: auth_krb5-sentinel.patch Patch4: luser_relay.patch Patch5: user_deny_db-once.patch @@ -177,7 +176,6 @@ %setup -q -a 1 -n %{prjname}-%{version} patch -s -p0 < contrib/drac_auth.patch %patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -199,10 +197,6 @@ %endif %build -#%{?suse_update_config:%{suse_update_config -l -f build}} -#rm -f sieve/sieve.c sieve/addr.c -#autoconf -#autoreconf --force --install rm -fr aclocal.m4 configure config.h.in autom4te.cache sh SMakefile ++++++ cyrus-imapd-openslp.patch ++++++ --- /var/tmp/diff_new_pack.ogD76k/_old 2010-11-20 12:36:42.000000000 +0100 +++ /var/tmp/diff_new_pack.ogD76k/_new 2010-11-20 12:36:42.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- configure.in.orig +++ configure.in -@@ -1232,6 +1232,19 @@ AC_ARG_WITH(drac, [ --with-drac=DIR +@@ -1193,6 +1193,19 @@ AC_ARG_WITH(drac, [ --with-drac=DIR fi) AC_SUBST(DRACLIBS) @@ -39,7 +39,7 @@ =================================================================== --- master/master.c.orig +++ master/master.c -@@ -108,6 +108,10 @@ +@@ -110,6 +110,10 @@ int deny_severity = LOG_ERR; #endif @@ -50,7 +50,7 @@ #include "masterconf.h" #include "master.h" -@@ -117,6 +121,16 @@ +@@ -119,6 +123,16 @@ #include "util.h" #include "xmalloc.h" @@ -67,7 +67,7 @@ enum { become_cyrus_early = 1, child_table_size = 10000, -@@ -177,10 +191,41 @@ static struct timeval janitor_mark; /* L +@@ -181,10 +195,41 @@ static struct timeval janitor_mark; /* L void limit_fds(rlim_t); void schedule_event(struct event *a); @@ -109,7 +109,7 @@ exit(code); } -@@ -462,7 +507,90 @@ void service_create(struct service *s) +@@ -466,7 +511,90 @@ void service_create(struct service *s) s->socket = 0; continue; } @@ -201,7 +201,7 @@ s->ready_workers = 0; s->associate = nsocket; s->family = res->ai_family; -@@ -1000,6 +1128,9 @@ void sigterm_handler(int sig __attribute +@@ -1022,6 +1150,9 @@ void sigterm_handler(int sig __attribute /* tell master agent we're exiting */ snmp_shutdown("cyrusMaster"); #endif @@ -211,7 +211,7 @@ syslog(LOG_INFO, "exiting on SIGTERM/SIGINT"); exit(0); -@@ -1852,6 +1983,16 @@ int main(int argc, char **argv) +@@ -1876,6 +2007,16 @@ int main(int argc, char **argv) syslog(LOG_NOTICE, "process started"); ++++++ 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 2009-09-03 17:04:46.000000000 +0200 +++ new/SuSE/cron.daily.cyrus 2010-11-19 09:55:59.000000000 +0100 @@ -29,7 +29,7 @@ dumpfile=$DBDIR/$BACKUPBASENAME rm -f $bakfile rm -f $dumpfile -su - cyrus -c 'ctl_mboxlist -d' > $dumpfile +su - cyrus -c '/usr/lib/cyrus/bin/ctl_mboxlist -d' > $dumpfile gzip -9 -c < $dumpfile > $bakfile chown cyrus.mail $dumpfile chmod 640 $dumpfile ++++++ luser_relay.patch ++++++ --- /var/tmp/diff_new_pack.ogD76k/_old 2010-11-20 12:36:42.000000000 +0100 +++ /var/tmp/diff_new_pack.ogD76k/_new 2010-11-20 12:36:42.000000000 +0100 @@ -8,11 +8,11 @@ 2 files changed, 23 insertions(+), 5 deletions(-) -diff --git a/imap/lmtpengine.c b/imap/lmtpengine.c -index eff3e50..19347fc 100644 ---- a/imap/lmtpengine.c -+++ b/imap/lmtpengine.c -@@ -819,6 +819,8 @@ static int process_recipient(char *addr, struct namespace *namespace, +Index: cyrus-imapd-2.3.16/imap/lmtpengine.c +=================================================================== +--- cyrus-imapd-2.3.16.orig/imap/lmtpengine.c ++++ cyrus-imapd-2.3.16/imap/lmtpengine.c +@@ -819,6 +819,8 @@ static int process_recipient(char *addr, address_data_t *ret = (address_data_t *) xmalloc(sizeof(address_data_t)); int forcedowncase = config_getswitch(IMAPOPT_LMTP_DOWNCASE_RCPT); int quoted, detail; @@ -21,7 +21,7 @@ assert(addr != NULL && msg != NULL); -@@ -875,6 +877,13 @@ static int process_recipient(char *addr, struct namespace *namespace, +@@ -875,6 +877,13 @@ static int process_recipient(char *addr, } *dest = '\0'; @@ -35,7 +35,7 @@ /* make a working copy of rcpt */ ret->user = ret->rcpt = xstrdup(rcpt); -@@ -900,12 +909,17 @@ static int process_recipient(char *addr, struct namespace *namespace, +@@ -900,12 +909,17 @@ static int process_recipient(char *addr, r = verify_user(ret->user, ret->domain, ret->mailbox, (quota_t) (ignorequota ? -1 : msg->size), msg->authstate); if (r) { @@ -58,13 +58,13 @@ ret->ignorequota = ignorequota; msg->rcpt[msg->rcpt_num] = ret; -diff --git a/lib/imapoptions b/lib/imapoptions -index 06d9f2d..728f8a1 100644 ---- a/lib/imapoptions -+++ b/lib/imapoptions -@@ -1279,6 +1279,10 @@ product version in the capabilities */ - to set this to yes, especially if OpenLDAP is used as authentication - source. */ +Index: cyrus-imapd-2.3.16/lib/imapoptions +=================================================================== +--- cyrus-imapd-2.3.16.orig/lib/imapoptions ++++ cyrus-imapd-2.3.16/lib/imapoptions +@@ -1274,6 +1274,10 @@ product version in the capabilities */ + interface, otherwise the user is assumed to be in the default + domain (if set). */ +{ "lmtp_luser_relay", NULL, STRING } +/* Send mail to mailboxes, which do not exists, to this user. NOTE: This must @@ -73,6 +73,3 @@ /* .SH SEE ALSO .PP --- -1.6.4.2 - ++++++ pie.patch ++++++ --- /var/tmp/diff_new_pack.ogD76k/_old 2010-11-20 12:36:42.000000000 +0100 +++ /var/tmp/diff_new_pack.ogD76k/_new 2010-11-20 12:36:42.000000000 +0100 @@ -1,8 +1,8 @@ -Index: cyrus-imapd-2.3.14/configure.in +Index: cyrus-imapd-2.3.16/configure.in =================================================================== ---- cyrus-imapd-2.3.14.orig/configure.in -+++ cyrus-imapd-2.3.14/configure.in -@@ -1295,6 +1295,27 @@ AC_SUBST(PERL_SUBDIRS) +--- cyrus-imapd-2.3.16.orig/configure.in ++++ cyrus-imapd-2.3.16/configure.in +@@ -1256,6 +1256,27 @@ AC_SUBST(PERL_SUBDIRS) AC_SUBST(PERL_DEPSUBDIRS) AC_SUBST(PERL) @@ -30,10 +30,10 @@ AH_TOP([ /* * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved. -Index: cyrus-imapd-2.3.14/imap/Makefile.in +Index: cyrus-imapd-2.3.16/imap/Makefile.in =================================================================== ---- cyrus-imapd-2.3.14.orig/imap/Makefile.in -+++ cyrus-imapd-2.3.14/imap/Makefile.in +--- cyrus-imapd-2.3.16.orig/imap/Makefile.in ++++ cyrus-imapd-2.3.16/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@ @@ -45,10 +45,10 @@ SHELL = /bin/sh MAKEDEPEND = @MAKEDEPEND@ -Index: cyrus-imapd-2.3.14/lib/Makefile.in +Index: cyrus-imapd-2.3.16/lib/Makefile.in =================================================================== ---- cyrus-imapd-2.3.14.orig/lib/Makefile.in -+++ cyrus-imapd-2.3.14/lib/Makefile.in +--- cyrus-imapd-2.3.16.orig/lib/Makefile.in ++++ cyrus-imapd-2.3.16/lib/Makefile.in @@ -63,8 +63,8 @@ CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPF LIBS = @LIBS@ @@ -60,10 +60,10 @@ SHELL = /bin/sh MAKEDEPEND = @MAKEDEPEND@ -Index: cyrus-imapd-2.3.14/master/Makefile.in +Index: cyrus-imapd-2.3.16/master/Makefile.in =================================================================== ---- cyrus-imapd-2.3.14.orig/master/Makefile.in -+++ cyrus-imapd-2.3.14/master/Makefile.in +--- cyrus-imapd-2.3.16.orig/master/Makefile.in ++++ cyrus-imapd-2.3.16/master/Makefile.in @@ -56,8 +56,8 @@ DEFS = @DEFS@ @LOCALDEFS@ CPPFLAGS = -I.. -I$(srcdir)/../lib -I$(srcdir)/../imap @CPPFLAGS@ @COM_ERR_CPPFLAGS@ DEPLIBS = @DEPLIBS@ @@ -75,10 +75,10 @@ LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@ @SLPLIBS@ SHELL = /bin/sh -Index: cyrus-imapd-2.3.14/netnews/Makefile.in +Index: cyrus-imapd-2.3.16/netnews/Makefile.in =================================================================== ---- cyrus-imapd-2.3.14.orig/netnews/Makefile.in -+++ cyrus-imapd-2.3.14/netnews/Makefile.in +--- cyrus-imapd-2.3.16.orig/netnews/Makefile.in ++++ cyrus-imapd-2.3.16/netnews/Makefile.in @@ -55,8 +55,8 @@ CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/ LIBS = @IMAP_LIBS@ @LIB_RT@ DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ @@ -90,10 +90,10 @@ SHELL = /bin/sh MAKEDEPEND = @MAKEDEPEND@ -Index: cyrus-imapd-2.3.14/notifyd/Makefile.in +Index: cyrus-imapd-2.3.16/notifyd/Makefile.in =================================================================== ---- cyrus-imapd-2.3.14.orig/notifyd/Makefile.in -+++ cyrus-imapd-2.3.14/notifyd/Makefile.in +--- cyrus-imapd-2.3.16.orig/notifyd/Makefile.in ++++ cyrus-imapd-2.3.16/notifyd/Makefile.in @@ -56,8 +56,8 @@ CYRUS_GROUP=@cyrus_group@ DEFS = @DEFS@ @LOCALDEFS@ @@ -105,10 +105,10 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ -Index: cyrus-imapd-2.3.14/perl/sieve/lib/Makefile.in +Index: cyrus-imapd-2.3.16/perl/sieve/lib/Makefile.in =================================================================== ---- cyrus-imapd-2.3.14.orig/perl/sieve/lib/Makefile.in -+++ cyrus-imapd-2.3.14/perl/sieve/lib/Makefile.in +--- cyrus-imapd-2.3.16.orig/perl/sieve/lib/Makefile.in ++++ cyrus-imapd-2.3.16/perl/sieve/lib/Makefile.in @@ -58,7 +58,7 @@ IMAP_LIBS = @IMAP_LIBS@ DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@ @@ -118,10 +118,10 @@ LDFLAGS = @LDFLAGS@ SHELL = /bin/sh -Index: cyrus-imapd-2.3.14/sieve/Makefile.in +Index: cyrus-imapd-2.3.16/sieve/Makefile.in =================================================================== ---- cyrus-imapd-2.3.14.orig/sieve/Makefile.in -+++ cyrus-imapd-2.3.14/sieve/Makefile.in +--- cyrus-imapd-2.3.16.orig/sieve/Makefile.in ++++ cyrus-imapd-2.3.16/sieve/Makefile.in @@ -60,8 +60,8 @@ COMPILE_ET = @COMPILE_ET@ DEFS = @DEFS@ @LOCALDEFS@ CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ @@ -133,10 +133,10 @@ MAKEDEPEND = @MAKEDEPEND@ -Index: cyrus-imapd-2.3.14/syslog/Makefile.in +Index: cyrus-imapd-2.3.16/syslog/Makefile.in =================================================================== ---- cyrus-imapd-2.3.14.orig/syslog/Makefile.in -+++ cyrus-imapd-2.3.14/syslog/Makefile.in +--- cyrus-imapd-2.3.16.orig/syslog/Makefile.in ++++ cyrus-imapd-2.3.16/syslog/Makefile.in @@ -55,8 +55,8 @@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ @@ -148,10 +148,10 @@ SHELL = /bin/sh MAKEDEPEND = @MAKEDEPEND@ -Index: cyrus-imapd-2.3.14/timsieved/Makefile.in +Index: cyrus-imapd-2.3.16/timsieved/Makefile.in =================================================================== ---- cyrus-imapd-2.3.14.orig/timsieved/Makefile.in -+++ cyrus-imapd-2.3.14/timsieved/Makefile.in +--- cyrus-imapd-2.3.16.orig/timsieved/Makefile.in ++++ cyrus-imapd-2.3.16/timsieved/Makefile.in @@ -56,8 +56,8 @@ CYRUS_GROUP=@cyrus_group@ DEFS = @DEFS@ @LOCALDEFS@ @@ -163,10 +163,10 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ -Index: cyrus-imapd-2.3.14/com_err/et/Makefile.in +Index: cyrus-imapd-2.3.16/com_err/et/Makefile.in =================================================================== ---- cyrus-imapd-2.3.14.orig/com_err/et/Makefile.in -+++ cyrus-imapd-2.3.14/com_err/et/Makefile.in +--- cyrus-imapd-2.3.16.orig/com_err/et/Makefile.in ++++ cyrus-imapd-2.3.16/com_err/et/Makefile.in @@ -58,8 +58,8 @@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit dosutils for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package dosutils for openSUSE:Factory checked in at Sat Nov 20 12:36:31 CET 2010. -------- --- dosutils/dosutils.changes 2009-11-09 02:01:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/dosutils/dosutils.changes 2010-11-10 16:02:04.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 10 15:01:59 UTC 2010 - coolo(a)novell.com + +- fix file list + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dosutils.spec ++++++ --- /var/tmp/diff_new_pack.1nWU57/_old 2010-11-20 12:36:23.000000000 +0100 +++ /var/tmp/diff_new_pack.1nWU57/_new 2010-11-20 12:36:23.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package dosutils (Version 2009.11.9) +# spec file for package dosutils (Version 2010.11.10) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,11 +20,11 @@ Name: dosutils BuildRequires: recode unzip -License: GPL v2 or later ; MIT License (or similar) +License: GPLv2+ ; MIT License (or similar) Group: Metapackages AutoReqProv: off Summary: Dosutils CD Directory -- Meta Package -Version: 2009.11.9 +Version: 2010.11.10 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: dosutils.tar.bz2 @@ -63,11 +63,9 @@ %files %defattr(-,root,root) -/CD1/dosutils +/CD1 %clean -if [ -n "$RPM_BUILD_ROOT" ] ; then - rm -rf $RPM_BUILD_ROOT -fi +rm -rf $RPM_BUILD_ROOT %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit gnash for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package gnash for openSUSE:Factory checked in at Sat Nov 20 12:36:25 CET 2010. -------- --- gnash/gnash.changes 2010-04-05 20:37:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnash/gnash.changes 2010-11-16 16:52:10.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Aug 25 19:49:29 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.8.8, see ChangeLog-0.8.8 +- Spec file cleaned with spec-cleaner. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnash-0.8.7.tar.bz2 New: ---- gnash-0.8.8.tar.bz2 gnash-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnash.spec ++++++ --- /var/tmp/diff_new_pack.mk0zLP/_old 2010-11-20 12:36:13.000000000 +0100 +++ /var/tmp/diff_new_pack.mk0zLP/_new 2010-11-20 12:36:13.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gnash (Version 0.8.7) +# spec file for package gnash (Version 0.8.8) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,30 +15,42 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %bcond_without distributable Name: gnash %define cvs_date 0 -BuildRequires: SDL-devel agg-devel boost-devel curl-devel gcc-c++ giflib-devel gstreamer-0_10-plugins-base-devel -BuildRequires: fdupes gstreamer010-devel gtk2-devel libjpeg-devel libstdc++-devel speex-devel +BuildRequires: SDL-devel +BuildRequires: agg-devel +BuildRequires: boost-devel +BuildRequires: curl-devel +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: giflib-devel +BuildRequires: gstreamer-0_10-plugins-base-devel +BuildRequires: gstreamer010-devel +BuildRequires: gtk2-devel +BuildRequires: libjpeg-devel +BuildRequires: libstdc++-devel +BuildRequires: speex-devel %if !%{with distributable} BuildRequires: ffmpeg-devel %endif -Summary: Free Flash movie player -Version: 0.8.7 +Version: 0.8.8 Release: 1 License: GPLv2+ +Summary: Free Flash movie player Group: Productivity/Networking/Web/Browsers %if %{cvs_date} %define package_version %{version}.cvs%{cvs_date} %else %define package_version %{version} %endif +Url: http://www.gnu.org/software/gnash/ Source: %{name}-%{package_version}.tar.bz2 +Source1: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM gnash-0.8.5-build-fixes.diff Patch: gnash-0.8.5-build-fixes.diff -Url: http://www.gnu.org/software/gnash/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,15 +63,9 @@ work 100% if they utilize any of the unimplemented methods. This is one of the areas to work on to achieve full version 7 compliance. - - -Authors: --------- - Rob Savoye <rob(a)senecass.com> - %package devel -Summary: gnash include files License: GPLv2+ +Summary: Gnash include files Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -83,7 +89,7 @@ autoreconf -fi # -fpermissive is for broken boost with gcc-4.3 (#353897) # -fpermissive -CXXFLAGS="$RPM_OPT_FLAGS" \ +CXXFLAGS="%{optflags}" \ %configure \ --disable-static \ --disable-ltdl-install \ @@ -105,17 +111,17 @@ %install %makeinstall install-plugins -find $RPM_BUILD_ROOT%{_libdir} -name '*.la' | xargs rm +find %{buildroot}%{_libdir} -name '*.la' -delete # move/install documents -mkdir -p $RPM_BUILD_ROOT%{_docdir} -mv $RPM_BUILD_ROOT%{_datadir}/doc/gnash $RPM_BUILD_ROOT%{_docdir} -install -c -m 0644 AUTHORS COPYING ChangeLog NEWS README TODO \ - $RPM_BUILD_ROOT%{_docdir}/gnash +mkdir -p %{buildroot}%{_docdir} +mv %{buildroot}%{_datadir}/doc/gnash %{buildroot}%{_docdir} +install -c -m 0644 AUTHORS COPYING ChangeLog* NEWS README TODO \ + %{buildroot}%{_docdir}/gnash %find_lang %{name} -%fdupes -s $RPM_BUILD_ROOT%{_datadir}/locale +%fdupes -s %{buildroot}%{_datadir}/locale %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -f %{name}.lang %defattr(-, root, root) @@ -125,13 +131,13 @@ %{_libdir}/browser-plugins/* %{_bindir}/* %{_datadir}/gnash -%config(noreplace) /etc/gnashrc -%config(noreplace) /etc/gnashpluginrc +%config(noreplace) %{_sysconfdir}/gnashrc +%config(noreplace) %{_sysconfdir}/gnashpluginrc %files devel %defattr(-,root,root) %dir %{_includedir}/%{name}/ -%{_includedir}/%{name}/*.h +%{_includedir}/%{name} %{_libdir}/pkgconfig/* %changelog ++++++ gnash-0.8.7.tar.bz2 -> gnash-0.8.8.tar.bz2 ++++++ ++++ 423500 lines of diff (skipped) ++++++ gnash-rpmlintrc ++++++ addFilter("devel-file-in-non-devel-package.*/usr/lib64/gnash/libgnashrender.so") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit NetworkManager-openvpn for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package NetworkManager-openvpn for openSUSE:Factory checked in at Sat Nov 20 12:36:18 CET 2010. -------- --- NetworkManager-openvpn/NetworkManager-openvpn.changes 2010-08-09 13:16:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/NetworkManager-openvpn/NetworkManager-openvpn.changes 2010-11-06 15:04:43.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Nov 6 16:00:57 CET 2010 - dimstar(a)opensuse.org + +- Update to version 0.8.2: + + Fixes to ensure correct IP configuration of tunnels + + Support for HTTP and SOCKS proxies + + Better debugging options + + Updated translations. +- Split out -lang package. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- NetworkManager-openvpn-0.8.1.tar.bz2 New: ---- NetworkManager-openvpn-0.8.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-openvpn.spec ++++++ --- /var/tmp/diff_new_pack.ZUALCa/_old 2010-11-20 12:36:07.000000000 +0100 +++ /var/tmp/diff_new_pack.ZUALCa/_new 2010-11-20 12:36:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package NetworkManager-openvpn (Version 0.8.1) +# spec file for package NetworkManager-openvpn (Version 0.8.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ %define prefix %{_prefix} %define sysconfdir %{_sysconfdir} Summary: NetworkManager VPN support for OpenVPN -Version: 0.8.1 +Version: 0.8.2 Release: 1 # FIXME .desktop icons are currently disabled (on purpose) in the NM tarballs. They will re-appear later on (when nmce supports --import) License: GPLv2+ @@ -36,6 +36,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: openvpn %{name}-frontend Requires: NetworkManager >= 0.7.0.r4274 +Recommends: %{name}-lang %description NetworkManager-openvpn provides VPN support to NetworkManager for @@ -53,6 +54,7 @@ NetworkManager-openvpn provides VPN support to NetworkManager for OpenVPN. +%lang_package %prep %setup -n %{name}-%{version} %patch0 -p1 @@ -82,7 +84,7 @@ %postun gnome -p /sbin/ldconfig -%files -f %{name}.lang +%files %defattr(-,root,root,-) %doc README %{_libexecdir}/nm-openvpn-service @@ -100,4 +102,6 @@ %{_datadir}/gnome-vpn-properties %{_datadir}/icons/hicolor/*/*/*.png +%files lang -f %{name}.lang + %changelog ++++++ NetworkManager-openvpn-0.8.1.tar.bz2 -> NetworkManager-openvpn-0.8.2.tar.bz2 ++++++ ++++ 19217 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

commit evolution-tray for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package evolution-tray for openSUSE:Factory checked in at Sat Nov 20 12:36:10 CET 2010. -------- --- GNOME/evolution-tray/evolution-tray.changes 2010-09-02 15:00:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/evolution-tray/evolution-tray.changes 2010-11-18 20:53:11.000000000 +0100 @@ -1,0 +2,20 @@ +Thu Nov 18 19:52:43 UTC 2010 - aj(a)suse.de + +- Add intltool as BuildRequires. + +------------------------------------------------------------------- +Thu Oct 28 15:50:20 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 0.0.6: + + Allow building against latest evolution. + + Add support for notifications. + + Fix starting minimised. +- Change devel BuildRequires to pkgconfig() ones: + + old-style: evolution-devel, gtk2-devel, libglade2-devel, + libgnome-devel, libgnomeui-devel. + + new-style: evolution-plugin, gtk+-2.0, libglade-2.0, + libgnome-2.0, libgnomeui-2.0 +- Add pkgconfig(libnotify) BuildRequires for notifications support. +- Add evolution-tray-fix-missing-include.patch to fix build. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- evolution-tray-0.0.5.tar.bz2 New: ---- evolution-tray-0.0.6.tar.bz2 evolution-tray-fix-missing-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-tray.spec ++++++ --- /var/tmp/diff_new_pack.stmhA3/_old 2010-11-20 12:36:04.000000000 +0100 +++ /var/tmp/diff_new_pack.stmhA3/_new 2010-11-20 12:36:04.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package evolution-tray (Version 0.0.5) +# spec file for package evolution-tray (Version 0.0.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,18 +18,22 @@ Name: evolution-tray -Version: 0.0.5 +Version: 0.0.6 Release: 1 License: GPLv2+ Summary: Evolution plugin to minimize in tray Url: http://gnome.eu.org/evo/index.php/Evolution_Tray Group: Productivity/Office/Other Source0: %{name}-%{version}.tar.bz2 -BuildRequires: evolution-devel -BuildRequires: gtk2-devel -BuildRequires: libglade2-devel -BuildRequires: libgnome-devel -BuildRequires: libgnomeui-devel +# PATCH-FIX-UPSTREAM evolution-tray-fix-missing-include.patch vuntz(a)opensuse.org -- Fix build by adding missing include, sent upstream by mail +Patch0: evolution-tray-fix-missing-include.patch +BuildRequires: intltool +BuildRequires: pkgconfig(evolution-plugin) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(libglade-2.0) +BuildRequires: pkgconfig(libgnome-2.0) +BuildRequires: pkgconfig(libgnomeui-2.0) +BuildRequires: pkgconfig(libnotify) Requires: evolution Enhances: evolution BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,6 +46,7 @@ %prep %setup -q +%patch0 -p1 %build %configure ++++++ evolution-tray-0.0.5.tar.bz2 -> evolution-tray-0.0.6.tar.bz2 ++++++ ++++ 9793 lines of diff (skipped) ++++++ evolution-tray-fix-missing-include.patch ++++++ Index: evolution-tray-0.0.6/src/tray.c =================================================================== --- evolution-tray-0.0.6.orig/src/tray.c +++ evolution-tray-0.0.6/src/tray.c @@ -36,6 +36,7 @@ #if EVOLUTION_VERSION >= 29101 #include <mail/e-mail-session.h> #else +#include <mail/mail-config.h> #include <mail/mail-session.h> #endif #include <mail/mail-ops.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtk3-engine-murrine for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package gtk3-engine-murrine for openSUSE:Factory checked in at Sat Nov 20 12:35:51 CET 2010. -------- --- GNOME/gtk3-engine-murrine/gtk3-engine-murrine.changes 2010-10-15 11:50:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/gtk3-engine-murrine/gtk3-engine-murrine.changes 2010-11-08 20:21:25.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 8 14:13:16 EST 2010 - vuntz(a)opensuse.org + +- Add gtk3-engine-murrine-additional-fixes.patch to fix use of + undefined symbols and various warnings. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gtk3-engine-murrine-additional-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk3-engine-murrine.spec ++++++ --- /var/tmp/diff_new_pack.Ko3uLA/_old 2010-11-20 12:35:41.000000000 +0100 +++ /var/tmp/diff_new_pack.Ko3uLA/_new 2010-11-20 12:35:41.000000000 +0100 @@ -22,7 +22,7 @@ %define _name murrine Summary: Murrine GTK Theme Engine Version: 0.98.1.1_git -Release: 2 +Release: 3 %define _version 0.98.1.1 License: LGPLv2.1 | LGPLv3 Group: System/GUI/GNOME @@ -31,6 +31,8 @@ Source2: baselibs.conf # PATCH-FIX-UPSTREAM gtk3-engine-murrine-git-branch.patch vuntz(a)opensuse.org -- Patch to use the gtk+3 branch Patch0: gtk3-engine-murrine-git-branch.patch +# PATCH-FIX-UPSTREAM gtk3-engine-murrine-additional-fixes.patch bgo#634346 bgo#634348 vuntz(a)opensuse.org -- Fixes to work with latest gtk+ 3 and fix warnings +Patch1: gtk3-engine-murrine-additional-fixes.patch BuildRequires: gtk3-devel BuildRequires: intltool BuildRequires: pkg-config @@ -44,6 +46,7 @@ %prep %setup -q -n %{_name}-%{_version} %patch0 -p1 +%patch1 -p1 %build autoreconf -fi @@ -62,6 +65,7 @@ %doc AUTHORS COPYING COPYING.2.1 ChangeLog NEWS README TODO %{_libdir}/gtk-3.0/*/engines/libmurrine.so %dir %{_datadir}/gtk-engines +%dir %{_datadir}/gtk-engines/3.0 %{_datadir}/gtk-engines/3.0/murrine.xml %changelog ++++++ gtk3-engine-murrine-additional-fixes.patch ++++++ >From 4e2c8b18569bc0982a898496412c6527796ce2a5 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz(a)gnome.org> Date: Mon, 8 Nov 2010 13:05:01 -0500 Subject: [PATCH 1/8] Update for GTK+ 3 changes GTK_WIDGET_DRAWABLE doesn't exist anymore, and GtkComboBoxEntry has been removed. https://bugzilla.gnome.org/show_bug.cgi?id=634346 --- src/animation.c | 2 +- src/support.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/animation.c b/src/animation.c index feb8a10..29af661 100644 --- a/src/animation.c +++ b/src/animation.c @@ -161,7 +161,7 @@ update_animation_info (gpointer key, gpointer value, gpointer user_data) g_assert_not_reached (); /* remove the widget from the hash table if it is not drawable */ - if (!GTK_WIDGET_DRAWABLE (widget)) + if (!gtk_widget_is_drawable (widget)) return TRUE; if (GTK_IS_PROGRESS_BAR (widget)) diff --git a/src/support.c b/src/support.c index 95850fe..e8f6498 100644 --- a/src/support.c +++ b/src/support.c @@ -128,7 +128,7 @@ murrine_find_combo_box_widget (GtkWidget *widget) { GtkWidget *result = NULL; - if (widget && !GTK_IS_COMBO_BOX_ENTRY (widget)) + if (widget) { if (GTK_IS_COMBO_BOX (widget)) result = widget; -- 1.7.3.1 >From 8d209cb6f2ca62e2e7ef53cfbad6c5cecbef7738 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz(a)gnome.org> Date: Mon, 8 Nov 2010 13:06:43 -0500 Subject: [PATCH 2/8] Remove unneeded argument to g_scanner_warn() This causes a warning. https://bugzilla.gnome.org/show_bug.cgi?id=634348 --- src/murrine_rc_style.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/murrine_rc_style.c b/src/murrine_rc_style.c index 96786d4..36bed89 100644 --- a/src/murrine_rc_style.c +++ b/src/murrine_rc_style.c @@ -803,19 +803,19 @@ murrine_rc_style_parse (GtkRcStyle *rc_style, token = murrine_gtk2_rc_parse_dummy (settings, scanner, "gradients"); break; case TOKEN_HILIGHT_RATIO: - g_scanner_warn (scanner, "Murrine configuration option \"hilight_ratio\" will be deprecated in future releases. Please use \"highlight_shade\" instead.", "hilight_ratio"); + g_scanner_warn (scanner, "Murrine configuration option \"hilight_ratio\" will be deprecated in future releases. Please use \"highlight_shade\" instead."); double hilight_ratio; token = theme_parse_shade (settings, scanner, &hilight_ratio); murrine_style->highlight_shade = hilight_ratio/0.909090; murrine_style->flags |= MRN_FLAG_HIGHLIGHT_SHADE; break; case TOKEN_HIGHLIGHT_RATIO: - g_scanner_warn (scanner, "Murrine configuration option \"highlight_ratio\" will be deprecated in future releases. Please use \"highlight_shade\" instead.", "highlight_ratio"); + g_scanner_warn (scanner, "Murrine configuration option \"highlight_ratio\" will be deprecated in future releases. Please use \"highlight_shade\" instead."); token = theme_parse_shade (settings, scanner, &murrine_style->highlight_shade); murrine_style->flags |= MRN_FLAG_HIGHLIGHT_SHADE; break; case TOKEN_LIGHTBORDER_RATIO: - g_scanner_warn (scanner, "Murrine configuration option \"lightborder_ratio\" will be deprecated in future releases. Please use \"lightborder_shade\" instead.", "lightborder_ratio"); + g_scanner_warn (scanner, "Murrine configuration option \"lightborder_ratio\" will be deprecated in future releases. Please use \"lightborder_shade\" instead."); token = theme_parse_shade (settings, scanner, &murrine_style->lightborder_shade); murrine_style->flags |= MRN_FLAG_LIGHTBORDER_SHADE; break; -- 1.7.3.1 >From f963b0c384243907219f9b473863b8640a4723c5 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz(a)gnome.org> Date: Mon, 8 Nov 2010 13:10:54 -0500 Subject: [PATCH 3/8] Remove unused variables https://bugzilla.gnome.org/show_bug.cgi?id=634348 --- src/animation.c | 1 - src/murrine_draw.c | 2 -- src/murrine_draw_rgba.c | 2 -- src/murrine_style.c | 4 ---- 4 files changed, 0 insertions(+), 9 deletions(-) diff --git a/src/animation.c b/src/animation.c index 29af661..d0d5f3f 100644 --- a/src/animation.c +++ b/src/animation.c @@ -155,7 +155,6 @@ update_animation_info (gpointer key, gpointer value, gpointer user_data) { AnimationInfo *animation_info = value; GtkWidget *widget = key; - gdouble elapsed; if ((widget == NULL) || (animation_info == NULL)) g_assert_not_reached (); diff --git a/src/murrine_draw.c b/src/murrine_draw.c index 01e1beb..605b0b2 100644 --- a/src/murrine_draw.c +++ b/src/murrine_draw.c @@ -1346,8 +1346,6 @@ murrine_draw_tab (cairo_t *cr, const TabParameters *tab, int x, int y, int width, int height) { - const MurrineRGB *stripe_fill = &colors->spot[1]; - const MurrineRGB *stripe_border = &colors->spot[2]; const MurrineRGB *fill = &colors->bg[widget->state_type]; const MurrineRGB *border = &colors->shade[!widget->active ? 5 : 4]; cairo_pattern_t *pat; diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c index 539e965..eaf8fe0 100644 --- a/src/murrine_draw_rgba.c +++ b/src/murrine_draw_rgba.c @@ -1128,8 +1128,6 @@ murrine_rgba_draw_tab (cairo_t *cr, const TabParameters *tab, int x, int y, int width, int height) { - const MurrineRGB *stripe_fill = &colors->spot[1]; - const MurrineRGB *stripe_border = &colors->spot[2]; const MurrineRGB *fill = &colors->bg[widget->state_type]; const MurrineRGB *border = &colors->shade[!widget->active ? 5 : 4]; cairo_pattern_t *pat; diff --git a/src/murrine_style.c b/src/murrine_style.c index 99ace6e..8e3bfff 100644 --- a/src/murrine_style.c +++ b/src/murrine_style.c @@ -1337,7 +1337,6 @@ murrine_style_draw_box (DRAW_ARGS) if (murrine_style->roundness > 1) { ScrollBarStepperParameters stepper; - GdkRectangle this_rectangle = { x, y, width, height }; if (g_str_equal(detail + 10, "_start")) stepper.stepper = MRN_STEPPER_START; @@ -1483,7 +1482,6 @@ murrine_style_draw_slider (DRAW_ARGS, GtkOrientation orientation) { WidgetParameters params; ScrollBarParameters scrollbar; - boolean within_bevel = FALSE; scrollbar.has_color = FALSE; scrollbar.horizontal = (orientation == GTK_ORIENTATION_HORIZONTAL); @@ -1752,8 +1750,6 @@ murrine_style_draw_resize_grip (GtkStyle *style, ResizeGripParameters grip; grip.edge = (MurrineWindowEdge)edge; - int lx, ly; - if (edge != GDK_WINDOW_EDGE_SOUTH_EAST) return; /* sorry... need to work on this :P */ -- 1.7.3.1 >From 911a32047ddd0eddb7dec5b51b748f5e1291f81a Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz(a)gnome.org> Date: Mon, 8 Nov 2010 13:13:04 -0500 Subject: [PATCH 4/8] Add function declarations to support.h to fix warnings https://bugzilla.gnome.org/show_bug.cgi?id=634348 --- src/support.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/support.h b/src/support.h index e0c7d17..d9dea9d 100644 --- a/src/support.h +++ b/src/support.h @@ -119,6 +119,8 @@ #define MRN_WIDGET_HAS_DEFAULT(object) ((object) && MRN_IS_WIDGET(object) && GTK_WIDGET_HAS_DEFAULT(object)) G_GNUC_INTERNAL GtkTextDirection murrine_get_direction (GtkWidget *widget); +G_GNUC_INTERNAL gboolean murrine_widget_is_ltr (GtkWidget *widget); +G_GNUC_INTERNAL gboolean murrine_object_is_a (const GObject * object, const gchar * type_name); G_GNUC_INTERNAL GtkWidget *murrine_special_get_ancestor (GtkWidget *widget, GType widget_type); G_GNUC_INTERNAL GdkColor* murrine_get_parent_bgcolor (GtkWidget *widget); G_GNUC_INTERNAL GtkWidget* murrine_get_parent_window (GtkWidget *widget); -- 1.7.3.1 >From 822299634f8df37039b6661d57e6a766b201f641 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz(a)gnome.org> Date: Mon, 8 Nov 2010 13:38:07 -0500 Subject: [PATCH 5/8] Initialize some variables to remove warnings https://bugzilla.gnome.org/show_bug.cgi?id=634348 --- src/murrine_draw.c | 6 +++--- src/murrine_draw_rgba.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/murrine_draw.c b/src/murrine_draw.c index 605b0b2..184aa69 100644 --- a/src/murrine_draw.c +++ b/src/murrine_draw.c @@ -1261,8 +1261,8 @@ murrine_draw_frame (cairo_t *cr, int x, int y, int width, int height) { MurrineRGB *border = frame->border; - MurrineRectangle bevel_clip; - MurrineRectangle frame_clip; + MurrineRectangle bevel_clip = { 0, 0, 0, 0 }; + MurrineRectangle frame_clip = { 0, 0, 0, 0 }; const MurrineRGB *dark = &colors->shade[3]; MurrineRGB highlight, shadow_color; @@ -1348,7 +1348,7 @@ murrine_draw_tab (cairo_t *cr, { const MurrineRGB *fill = &colors->bg[widget->state_type]; const MurrineRGB *border = &colors->shade[!widget->active ? 5 : 4]; - cairo_pattern_t *pat; + cairo_pattern_t *pat = NULL; /* Set clip */ cairo_rectangle (cr, x, y, width, height); diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c index eaf8fe0..5743b2c 100644 --- a/src/murrine_draw_rgba.c +++ b/src/murrine_draw_rgba.c @@ -1043,8 +1043,8 @@ murrine_rgba_draw_frame (cairo_t *cr, int x, int y, int width, int height) { MurrineRGB *border = frame->border; - MurrineRectangle bevel_clip; - MurrineRectangle frame_clip; + MurrineRectangle bevel_clip = { 0, 0, 0, 0 }; + MurrineRectangle frame_clip = { 0, 0, 0, 0 }; const MurrineRGB *dark = &colors->shade[5]; MurrineRGB highlight, shadow_color; @@ -1130,7 +1130,7 @@ murrine_rgba_draw_tab (cairo_t *cr, { const MurrineRGB *fill = &colors->bg[widget->state_type]; const MurrineRGB *border = &colors->shade[!widget->active ? 5 : 4]; - cairo_pattern_t *pat; + cairo_pattern_t *pat = NULL; /* Set clip */ cairo_rectangle (cr, x, y, width, height); -- 1.7.3.1 >From 662a5a1f89cecc1b2aaf284d693d28ab73113f73 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz(a)gnome.org> Date: Mon, 8 Nov 2010 13:40:23 -0500 Subject: [PATCH 6/8] Remove unused static functions https://bugzilla.gnome.org/show_bug.cgi?id=634348 --- src/murrine_draw.c | 10 ---------- src/murrine_style.c | 15 --------------- 2 files changed, 0 insertions(+), 25 deletions(-) diff --git a/src/murrine_draw.c b/src/murrine_draw.c index 184aa69..5c211b4 100644 --- a/src/murrine_draw.c +++ b/src/murrine_draw.c @@ -3373,16 +3373,6 @@ murrine_draw_focus_classic (cairo_t *cr, } static void -murrine_draw_tab_focus (cairo_t *cr, - const MurrineColors *colors, - const WidgetParameters *widget, - const FocusParameters *focus, - int x, int y, int width, int height) -{ - -} - -static void murrine_draw_focus_border (cairo_t *cr, const MurrineColors *colors, const WidgetParameters *widget, diff --git a/src/murrine_style.c b/src/murrine_style.c index 8e3bfff..edcd6be 100644 --- a/src/murrine_style.c +++ b/src/murrine_style.c @@ -2376,21 +2376,6 @@ murrine_style_realize (GtkStyle *style) } static void -gdk_cairo_set_source_color_alpha (cairo_t *cr, - GdkColor *color, - float alpha) -{ - g_return_if_fail (cr != NULL); - g_return_if_fail (color != NULL); - - cairo_set_source_rgba (cr, - color->red/65535., - color->green/65535., - color->blue/65535., - alpha); -} - -static void murrine_style_copy (GtkStyle *style, GtkStyle *src) { MurrineStyle *mrn_style = MURRINE_STYLE (style); -- 1.7.3.1 >From 036cfe4c599b53c438128089f26f5ca54d4350e1 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz(a)gnome.org> Date: Mon, 8 Nov 2010 13:42:26 -0500 Subject: [PATCH 7/8] Use MRN_SHADOW_* instead of GTK_SHADOW_* This is needed to avoid warnings when comparing of MurrineShadowType. https://bugzilla.gnome.org/show_bug.cgi?id=634348 --- src/murrine_draw.c | 8 ++++---- src/murrine_draw_rgba.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/murrine_draw.c b/src/murrine_draw.c index 5c211b4..318511b 100644 --- a/src/murrine_draw.c +++ b/src/murrine_draw.c @@ -2775,13 +2775,13 @@ murrine_draw_radiobutton (cairo_t *cr, const MurrineRGB *bg = &colors->base[0]; gboolean inconsistent = FALSE; gboolean draw_box = !checkbox->in_menu; - gboolean draw_bullet = (checkbox->shadow_type == GTK_SHADOW_IN); + gboolean draw_bullet = (checkbox->shadow_type == MRN_SHADOW_IN); int roundness = width+height; double highlight_shade_new = widget->highlight_shade; double lightborder_shade_new = widget->lightborder_shade; MurrineGradients mrn_gradient_new = widget->mrn_gradient; - inconsistent = (checkbox->shadow_type == GTK_SHADOW_ETCHED_IN); + inconsistent = (checkbox->shadow_type == MRN_SHADOW_ETCHED_IN); draw_bullet |= inconsistent; if (widget->state_type == GTK_STATE_INSENSITIVE) @@ -2919,13 +2919,13 @@ murrine_draw_checkbox (cairo_t *cr, const MurrineRGB *bg = &colors->base[0]; gboolean inconsistent = FALSE; gboolean draw_box = !checkbox->in_menu; - gboolean draw_bullet = (checkbox->shadow_type == GTK_SHADOW_IN); + gboolean draw_bullet = (checkbox->shadow_type == MRN_SHADOW_IN); int roundness = CLAMP (widget->roundness, 0, 2); double highlight_shade_new = widget->highlight_shade; double lightborder_shade_new = widget->lightborder_shade; MurrineGradients mrn_gradient_new = widget->mrn_gradient; - inconsistent = (checkbox->shadow_type == GTK_SHADOW_ETCHED_IN); + inconsistent = (checkbox->shadow_type == MRN_SHADOW_ETCHED_IN); draw_bullet |= inconsistent; if (widget->state_type == GTK_STATE_INSENSITIVE) diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c index 5743b2c..05cb5ea 100644 --- a/src/murrine_draw_rgba.c +++ b/src/murrine_draw_rgba.c @@ -1821,13 +1821,13 @@ murrine_rgba_draw_radiobutton (cairo_t *cr, const MurrineRGB *bg = &colors->base[0]; gboolean inconsistent = FALSE; gboolean draw_box = !checkbox->in_menu; - gboolean draw_bullet = (checkbox->shadow_type == GTK_SHADOW_IN); + gboolean draw_bullet = (checkbox->shadow_type == MRN_SHADOW_IN); int roundness = width+height; double highlight_shade_new = widget->highlight_shade; double lightborder_shade_new = widget->lightborder_shade; MurrineGradients mrn_gradient_new = widget->mrn_gradient; - inconsistent = (checkbox->shadow_type == GTK_SHADOW_ETCHED_IN); + inconsistent = (checkbox->shadow_type == MRN_SHADOW_ETCHED_IN); draw_bullet |= inconsistent; if (widget->state_type == GTK_STATE_INSENSITIVE) @@ -1967,13 +1967,13 @@ murrine_rgba_draw_checkbox (cairo_t *cr, const MurrineRGB *bg = &colors->base[0]; gboolean inconsistent = FALSE; gboolean draw_box = !checkbox->in_menu; - gboolean draw_bullet = (checkbox->shadow_type == GTK_SHADOW_IN); + gboolean draw_bullet = (checkbox->shadow_type == MRN_SHADOW_IN); int roundness = CLAMP (widget->roundness, 0, 2); double highlight_shade_new = widget->highlight_shade; double lightborder_shade_new = widget->lightborder_shade; MurrineGradients mrn_gradient_new = widget->mrn_gradient; - inconsistent = (checkbox->shadow_type == GTK_SHADOW_ETCHED_IN); + inconsistent = (checkbox->shadow_type == MRN_SHADOW_ETCHED_IN); draw_bullet |= inconsistent; if (widget->state_type == GTK_STATE_INSENSITIVE) -- 1.7.3.1 >From 12fc4543a3362f045eaf875474cd442024d35631 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz(a)gnome.org> Date: Mon, 8 Nov 2010 13:45:17 -0500 Subject: [PATCH 8/8] Help compiler find out that a variable is always set https://bugzilla.gnome.org/show_bug.cgi?id=634348 --- src/cairo-support.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cairo-support.c b/src/cairo-support.c index 2a3592c..c09572d 100644 --- a/src/cairo-support.c +++ b/src/cairo-support.c @@ -85,7 +85,7 @@ murrine_rgb_to_hls (gdouble *r, h = (green-blue)/delta; else if (green == max) h = 2+(blue-red)/delta; - else if (blue == max) + else /* ie: if (blue == max) */ h = 4+(red-green)/delta; h *= 60; -- 1.7.3.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

commit hawk for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package hawk for openSUSE:Factory checked in at Sat Nov 20 12:35:42 CET 2010. -------- --- hawk/hawk.changes 2010-06-25 05:26:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/hawk/hawk.changes 2010-09-09 08:44:39.000000000 +0200 @@ -2 +2,13 @@ -Fri Jun 25 03:20:25 UTC 2010 - tserong(a)novell.com +Thu Sep 9 06:25:53 UTC 2010 - tserong(a)novell.com + +- Require rack version (1.1.0), to build on systems with rack 1.2 installed + (see https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/5146) + +------------------------------------------------------------------- +Tue Aug 10 04:50:19 UTC 2010 - tserong(a)novell.com + +- GUI: Refresh status display automatically on cluster state change (bnc#593013) +- Upstream version cs:443ba6917308 + +------------------------------------------------------------------- +Wed Jun 30 04:26:05 UTC 2010 - tserong(a)novell.com calling whatdependson for head-i586 Old: ---- allow-default-rack-version.patch New: ---- hawk_monitor-as-needed.patch require-rack-1.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk.spec ++++++ --- /var/tmp/diff_new_pack.JlRc4v/_old 2010-11-20 12:35:32.000000000 +0100 +++ /var/tmp/diff_new_pack.JlRc4v/_new 2010-11-20 12:35:32.000000000 +0100 @@ -27,14 +27,15 @@ Name: hawk Summary: HA Web Konsole Version: 0.3.5 -Release: 1 +Release: 2 License: GPLv2 Group: Productivity/Clustering/HA Source: %{name}-%{version}.tar.bz2 Source1: filter-requires.sh Patch1: string-unpack-s390x.patch Patch2: use-unix2_chkpwd.patch -Patch3: allow-default-rack-version.patch +Patch3: require-rack-1.1.patch +Patch4: hawk_monitor-as-needed.patch %define _use_internal_dependency_generator 0 %define __find_requires /bin/sh %{SOURCE1} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,6 +50,7 @@ BuildRequires: ruby-fcgi BuildRequires: rubygem-rails-2_3 BuildRequires: fdupes +BuildRequires: glib2-devel libpacemaker-devel libxml2-devel # Require startproc respecting -p, bnc#559534#c44 %if 0%{?suse_version} > 1110 # 11.2 or newer; @@ -71,6 +73,7 @@ %patch1 -p0 %patch2 -p0 %patch3 -p0 +%patch4 -p0 %build make WWW_BASE=%{www_base} INIT_STYLE=%{init_style} @@ -137,6 +140,7 @@ %files -f %{name}.lang %defattr(-,root,root) +%{_sbindir}/hawk_monitor %dir %{www_base}/hawk %{www_base}/hawk/app %{www_base}/hawk/config ++++++ hawk-0.3.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.3.5/.hg_archival.txt new/hawk-0.3.5/.hg_archival.txt --- old/hawk-0.3.5/.hg_archival.txt 2010-05-10 07:06:34.000000000 +0200 +++ new/hawk-0.3.5/.hg_archival.txt 2010-08-10 06:45:10.000000000 +0200 @@ -1,2 +1,2 @@ repo: 53225c8fc9056b3c31743a53a67c6a0e19c4dfd2 -node: 2a79e0d9cb43b5aff06f02d2a5ef2a66436225d3 +node: 443ba6917308a094a65787518efa004f48aa79db diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.3.5/.hgignore new/hawk-0.3.5/.hgignore --- old/hawk-0.3.5/.hgignore 2010-05-10 07:06:34.000000000 +0200 +++ new/hawk-0.3.5/.hgignore 2010-08-10 06:45:10.000000000 +0200 @@ -16,3 +16,4 @@ hawk*.tar.bz2 *.src.rpm tools/hawk_chkpwd +tools/hawk_monitor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.3.5/Makefile new/hawk-0.3.5/Makefile --- old/hawk-0.3.5/Makefile 2010-05-10 07:06:34.000000000 +0200 +++ new/hawk-0.3.5/Makefile 2010-08-10 06:45:10.000000000 +0200 @@ -54,7 +54,7 @@ # Override this to get a different init script (e.g. "redhat") INIT_STYLE = suse -all: scripts/hawk.$(INIT_STYLE) hawk/config/lighttpd.conf tools/hawk_chkpwd +all: scripts/hawk.$(INIT_STYLE) hawk/config/lighttpd.conf tools/hawk_chkpwd tools/hawk_monitor (cd hawk; rake makemo; rake freeze:rails; rake freeze:gems) %: %.in @@ -63,6 +63,11 @@ tools/hawk_chkpwd: tools/hawk_chkpwd.c gcc -o $@ $< -lpam +tools/hawk_monitor: tools/hawk_monitor.c + gcc $(shell pkg-config --cflags glib-2.0) $(shell pkg-config --libs glib-2.0) \ + -I/usr/include/pacemaker -I/usr/include/heartbeat \ + -lcib -lcrmcommon -Wall \ + -o $@ $< clean: rm -rf hawk/locale @@ -71,6 +76,8 @@ rm -rf hawk/log rm -f hawk/config/lighttpd.conf rm -f scripts/hawk.{suse,redhat} + rm -f tools/hawk_chkpwd + rm -f tools/hawk_monitor install: mkdir -p $(DESTDIR)$(WWW_BASE)/hawk/log @@ -89,6 +96,8 @@ install -D -m 0755 scripts/hawk.$(INIT_STYLE) $(DESTDIR)/etc/init.d/hawk install -D -m 4750 tools/hawk_chkpwd $(DESTDIR)/usr/sbin/hawk_chkpwd -chown root.haclient $(DESTDIR)/usr/sbin/hawk_chkpwd + install -D -m 0755 tools/hawk_monitor $(DESTDIR)/usr/sbin/hawk_monitor + ln -s /usr/sbin/hawk_monitor $(DESTDIR)$(WWW_BASE)/hawk/public/monitor # Make a tar.bz2 named for the most recent human-readable tag archive: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.3.5/hawk/app/controllers/main_controller.rb new/hawk-0.3.5/hawk/app/controllers/main_controller.rb --- old/hawk-0.3.5/hawk/app/controllers/main_controller.rb 2010-05-10 07:06:34.000000000 +0200 +++ new/hawk-0.3.5/hawk/app/controllers/main_controller.rb 2010-08-10 06:45:10.000000000 +0200 @@ -143,7 +143,7 @@ # everything empty. Status display can key off non-empty @summary return unless @cib.root - @cib_up = true + @cib_epoch = "#{get_xml_attr((a)cib.root, 'admin_epoch')}:#{get_xml_attr(@cib.root, 'epoch')}:#{get_xml_attr(@cib.root, 'num_updates')}" @summary[:stack] = get_property('cluster-infrastructure') || _('Unknown') @summary[:version] = get_property('dc-version') || _('Unknown') @@ -492,7 +492,7 @@ @cib = nil # Everything we're showing status of - @cib_up = false + @cib_epoch = "" @errors = [] @summary = {} @nodes = [] @@ -556,7 +556,7 @@ format.html # status.html.erb format.json { render :json => { - :cib_up => @cib_up, + :cib_epoch => @cib_epoch, :errors => @errors, :summary => @summary, :nodes => @node_panel, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.3.5/hawk/app/views/main/_summary.html.erb new/hawk-0.3.5/hawk/app/views/main/_summary.html.erb --- old/hawk-0.3.5/hawk/app/views/main/_summary.html.erb 2010-05-10 07:06:34.000000000 +0200 +++ new/hawk-0.3.5/hawk/app/views/main/_summary.html.erb 2010-08-10 06:45:10.000000000 +0200 @@ -1,4 +1,4 @@ -<div id="summary"<%= ' style="display: none"' unless @cib_up %>> +<div id="summary"<%= ' style="display: none"' if @cib_epoch.empty? %>> <table> <tr><th><%= _('Cluster Stack:') %></th> <td><span id="summary::stack"><%=h @summary[:stack] %></span></td></tr> <tr><th><%= _('Pacemaker Version:') %></th> <td><span id="summary::version"><%=h @summary[:version] %></span></td></tr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.3.5/hawk/app/views/main/status.html.erb new/hawk-0.3.5/hawk/app/views/main/status.html.erb --- old/hawk-0.3.5/hawk/app/views/main/status.html.erb 2010-05-10 07:06:34.000000000 +0200 +++ new/hawk-0.3.5/hawk/app/views/main/status.html.erb 2010-08-10 06:45:10.000000000 +0200 @@ -11,6 +11,6 @@ <%= render :partial => 'menus' %> <script type="text/javascript"></script> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.3.5/hawk/config/lighttpd.conf.in new/hawk-0.3.5/hawk/config/lighttpd.conf.in --- old/hawk-0.3.5/hawk/config/lighttpd.conf.in 2010-05-10 07:06:34.000000000 +0200 +++ new/hawk-0.3.5/hawk/config/lighttpd.conf.in 2010-08-10 06:45:10.000000000 +0200 @@ -123,7 +123,7 @@ ## server.pid-file = state_dir + "/hawk.pid" -server.modules = ( "mod_rewrite", "mod_access", "mod_accesslog", "mod_fastcgi", "mod_compress", "mod_expire" ) +server.modules = ( "mod_rewrite", "mod_access", "mod_accesslog", "mod_cgi", "mod_fastcgi", "mod_compress", "mod_expire" ) server.error-handler-404 = "/dispatch.fcgi" server.document-root = "@WWW_BASE@/hawk/public/" @@ -154,6 +154,8 @@ "bin-environment" => ( "RAILS_ENV" => "production" ) ) ) ) +cgi.assign = ( "/monitor" => "" ) + mimetype.assign = ( ".css" => "text/css", ".gif" => "image/gif", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.3.5/hawk/public/javascripts/application.js new/hawk-0.3.5/hawk/public/javascripts/application.js --- old/hawk-0.3.5/hawk/public/javascripts/application.js 2010-05-10 07:06:34.000000000 +0200 +++ new/hawk-0.3.5/hawk/public/javascripts/application.js 2010-08-10 06:45:10.000000000 +0200 @@ -132,40 +132,6 @@ return expand; } -// Um... what's "object" for? -function handle_update(request, object) -{ - // TODO(should): really should be using Ajax.Request onSuccess to - // trigger this callback... - if (request.responseJSON) { - update_errors(request.responseJSON.errors); - - if (request.responseJSON.cib_up) { - $("summary").show(); - update_summary(request.responseJSON.summary); - - $("nodelist").show(); - if (update_panel(request.responseJSON.nodes)) { - if ($("nodelist::children").hasClassName("closed")) { - expand_block("nodelist"); - } - } - - $("reslist").show(); - if (update_panel(request.responseJSON.resources)) { - if ($("reslist::children").hasClassName("closed")) { - expand_block("reslist"); - } - } - } else { - $("summary").hide(); - $("nodelist").hide(); - $("reslist").hide(); - } - } - do_update(); -} - // Like string.split, but breaks on '::' // TODO(could): think about changing our naming conventions so we don't need this. function dc_split(str) @@ -408,8 +374,49 @@ $("dialog").setStyle(style).show(); } -function do_update() +function do_update(cur_epoch) { - setTimeout("new Ajax.Request('/main/status', { parameters: 'format=json', asynchronous: true, onComplete: handle_update });", 15000); + new Ajax.Request('/monitor?' + cur_epoch, { method: 'get', + onSuccess: function(transport) { + var new_epoch = transport.responseJSON ? transport.responseJSON.epoch : ""; + if (new_epoch != cur_epoch) { + new Ajax.Request('/main/status?format=json', { method: 'get', + onSuccess: function(transport) { + var new_epoch = ""; + if (transport.responseJSON) { + update_errors(transport.responseJSON.errors); + + new_epoch = transport.responseJSON.cib_epoch; + if (new_epoch != "") { + $("summary").show(); + update_summary(transport.responseJSON.summary); + + $("nodelist").show(); + if (update_panel(transport.responseJSON.nodes)) { + if ($("nodelist::children").hasClassName("closed")) { + expand_block("nodelist"); + } + } + + $("reslist").show(); + if (update_panel(transport.responseJSON.resources)) { + if ($("reslist::children").hasClassName("closed")) { + expand_block("reslist"); + } + } + } else { + $("summary").hide(); + $("nodelist").hide(); + $("reslist").hide(); + } + } + do_update(new_epoch); + } + }); + } else { + do_update(new_epoch); + } + } + }); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.3.5/hawk.spec new/hawk-0.3.5/hawk.spec --- old/hawk-0.3.5/hawk.spec 2010-05-10 07:06:34.000000000 +0200 +++ new/hawk-0.3.5/hawk.spec 2010-08-10 06:45:10.000000000 +0200 @@ -158,6 +158,7 @@ %files -f %{name}.lang %defattr(-,root,root) %attr(4750, root, %{gname})%{_sbindir}/hawk_chkpwd +%{_sbindir}/hawk_monitor %dir %{www_base}/hawk %{www_base}/hawk/app %{www_base}/hawk/config diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.3.5/tools/hawk_monitor.c new/hawk-0.3.5/tools/hawk_monitor.c --- old/hawk-0.3.5/tools/hawk_monitor.c 1970-01-01 01:00:00.000000000 +0100 +++ new/hawk-0.3.5/tools/hawk_monitor.c 2010-08-10 06:45:10.000000000 +0200 @@ -0,0 +1,217 @@ +/* + * Copyright (c) 2010 Novell Inc., Tim Serong <tserong(a)novell.com> + * All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it would be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * Further, this software is distributed without any warranty that it is + * free of the rightful claim of any third person regarding infringement + * or the like. Any license provided herein, whether implied or + * otherwise, applies only to this software file. Patent licenses, if + * any, provided herein do not apply to combinations of this program with + * other software, or any other product whatsoever. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. + */ + +/* + * This monitor program is intentionally as dumb as a pile of rocks. + * Its only purpose is to be polled by the user's web browser, to + * indicate whether the state of the cluster has changed since the + * status display was last rendered. If something has changed, the + * browser needs to make another proper request (to the Rails app) + * to update the status display accordingly. + * + * USAGE: + * + * 1) Client invokes with QUERY_STRING == epoch (e.g.: /monitor?0:36:2), + * where epoch is either "admin_epoch:epoch:num_updates" from the CIB, + * or is an empty string (for unknown, or previously disconnected). + * + * 2) Server connects to CIB, and: + * - If client epoch is empty string: + * - If CIB connection succeeds, respond immediately with new epoch. + * - If connection fails, attept to connect for up to 60 seconds. + * - Finally, respond with either epoch = empty string (timeout) or + * real epoch from CIB if connection ultimately succeeded. + * - If client epoch is present: + * - If CIB connection fails, respond immediately with empty string. + * - If CIB connection succeeds, and CIB has a different epoch, + * respond immediately with the new epoch. + * - Otherwise, wait up to 60 seconds for something to change, then + * respond with either the new epoch (if something changed), the + * current epoch (if the timeout expired) or empty string (if the + * connection to CIB fell over). + * + * Note that the response from hawk_monitor will always be in the form: + * + * Content-type: application/json + * + * {"epoch":"n:n:n"} + * + * This means, from the client's perspective, the algorithm is: + * + * 1) Request https://SERVER:7630/monitor?EPOCH + * 2) Wait and see what comes back. If the epoch returned is in any + * way different to what you started with, fire off another request + * to update the display (https://SERVER:7630/main/status?format=json) + * 3) Remember the new epoch, and go back to step 1. + * + * SECURITY/PERFORMANCE CONSIDERATIONS: + * + * - hawk_monitor runs as a regular CGI application, i.e. the web server forks + * a new process for each request. This overhead is deemed acceptable, as + * this is for a low use monitoring app, not a heavy load public web site. + * + * - No authentication is performed, so anyone can get the current epoch from + * the CIB. This data should not however constitute any sort of security + * risk. + * + * - It may be possible to perpetrate a DOS attack by invoking hundreds of + * instances of hawk_monitor in quick succession, because each instance + * potentially hangs around for 60 seconds). Some consideration needs to + * be given to this, to find a balance between DOS risk as rendering the + * system unusable for multiple users, or multiple tabbed browsing sessions. + */ + +#include <stdio.h> +#include <stdlib.h> + +#include <crm/cib.h> +#include <crm/common/util.h> + +#define CONNECT_TIMEOUT 60 +#define MAX_EPOCH_LENGTH 128 /* way longer than necessary */ + +int cib_connect(void); +void mon_cib_connection_destroy(gpointer user_data); +void crm_diff_update(const char *event, xmlNode *msg); +gboolean mon_timer_popped(gpointer data); +void mon_shutdown(int nsig); +void finish(void); +void get_new_epoch(void); + +char new_epoch[MAX_EPOCH_LENGTH] = ""; +cib_t *cib = NULL; +GMainLoop *mainloop = NULL; + +/* + * Based on cib_connect() crm_mon.c, but intentionally ignoring notify + * callback setup errors (it's just not that important, we'll time + * out anyway...) + */ +int cib_connect(void) +{ + int rc = cib_ok; + CRM_CHECK(cib != NULL, return cib_missing); + + if (cib->state == cib_connected_query || cib->state == cib_connected_command) + return cib_ok; + + rc = cib->cmds->signon(cib, crm_system_name, cib_query); + + if (rc != cib_ok) + return rc; + + cib->cmds->set_connection_dnotify(cib, mon_cib_connection_destroy); + cib->cmds->del_notify_callback(cib, T_CIB_DIFF_NOTIFY, crm_diff_update); + cib->cmds->add_notify_callback(cib, T_CIB_DIFF_NOTIFY, crm_diff_update); + + return rc; +} + +void mon_cib_connection_destroy(gpointer user_data) +{ + if (cib) { + cib->cmds->signoff(cib); + g_main_loop_quit(mainloop); + } +} + +void crm_diff_update(const char *event, xmlNode *msg) +{ + g_main_loop_quit(mainloop); +} + +gboolean mon_timer_popped(gpointer data) +{ + g_main_loop_quit(mainloop); + return FALSE; +} + +void mon_shutdown(int nsig) +{ + finish(); +} + +void finish(void) +{ + if (cib != NULL) { + get_new_epoch(); /* Last chance... */ + cib->cmds->signoff(cib); + cib_delete(cib); + cib = NULL; + } + printf("Content-type: application/json\n\n{\"epoch\":\"%s\"}", new_epoch); + exit(0); +} + +void get_new_epoch(void) +{ + int admin_epoch; + int epoch; + int num_updates; + xmlNode *cib_top = NULL; + cib->cmds->query(cib, "/cib", &cib_top, cib_sync_call|cib_scope_local|cib_xpath|cib_no_children); + if (cib_version_details(cib_top, &admin_epoch, &epoch, &num_updates)) { + snprintf(new_epoch, MAX_EPOCH_LENGTH, "%d:%d:%d", admin_epoch, epoch, num_updates); + } + free_xml(cib_top); +} + +int main(int argc, char **argv) +{ + int rc = cib_ok; + int timeout = 0; + char *client_epoch = getenv("QUERY_STRING"); + if (client_epoch && client_epoch[0] == '\0') + client_epoch = NULL; + + crm_log_init(NULL, LOG_CRIT, FALSE, FALSE, argc, argv); + + cib = cib_new(); + + rc = cib_connect(); + if (rc != cib_ok && client_epoch == NULL) { + /* Client had no epoch, wait to connect */ + do { + sleep(1); + rc = cib_connect(); + } while (rc == cib_connection && ++timeout < CONNECT_TIMEOUT); + } + + if (rc == cib_ok) { + get_new_epoch(); + if (client_epoch != NULL && strcmp(client_epoch, new_epoch) == 0) { + /* Wait a while to see if something changes */ + mainloop = g_main_loop_new(NULL, FALSE); + mainloop_add_signal(SIGTERM, mon_shutdown); + mainloop_add_signal(SIGINT, mon_shutdown); + g_timeout_add(CONNECT_TIMEOUT * 1000, mon_timer_popped, NULL); + g_main_loop_run(mainloop); + g_main_loop_unref(mainloop); + } + } + + finish(); + return 0; /* never reached */ +} + ++++++ hawk_monitor-as-needed.patch ++++++ Index: Makefile =================================================================== --- Makefile.orig +++ Makefile @@ -63,8 +63,8 @@ all: scripts/hawk.$(INIT_STYLE) hawk/con tools/hawk_monitor: tools/hawk_monitor.c gcc $(shell pkg-config --cflags glib-2.0) $(shell pkg-config --libs glib-2.0) \ -I/usr/include/pacemaker -I/usr/include/heartbeat \ - -lcib -lcrmcommon -Wall \ - -o $@ $< + -o $@ $< \ + -lcib -lcrmcommon -Wall clean: rm -rf hawk/locale ++++++ require-rack-1.1.patch ++++++ Index: hawk/config/environment.rb =================================================================== --- hawk/config/environment.rb.orig +++ hawk/config/environment.rb @@ -24,11 +24,13 @@ Rails::Initializer.run do |config| config.gem "locale_rails" config.gem "gettext" config.gem "gettext_rails" - # Explicitly require any rack version in the 1.0 series. This is necessary because - # ActionPack 2.3.5 explicitly specifies this as well, so if we run on a system with - # rack 1.1, it all breaks horribly if we don't force it back to 1.0 here. Some further - # discussion is at https://rails.lighthouseapp.com/projects/8994/tickets/3685-actionpack-235-g… - config.gem "rack", :version => '~> 1.0.0' + # Explicitly require any rack version in the 1.1 series. This is necessary because + # ActionPack 2.3.8 explicitly specifies this as well, so if we run on a system with + # rack 1.2, it all breaks horribly if we don't force it back to 1.1 here. Some further + # discussion is at: + # https://rails.lighthouseapp.com/projects/8994/tickets/3685-actionpack-235-g… + # https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/5146 + config.gem "rack", :version => '~> 1.1.0' # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named ++++++ use-unix2_chkpwd.patch ++++++ --- /var/tmp/diff_new_pack.JlRc4v/_old 2010-11-20 12:35:32.000000000 +0100 +++ /var/tmp/diff_new_pack.JlRc4v/_new 2010-11-20 12:35:32.000000000 +0100 @@ -2,12 +2,12 @@ =================================================================== --- Makefile.orig +++ Makefile -@@ -54,16 +54,12 @@ WWW_BASE = /srv/www +@@ -54,15 +54,12 @@ WWW_BASE = /srv/www # Override this to get a different init script (e.g. "redhat") INIT_STYLE = suse --all: scripts/hawk.$(INIT_STYLE) hawk/config/lighttpd.conf tools/hawk_chkpwd -+all: scripts/hawk.$(INIT_STYLE) hawk/config/lighttpd.conf +-all: scripts/hawk.$(INIT_STYLE) hawk/config/lighttpd.conf tools/hawk_chkpwd tools/hawk_monitor ++all: scripts/hawk.$(INIT_STYLE) hawk/config/lighttpd.conf tools/hawk_monitor (cd hawk; rake makemo; rake freeze:rails; rake freeze:gems) %: %.in @@ -16,19 +16,18 @@ -tools/hawk_chkpwd: tools/hawk_chkpwd.c - gcc -o $@ $< -lpam - -- - clean: - rm -rf hawk/locale - rm -rf hawk/vendor -@@ -87,8 +83,6 @@ install: + tools/hawk_monitor: tools/hawk_monitor.c + gcc $(shell pkg-config --cflags glib-2.0) $(shell pkg-config --libs glib-2.0) \ + -I/usr/include/pacemaker -I/usr/include/heartbeat \ +@@ -94,8 +91,6 @@ install: rm $(DESTDIR)$(WWW_BASE)/hawk/config/lighttpd.conf.in -chown -R hacluster.haclient $(DESTDIR)$(WWW_BASE)/hawk install -D -m 0755 scripts/hawk.$(INIT_STYLE) $(DESTDIR)/etc/init.d/hawk - install -D -m 4750 tools/hawk_chkpwd $(DESTDIR)/usr/sbin/hawk_chkpwd - -chown root.haclient $(DESTDIR)/usr/sbin/hawk_chkpwd + install -D -m 0755 tools/hawk_monitor $(DESTDIR)/usr/sbin/hawk_monitor + ln -s /usr/sbin/hawk_monitor $(DESTDIR)$(WWW_BASE)/hawk/public/monitor - # Make a tar.bz2 named for the most recent human-readable tag - archive: Index: hawk/app/controllers/sessions_controller.rb =================================================================== --- hawk/app/controllers/sessions_controller.rb.orig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit mercurial for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at Sat Nov 20 12:35:32 CET 2010. -------- --- mercurial/mercurial.changes 2010-11-11 00:16:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/mercurial/mercurial.changes 2010-11-19 08:38:46.000000000 +0100 @@ -1,0 +2,16 @@ +Fri Nov 19 07:36:19 UTC 2010 - wr(a)rosenauer.org + +- Update to version 1.7.1 + * 1.7 clients broke support for pushing bookmarks with HTTP + * alias: fall back to normal error handling for ambigious + commands (issue2475) + * bundlerepository: get rid of temporary bundle files (issue2478) + * bundlerepository: test self.tempfile field, not tempfile module + * eol: exclude .hgtags file from eol translation (issue2493) + * log: fix log -rREV FILE when REV isnt the last filerev (issue2492) + * opener: check hardlink count reporting (issue1866) + * pushkey: force HTTP POST on push and add tests (issue2489) + * revlog: fix descendants() if nullrev is in revs + * subrepo: test & fix svn subrepo removal + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mercurial-1.7.tar.bz2 New: ---- mercurial-1.7.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.BkxnRH/_old 2010-11-20 12:35:24.000000000 +0100 +++ /var/tmp/diff_new_pack.BkxnRH/_new 2010-11-20 12:35:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mercurial (Version 1.7) +# spec file for package mercurial (Version 1.7.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -37,7 +37,7 @@ BuildRequires: fdupes %endif Summary: Scalable Distributed SCM -Version: 1.7 +Version: 1.7.1 Release: 1 License: GPLv2+ Group: Development/Tools/Version Control ++++++ mercurial-1.7.tar.bz2 -> mercurial-1.7.1.tar.bz2 ++++++ ++++ 3551 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

commit monit for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package monit for openSUSE:Factory checked in at Sat Nov 20 12:35:19 CET 2010. -------- --- monit/monit.changes 2009-11-03 20:20:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/monit/monit.changes 2010-10-13 14:26:09.000000000 +0200 @@ -1,0 +2,60 @@ +Thu Sep 23 22:17:18 UTC 2010 - pascal.bleser(a)opensuse.org + +- fixed typo in init script, "description" -> "Description" +- added missing dependency on $remote_fs in init script +- dropped monit-no_strip.patch, as upstream doesn't forcibly strip symbols any more +- /var/run/monit is now created at runtime, in order to work properly if /var/run is on tmpfs +- documentation split out into -doc subpackage + +- update to 5.2: + + new features: + * added support for monitoring processes without pidfile using pattern matching + * added support for swap monitoring + * allow to override the default action when service doesn't exist + * Monit automatically registers credentials with M/Monit now, so it's not necessary to set it manually in M/Monit anymore + * added memcache protocol test + * added openssl FIPS to Monit httpd + * the 'check system' can now use start/stop program statements too + * added the option to set the "Reply-To" mail header in mail-format + * display backtrace on error if debug mode is enabled (requires backtrace support in libc) + + bugfixes: + * show real process uptime - formerly the presented uptime was based on create and modify timestamp of process' pidfile which provides invalid uptime if the pidfile is replaced and process keeps running with original PID + * when user triggered action for some service (such as stop) and before that action completed user triggered another action for the same service (such as start), the second action has been ignored. Monit will not accept new action and return temporary error until the previous action completed + * if process resource usage gathering failed, retry next cycle as the error can be temporary + * fixed sporadic failures when SSL was used + * ICMP echo test (ping): + - fixed sporadic false positive/negative + - removed limit of 20 pings per cycle + * DNS test: + - accept NS root request refusal as correct response because server reacts on request + - accept authority answer as alternative to record + * RADIUS test fix + * M/Monit heartbeat is fully independent of testing cycle now to prevent false positive when service test blocks + * fixed SMTP STARTTLS protocol, required for servers that adhere strictly to RFC 3207 4.2 + * service name: + - allow the service name to start with "/" + - fixed handling of the service names which contain "/" in the name in Monit web interface + * when 'check system' is not defined, monit adds it automatically using hostname for service name + * remove extra NL characters from message when resource succeeded event is sent + * fixed display of cpu user/system/wait usage which temporarily displayed -1.0% between two monitoring cycles while cpu monitoring was initializing + * fixed display of port response time as -1 if 'monit status' was called in the middle of service test + * fixed display of service initializing state after monit start or reload + * fixed MONIT_DESCRIPTION environment variable + +------------------------------------------------------------------- +Tue Aug 10 14:45:36 UTC 2010 - lmuelle(a)suse.de + +- Remove merged superfluous hz patch. + +------------------------------------------------------------------- +Tue Aug 10 14:42:30 UTC 2010 - lmuelle(a)suse.de + +- Add Should-Start $syslog $time $named to the init script; (bnc#553082). + +------------------------------------------------------------------- +Tue Feb 23 20:19:41 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 5.1.1: + * several more protocol tests and bugfixes were added + +------------------------------------------------------------------- @@ -6,0 +67,12 @@ +Wed Sep 30 00:00:00 UTC 2009 - pascal.bleser(a)opensuse.org + +- update to 5.0.3 + + +------------------------------------------------------------------- +Thu Apr 16 00:00:00 UTC 2009 - pascal.bleser(a)opensuse.org + +- update to 5.0 + + +------------------------------------------------------------------- @@ -13,0 +86,12 @@ +Tue Nov 6 00:00:00 UTC 2007 - guru(a)unixtech.be + +- update to 4.10 + + +------------------------------------------------------------------- +Thu Sep 20 00:00:00 UTC 2007 - guru(a)unixtech.be + +- moved to openSUSE Build Service + + +------------------------------------------------------------------- @@ -18,0 +103,5 @@ +Sat Mar 24 00:00:00 UTC 2007 - guru(a)unixtech.be + +- new package, based on SUSE/Factory's monit source RPM (2007-03-24) + +------------------------------------------------------------------- @@ -134,0 +224 @@ + calling whatdependson for head-i586 Old: ---- monit-4.10.1.tar.bz2 monit-hz.patch no-strip.patch page_shift.patch vendor-files.tar.gz New: ---- monit-5.2.tar.bz2 monit-page_shift.patch monit-vendor-files.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monit.spec ++++++ --- /var/tmp/diff_new_pack.kUlbbc/_old 2010-11-20 12:34:46.000000000 +0100 +++ /var/tmp/diff_new_pack.kUlbbc/_new 2010-11-20 12:34:46.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package monit (Version 4.10.1) +# spec file for package monit (Version 5.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,30 +19,30 @@ Name: monit -BuildRequires: bison flex openssl-devel -Version: 4.10.1 -Release: 69 -License: GPL v2 or later -Group: System/Monitoring +Version: 5.2 +Release: 1 Summary: Service Manager and Monitor System -Url: http://www.tildeslash.com/monit/ -AutoReqProv: on -Source: http://www.tildeslash.com/monit/dist/%{name}-%{version}.tar.bz2 -Source1: vendor-files.tar.gz -Patch: page_shift.patch -Patch1: no-strip.patch -Patch2: monit-hz.patch -%if %ul_version >= 1 -%define VENDOR UL -%else +# http://mmonit.com/monit/dist/monit-%{version}.tar.gz +Source: monit-%{version}.tar.bz2 +Source1: monit-vendor-files.tar.gz +Patch1: monit-page_shift.patch +Url: http://mmonit.com/monit/download/ +Group: System/Monitoring +License: GNU General Public License (GPL) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: bison flex gcc glibc-devel make openssl-devel +BuildRequires: autoconf automake libtool +Obsoletes: monit-beta < %{version} +Provides: monit-beta = %{version} +%if 0%{?suse_version} >= 1030 +BuildRequires: licenses +Requires: licenses +%endif %if "%{_vendor}" == "suse" %define VENDOR SUSE %else %define VENDOR %_vendor %endif -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %fillup_prereq %insserv_prereq %description Monit is a utility for managing and monitoring processes, files, @@ -57,6 +57,7 @@ + Authors: -------- Jan-Henrik Haukeland <hauk at tildeslash dot com> @@ -64,68 +65,109 @@ Rory Toma <rory at digeo dot com> Christian Hopp <chopp at iei dot tu-clausthal dot de> +%package doc +License: GNU General Public License (GPL) +Summary: Service Manager and Monitor System (Documentation and Examples) +Group: System/Monitoring +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif + +%description doc +Monit is a utility for managing and monitoring processes, files, +directories, and devices on a Unix system. Monit conducts automatic +maintenance and repair and can execute meaningful causal actions in +error situations. For example, monit can start a process if it does +not run, restart a process if it does not respond, and stop a process +if it uses too many resources. You can use monit to monitor files, +directories, and devices for changes, such as time stamp changes, +checksum changes, or size changes. You can even use monit to monitor +remote hosts: monit can ping a remote host and check port connections. + +This package only contains the documentation and examples. +You must also install the package %{name} to actually use monit. + %prep -%setup -a1 -%patch -p1 +%setup -q -a1 %patch1 -%patch2 + +find doc/ -type f -size 0 -exec %__rm {} \; %build -%{?suse_update_config:%{suse_update_config -f}} -autoreconf --force --install -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%{configure} \ - --prefix=%{_prefix} \ - --sysconfdir=%{_sysconfdir} \ - --with-ssl-lib-dir=%{_libdir} -%{__make} +#autoreconf -fiv +export CFLAGS="%{optflags} -fno-strict-aliasing" +%configure \ + --with-ssl-lib-dir="%{_libdir}" + +%__make %{?jobs:-j%{jobs}} %install -make \ - BINDIR=${RPM_BUILD_ROOT}/%{_bindir} \ - MANDIR=${RPM_BUILD_ROOT}/%{_mandir}/man1 \ +%__make \ + BINDIR="%{buildroot}%{_bindir}" \ + MANDIR="%{buildroot}%{_mandir}/man1" \ install -mkdir -p \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/monit.d \ - ${RPM_BUILD_ROOT}/%{_sbindir} \ - ${RPM_BUILD_ROOT}/%{_datadir}/monit \ - ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates \ - ${RPM_BUILD_ROOT}/%{_var}/lib/monit \ - ${RPM_BUILD_ROOT}/%{_var}/run/monit + +%__install -d \ + "%{buildroot}/etc/init.d" \ + "%{buildroot}%{_sysconfdir}/monit.d" \ + "%{buildroot}%{_sbindir}" \ + "%{buildroot}%{_datadir}/monit" \ + "%{buildroot}%{_var}/adm/fillup-templates" \ + "%{buildroot}%{_var}/run/monit" \ + "%{buildroot}%{_var}/lib/monit" + . vendor-files/sysconfig/monit.tmpl -MONIT_BIN="/usr/bin/monit" -MONIT_MODIFY_INITTAB="/usr/share/monit/monit-modifyinittab" -MONIT_PID_FILE="/var/run/monit/monit.pid" +MONIT_BIN="%{_bindir}/monit" +MONIT_MODIFY_INITTAB="%{_datadir}/monit/monit-modifyinittab" +MONIT_PID_FILE="%{_var}/run/monit/monit.pid" MONIT_SYSCONFIG_FILE="/etc/sysconfig/monit" -MONIT_INITTAB_STATE_FILE="/var/lib/monit/monit-inittab.state" -MONIT_ARGS="-p ${MONIT_PID_FILE} -s /var/run/monit/monit.state" -MONIT_EVENTQUE_DIR="/var/lib/monit" -sed -e "s%/var/monit%${MONIT_EVENTQUE_DIR}%g" \ - monitrc > \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/monitrc +MONIT_INITTAB_STATE_FILE="%{_var}/lib/monit/monit-inittab.state" +MONIT_ARGS="-p ${MONIT_PID_FILE} -s %{_var}/run/monit/monit.state" +MONIT_EVENTQUE_DIR="%{_var}/lib/monit" +%__sed -e "s|%{_var}/monit|${MONIT_EVENTQUE_DIR}|g" \ + < monitrc > "%{buildroot}%{_sysconfdir}/monitrc" + pushd vendor-files for templatefile in docu/README tools/monit-modifyinittab init/monit sysconfig/monit; do - sed -e "s%__MONIT_RC_FILE__%${MONIT_RC_FILE}%g" \ - -e "s%__MONIT_INITTAB_BASE__%${MONIT_INITTAB_BASE}%g" \ - -e "s%__MONIT_INITTAB_COMMENT__%${MONIT_INITTAB_COMMENT}%g" \ - -e "s%__MONIT_INITTAB_STATE_FILE__%${MONIT_INITTAB_STATE_FILE}%g" \ - -e "s%__MONIT_ARGS__%${MONIT_ARGS}%g" \ - -e "s%__MONIT_BIN__%${MONIT_BIN}%g" \ - -e "s%__MONIT_MODIFY_INITTAB__%${MONIT_MODIFY_INITTAB}%g" \ - -e "s%__MONIT_PID_FILE__%${MONIT_PID_FILE}%g" \ - -e "s%__MONIT_SYSCONFIG_FILE__%${MONIT_SYSCONFIG_FILE}%g" \ - ${templatefile}.tmpl > \ - ${templatefile} + %__sed \ + -e "s|__MONIT_RC_FILE__|${MONIT_RC_FILE}|g" \ + -e "s|__MONIT_INITTAB_BASE__|${MONIT_INITTAB_BASE}|g" \ + -e "s|__MONIT_INITTAB_COMMENT__|${MONIT_INITTAB_COMMENT}|g" \ + -e "s|__MONIT_INITTAB_STATE_FILE__|${MONIT_INITTAB_STATE_FILE}|g" \ + -e "s|__MONIT_ARGS__|${MONIT_ARGS}|g" \ + -e "s|__MONIT_BIN__|${MONIT_BIN}|g" \ + -e "s|__MONIT_MODIFY_INITTAB__|${MONIT_MODIFY_INITTAB}|g" \ + -e "s|__MONIT_PID_FILE__|${MONIT_PID_FILE}|g" \ + -e "s|__MONIT_SYSCONFIG_FILE__|${MONIT_SYSCONFIG_FILE}|g" \ + < "${templatefile}.tmpl" \ + > "${templatefile}" +done +popd # vendor-files + +%__install -m0754 vendor-files/init/monit "%{buildroot}/etc/init.d/monit" +%__ln_s ../../etc/init.d/monit "%{buildroot}/usr/sbin/rcmonit" +%__install -m0754 vendor-files/tools/monit-modifyinittab "%{buildroot}%{_datadir}/monit" +%__install -m0644 vendor-files/sysconfig/monit "%{buildroot}%{_var}/adm/fillup-templates/sysconfig.monit" +touch "%{buildroot}%{_var}/lib/monit/monit-inittab.state" +touch "%{buildroot}%{_var}/run/monit"/monit.{pid,state} +%__install -m0644 vendor-files/docu/README README.SUSE + +for f in COPYING LICENSE; do + h=/usr/share/doc/licenses/md5/$(md5sum "$f"|cut -f1 -d" ") + test -e "$h" && %__ln_s -f "$h" "$f" +done + +%__install -d "%{buildroot}%{_docdir}/%{name}" +>doc.main.lst +for f in COPYING LICENSE; do + %__install -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$f" + echo "%doc %{_docdir}/%{name}/$f" >>doc.main.lst +done +>doc.doc.lst +for f in CHANGES.txt PLATFORMS README* doc; do + %__cp -a "$f" "%{buildroot}%{_docdir}/%{name}/" + echo "%doc %{_docdir}/%{name}/$(basename $f)" >>doc.doc.lst done -popd -install -m 0754 vendor-files/init/monit ${RPM_BUILD_ROOT}/etc/init.d/monit -ln -s ../../etc/init.d/monit ${RPM_BUILD_ROOT}/%{_sbindir}/rcmonit -install -m 0754 vendor-files/tools/monit-modifyinittab ${RPM_BUILD_ROOT}/%{_datadir}/monit -install -m 0644 vendor-files/sysconfig/monit ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates/sysconfig.monit -touch ${RPM_BUILD_ROOT}/%{_var}/lib/monit/monit-inittab.state -touch ${RPM_BUILD_ROOT}/%{_var}/run/monit/monit.{pid,state} -install -m 0644 vendor-files/docu/README ${RPM_BUILD_DIR}/%{name}-%{version}/README.%{VENDOR} %post %{fillup_and_insserv} @@ -138,24 +180,27 @@ %{insserv_cleanup} %clean -[ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} +%__rm -rf "%{buildroot}" -%files +%files -f doc.main.lst %defattr(-,root,root) -%doc CHANGES.txt CONTRIBUTORS COPYING FAQ.txt LICENSE PLATFORMS README* STATUS UPGRADE.txt doc -%attr(0600, root, root) %config(noreplace) %{_sysconfdir}/monitrc +%doc %dir %{_docdir}/%{name} +%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/monitrc %dir %{_sysconfdir}/monit.d -%attr(0754, root, root) %config %{_sysconfdir}/init.d/monit -%{_sbindir}/rcmonit +%attr(0754,root,root) %config /etc/init.d/monit +/usr/sbin/rcmonit %{_bindir}/monit -%{_mandir}/man1/monit.1.gz %dir %{_datadir}/monit %{_datadir}/monit/monit-modifyinittab %{_var}/adm/fillup-templates/sysconfig.monit %dir %{_var}/lib/monit %ghost %{_var}/lib/monit/monit-inittab.state -%dir %{_var}/run/monit +%ghost %dir %{_var}/run/monit %ghost %{_var}/run/monit/monit.pid %ghost %{_var}/run/monit/monit.state +%doc %{_mandir}/man1/monit.1%{ext_man} +%files doc -f doc.doc.lst +%defattr(-,root,root) +%doc %dir %{_docdir}/%{name} %changelog ++++++ monit-4.10.1.tar.bz2 -> monit-5.2.tar.bz2 ++++++ ++++ 52049 lines of diff (skipped) ++++++ monit-page_shift.patch ++++++ --- process/sysdep_LINUX.c.orig 2010-09-24 00:18:10.000000000 +0200 +++ process/sysdep_LINUX.c 2010-09-24 00:18:41.000000000 +0200 @@ -279,10 +279,7 @@ if (stat_item_state == 'Z') pt[i].status_flag |= PROCESS_ZOMBIE; - if (page_shift_to_kb < 0) - pt[i].mem_kbyte = (stat_item_rss >> abs(page_shift_to_kb)); - else - pt[i].mem_kbyte = (stat_item_rss << abs(page_shift_to_kb)); + pt[i].mem_kbyte = stat_item_rss * getpagesize() / 1024; if (! read_proc_file(buf, sizeof(buf), "cmdline", pt[i].pid, &bytes)) { DEBUG("system statistic error -- cannot read /proc/%d/cmdline\n", pt[i].pid); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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