openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
March 2010
- 1 participants
- 1093 discussions
Hello community,
here is the log from the commit of package emacs for openSUSE:Factory
checked in at Wed Mar 31 20:00:59 CEST 2010.
--------
--- emacs/emacs.changes 2010-03-17 14:26:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/emacs/emacs.changes 2010-03-26 18:37:30.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Mar 26 18:32:03 CET 2010 - werner(a)suse.de
+
+- Do not remove wrapper script for bug bnc#555682 (bnc#589394)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
emacs-23.1-gcc45.dif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ emacs.spec ++++++
--- /var/tmp/diff_new_pack.DPVT6j/_old 2010-03-31 19:59:39.000000000 +0200
+++ /var/tmp/diff_new_pack.DPVT6j/_new 2010-03-31 19:59:39.000000000 +0200
@@ -25,7 +25,7 @@
License: GPLv2+
Group: Productivity/Editors/Emacs
Version: 23.1
-Release: 9
+Release: 10
Obsoletes: ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc
Requires: emacs-info = %{version}
Requires: emacs_program = %{version}-%{release}
@@ -59,6 +59,7 @@
Patch17: emacs-23.1-bnc558884.patch
Patch18: emacs-sparc.diff
Patch19: emacs-23.1-fix_cpp.patch
+Patch20: emacs-23.1-gcc45.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global bug_345669 0
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
@@ -247,10 +248,11 @@
%patch17 -p0 -b .gtkmenus
%patch19 -p1 -b .configure
%patch
+%patch18 -p1 -b .sparc
if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then
install-mh -auto < /dev/null
fi
-%patch -P 18 -p1
+%patch20 -p0 -b .gcc45
%build
CC=gcc-4.3
@@ -583,6 +585,7 @@
/etc/skel/.gnu-emacs
%{_bindir}/b2m
%{_bindir}/ebrowse
+%{_bindir}/emacs
%{_bindir}/emacsclient
%{_bindir}/grep-changelog
%{_bindir}/rcs-checkin
@@ -2700,13 +2703,13 @@
%files -n emacs-nox
%defattr(-, root, root)
-/usr/bin/emacs-nox
+%{_bindir}/emacs-nox
%files -n emacs-x11
%defattr(-, root, root)
-/usr/bin/emacs
-/usr/bin/emacs-x11
-/usr/bin/emacs-gtk
+%{_bindir}/emacs
+%{_bindir}/emacs-x11
+%{_bindir}/emacs-gtk
%{appDefaultsFile}
%{_datadir}/applications/emacs.desktop
%{_datadir}/pixmaps/emacs.png
++++++ emacs-23.1-gcc45.dif ++++++
--- lib-src/pop.c
+++ lib-src/pop.c 2010-03-17 14:07:55.904126829 +0000
@@ -28,6 +28,7 @@ along with GNU Emacs. If not, see <http
#ifdef MAIL_USE_POP
+#include <ctype.h>
#include <sys/types.h>
#ifdef WINDOWSNT
#include "ntlib.h"
@@ -1232,9 +1233,10 @@ socket_connection (host, flags)
for (cp = realhost; *cp; cp++)
{
- if (isupper (*cp))
+ const int c = *cp;
+ if (isupper (c))
{
- *cp = tolower (*cp);
+ *cp = tolower (c);
}
}
--- oldXMenu/Error.c
+++ oldXMenu/Error.c 2010-03-17 13:48:49.380126642 +0000
@@ -1,5 +1,6 @@
/* Copyright Massachusetts Institute of Technology 1985 */
+#include <stdio.h>
#include "copyright.h"
--- src/ccl.c
+++ src/ccl.c 2010-03-17 13:50:29.380626270 +0000
@@ -27,6 +27,9 @@ along with GNU Emacs. If not, see <http
#include <config.h>
#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#include "lisp.h"
#include "character.h"
--- src/charset.c
+++ src/charset.c 2010-03-18 09:41:44.856306456 +0000
@@ -272,7 +272,7 @@ load_charset_map (charset, entries, n_en
int n_entries;
int control_flag;
{
- Lisp_Object vec, table;
+ Lisp_Object vec = 0, table = 0;
unsigned max_code = CHARSET_MAX_CODE (charset);
int ascii_compatible_p = charset->ascii_compatible_p;
int min_char, max_char, nonascii_min_char;
@@ -640,7 +640,7 @@ load_charset (charset, control_flag)
struct charset *charset;
int control_flag;
{
- Lisp_Object map;
+ Lisp_Object map = 0;
if (inhibit_load_charset_map
&& temp_charset_work
--- src/cm.c
+++ src/cm.c 2010-03-18 09:45:28.412126540 +0000
@@ -33,13 +33,6 @@ along with GNU Emacs. If not, see <http
configure finds a non-standard termcap.h that the main build
won't find. */
-#if defined HAVE_TERMCAP_H && 0
-#include <termcap.h>
-#else
-extern void tputs P_ ((const char *, int, int (*)(int)));
-extern char *tgoto P_ ((const char *, int, int));
-#endif
-
#define BIG 9999 /* 9999 good on VAXen. For 16 bit machines
use about 2000.... */
@@ -339,7 +332,7 @@ cmgoto (tty, row, col)
llcost,
relcost,
directcost;
- int use;
+ int use = 0;
char *p,
*dcm;
--- src/cm.h
+++ src/cm.h 2010-03-18 08:15:28.376126640 +0000
@@ -160,7 +160,17 @@ extern char PC; /* Pad character */
extern int cost;
extern int evalcost ();
-#define emacs_tputs(tty, str, affcnt, putc) (current_tty = (tty), tputs (str, affcnt, putc))
+#if defined HAVE_TERMCAP_H && 0
+#include <termcap.h>
+#else
+/*
+ * #include <curses.h>
+ * #include <term.h>
+ */
+extern int tputs P_ ((const char *, int, int (*)(int)));
+extern char *tgoto P_ ((const char *, int, int));
+#endif
+#define emacs_tputs(tty, str, affcnt, putc) ({ current_tty = (tty); (void)tputs (str, affcnt, putc); })
extern struct tty_display_info *current_tty;
extern void cmcheckmagic P_ ((struct tty_display_info *));
--- src/coding.c
+++ src/coding.c 2010-03-18 09:44:45.360626578 +0000
@@ -3060,7 +3060,7 @@ detect_coding_iso_2022 (coding, detect_i
const unsigned char *src_end = coding->source + coding->src_bytes;
int multibytep = coding->src_multibyte;
int single_shifting = 0;
- int id;
+ int id = 0;
int c, c1;
int consumed_chars = 0;
int i;
@@ -3573,7 +3573,7 @@ decode_coding_iso_2022 (coding)
int charset_id_0 = CODING_ISO_INVOKED_CHARSET (coding, 0);
int charset_id_1 = CODING_ISO_INVOKED_CHARSET (coding, 1);
int charset_id_2, charset_id_3;
- struct charset *charset;
+ struct charset *charset = (struct charset*)0;
int c;
struct composition_status *cmp_status = CODING_ISO_CMP_STATUS (coding);
Lisp_Object attrs, charset_list;
@@ -5591,7 +5591,7 @@ decode_coding_charset (coding)
{
int c;
Lisp_Object val;
- struct charset *charset;
+ struct charset *charset = (struct charset*)0;
int dim;
int len = 1;
unsigned code;
@@ -7739,12 +7739,12 @@ decode_coding_object (coding, src_object
Lisp_Object dst_object;
{
int count = specpdl_ptr - specpdl;
- unsigned char *destination;
- EMACS_INT dst_bytes;
+ unsigned char *destination = (unsigned char*)0;
+ EMACS_INT dst_bytes = 0;
EMACS_INT chars = to - from;
EMACS_INT bytes = to_byte - from_byte;
Lisp_Object attrs;
- int saved_pt = -1, saved_pt_byte;
+ int saved_pt = -1, saved_pt_byte = 0;
int need_marker_adjustment = 0;
Lisp_Object old_deactivate_mark;
@@ -7933,7 +7933,7 @@ encode_coding_object (coding, src_object
EMACS_INT chars = to - from;
EMACS_INT bytes = to_byte - from_byte;
Lisp_Object attrs;
- int saved_pt = -1, saved_pt_byte;
+ int saved_pt = -1, saved_pt_byte = 0;
int need_marker_adjustment = 0;
int kill_src_buffer = 0;
Lisp_Object old_deactivate_mark;
@@ -8273,8 +8273,8 @@ detect_coding_system (src, src_chars, sr
base_category = XINT (CODING_ATTR_CATEGORY (attrs));
if (base_category == coding_category_undecided)
{
- enum coding_category category;
- struct coding_system *this;
+ enum coding_category category = 0;
+ struct coding_system *this = (struct coding_system*)0;
int c, i;
/* Skip all ASCII bytes except for a few ISO2022 controls. */
--- src/doprnt.c
+++ src/doprnt.c 2010-03-17 14:05:00.296126178 +0000
@@ -154,8 +154,9 @@ doprnt1 (lispstrings, buffer, bufsize, f
while ('0' <= fmt[1] && fmt[1] <= '9')
{
unsigned m = n * 10;
+ unsigned o = n;
if (m / 10 != n
- || (n = m + (fmt[1] - '0')) < n)
+ || (n = m + (fmt[1] - '0')) < o)
error ("Format width or precision too large");
*string++ = *++fmt;
}
--- src/fns.c
+++ src/fns.c 2010-03-17 13:48:06.940163237 +0000
@@ -20,6 +20,7 @@ along with GNU Emacs. If not, see <http
#include <config.h>
+#include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
--- src/font.c
+++ src/font.c 2010-03-18 09:34:23.476126798 +0000
@@ -1491,7 +1491,7 @@ font_parse_fcname (name, font)
else
{
/* KEY=VAL pairs */
- Lisp_Object key;
+ Lisp_Object key = (Lisp_Object)0;
int prop;
if (q - p == 10 && memcmp (p + 1, "pixelsize", 9) == 0)
@@ -1618,7 +1618,7 @@ font_unparse_fcname (font, pixel_size, n
{
Lisp_Object family, foundry;
Lisp_Object tail, val;
- int point_size;
+ int point_size = 0;
int i, len = 1;
char *p;
Lisp_Object styles[3];
@@ -2933,7 +2933,7 @@ font_open_entity (f, entity, pixel_size)
Lisp_Object objlist, size, val, font_object;
struct font *font;
int min_width, height;
- int scaled_pixel_size;
+ int scaled_pixel_size = 0;
font_assert (FONT_ENTITY_P (entity));
size = AREF (entity, FONT_SIZE_INDEX);
--- src/keyboard.c
+++ src/keyboard.c 2010-03-18 09:25:58.544126669 +0000
@@ -3041,7 +3041,7 @@ read_char (commandflag, nmaps, maps, pre
if (NILP (c))
{
- KBOARD *kb;
+ KBOARD *kb = (KBOARD*)0;
if (end_time)
{
@@ -4517,7 +4517,7 @@ timer_check (do_it_now)
int do_it_now;
{
EMACS_TIME nexttime;
- EMACS_TIME now, idleness_now;
+ EMACS_TIME now, idleness_now = {0,0};
Lisp_Object timers, idle_timers, chosen_timer;
struct gcpro gcpro1, gcpro2, gcpro3;
@@ -4554,7 +4554,7 @@ timer_check (do_it_now)
Lisp_Object *vector;
Lisp_Object timer = Qnil, idle_timer = Qnil;
EMACS_TIME timer_time, idle_timer_time;
- EMACS_TIME difference, timer_difference, idle_timer_difference;
+ EMACS_TIME difference, timer_difference = {0,0}, idle_timer_difference = {0,0};
/* Skip past invalid timers and timers already handled. */
if (!NILP (timers))
--- src/md5.c
+++ src/md5.c 2010-03-17 13:51:35.852626322 +0000
@@ -26,6 +26,7 @@
# include <config.h>
#endif
+#include <stdio.h>
#include <sys/types.h>
#if STDC_HEADERS || defined _LIBC
--- src/syntax.c
+++ src/syntax.c 2010-03-18 09:35:21.984126762 +0000
@@ -491,7 +491,7 @@ back_comment (from, from_byte, stop, com
EMACS_INT comment_end = from;
EMACS_INT comment_end_byte = from_byte;
EMACS_INT comstart_pos = 0;
- EMACS_INT comstart_byte;
+ EMACS_INT comstart_byte = 0;
/* Place where the containing defun starts,
or 0 if we didn't come across it yet. */
EMACS_INT defun_start = 0;
@@ -1408,7 +1408,7 @@ skip_chars (forwardp, string, lim, handl
register unsigned int c;
unsigned char fastmap[0400];
/* Store the ranges of non-ASCII characters. */
- int *char_ranges;
+ int *char_ranges = (int*)0;
int n_char_ranges = 0;
int negate = 0;
register int i, i_byte;
--- src/term.c
+++ src/term.c 2010-03-18 08:56:44.632126575 +0000
@@ -70,7 +70,6 @@ static int been_here = -1;
#if defined HAVE_TERMCAP_H && 0
#include <termcap.h>
#else
-extern void tputs P_ ((const char *, int, int (*)(int)));
extern int tgetent P_ ((char *, const char *));
extern int tgetflag P_ ((char *id));
extern int tgetnum P_ ((char *id));
--- src/unexhp9k800.c
+++ src/unexhp9k800.c 2010-03-17 13:52:28.540626294 +0000
@@ -54,6 +54,9 @@
#endif
#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#include <fcntl.h>
#include <errno.h>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package syslogd for openSUSE:Factory
checked in at Wed Mar 31 20:00:17 CEST 2010.
--------
--- syslogd/syslogd.changes 2010-01-19 11:40:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/syslogd/syslogd.changes 2010-03-29 17:23:23.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Mar 29 16:48:18 CEST 2010 - werner(a)suse.de
+
+- Do not lose signals during reseting signal flag (bnc#568150)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
sysklogd-1.4.1-reload.dif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ syslogd.spec ++++++
--- /var/tmp/diff_new_pack.puBOQJ/_old 2010-03-31 19:59:41.000000000 +0200
+++ /var/tmp/diff_new_pack.puBOQJ/_new 2010-03-31 19:59:41.000000000 +0200
@@ -27,7 +27,7 @@
Provides: syslog
AutoReqProv: on
Version: 1.4.1
-Release: 713
+Release: 714
Summary: The Syslog daemon
Source: sysklogd-1.4.1.tar.bz2
Source1: logrotate.syslog
@@ -59,6 +59,7 @@
Patch20: sysklogd-1.4.1-clearing.patch
Patch21: sysklogd-1.4.1-nofortify.patch
Patch22: sysklogd-1.4.1-sysmap-prior-to-2.5.patch
+Patch23: sysklogd-1.4.1-reload.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -126,6 +127,7 @@
%patch20 -p0 -b .clear
%patch21 -p0 -b .nofortify
%patch22 -p0 -b .sysmap
+%patch23 -p0 -b .reload
%patch0 -p0
%build
++++++ sysklogd-1.4.1-reload.dif ++++++
--- syslogd.c
+++ syslogd.c 2010-03-29 15:12:11.000000000 +0000
@@ -565,7 +565,7 @@ char **parts;
int inetm = 0;
static int debugging_on = 0;
static int nlogs = -1;
-static int restart = 0;
+static volatile sig_atomic_t restart;
#define MAXFUNIX 20
@@ -1096,6 +1096,7 @@ int main(argc, argv)
dprintf("Starting.\n");
init();
+ (void) signal(SIGHUP, sighup_handler);
#ifndef TESTING
if ( Debug )
{
@@ -1167,9 +1168,22 @@ int main(argc, argv)
(fd_set *) NULL, (struct timeval *) NULL);
if ( restart )
{
+#ifndef _BSD_SOURCE
+ int omask = sigblock(sigmask(SIGHUP));
+#else
+ sigset_t blockhup;
+ sigemptyset(&blockhup);
+ sigaddset (&blockhup, SIGHUP);
+ (void) sigprocmask(SIG_BLOCK, &blockhup, NULL);
+#endif
+ restart = 0;
dprintf("\nReceived SIGHUP, reloading syslogd.\n");
init();
- restart = 0;
+#ifndef _BSD_SOURCE
+ (void) sigsetmask(omask);
+#else
+ (void) sigprocmask (SIG_UNBLOCK, &blockhup, NULL);
+#endif
continue;
}
if (nfds == 0) {
@@ -1676,17 +1690,23 @@ void logmsg(pri, msg, from, flags)
register struct filed *f;
int fac, prilev;
int msglen;
-#ifndef SYSV
+#ifndef _BSD_SOURCE
int omask;
#else
int lognum;
+ sigset_t nset, oset;
#endif
char *timestamp;
dprintf("logmsg: %s, flags %x, from %s, msg %s\n", textpri(pri), flags, from, msg);
-#ifndef SYSV
+#ifndef _BSD_SOURCE
omask = sigblock(sigmask(SIGHUP)|sigmask(SIGALRM));
+#else
+ sigemptyset(&nset);
+ sigaddset (&nset, SIGHUP);
+ sigaddset (&nset, SIGALRM);
+ (void)sigprocmask(SIG_BLOCK, &nset, &oset);
#endif
/*
@@ -1724,8 +1744,10 @@ void logmsg(pri, msg, from, flags)
(void) close(f->f_file);
f->f_file = -1;
}
-#ifndef SYSV
+#ifndef _BSD_SOURCE
(void) sigsetmask(omask);
+#else
+ (void)sigprocmask(SIG_SETMASK, &oset, NULL);
#endif
return;
}
@@ -1789,8 +1811,10 @@ void logmsg(pri, msg, from, flags)
}
}
}
-#ifndef SYSV
+#ifndef _BSD_SOURCE
(void) sigsetmask(omask);
+#else
+ (void)sigprocmask(SIG_SETMASK, &oset, NULL);
#endif
}
#if FALSE
@@ -2108,7 +2132,7 @@ void wallmsg(f, iov)
(void) signal(SIGTERM, SIG_DFL);
(void) alarm(0);
(void) signal(SIGALRM, endtty);
-#ifndef SYSV
+#ifndef _BSD_SOURCE
(void) signal(SIGTTOU, SIG_IGN);
(void) sigsetmask(0);
#endif
@@ -2178,14 +2202,14 @@ void wallmsg(f, iov)
void reapchild()
{
int saved_errno = errno;
-#if defined(SYSV) && !defined(linux)
+#if defined(SYSV) && !defined(_BSD_SOURCE)
(void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */
wait ((int *)0);
#else
while (waitpid(-1, (int*)0, WNOHANG|WUNTRACED) > 0)
;
#endif
-#ifdef linux
+#ifndef _BSD_SOURCE
(void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */
#endif
errno = saved_errno;
@@ -2318,7 +2342,9 @@ void debug_switch()
{
dprintf("Switching debugging_on to %s\n", (debugging_on == 0) ? "true" : "false");
debugging_on = (debugging_on == 0) ? 1 : 0;
+#ifndef _BSD_SOURCE
signal(SIGUSR1, debug_switch);
+#endif
}
@@ -2350,7 +2376,9 @@ void die(int sig)
(void) snprintf(buf, sizeof(buf), "exiting on signal %d", sig);
errno = 0;
logmsg(LOG_SYSLOG|LOG_INFO, buf, LocalHostName, ADDDATE);
+#ifdef _BSD_SOURCE
signal(sig, SIG_IGN);
+#endif
}
void dienow(void)
@@ -2664,7 +2692,6 @@ void init()
logmsg(LOG_SYSLOG|LOG_INFO, "syslogd " VERSION "." PATCHLEVEL \
": restart." , LocalHostName, ADDDATE);
#endif
- (void) signal(SIGHUP, sighup_handler);
dprintf("syslogd: restarted.\n");
}
#if FALSE
@@ -3061,7 +3088,9 @@ void sighup_handler()
{
restart = 1;
+#ifndef _BSD_SOURCE
signal(SIGHUP, sighup_handler);
+#endif
return;
}
++++++ sysklogd-1.4.1.dif ++++++
--- /var/tmp/diff_new_pack.puBOQJ/_old 2010-03-31 19:59:41.000000000 +0200
+++ /var/tmp/diff_new_pack.puBOQJ/_new 2010-03-31 19:59:41.000000000 +0200
@@ -598,7 +598,7 @@
(void) alarm(0);
(void) signal(SIGALRM, endtty);
+ (void) siginterrupt(SIGALRM,1); /* Make recvfrom() be able to receive EINTR */
- #ifndef SYSV
+ #ifndef _BSD_SOURCE
(void) signal(SIGTTOU, SIG_IGN);
(void) sigsetmask(0);
@@ -2123,7 +2141,7 @@ void wallmsg(f, iov)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 for openSUSE:Factory
checked in at Wed Mar 31 20:00:04 CEST 2010.
--------
--- cyrus-imapd/cyrus-imapd.changes 2010-03-30 10:34:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/cyrus-imapd/cyrus-imapd.changes 2010-03-30 13:45:21.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Mar 30 11:35:40 UTC 2010 - rbos(a)opensuse.org
+
+- Removed Patch101 KOLAB_cyrus-imapd-%{version}_Annotations2.patch
+- Change Source107 to Patch107
+
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
KOLAB_cyrus-imapd-2.3.16_Annotations2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cyrus-imapd.spec ++++++
--- /var/tmp/diff_new_pack.1li1zS/_old 2010-03-31 19:58:15.000000000 +0200
+++ /var/tmp/diff_new_pack.1li1zS/_new 2010-03-31 19:58:15.000000000 +0200
@@ -51,7 +51,7 @@
AutoReqProv: on
Summary: The Cyrus IMAP and POP Mail Server
Version: 2.3.16
-Release: 2
+Release: 3
Source: %{prjname}-%{version}.tar.bz2
Source1: cyrus-imapd-rc.tar.gz
# The autocreate Patchset is maintained at:
@@ -71,14 +71,12 @@
# KOLAB_cyrus-imapd patches are maintained at
# http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/imapd/patches/
Patch100: KOLAB_cyrus-imapd-%{version}_Cyradm_Annotations.patch
-Patch101: KOLAB_cyrus-imapd-%{version}_Annotations2.patch
Patch102: KOLAB_cyrus-imapd-%{version}_Folder-names.patch
Patch103: KOLAB_cyrus-imapd-%{version}_Groups2.patch
Patch104: KOLAB_cyrus-imapd-%{version}_Logging.patch
Patch105: KOLAB_cyrus-imapd-%{version}_timsieved_starttls-sendcaps.patch
Patch106: KOLAB_cyrus-imapd-%{version}_UID.patch
-# This patch does not apply cleanly currently
-Source107: KOLAB_cyrus-imapd-%{version}_cross-domain-acls.patch
+Patch107: KOLAB_cyrus-imapd-%{version}_cross-domain-acls.patch
%endif
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
@@ -184,12 +182,12 @@
%if %{with_kolab}
%patch100 -p1
-%patch101 -p1
%patch102 -p1
%patch103 -p1
%patch104 -p1
%patch105 -p1
%patch106 -p1
+%patch107 -p1
%endif
%build
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 sysconfig for openSUSE:Factory
checked in at Wed Mar 31 19:59:07 CEST 2010.
--------
--- sysconfig/sysconfig.changes 2010-03-12 19:01:16.000000000 +0100
+++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2010-03-29 11:00:05.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Mar 29 08:59:30 UTC 2010 - coolo(a)novell.com
+
+- make the network script cleanup the netconfig scripts on stop,
+ so that it doesn't have to be done on boot - where it's much more
+ expensive
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
cleanup.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sysconfig.spec ++++++
--- /var/tmp/diff_new_pack.spolvF/_old 2010-03-31 19:58:34.000000000 +0200
+++ /var/tmp/diff_new_pack.spolvF/_new 2010-03-31 19:58:34.000000000 +0200
@@ -20,7 +20,7 @@
Name: sysconfig
Version: 0.73.4
-Release: 1
+Release: 2
Summary: The sysconfig scheme
Group: System/Base
License: GPLv2+
@@ -29,6 +29,7 @@
Requires: iproute2 dbus-1 procps
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %name-%version.tar.bz2
+Patch0: cleanup.diff
%description
This package provides the SuSE system configuration scheme.
@@ -49,6 +50,7 @@
%prep
%setup -n sysconfig-%{version}
+%patch0 -p1
%build
autoreconf --force --install
++++++ cleanup.diff ++++++
Index: sysconfig-0.73.4/scripts/network
===================================================================
--- sysconfig-0.73.4.orig/scripts/network 2010-03-12 18:59:05.000000000 +0100
+++ sysconfig-0.73.4/scripts/network 2010-03-29 10:59:08.000000000 +0200
@@ -199,6 +199,7 @@ case "$ACTION" in
$FAKE killproc -TERM $NETWORKMANAGER_BIN
rc_status -v
fi
+ netconfig update
# else fall through to NetControl
;;
try-restart)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 squid3 for openSUSE:Factory
checked in at Wed Mar 31 19:57:57 CEST 2010.
--------
--- squid3/squid3.changes 2010-02-16 10:42:52.000000000 +0100
+++ /mounts/work_src_done/STABLE/squid3/squid3.changes 2010-03-16 23:29:13.000000000 +0100
@@ -1,0 +2,10 @@
+Tue Mar 16 22:18:08 UTC 2010 - chris(a)computersalat.de
+
+- new version 3.0.STABLE25
+ - Bug 2845: Rework the http digest auth parser
+ - Bug 2787: unknown/unexpected status code messages
+ - Bug 2507: squid_ldap_group: Strip Domain name separated by +
+ - Bug 2367: stale=true on digest requests with unknown nonce
+ - ... and several other minor corrections
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
squid-3.0.STABLE24-RELEASENOTES.html
squid-3.0.STABLE24.tar.bz2
New:
----
squid-3.0.STABLE25-RELEASENOTES.html
squid-3.0.STABLE25.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ squid3.spec ++++++
--- /var/tmp/diff_new_pack.Z1yxpa/_old 2010-03-31 19:57:07.000000000 +0200
+++ /var/tmp/diff_new_pack.Z1yxpa/_new 2010-03-31 19:57:07.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package squid3 (Version 3.0.STABLE24)
+# spec file for package squid3 (Version 3.0.STABLE25)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -25,7 +25,7 @@
Name: squid3
Summary: Squid Version 3 WWW Proxy Server
-Version: 3.0.STABLE24
+Version: 3.0.STABLE25
Release: 1
License: GPLv2+
Url: http://www.squid-cache.org/Versions/v3
++++++ squid-3.0.STABLE24-RELEASENOTES.html -> squid-3.0.STABLE25-RELEASENOTES.html ++++++
++++++ squid-3.0.STABLE24.tar.bz2 -> squid-3.0.STABLE25.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.0.STABLE24/ChangeLog new/squid-3.0.STABLE25/ChangeLog
--- old/squid-3.0.STABLE24/ChangeLog 2010-02-12 14:52:58.000000000 +0100
+++ new/squid-3.0.STABLE25/ChangeLog 2010-03-14 06:45:39.000000000 +0100
@@ -1,3 +1,11 @@
+Changes to squid-3.0.STABLE25 (14 Mar 2010):
+
+ - Bug 2845: Rework the http digest auth parser
+ - Bug 2787: unknown/unexpected status code messages
+ - Bug 2507: squid_ldap_group: Strip Domain name separated by +
+ - Bug 2367: stale=true on digest requests with unknown nonce
+ - ... and several other minor corrections
+
Changes to squid-3.0.STABLE24 (13 Feb 2010):
- Bug 2858: Segment violation in HTCP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.0.STABLE24/configure new/squid-3.0.STABLE25/configure
--- old/squid-3.0.STABLE24/configure 2010-02-12 14:53:20.000000000 +0100
+++ new/squid-3.0.STABLE25/configure 2010-03-14 06:45:43.000000000 +0100
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.in Revision.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for Squid Web Proxy 3.0.STABLE24.
+# Generated by GNU Autoconf 2.62 for Squid Web Proxy 3.0.STABLE25.
#
# Report bugs to <http://www.squid-cache.org/bugs/>.
#
@@ -751,8 +751,8 @@
# Identity of this package.
PACKAGE_NAME='Squid Web Proxy'
PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='3.0.STABLE24'
-PACKAGE_STRING='Squid Web Proxy 3.0.STABLE24'
+PACKAGE_VERSION='3.0.STABLE25'
+PACKAGE_STRING='Squid Web Proxy 3.0.STABLE25'
PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/'
ac_unique_file="src/main.cc"
@@ -1663,7 +1663,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 Squid Web Proxy 3.0.STABLE24 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 3.0.STABLE25 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1733,7 +1733,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Squid Web Proxy 3.0.STABLE24:";;
+ short | recursive ) echo "Configuration of Squid Web Proxy 3.0.STABLE25:";;
esac
cat <<\_ACEOF
@@ -2047,7 +2047,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Squid Web Proxy configure 3.0.STABLE24
+Squid Web Proxy configure 3.0.STABLE25
generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -2061,7 +2061,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Squid Web Proxy $as_me 3.0.STABLE24, which was
+It was created by Squid Web Proxy $as_me 3.0.STABLE25, which was
generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@
@@ -2779,7 +2779,7 @@
# Define the identity of the package.
PACKAGE='squid'
- VERSION='3.0.STABLE24'
+ VERSION='3.0.STABLE25'
cat >>confdefs.h <<_ACEOF
@@ -48207,7 +48207,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Squid Web Proxy $as_me 3.0.STABLE24, which was
+This file was extended by Squid Web Proxy $as_me 3.0.STABLE25, which was
generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -48260,7 +48260,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-Squid Web Proxy config.status 3.0.STABLE24
+Squid Web Proxy config.status 3.0.STABLE25
configured by $0, generated by GNU Autoconf 2.62,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.0.STABLE24/configure.in new/squid-3.0.STABLE25/configure.in
--- old/squid-3.0.STABLE24/configure.in 2010-02-12 14:53:20.000000000 +0100
+++ new/squid-3.0.STABLE25/configure.in 2010-03-14 06:45:43.000000000 +0100
@@ -1,7 +1,7 @@
dnl Configuration input file for Squid
dnl
dnl
-AC_INIT(Squid Web Proxy, 3.0.STABLE24, http://www.squid-cache.org/bugs/, squid)
+AC_INIT(Squid Web Proxy, 3.0.STABLE25, http://www.squid-cache.org/bugs/, squid)
AC_PREREQ(2.52)
AM_CONFIG_HEADER(include/autoconf.h)
AC_CONFIG_AUX_DIR(cfgaux)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.0.STABLE24/helpers/external_acl/ldap_group/squid_ldap_group.c new/squid-3.0.STABLE25/helpers/external_acl/ldap_group/squid_ldap_group.c
--- old/squid-3.0.STABLE24/helpers/external_acl/ldap_group/squid_ldap_group.c 2010-02-12 14:53:08.000000000 +0100
+++ new/squid-3.0.STABLE25/helpers/external_acl/ldap_group/squid_ldap_group.c 2010-03-14 06:45:40.000000000 +0100
@@ -475,6 +475,8 @@
char *u = strrchr(user, '\\');
if (!u)
u = strrchr(user, '/');
+ if (!u)
+ u = strrchr(user, '+');
if (u && u[1])
user = u + 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.0.STABLE24/include/version.h new/squid-3.0.STABLE25/include/version.h
--- old/squid-3.0.STABLE24/include/version.h 2010-02-12 14:53:20.000000000 +0100
+++ new/squid-3.0.STABLE25/include/version.h 2010-03-14 06:45:43.000000000 +0100
@@ -9,5 +9,5 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1265982776
+#define SQUID_RELEASE_TIME 1268545528
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.0.STABLE24/src/HttpHeaderTools.cc new/squid-3.0.STABLE25/src/HttpHeaderTools.cc
--- old/squid-3.0.STABLE24/src/HttpHeaderTools.cc 2010-02-12 14:53:15.000000000 +0100
+++ new/squid-3.0.STABLE25/src/HttpHeaderTools.cc 2010-03-14 06:45:43.000000000 +0100
@@ -353,25 +353,29 @@
{
const char *end, *pos;
val->clean();
- assert (*start == '"');
+ if (*start != '"') {
+ debugs(66, 2, "failed to parse a quoted-string header field near '" << start << "'");
+ return 0;
+ }
pos = start + 1;
- while (1) {
- if (!(end = index (pos,'"'))) {
+ while (*pos != '"') {
+ bool quoted = (*pos == '\\');
+ if (quoted)
+ pos++;
+ if (!*pos) {
debugs(66, 2, "failed to parse a quoted-string header field near '" << start << "'");
+ val->clean();
return 0;
}
-
- /* check for quoted-chars */
- if (*(end - 1) != '\\') {
- /* done */
- val->append(start + 1, end-start-1);
- return 1;
- }
-
- /* try for the end again */
- pos = end + 1;
+ end = pos + strcspn(pos + quoted, "\"\\") + quoted;
+ val->append(pos, end-pos);
+ pos = end;
}
+ /* Make sure it's defined even if empty "" */
+ if (!val->buf())
+ val->limitInit("", 0);
+ return 1;
}
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.0.STABLE24/src/auth/digest/auth_digest.cc new/squid-3.0.STABLE25/src/auth/digest/auth_digest.cc
--- old/squid-3.0.STABLE24/src/auth/digest/auth_digest.cc 2010-02-12 14:53:16.000000000 +0100
+++ new/squid-3.0.STABLE25/src/auth/digest/auth_digest.cc 2010-03-14 06:45:43.000000000 +0100
@@ -67,6 +67,33 @@
CBDATA_TYPE(DigestAuthenticateStateData);
+enum http_digest_attr_type {
+ DIGEST_USERNAME,
+ DIGEST_REALM,
+ DIGEST_QOP,
+ DIGEST_ALGORITHM,
+ DIGEST_URI,
+ DIGEST_NONCE,
+ DIGEST_NC,
+ DIGEST_CNONCE,
+ DIGEST_RESPONSE,
+ DIGEST_ENUM_END
+};
+
+static const HttpHeaderFieldAttrs DigestAttrs[DIGEST_ENUM_END] = {
+ {"username", (http_hdr_type)DIGEST_USERNAME},
+ {"realm", (http_hdr_type)DIGEST_REALM},
+ {"qop", (http_hdr_type)DIGEST_QOP},
+ {"algorithm", (http_hdr_type)DIGEST_ALGORITHM},
+ {"uri", (http_hdr_type)DIGEST_URI},
+ {"nonce", (http_hdr_type)DIGEST_NONCE},
+ {"nc", (http_hdr_type)DIGEST_NC},
+ {"cnonce", (http_hdr_type)DIGEST_CNONCE},
+ {"response", (http_hdr_type)DIGEST_RESPONSE},
+};
+
+static HttpHeaderFieldInfo *DigestFieldsInfo = NULL;
+
/*
*
* Nonce Functions
@@ -507,6 +534,11 @@
if (digestauthenticators)
helperShutdown(digestauthenticators);
+ if (DigestFieldsInfo) {
+ httpHeaderDestroyFieldsInfo(DigestFieldsInfo, DIGEST_ENUM_END);
+ DigestFieldsInfo = NULL;
+ }
+
authdigest_initialised = 0;
if (!shutting_down) {
@@ -642,6 +674,7 @@
if (strcasecmp(digest_request->response, Response)) {
credentials(Failed);
+ digest_request->flags.invalid_password = 1;
digest_request->setDenyMessage("Incorrect password");
return;
} else {
@@ -871,6 +904,7 @@
AuthDigestConfig::init(AuthConfig * scheme)
{
if (authenticate) {
+ DigestFieldsInfo = httpHeaderBuildFieldsInfo(DigestAttrs, DIGEST_ENUM_END);
authenticateDigestNonceSetup();
authdigest_initialised = 1;
@@ -1093,124 +1127,84 @@
String temp(proxy_auth);
while (strListGetItem(&temp, ',', &item, &ilen, &pos)) {
- if ((p = strchr(item, '=')) && (p - item < ilen))
- ilen = p++ - item;
-
- if (!strncmp(item, "username", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
+ String value;
+ size_t nlen;
+ /* isolate directive name */
+ if ((p = (const char *)memchr(item, '=', ilen)) && (p - item < ilen)) {
+ nlen = p++ - item;
+ if (!httpHeaderParseQuotedString(p, &value))
+ value.limitInit(p, ilen - (p - item));
+ } else
+ nlen = ilen;
+
+ if (!value.buf()) {
+ debugs(29, 9, "authDigestDecodeAuth: Failed to parse attribute '" << item << "' in '" << temp << "'");
+ continue;
+ }
- /* quote mark */
- p++;
+ /* find type */
+ http_digest_attr_type type = (http_digest_attr_type)httpHeaderIdByName(item, nlen, DigestFieldsInfo, DIGEST_ENUM_END);
+ switch (type) {
+ case DIGEST_USERNAME:
safe_free(username);
- username = xstrndup(p, strchr(p, '"') + 1 - p);
-
+ username = xstrndup(value.buf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found Username '" << username << "'");
- } else if (!strncmp(item, "realm", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
-
- /* quote mark */
- p++;
+ break;
+ case DIGEST_REALM:
safe_free(digest_request->realm);
- digest_request->realm = xstrndup(p, strchr(p, '"') + 1 - p);
-
+ digest_request->realm = xstrndup(value.buf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found realm '" << digest_request->realm << "'");
- } else if (!strncmp(item, "qop", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
-
- if (*p == '\"')
- /* quote mark */
- p++;
+ break;
+ case DIGEST_QOP:
safe_free(digest_request->qop);
- digest_request->qop = xstrndup(p, strcspn(p, "\" \t\r\n()<>@,;:\\/[]?={}") + 1);
-
+ digest_request->qop = xstrndup(value.buf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found qop '" << digest_request->qop << "'");
- } else if (!strncmp(item, "algorithm", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
-
- if (*p == '\"')
- /* quote mark */
- p++;
+ break;
+ case DIGEST_ALGORITHM:
safe_free(digest_request->algorithm);
- digest_request->algorithm = xstrndup(p, strcspn(p, "\" \t\r\n()<>@,;:\\/[]?={}") + 1);
-
+ digest_request->algorithm = xstrndup(value.buf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found algorithm '" << digest_request->algorithm << "'");
- } else if (!strncmp(item, "uri", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
-
- /* quote mark */
- p++;
+ break;
+ case DIGEST_URI:
safe_free(digest_request->uri);
- digest_request->uri = xstrndup(p, strchr(p, '"') + 1 - p);
-
+ digest_request->uri = xstrndup(value.buf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found uri '" << digest_request->uri << "'");
- } else if (!strncmp(item, "nonce", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
-
- /* quote mark */
- p++;
+ break;
+ case DIGEST_NONCE:
safe_free(digest_request->nonceb64);
- digest_request->nonceb64 = xstrndup(p, strchr(p, '"') + 1 - p);
-
+ digest_request->nonceb64 = xstrndup(value.buf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found nonce '" << digest_request->nonceb64 << "'");
- } else if (!strncmp(item, "nc", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
-
- xstrncpy(digest_request->nc, p, 9);
+ break;
+ case DIGEST_NC:
+ if (value.size() != 8) {
+ debugs(29, 9, "authDigestDecodeAuth: Invalid nc '" << value << "' in '" << temp << "'");
+ }
+ xstrncpy(digest_request->nc, value.buf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found noncecount '" << digest_request->nc << "'");
- } else if (!strncmp(item, "cnonce", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
-
- /* quote mark */
- p++;
+ break;
+ case DIGEST_CNONCE:
safe_free(digest_request->cnonce);
- digest_request->cnonce = xstrndup(p, strchr(p, '"') + 1 - p);
-
+ digest_request->cnonce = xstrndup(value.buf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found cnonce '" << digest_request->cnonce << "'");
- } else if (!strncmp(item, "response", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
-
- /* quote mark */
- p++;
+ break;
+ case DIGEST_RESPONSE:
safe_free(digest_request->response);
- digest_request->response = xstrndup(p, strchr(p, '"') + 1 - p);
-
+ digest_request->response = xstrndup(value.buf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found response '" << digest_request->response << "'");
+ break;
+
+ default:
+ debugs(29, 3, "authDigestDecodeAuth: Unknown attribute '" << item << "' in '" << temp << "'");
+ break;
}
}
@@ -1228,69 +1222,103 @@
* correct values - 400/401/407
*/
- /* first the NONCE count */
+ /* 2069 requirements */
- if (digest_request->cnonce && strlen(digest_request->nc) != 8) {
- debugs(29, 4, "authenticateDigestDecode: nonce count length invalid");
+ /* do we have a username ? */
+ if (!username || username[0] == '\0') {
+ debugs(29, 2, "authenticateDigestDecode: Empty or not present username");
return authDigestLogUsername(username, digest_request);
}
- /* now the nonce */
- nonce = authenticateDigestNonceFindNonce(digest_request->nonceb64);
-
- if (!nonce) {
- /* we couldn't find a matching nonce! */
- debugs(29, 4, "authenticateDigestDecode: Unexpected or invalid nonce received");
+ /* Sanity check of the username.
+ * " can not be allowed in usernames until * the digest helper protocol
+ * have been redone
+ */
+ if (strchr(username, '"')) {
+ debugs(29, 2, "authenticateDigestDecode: Unacceptable username '" << username << "'");
return authDigestLogUsername(username, digest_request);
}
- digest_request->nonce = nonce;
- authDigestNonceLink(nonce);
-
- /* check the qop is what we expected. Note that for compatability with
- * RFC 2069 we should support a missing qop. Tough. */
+ /* do we have a realm ? */
+ if (!digest_request->realm || digest_request->realm[0] == '\0') {
+ debugs(29, 2, "authenticateDigestDecode: Empty or not present realm");
+ return authDigestLogUsername(username, digest_request);
+ }
- if (digest_request->qop && strcmp(digest_request->qop, QOP_AUTH) != 0) {
- /* we received a qop option we didn't send */
- debugs(29, 4, "authenticateDigestDecode: Invalid qop option received");
+ /* and a nonce? */
+ if (!digest_request->nonceb64 || digest_request->nonceb64[0] == '\0') {
+ debugs(29, 2, "authenticateDigestDecode: Empty or not present nonce");
return authDigestLogUsername(username, digest_request);
}
/* we can't check the URI just yet. We'll check it in the
- * authenticate phase */
+ * authenticate phase, but needs to be given */
+ if (!digest_request->uri || digest_request->uri[0] == '\0') {
+ debugs(29, 2, "authenticateDigestDecode: Missing URI field");
+ return authDigestLogUsername(username, digest_request);
+ }
/* is the response the correct length? */
-
if (!digest_request->response || strlen(digest_request->response) != 32) {
- debugs(29, 4, "authenticateDigestDecode: Response length invalid");
+ debugs(29, 2, "authenticateDigestDecode: Response length invalid");
return authDigestLogUsername(username, digest_request);
}
- /* do we have a username ? */
- if (!username || username[0] == '\0') {
- debugs(29, 4, "authenticateDigestDecode: Empty or not present username");
+ /* check the algorithm is present and supported */
+ if (!digest_request->algorithm)
+ digest_request->algorithm = xstrndup("MD5", 4);
+ else if (strcmp(digest_request->algorithm, "MD5")
+ && strcmp(digest_request->algorithm, "MD5-sess")) {
+ debugs(29, 2, "authenticateDigestDecode: invalid algorithm specified!");
return authDigestLogUsername(username, digest_request);
}
- /* check that we're not being hacked / the username hasn't changed */
- if (nonce->user && strcmp(username, nonce->user->username())) {
- debugs(29, 4, "authenticateDigestDecode: Username for the nonce does not equal the username for the request");
- return authDigestLogUsername(username, digest_request);
+ /* 2617 requirements, indicated by qop */
+ if (digest_request->qop) {
+
+ /* check the qop is what we expected. */
+ if (strcmp(digest_request->qop, QOP_AUTH) != 0) {
+ /* we received a qop option we didn't send */
+ debugs(29, 2, "authenticateDigestDecode: Invalid qop option received");
+ return authDigestLogUsername(username, digest_request);
+ }
+
+ /* check cnonce */
+ if (!digest_request->cnonce || digest_request->cnonce[0] == '\0') {
+ debugs(29, 2, "authenticateDigestDecode: Missing cnonce field");
+ return authDigestLogUsername(username, digest_request);
+ }
+
+ /* check nc */
+ if (strlen(digest_request->nc) != 8 || strspn(digest_request->nc, "0123456789abcdefABCDEF") != 8) {
+ debugs(29, 2, "authenticateDigestDecode: invalid nonce count");
+ return authDigestLogUsername(username, digest_request);
+ }
+ } else {
+ /* cnonce and nc both require qop */
+ if (digest_request->cnonce || digest_request->nc) {
+ debugs(29, 2, "authenticateDigestDecode: missing qop!");
+ return authDigestLogUsername(username, digest_request);
+ }
}
- /* if we got a qop, did we get a cnonce or did we get a cnonce wihtout a qop? */
- if ((digest_request->qop && !digest_request->cnonce)
- || (!digest_request->qop && digest_request->cnonce)) {
- debugs(29, 4, "authenticateDigestDecode: qop without cnonce, or vice versa!");
+ /** below nonce state dependent **/
+
+ /* now the nonce */
+ nonce = authenticateDigestNonceFindNonce(digest_request->nonceb64);
+ if (!nonce) {
+ /* we couldn't find a matching nonce! */
+ debugs(29, 2, "authenticateDigestDecode: Unexpected or invalid nonce received");
+ digest_request->credentials(AuthDigestUserRequest::Failed);
return authDigestLogUsername(username, digest_request);
}
- /* check the algorithm is present and supported */
- if (!digest_request->algorithm)
- digest_request->algorithm = xstrndup("MD5", 4);
- else if (strcmp(digest_request->algorithm, "MD5")
- && strcmp(digest_request->algorithm, "MD5-sess")) {
- debugs(29, 4, "authenticateDigestDecode: invalid algorithm specified!");
+ digest_request->nonce = nonce;
+ authDigestNonceLink(nonce);
+
+ /* check that we're not being hacked / the username hasn't changed */
+ if (nonce->user && strcmp(username, nonce->user->username())) {
+ debugs(29, 2, "authenticateDigestDecode: Username for the nonce does not equal the username for the request");
return authDigestLogUsername(username, digest_request);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.0.STABLE24/src/cbdata.h new/squid-3.0.STABLE25/src/cbdata.h
--- old/squid-3.0.STABLE24/src/cbdata.h 2010-02-12 14:53:17.000000000 +0100
+++ new/squid-3.0.STABLE25/src/cbdata.h 2010-03-14 06:45:39.000000000 +0100
@@ -83,8 +83,7 @@
} \
void operator delete (void *address) { \
if (address) cbdataInternalFreeDbg(address,__FILE__,__LINE__); \
- } \
-#else
+ }
#else /* CBDATA_DEBUG */
#define cbdataAlloc(type) ((type *)cbdataInternalAlloc(CBDATA_##type))
#define cbdataFree(var) do {if (var) {cbdataInternalFree(var); var = NULL;}} while(0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.0.STABLE24/src/cf.data.pre new/squid-3.0.STABLE25/src/cf.data.pre
--- old/squid-3.0.STABLE24/src/cf.data.pre 2010-02-12 14:53:17.000000000 +0100
+++ new/squid-3.0.STABLE25/src/cf.data.pre 2010-03-14 06:45:43.000000000 +0100
@@ -1595,7 +1595,7 @@
The syntax is identical to 'http_access' and the other lists of
ACL elements. See the comments for 'http_access' below, or
- the Squid FAQ (http://www.squid-cache.org/FAQ/FAQ-10.html)
+ the Squid FAQ (http://wiki.squid-cache.org/SquidFaq/SquidAcl)
DOC_END
NAME: neighbor_type_domain
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.0.STABLE24/src/http.cc new/squid-3.0.STABLE25/src/http.cc
--- old/squid-3.0.STABLE24/src/http.cc 2010-02-12 14:53:18.000000000 +0100
+++ new/squid-3.0.STABLE25/src/http.cc 2010-03-14 06:45:41.000000000 +0100
@@ -569,8 +569,9 @@
return 0;
- default: /* Unknown status code */
- debugs (11, DBG_IMPORTANT, "WARNING: Unexpected http status code " << rep->sline.status);
+ default:
+ /* RFC 2616 section 6.1.1: an unrecognized response MUST NOT be cached. */
+ debugs (11, 3, HERE << "Unknown HTTP status code " << rep->sline.status << ". Not cacheable.");
return 0;
@@ -747,6 +748,19 @@
readBuf->consume(header_bytes_read);
}
+ /* Skip 1xx messages for now. Advertised in Via as an internal 1.0 hop */
+ if (newrep->sline.status >= 100 && newrep->sline.status < 200) {
+ delete newrep;
+ debugs(11, 2, HERE << "1xx headers consume " << header_bytes_read << " bytes header.");
+ header_bytes_read = 0;
+ if (reply_bytes_read > 0)
+ debugs(11, 2, HERE << "1xx headers consume " << reply_bytes_read << " bytes reply.");
+ reply_bytes_read = 0;
+ ctx_exit(ctx);
+ processReplyHeader();
+ return;
+ }
+
flags.chunked = 0;
if (newrep->header.hasListMember(HDR_TRANSFER_ENCODING, "chunked", ',')) {
flags.chunked = 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 cups-pk-helper for openSUSE:Factory
checked in at Wed Mar 31 19:57:41 CEST 2010.
--------
--- cups-pk-helper/cups-pk-helper.changes 2010-02-19 17:11:18.000000000 +0100
+++ /mounts/work_src_done/STABLE/cups-pk-helper/cups-pk-helper.changes 2010-03-22 15:28:51.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Mar 22 10:10:47 UTC 2010 - dimstar(a)opensuse.org
+
+- Add cups-pk-helper-buildfix.patch to fix build, taken from
+ upstream.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
cups-pk-helper-buildfix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups-pk-helper.spec ++++++
--- /var/tmp/diff_new_pack.pdSXlm/_old 2010-03-31 19:56:51.000000000 +0200
+++ /var/tmp/diff_new_pack.pdSXlm/_new 2010-03-31 19:56:51.000000000 +0200
@@ -22,10 +22,12 @@
License: GPLv2+
Group: Hardware/Printing
Version: 0.1.0
-Release: 1
+Release: 2
Summary: PolicyKit helper to configure cups with fine-grained privileges
Url: http://www.vuntz.net/download/cups-pk-helper/
Source0: http://www.vuntz.net/download/cups-pk-helper/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM cups-pk-helper-buildfix.patch fdo#27235 dimstar(a)opensuse.org -- Fix build: Patch from upstream commit df2b6a4.
+Patch0: cups-pk-helper-buildfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cups-devel
# For directory ownership
@@ -43,6 +45,7 @@
%prep
%setup -q
+%patch0 -p1
%build
%configure --libexecdir=%{_libdir}/cups-pk-helper
++++++ cups-pk-helper-buildfix.patch ++++++
>From df2b6a40ac99360aafa05c71be28ee8a972bd8c4 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz(a)novell.com>
Date: Mon, 22 Mar 2010 10:35:03 +0000
Subject: Make the include/exclude schemes work when getting devices with cups 1.4
We were using g_strjoin() instead of g_strjoinv().
Thanks to Dominique Leuenberger
<dominique-freedesktop.org(a)leuenberger.net> for noticing the warning.
http://bugs.freedesktop.org/show_bug.cgi?id=27235
---
diff --git a/src/cups.c b/src/cups.c
index e439051..4186f42 100644
--- a/src/cups.c
+++ b/src/cups.c
@@ -1227,12 +1227,12 @@ _cph_cups_devices_get_14 (CphCups *cups,
timeout_param = timeout;
if (include_schemes && len_include > 0)
- include_schemes_param = g_strjoin (",", include_schemes);
+ include_schemes_param = g_strjoinv (",", (char **) include_schemes);
else
include_schemes_param = g_strdup (CUPS_INCLUDE_ALL);
if (exclude_schemes && len_exclude > 0)
- exclude_schemes_param = g_strjoin (",", exclude_schemes);
+ exclude_schemes_param = g_strjoinv (",", (char **) exclude_schemes);
else
exclude_schemes_param = g_strdup (CUPS_EXCLUDE_NONE);
--
cgit v0.8.3-6-g21f6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 cups for openSUSE:Factory
checked in at Wed Mar 31 19:57:29 CEST 2010.
--------
--- cups/cups.changes 2010-03-16 12:49:40.000000000 +0100
+++ /mounts/work_src_done/STABLE/cups/cups.changes 2010-03-31 13:28:43.000000000 +0200
@@ -1,0 +2,18 @@
+Wed Mar 31 12:52:02 CEST 2010 - jsmeix(a)suse.de
+
+- Upgraded to CUPS 1.4.3:
+ * The scheduler could try responding on a closed client
+ connection, leading to a crash
+ (CVE-2009-3553, STR #3200, and bnc#554861).
+ * The lppasswd program allowed the localization files
+ to be overridden when running in setuid mode
+ (CVE-2010-0393, STR #3482, and bnc#574336).
+ * The scheduler would crash when an active printer was deleted.
+ * The DBUS notifier did not build (STR #3447).
+ * The scheduler did not reset the SIGPIPE handler
+ of child processes (STR #3399).
+ * For a complete list see the CHANGES.txt file.
+- cups-1.3.9-CVE-2009-3553.patch has become
+ obsolete because it is fixed in the source.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
cups-1.4.2-source.tar.bz2
New:
----
cups-1.4.3-source.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups.spec ++++++
--- /var/tmp/diff_new_pack.RBRX3W/_old 2010-03-31 19:56:20.000000000 +0200
+++ /var/tmp/diff_new_pack.RBRX3W/_new 2010-03-31 19:56:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package cups (Version 1.4.2)
+# spec file for package cups (Version 1.4.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -29,7 +29,7 @@
License: GPLv2+
Group: Hardware/Printing
Summary: The Common UNIX Printing System
-Version: 1.4.2
+Version: 1.4.3
Release: 1
# Require the exact matching version-release of the cups-libs sub-package because
# non-matching CUPS libraries may let CUPS software crash (e.g. segfault)
@@ -51,8 +51,8 @@
Conflicts: plp lprold lprng
Obsoletes: cups-SUSE-ppds-dat
# Source0...Source9 is for sources from upstream:
-# URL for Source0: http://ftp.easysw.com/pub/cups/1.4.2/cups-1.4.2-source.tar.bz2
-# MD5 sum for Source0 on http://www.cups.org/software.php is d95e2d588e3d36e563027a963b117b1b
+# URL for Source0: http://ftp.easysw.com/pub/cups/1.4.3/cups-1.4.3-source.tar.bz2
+# MD5 sum for Source0 on http://www.cups.org/software.php is e70b1c3f60143d7310c1d74c111a21ab
Source0: cups-%{version}-source.tar.bz2
# Patch0...Patch9 is for patches from upstream:
# Source10...Source99 is for sources from Novell/openSUSE which are intended for upstream:
@@ -60,7 +60,6 @@
# Patch10 adds 'smb://...' URIs to templates/choose-uri.tmpl:
Patch10: cups-1.2rc1-template.patch
# Source100...Source999 is for private sources from Novell/openSUSE which are not intended for upstream:
-Source100: cups-krb5-config
Source101: cups.init
Source102: postscript.ppd.bz2
Source103: cups.sysconfig
@@ -200,8 +199,6 @@
%patch103
# Patch104 adds the 'allowallforanybody' policy to cupsd.conf:
%patch104
-# Install our special krb5-config (Source100: cups-krb5-config):
-install -m755 %{SOURCE100} krb5-config
%build
%{?suse_update_config:%{suse_update_config -f . }}
@@ -211,7 +208,7 @@
export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -O2 -fno-strict-aliasing -fstack-protector"
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector -DLDAP_DEPRECATED"
export CXX=g++
-KRB5CONFIG=${PWD}/krb5-config ./configure \
+./configure \
--mandir=%{_mandir} \
--sysconfdir=%{_sysconfdir} \
--libdir=%{_libdir} \
@@ -244,28 +241,32 @@
install -m 644 %{SOURCE103} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.cups
perl -pi -e "s:\@LIB\@:%{_libdir}:g" $RPM_BUILD_ROOT/etc/init.d/cups
ln -sf ../../etc/init.d/cups $RPM_BUILD_ROOT/usr/sbin/rccups
-# use Ghostscript fonts instead of CUPS fonts:
+# Use Ghostscript fonts instead of CUPS fonts:
rm -r $RPM_BUILD_ROOT/usr/share/cups/fonts
mkdir -p $RPM_BUILD_ROOT/usr/share/ghostscript/fonts
ln -sf /usr/share/ghostscript/fonts $RPM_BUILD_ROOT/usr/share/cups/
-# make directory for ssl files:
+# Make directory for ssl files:
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl
-# add old client.conf as reference (Source108: cups-client.conf):
+# Add a client.conf as template (Source108: cups-client.conf):
install -m644 %{SOURCE108} $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
install -m 644 -D packaging/cups-dbus.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/cups.conf
# Source104: cups.xinetd
install -m 644 -D %{SOURCE104} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd
perl -pi -e "s:\@LIB\@:%{_libdir}:g" $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd
+# Make the libraries accessible also via generic named links:
ln -sf libcupsimage.so.2 $RPM_BUILD_ROOT%{_libdir}/libcupsimage.so
ln -sf libcups.so.2 $RPM_BUILD_ROOT%{_libdir}/libcups.so
+# Add missing usual directories:
install -d -m755 $RPM_BUILD_ROOT/usr/share/cups/drivers
install -d -m755 $RPM_BUILD_ROOT/var/cache/cups
install -d -m755 $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}
install -d -m755 $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/images
+# Add conf/pam.suse regarding support for PAM (see Patch100: cups-pam.diff):
install -m 644 -D conf/pam.suse $RPM_BUILD_ROOT/etc/pam.d/cups
-for f in CHANGES*.txt CREDITS.txt INSTALL.txt LICENSE.txt README.txt; do
- install -m 644 "$f" $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/
+# Add missing usual documentation:
+for f in CHANGES*.txt CREDITS.txt INSTALL.txt LICENSE.txt README.txt
+do install -m 644 "$f" $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/
done
# Source102: postscript.ppd.bz2
bzip2 -cd < %{SOURCE102} > $RPM_BUILD_ROOT%{_datadir}/cups/model/Postscript.ppd
@@ -274,7 +275,7 @@
# Source106: PSLEVEL2.PPD.bz2
bzip2 -cd < %{SOURCE106} > $RPM_BUILD_ROOT%{_datadir}/cups/model/Postscript-level2.ppd
find %{buildroot}/usr/share/cups/model -name "*.ppd" | while read FILE
-do # change default paper size from Letter to A4 if possible
+do # Change default paper size from Letter to A4 if possible
# https://bugzilla.novell.com/show_bug.cgi?id=suse30662
# and delete trailing whitespace:
perl -pi -e 's:^(\*Default.*)Letter\s*$:$1A4\n:; \
@@ -283,19 +284,19 @@
s:\s\n:\n:' "$FILE"
gzip -9 "$FILE"
done
-# add files for menu:
+# Add files for desktop menu:
rm -f $RPM_BUILD_ROOT/usr/share/applications/cups.desktop
%suse_update_desktop_file -i -r %name PrintingUtility 2>/dev/null
mkdir $RPM_BUILD_ROOT/usr/share/pixmaps
install -m 644 $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps/cups.png $RPM_BUILD_ROOT/usr/share/pixmaps
rm -rf $RPM_BUILD_ROOT/usr/share/icons
-# remove unpackaged files:
+# Remove unpackaged files:
rm -rf $RPM_BUILD_ROOT/%{_mandir}/es/cat?
rm -rf $RPM_BUILD_ROOT/%{_mandir}/fr/cat?
rm -rf $RPM_BUILD_ROOT/%{_mandir}/cat?
-# remove unknown locale directory:
+# Remove unknown locale directory:
rm -rf $RPM_BUILD_ROOT/usr/share/locale/no
-# run fdupes:
+# Run fdupes:
%fdupes $RPM_BUILD_ROOT
%clean
@@ -303,20 +304,50 @@
%pre
/usr/sbin/groupadd -g 71 -o -r ntadmin 2>/dev/null || :
-
-%post libs -p /sbin/ldconfig
+# exit successfully in any case:
+exit 0
%post
%{fillup_and_insserv -ny cups cups}
+# exit successfully in any case:
+exit 0
%preun
%stop_on_removal cups
+# exit successfully in any case:
+exit 0
%postun
%restart_on_update cups
%{insserv_cleanup}
+# exit successfully in any case:
+exit 0
-%postun libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
+# exit successfully in any case:
+exit 0
+
+%postun libs
+/sbin/ldconfig
+# exit successfully in any case:
+exit 0
+
+# The files sections list all mandatory files explicitely one by one.
+# In particular all executables are listed explicitely.
+# This avoids that CUPS' configure magic might silently
+# not build and install an executable when whatever condition
+# for configure's automated tests is not fulfilled in the build system.
+# See https://bugzilla.novell.com/show_bug.cgi?id=526847#c9
+# (In CUPS 1.3.10 a configure magic did silently skip to build
+# the pdftops filter when there was no /usr/bin/pdftops
+# installed in the build system regardless of an explicite
+# configure setting ' --with-pdftops=/usr/bin/pdftops',
+# see also http://www.cups.org/str.php?L3278)
+# When all mandatory files are explicitely listed.
+# the build fails intentionally if a mandatory file was not built
+# which ensures that already existing correctly built binary RPMs
+# are not overwritten by broken RPMs where mandatory files are missing.
%files
%defattr(-,root,root)
@@ -382,6 +413,7 @@
/usr/lib/cups/monitor/bcp
/usr/lib/cups/monitor/tbcp
%dir /usr/lib/cups/notifier
+/usr/lib/cups/notifier/dbus
/usr/lib/cups/notifier/mailto
/usr/lib/cups/notifier/rss
%dir %attr(0775,root,ntadmin) %{_datadir}/cups/drivers
@@ -413,13 +445,22 @@
%{_datadir}/cups/
%exclude %{_datadir}/cups/ppdc/
+# Set explicite owner, group, and permissions for lppasswd
+# to enforce to have the upstream owner, group, and permissions in the RPM
+# because otherwise our build magic /usr/sbin/Check sets them to lp:lp 2755
+# according to /etc/permissions.secure in the build system,
+# see https://bugzilla.novell.com/show_bug.cgi?id=574336#c12
+# and subsequent comments up to comment #17 therein.
+# Even if /etc/permissions.secure in the openSUSE:Factory build system might be
+# already fixed, it must also work for build systems for released products.
+
%files client
%defattr(-,root,root)
%{_bindir}/cancel
%{_bindir}/cupstestdsc
%{_bindir}/lp
%{_bindir}/lpoptions
-%attr(2755,lp,lp) %{_bindir}/lppasswd
+%attr(0555,root,root) %{_bindir}/lppasswd
%{_bindir}/lpq
%{_bindir}/lpr
%{_bindir}/lprm
++++++ cups-1.4.2-source.tar.bz2 -> cups-1.4.3-source.tar.bz2 ++++++
++++ 18180 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 sax2 for openSUSE:Factory
checked in at Wed Mar 31 19:56:12 CEST 2010.
--------
--- sax2/sax2.changes 2010-03-16 05:43:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2010-03-27 13:31:32.000000000 +0100
@@ -1,0 +2,11 @@
+Sat Mar 27 13:06:39 CET 2010 - sndirsch(a)suse.de
+
+- switch to gcc 4.3 for now to fix buffer overflows in sysp
+ (bnc #586112)
+
+-------------------------------------------------------------------
+Fri Mar 26 10:52:32 CET 2010 - sndirsch(a)suse.de
+
+- latest translation fixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
sax2-gcc43.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sax2.spec ++++++
--- /var/tmp/diff_new_pack.Rp6heG/_old 2010-03-31 19:54:57.000000000 +0200
+++ /var/tmp/diff_new_pack.Rp6heG/_new 2010-03-31 19:54:57.000000000 +0200
@@ -30,6 +30,9 @@
%if %{suse_version} > 1020
BuildRequires: fdupes
%endif
+%if %{suse_version} > 1120
+BuildRequires: -gcc45 -gcc45-c++ gcc43 gcc43-c++
+%endif
%if %{build_java}
BuildRequires: java-1_4_2-gcj-compat-devel
%endif
@@ -51,12 +54,15 @@
PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq
Summary: SuSE advanced X Window System-configuration
Version: 8.1
-Release: 589
+Release: 590
Group: System/X11/Utilities
License: GPLv2+
Source: sax2.tar.bz2
Source1: sax2.desktop
Source2: sax2-rpmlintrc
+%if %{suse_version} > 1120
+Patch0: sax2-gcc43.diff
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -232,8 +238,16 @@
%prep
%setup -n sax
+%if %{suse_version} > 1120
+%patch0 -p1
+%endif
%build
+%if %{suse_version} > 1120
+CC=gcc-4.3
+CXX=g++-4.3
+export CC CXX
+%endif
# disable as-needed to fix build
export SUSE_ASNEEDED=0
test -e /.buildenv && . /.buildenv
@@ -532,4 +546,5 @@
%endif
%endif
+
%changelog
++++++ sax2-gcc43.diff ++++++
diff -u -r sax.orig//api/.make sax/api/.make
--- sax.orig//api/.make 2010-03-27 10:12:41.000000000 +0000
+++ sax/api/.make 2010-03-27 11:00:13.000000000 +0000
@@ -11,8 +11,10 @@
if [ -d /usr/share/qt/mkspecs/linux-g++ ];then
export QMAKESPEC=/usr/share/qt/mkspecs/linux-g++/
`which qmake` -makefile -unix -o Makefile xapi.pro
+ sed -i -e 's/g++$/g++-4.3/g' -e 's/gcc$/gcc-4.3/g' Makefile
else
export QMAKESPEC=/usr/share/qt4/mkspecs/linux-g++/
`which qmake` -makefile -unix -o Makefile xapi.pro
+ sed -i -e 's/g++$/g++-4.3/g' -e 's/gcc$/gcc-4.3/g' Makefile
fi
diff -u -r sax.orig//api/data/LangFirstPath sax/api/data/LangFirstPath
diff -u -r sax.orig//api/xcmd/.make sax/api/xcmd/.make
--- sax.orig//api/xcmd/.make 2010-03-27 10:12:41.000000000 +0000
+++ sax/api/xcmd/.make 2010-03-27 10:59:03.000000000 +0000
@@ -11,8 +11,10 @@
if [ -d /usr/share/qt/mkspecs/linux-g++ ];then
export QMAKESPEC=/usr/share/qt/mkspecs/linux-g++/
`which qmake` -makefile -unix -o Makefile xcmd.pro
+ sed -i -e 's/g++$/g++-4.3/g' -e 's/gcc$/gcc-4.3/g' Makefile
else
export QMAKESPEC=/usr/share/qt4/mkspecs/linux-g++/
`which qmake` -makefile -unix -o Makefile xcmd.pro
+ sed -i -e 's/g++$/g++-4.3/g' -e 's/gcc$/gcc-4.3/g' Makefile
fi
diff -u -r sax.orig//libsax/.make sax/libsax/.make
--- sax.orig//libsax/.make 2010-03-27 10:12:41.000000000 +0000
+++ sax/libsax/.make 2010-03-27 10:52:38.000000000 +0000
@@ -11,7 +11,9 @@
if [ -d /usr/share/qt/mkspecs/linux-g++ ];then
export QMAKESPEC=/usr/share/qt/mkspecs/linux-g++/
`which qmake` -makefile -unix -o Makefile sax.pro
+ sed -i -e 's/g++$/g++-4.3/g' -e 's/gcc$/gcc-4.3/g' Makefile
else
export QMAKESPEC=/usr/share/qt4/mkspecs/linux-g++/
`which qmake` -makefile -unix -o Makefile sax.pro
+ sed -i -e 's/g++$/g++-4.3/g' -e 's/gcc$/gcc-4.3/g' Makefile
fi
diff -u -r sax.orig//libsax/bindings/perl/Makefile.PL sax/libsax/bindings/perl/Makefile.PL
--- sax.orig//libsax/bindings/perl/Makefile.PL 2010-03-27 10:12:41.000000000 +0000
+++ sax/libsax/bindings/perl/Makefile.PL 2010-03-27 11:09:06.000000000 +0000
@@ -22,6 +22,8 @@
'dynamic_lib' => { 'OTHERLDFLAGS' => '-L../.. -lsax' },
'OBJECT' => 'SaX_wrap.o',
'INC' => $INCPATH,
- 'OPTIMIZE' => "-O2 $CFLAGS"
+ 'OPTIMIZE' => "-O2 $CFLAGS",
+ 'CC' => "gcc-4.3",
+ 'LD' => "gcc-4.3"
);
diff -u -r sax.orig//libsax/bindings/python/Makefile sax/libsax/bindings/python/Makefile
--- sax.orig//libsax/bindings/python/Makefile 2010-03-27 10:12:41.000000000 +0000
+++ sax/libsax/bindings/python/Makefile 2010-03-27 10:56:00.000000000 +0000
@@ -13,10 +13,10 @@
export LD_LIBRARY_PATH=../../
all:
- g++ -c $(CFLAGS) -I/usr/X11R6/include -I/usr/include/xorg \
+ g++-4.3 -c $(CFLAGS) -I/usr/X11R6/include -I/usr/include/xorg \
-I/usr/include/python${PYVER} \
-O2 -fPIC -fno-strict-aliasing -pipe SaX_wrap.cxx
- g++ -shared SaX_wrap.o -o _SaX.so \
+ g++-4.3 -shared SaX_wrap.o -o _SaX.so \
-L/usr/X11R6/${BINDLIB} ${QTLIBS} \
-L../../ -lm -lxf86config -lsax -lxkbfile
python -c "import SaX"
diff -u -r sax.orig//parse/Makefile sax/parse/Makefile
diff -u -r sax.orig//parse/Makefile.Linux sax/parse/Makefile.Linux
--- sax.orig//parse/Makefile.Linux 2010-03-27 10:12:41.000000000 +0000
+++ sax/parse/Makefile.Linux 2010-03-27 10:18:48.000000000 +0000
@@ -17,7 +17,7 @@
perl Makefile.PL
test:
- gcc -O2 parse.c -o parse -L/usr/X11R6/lib -L/usr/X11R6/lib64 \
+ gcc-4.3 -O2 parse.c -o parse -L/usr/X11R6/lib -L/usr/X11R6/lib64 \
-iquote /usr/X11R6/include -iquote /usr/include/xorg -I. \
-DNEW_INPUT -DNDEBUG -D${EXTSEC} -D${XORGHD} \
-lxf86config -lm
diff -u -r sax.orig//parse/Makefile.PL sax/parse/Makefile.PL
--- sax.orig//parse/Makefile.PL 2010-03-27 10:12:41.000000000 +0000
+++ sax/parse/Makefile.PL 2010-03-27 10:22:25.000000000 +0000
@@ -17,5 +17,7 @@
'OBJECT' => 'parse.o XFree_wrap.o',
'DEFINE' => "-DNEW_INPUT -DNDEBUG -D$FLAG1 -D$FLAG2",
'INC' => '-iquote /usr/X11R6/include -iquote /usr/include/xorg -I.',
- 'OPTIMIZE' => "-O2 $CFLAGS"
+ 'OPTIMIZE' => "-O2 $CFLAGS",
+ 'CC' => "gcc-4.3",
+ 'LD' => "gcc-4.3",
);
diff -u -r sax.orig//spp/Makefile.PL sax/spp/Makefile.PL
--- sax.orig//spp/Makefile.PL 2010-03-27 10:12:41.000000000 +0000
+++ sax/spp/Makefile.PL 2010-03-27 10:25:51.000000000 +0000
@@ -16,6 +16,7 @@
'OBJECT' => 'SPP_wrap.o lex.yy.o spp.tab.o spp.o',
'INC' => "-I/usr/include/X11 $QTINC",
'OPTIMIZE' => "-O2 $CFLAGS",
- 'CC' => 'g++'
+ 'CC' => 'g++-4.3',
+ 'LD' => 'g++-4.3'
);
diff -u -r sax.orig//spp/Makefile.lex sax/spp/Makefile.lex
--- sax.orig//spp/Makefile.lex 2010-03-27 10:12:41.000000000 +0000
+++ sax/spp/Makefile.lex 2010-03-27 10:16:44.000000000 +0000
@@ -15,20 +15,20 @@
swig:spp.o spp.tab.o lex.yy.o
spp:spp.tab.o lex.yy.o spp.o example.o
- g++ -Wall -O2 $(CFLAGS) $(CFLAGSS) -o example example.o spp.o spp.tab.o lex.yy.o \
+ g++-4.3 -Wall -O2 $(CFLAGS) $(CFLAGSS) -o example example.o spp.o spp.tab.o lex.yy.o \
-lfl -lreadline $(QTLIBS) -lncurses
example.o:example.cpp
- g++ -Wall -O2 -fpic $(CFLAGS) -c example.cpp -I.
+ g++-4.3 -Wall -O2 -fpic $(CFLAGS) -c example.cpp -I.
spp.o:spp.cpp spp.h
- g++ -Wall -O2 -fpic $(CFLAGS) -c spp.cpp -I.
+ g++-4.3 -Wall -O2 -fpic $(CFLAGS) -c spp.cpp -I.
spp.tab.o: spp.tab.cc lex.yy.c
- g++ -Wall -O2 -fpic $(CFLAGS) -c spp.tab.cc -I.
+ g++-4.3 -Wall -O2 -fpic $(CFLAGS) -c spp.tab.cc -I.
lex.yy.o: lex.yy.c
- g++ -Wall -O2 -fpic $(CFLAGS) -c lex.yy.c -I.
+ g++-4.3 -Wall -O2 -fpic $(CFLAGS) -c lex.yy.c -I.
spp.tab.cc: spp.yc
bison -d spp.yc
diff -u -r sax.orig//sysp/Makefile sax/sysp/Makefile
--- sax.orig//sysp/Makefile 2010-03-27 10:12:41.000000000 +0000
+++ sax/sysp/Makefile 2010-03-27 10:26:21.000000000 +0000
@@ -1,4 +1,4 @@
-CC = g++ -Wall -L/usr/X11R6/lib -L/usr/X11R6/lib64 -DXORG_LOADER
+CC = g++-4.3 -Wall -L/usr/X11R6/lib -L/usr/X11R6/lib64 -DXORG_LOADER
LIB = ./lib/libsysp.a -lhd -lfl -lstdc++ -lX11 -lXrandr -lhal -lXxf86misc
OBJ = sysp.o mouse.o keyboard.o server.o cfg.o xstuff.o d3.o
diff -u -r sax.orig//sysp/lib/common/Makefile sax/sysp/lib/common/Makefile
--- sax.orig//sysp/lib/common/Makefile 2010-03-27 10:12:41.000000000 +0000
+++ sax/sysp/lib/common/Makefile 2010-03-27 10:36:28.000000000 +0000
@@ -1,4 +1,4 @@
-CC = g++ -Wall -fpic -O2 $(CFLAGS)
+CC = g++-4.3 -Wall -fpic -O2 $(CFLAGS)
all: qx.o xtest.o string.o
diff -u -r sax.orig//sysp/lib/cvt/Makefile.PL sax/sysp/lib/cvt/Makefile.PL
--- sax.orig//sysp/lib/cvt/Makefile.PL 2010-03-27 10:12:41.000000000 +0000
+++ sax/sysp/lib/cvt/Makefile.PL 2010-03-27 10:40:09.000000000 +0000
@@ -8,6 +8,6 @@
'LIBS' => ['-lm'],
'OBJECT' => 'CVT_wrap.o cvt.o',
'OPTIMIZE' => "-O2 $CFLAGS",
- 'CC' => 'gcc',
- 'LD' => 'gcc'
+ 'CC' => 'gcc-4.3',
+ 'LD' => 'gcc-4.3'
);
diff -u -r sax.orig//sysp/lib/fbset/Makefile.PL sax/sysp/lib/fbset/Makefile.PL
--- sax.orig//sysp/lib/fbset/Makefile.PL 2010-03-27 10:12:41.000000000 +0000
+++ sax/sysp/lib/fbset/Makefile.PL 2010-03-27 10:34:23.000000000 +0000
@@ -8,6 +8,6 @@
'LIBS' => ['-lm'],
'OBJECT' => 'FBSet_wrap.o fbset.o',
'OPTIMIZE' => "-O2 $CFLAGS",
- 'CC' => 'g++',
- 'LD' => 'g++'
+ 'CC' => 'g++-4.3',
+ 'LD' => 'g++-4.3'
);
diff -u -r sax.orig//sysp/lib/fbset/Makefile.swig sax/sysp/lib/fbset/Makefile.swig
--- sax.orig//sysp/lib/fbset/Makefile.swig 2010-03-27 10:12:41.000000000 +0000
+++ sax/sysp/lib/fbset/Makefile.swig 2010-03-27 10:35:29.000000000 +0000
@@ -4,13 +4,13 @@
all: fbset.o
example: example.o fbset.o
- g++ -Wall $(CFLAGS) -o example example.o fbset.o
+ g++-4.3 -Wall $(CFLAGS) -o example example.o fbset.o
fbset.o: fbset.cpp
- g++ -Wall $(CFLAGS) -c -fpic -O2 fbset.cpp
+ g++-4.3 -Wall $(CFLAGS) -c -fpic -O2 fbset.cpp
example.o: example.cpp
- g++ -Wall $(CFLAGS) -c -fpic -O2 example.cpp
+ g++-4.3 -Wall $(CFLAGS) -c -fpic -O2 example.cpp
swig:
swig -Wall -c++ -perl5 FBSet.i
diff -u -r sax.orig//sysp/lib/hw/Makefile sax/sysp/lib/hw/Makefile
--- sax.orig//sysp/lib/hw/Makefile 2010-03-27 10:12:41.000000000 +0000
+++ sax/sysp/lib/hw/Makefile 2010-03-27 10:36:02.000000000 +0000
@@ -6,7 +6,7 @@
# --
# Status: Up-to-date
#
-CC = g++ -Wall -fpic -O2
+CC = g++-4.3 -Wall -fpic -O2
OBJ = mouse.o tv.o keyboard.o monitor.o memory.o vbios.o cdrom.o framebuffer.o
all: ${OBJ}
diff -u -r sax.orig//sysp/lib/pci/Makefile sax/sysp/lib/pci/Makefile
--- sax.orig//sysp/lib/pci/Makefile 2010-03-27 10:12:41.000000000 +0000
+++ sax/sysp/lib/pci/Makefile 2010-03-27 10:33:19.000000000 +0000
@@ -1,6 +1,6 @@
RPM_OPT_FLAGS ?= -O2
-CC = g++
+CC = g++-4.3
OPT=-O2 -fomit-frame-pointer -fpic
CFLAGS=$(RPM_OPT_FLAGS) $(OPT) -Wall -W -Wno-parentheses
diff -u -r sax.orig//sysp/lib/plog/Makefile sax/sysp/lib/plog/Makefile
--- sax.orig//sysp/lib/plog/Makefile 2010-03-27 10:12:41.000000000 +0000
+++ sax/sysp/lib/plog/Makefile 2010-03-27 10:26:57.000000000 +0000
@@ -5,7 +5,7 @@
# Generate plog objects used for libsysp
#
-CC = g++
+CC = g++-4.3
LIBS = -lfl
YACC = bison
FLEX = flex -i
diff -u -r sax.orig//tools/plog/Makefile.PL.in sax/tools/plog/Makefile.PL.in
--- sax.orig//tools/plog/Makefile.PL.in 2010-03-27 10:12:41.000000000 +0000
+++ sax/tools/plog/Makefile.PL.in 2010-03-27 11:04:45.000000000 +0000
@@ -10,7 +10,7 @@
'DEFINE' => '-DX_BYTE_ORDER=X_LITTLE_ENDIAN -DNEW_INPUT -DNDEBUG',
'INC' => '',
'OPTIMIZE' => "-O2 $CFLAGS",
- 'CC' => 'g++',
- 'LD' => 'g++'
+ 'CC' => 'g++-4.3',
+ 'LD' => 'g++-4.3'
);
diff -u -r sax.orig//xfine/.make sax/xfine/.make
--- sax.orig//xfine/.make 2010-03-27 10:12:41.000000000 +0000
+++ sax/xfine/.make 2010-03-27 11:06:19.000000000 +0000
@@ -11,8 +11,10 @@
if [ -d /usr/share/qt/mkspecs/linux-g++ ];then
export QMAKESPEC=/usr/share/qt/mkspecs/linux-g++/
`which qmake` -makefile -unix -o Makefile xfine.pro
+ sed -i -e 's/g++$/g++-4.3/g' -e 's/gcc$/gcc-4.3/g' Makefile
else
export QMAKESPEC=/usr/share/qt4/mkspecs/linux-g++/
`which qmake` -makefile -unix -o Makefile xfine.pro
+ sed -i -e 's/g++$/g++-4.3/g' -e 's/gcc$/gcc-4.3/g' Makefile
fi
diff -u -r sax.old//sysp/lib/Makefile sax/sysp/lib/Makefile
--- sax.old//sysp/lib/Makefile 2010-03-27 11:38:01.000000000 +0000
+++ sax/sysp/lib/Makefile 2010-03-27 11:39:06.000000000 +0000
@@ -9,7 +9,7 @@
RPM_OPT_FLAGS ?= -O2
-CC = g++
+CC = g++-4.3
CFLAGS = $(RPM_OPT_FLAGS) -O2 -fpic -Wall
LIBS = -lfl
++++++ sax2.tar.bz2 ++++++
++++ 8096 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 compiz for openSUSE:Factory
checked in at Wed Mar 31 19:54:38 CEST 2010.
--------
--- compiz/compiz.changes 2010-03-22 14:21:42.000000000 +0100
+++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2010-03-30 15:42:43.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Mar 30 11:29:13 UTC 2010 - dimstar(a)opensuse.org
+
+- Update to version 0.8.6:
+ + Maintenance release.
+ + Various focus and window placement fixes.
+ + Fixed handling of windows that have a (server-drawn) border.
+ + Fixed handling of window icons that have a colour depth of 1
+ bit.
+ + Added KDE 4.4 support to KDE4 window decorator.
+- Drop patches compiz-kde44.patch and compiz-gtk2.19.7.patch.
+- Rebase kde-auto-comp.diff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
compiz-0.8.4.tar.bz2
compiz-gtk2.19.7.patch
compiz-kde44.patch
New:
----
compiz-0.8.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.ZFoJDY/_old 2010-03-31 19:53:45.000000000 +0200
+++ /var/tmp/diff_new_pack.ZFoJDY/_new 2010-03-31 19:53:45.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package compiz (Version 0.8.4)
+# spec file for package compiz (Version 0.8.6)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -74,8 +74,8 @@
%if 0%{suse_version} <= 01100
Enhances: xgl >= git_070104
%endif
-Version: 0.8.4
-Release: 4
+Version: 0.8.6
+Release: 1
Summary: OpenGL window and compositing manager
# To be nuked: MesaLib, patch60 $mesagl
Source: compiz-%version.tar.bz2
@@ -92,10 +92,6 @@
Patch3: bug-474862-allow-moving-focus-to-fs-window.diff
# PATCH-FIX-UPSTREAM kde-auto-comp.diff dreveman(a)novell.com -- unknown
Patch4: kde-auto-comp.diff
-# PATCH-FIX-UPSTREAM compiz-kde44.patch dimstar(a)opensuse.org -- Taken from upstream git commit 04c6a4.
-Patch5: compiz-kde44.patch
-# PATCH-FIx-UPSTREAM compiz-gtk2.19.7.patch dimstar(a)opensuse.org -- Fix build with newer gtk. Taken from upstream git.
-Patch6: compiz-gtk2.19.7.patch
Requires: compiz-branding = %{version}
Requires: compiz-decorator = %{version}
Provides: windowmanager
@@ -262,11 +258,8 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%build
-./autogen.sh
%configure \
--disable-static \
--with-pic \
++++++ bug-474862-allow-moving-focus-to-fs-window.diff ++++++
--- /var/tmp/diff_new_pack.ZFoJDY/_old 2010-03-31 19:53:45.000000000 +0200
+++ /var/tmp/diff_new_pack.ZFoJDY/_new 2010-03-31 19:53:45.000000000 +0200
@@ -1,16 +1,12 @@
-Index: compiz-0.8.4/src/screen.c
+Index: compiz-0.8.6/src/screen.c
===================================================================
---- compiz-0.8.4.orig/src/screen.c
-+++ compiz-0.8.4/src/screen.c
-@@ -2639,8 +2639,9 @@ focusDefaultWindow (CompScreen *s)
+--- compiz-0.8.6.orig/src/screen.c
++++ compiz-0.8.6/src/screen.c
+@@ -2646,6 +2646,7 @@ focusDefaultWindow (CompScreen *s)
+
+ if (w->type & (CompWindowTypeNormalMask |
+ CompWindowTypeDialogMask |
++ CompWindowTypeFullscreenMask |
+ CompWindowTypeModalDialogMask))
{
- if (focus)
- {
-- if (w->type & (CompWindowTypeNormalMask |
-- CompWindowTypeDialogMask |
-+ if (w->type & (CompWindowTypeFullscreenMask |
-+ CompWindowTypeNormalMask |
-+ CompWindowTypeDialogMask |
- CompWindowTypeModalDialogMask))
- {
- if (compareWindowActiveness (focus, w) < 0)
+ if (compareWindowActiveness (focus, w) < 0)
++++++ compiz-0.8.4.tar.bz2 -> compiz-0.8.6.tar.bz2 ++++++
++++ 70883 lines of diff (skipped)
++++++ kde-auto-comp.diff ++++++
--- /var/tmp/diff_new_pack.ZFoJDY/_old 2010-03-31 19:53:45.000000000 +0200
+++ /var/tmp/diff_new_pack.ZFoJDY/_new 2010-03-31 19:53:45.000000000 +0200
@@ -1,7 +1,7 @@
-Index: compiz-0.8.4/kde/window-decorator-kde4/decorator.cpp
+Index: compiz-0.8.6/kde/window-decorator-kde4/decorator.cpp
===================================================================
---- compiz-0.8.4.orig/kde/window-decorator-kde4/decorator.cpp
-+++ compiz-0.8.4/kde/window-decorator-kde4/decorator.cpp
+--- compiz-0.8.6.orig/kde/window-decorator-kde4/decorator.cpp
++++ compiz-0.8.6/kde/window-decorator-kde4/decorator.cpp
@@ -83,6 +83,15 @@ KWD::PluginManager::PluginManager (KShar
"kwin3_oxygen" : "kwin3_plastik";
}
@@ -18,9 +18,9 @@
KWD::Decorator::Decorator () :
KApplication (),
-@@ -160,8 +169,16 @@ KWD::Decorator::Decorator () :
- CopyFromParent,
- CWOverrideRedirect, &attr);
+@@ -164,8 +173,16 @@ KWD::Decorator::Decorator () :
+ XChangeProperty (QX11Info::display(), mCompositeWindow, Atoms::enlightmentDesktop,
+ XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &data, 1);
+ redirectError = 0;
+ int (*oldErrorHandler) (Display *, XErrorEvent *) =
@@ -36,10 +36,10 @@
XMapWindow (QX11Info::display(), mCompositeWindow);
}
-Index: compiz-0.8.4/kde/window-decorator/decorator.cpp
+Index: compiz-0.8.6/kde/window-decorator/decorator.cpp
===================================================================
---- compiz-0.8.4.orig/kde/window-decorator/decorator.cpp
-+++ compiz-0.8.4/kde/window-decorator/decorator.cpp
+--- compiz-0.8.6.orig/kde/window-decorator/decorator.cpp
++++ compiz-0.8.6/kde/window-decorator/decorator.cpp
@@ -188,6 +188,16 @@ dbusHandleMessage (DBusConnection *conne
return result;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 rrdtool for openSUSE:Factory
checked in at Wed Mar 31 19:54:27 CEST 2010.
--------
--- rrdtool/rrdtool.changes 2009-04-20 17:59:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/rrdtool/rrdtool.changes 2010-03-30 18:20:51.000000000 +0200
@@ -1,0 +2,36 @@
+Tue Mar 30 18:16:24 CEST 2010 - anicka(a)suse.cz
+
+- update to 1.4.3
+ * rrdcached: Log to stderr (in addition to syslog) when running
+ in foreground.
+ * rrdcached: Added -m command line option.
+ * rrdcached: Added -s option so set group permissions of the
+ UNIX domain socket.
+ * rrd_create: added --no-overwrite option. It prevents rrdtool
+ from clobbering existing rrd files.
+ * ruby bindings: rb_rrd_xport function
+ * use locale settings and _NL_TIME_WEEK_1STDAY to determine
+ the first day of the week. Works on Linux at least
+ * rrd_graph: \u to backup one line for special legend placement
+ tricks
+ * rrd_update: new (better) checker for incoming COUNTER
+ or DERIVED data.
+
+-------------------------------------------------------------------
+Mon Mar 8 10:00:49 UTC 2010 - coolo(a)novell.com
+
+- update to 1.4.2
+ * RRD Caching Daemon (rrdcached)
+ See rrdcached documentation.
+ * The output of rrdtool dump has been adjusted to be simpler to parse by
+ existing xml parsers.
+ * RRD Graphing functions (rrdtool graph)
+ + VDEF PERCENTNAN (a PRECENT that ignores NAN)
+ + CDEF PREDICT and PREDICTSIGMA functions for on-the-fly
+ data prediction without the need to modify existing rrd files as it is
+ required for HoltWinters.
+ + LibDBI integration provides a path to read data directly of a supported
+ SQL database into rrdtool graph. See rrdgraph_libdbi documentation.
+ * quite some more - see NEWS and CHANGES
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
rrdtool-1.3.7.tar.bz2
New:
----
rrdtool-1.4.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rrdtool.spec ++++++
--- /var/tmp/diff_new_pack.DzEn0h/_old 2010-03-31 19:53:35.000000000 +0200
+++ /var/tmp/diff_new_pack.DzEn0h/_new 2010-03-31 19:53:35.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package rrdtool (Version 1.3.7)
+# spec file for package rrdtool (Version 1.4.3)
#
-# 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,11 +19,12 @@
Name: rrdtool
BuildRequires: cairo-devel freetype2-devel gettext-tools glib2-devel intltool libart_lgpl-devel libpng-devel libxml2-devel pango-devel python-devel tcl-devel
-License: GPL v2 or later
+BuildRequires: ruby-devel
+License: GPLv2+
Group: Productivity/Scientific/Math
AutoReqProv: on
Requires: perl = %{perl_version}
-Version: 1.3.7
+Version: 1.4.3
Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: cgilib-0.5.tar.bz2
@@ -38,12 +39,6 @@
generate graphical representations of the data values collected over a
definable time period.
-
-
-Authors:
---------
- Tobias Oetiker <oetiker(a)ee.ethz.ch>
-
%prep
%setup -q -a1
@@ -131,7 +126,7 @@
#%{_datadir}/%{name}
%package devel
-License: GPL v2 or later
+License: GPLv2+
Summary: A tool for data logging and analysis - Development files
Group: Productivity/Scientific/Math
Requires: %name = %version
@@ -143,11 +138,6 @@
definable time period.
-
-Authors:
---------
- Tobias Oetiker <oetiker(a)ee.ethz.ch>
-
%files devel
%defattr(-, root, root)
/usr/include/*
@@ -156,7 +146,7 @@
%{_libdir}/pkgconfig/librrd.pc
%package -n python-rrdtool
-License: GPL v2 or later
+License: GPLv2+
Summary: Python bindings for rrdtool
Group: Productivity/Scientific/Math
Requires: %name = %version
@@ -170,12 +160,6 @@
This package contains the Python bindings
-
-
-Authors:
---------
- Tobias Oetiker <oetiker(a)ee.ethz.ch>
-
%files -n python-rrdtool
%defattr(-, root, root)
%{py_sitedir}/*
++++++ rrdtool-1.3.7.tar.bz2 -> rrdtool-1.4.3.tar.bz2 ++++++
++++ 166832 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