April 2012 - openSUSE Commits - openSUSE Mailing Lists

commit tar for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package tar for openSUSE:Factory checked in at 2012-04-23 16:13:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tar (Old) and /work/SRC/openSUSE:Factory/.tar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tar", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/tar/tar.changes 2012-02-14 13:11:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tar.new/tar.changes 2012-04-23 16:13:51.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Apr 20 19:55:01 UTC 2012 - crrodriguez(a)opensuse.org + +- disable 'runtime checks' in m4/*.m4 that override + system calls with custom implementations to workaround + very old kernel/libc bugs (dating 2003-2009) + we do not ship those buggy components nowdays. + +------------------------------------------------------------------- +Fri Apr 20 15:38:17 UTC 2012 - crrodriguez(a)opensuse.org + +- Switch to default archive type to POSIX.1-2001, which is ten years + old and has no limits on filesize,filename length etc. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tar.spec ++++++ --- /var/tmp/diff_new_pack.rfMyd9/_old 2012-04-23 16:13:52.000000000 +0200 +++ /var/tmp/diff_new_pack.rfMyd9/_new 2012-04-23 16:13:52.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package tar # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + # minimum suse version where the full featured package builds %define min_suse_ver 1010 @@ -31,6 +32,7 @@ Patch6: tar-backup-spec-fix-paths.patch Patch7: tar-1.26-remove_O_NONBLOCK.patch %if 0%{?suse_version} >= %min_suse_ver +BuildRequires: automake BuildRequires: help2man Recommends: tar-lang = %{version} Recommends: xz @@ -68,6 +70,9 @@ %define my_cflags -W -Wall -Wpointer-arith -Wstrict-prototypes -Wformat-security -Wno-unused-parameter export CFLAGS="%{optflags} %my_cflags" export RSH="/usr/bin/rsh" +export DEFAULT_ARCHIVE_FORMAT="POSIX" +sed -i -e 's@need runtime check@yes@g' m4/*.m4 +autoreconf -fiv %configure \ --enable-backup-scripts \ --disable-silent-rules -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemd for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2012-04-23 16:13:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2012-04-20 15:21:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd.changes 2012-04-23 16:13:49.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 20 17:16:37 CEST 2012 - sbrabec(a)suse.cz + +- Implemented SUSE specific sysconfig numlock logic (bnc#746595). + +------------------------------------------------------------------- New: ---- systemd-numlock-suse.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.KCLnCc/_old 2012-04-23 16:13:50.000000000 +0200 +++ /var/tmp/diff_new_pack.KCLnCc/_new 2012-04-23 16:13:50.000000000 +0200 @@ -67,6 +67,7 @@ Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch # handle SUSE specific kbd settings Patch6: 0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch +Patch7: systemd-numlock-suse.patch # don't start getty on tty1 until all password request are done Patch8: tty1.patch Patch10: 0001-service-Fix-dependencies-added-when-parsing-insserv..patch @@ -135,6 +136,7 @@ %setup -q %patch1 -p1 %patch6 -p1 +%patch7 -p1 %patch8 -p1 %patch10 -p1 %patch13 -p1 ++++++ systemd-numlock-suse.patch ++++++ Index: systemd-44/src/vconsole/vconsole-setup.c =================================================================== --- systemd-44.orig/src/vconsole/vconsole-setup.c +++ systemd-44/src/vconsole/vconsole-setup.c @@ -265,12 +265,14 @@ int main(int argc, char **argv) { char *vc_kbd_delay = NULL; char *vc_kbd_rate = NULL; char *vc_kbd_disable_caps_lock = NULL; + char *vc_kbd_numlock = NULL; char *vc_compose_table = NULL; pid_t kbd_rate_pid = 0, compose_table_pid = 0; #endif int fd = -1; bool utf8; bool disable_capslock = false; + bool numlock = false; int r = EXIT_FAILURE; pid_t font_pid = 0, keymap_pid = 0; @@ -374,6 +376,7 @@ int main(int argc, char **argv) { "KBD_DELAY", &vc_kbd_delay, "KBD_RATE", &vc_kbd_rate, "KBD_DISABLE_CAPS_LOCK", &vc_kbd_disable_caps_lock, + "KBD_NUMLOCK", &vc_kbd_numlock, "COMPOSETABLE", &vc_compose_table, NULL)) < 0) { @@ -391,6 +394,37 @@ int main(int argc, char **argv) { log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r)); } disable_capslock = vc_kbd_disable_caps_lock && strcasecmp(vc_kbd_disable_caps_lock, "YES") == 0; + if (vc_kbd_numlock && strcasecmp(vc_kbd_numlock, "BIOS") == 0) { + int hwinfo_fd[2]; + pid_t hwinfo_pid; + + pipe(hwinfo_fd); + if ((hwinfo_pid = fork()) < 0) { + log_error("Failed to fork: %m"); + _exit(EXIT_FAILURE); + } else if (hwinfo_pid == 0) { + const char *args[3]; + int i = 0; + args[i++] = HWINFO; + args[i++] = "--bios"; + args[i++] = NULL; + close(hwinfo_fd[0]); + fclose(stdout); + dup2(hwinfo_fd[1], STDOUT_FILENO); + execv(args[0], (char **) args); + _exit(EXIT_FAILURE); + } else { + char line[17]; + FILE *hwinfo_file = fdopen(hwinfo_fd[0], "r"); + close(hwinfo_fd[1]); + while (fgets(line, 17, hwinfo_file)) + if (strstr(line, "Num Lock: on")) + numlock = true; + close(hwinfo_fd[0]); + fclose(hwinfo_file); + } + } else + numlock = vc_kbd_numlock && strcasecmp(vc_kbd_numlock, "YES") == 0; #elif defined(TARGET_ARCH) if ((r = parse_env_file("/etc/rc.conf", NEWLINE, @@ -558,6 +592,10 @@ int main(int argc, char **argv) { finish: if (keymap_pid > 0) wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid); + if (numlock) + close(open("/run/numlock-on", O_WRONLY|O_CREAT, 0644)); + else + unlink("/run/numlock-on"); #ifdef TARGET_SUSE if (compose_table_pid > 0) Index: systemd-44/Makefile.am =================================================================== --- systemd-44.orig/Makefile.am +++ systemd-44/Makefile.am @@ -2043,7 +2043,8 @@ dist_udevrules_DATA += \ src/login/71-seat.rules nodist_udevrules_DATA += \ - src/login/73-seat-late.rules + src/login/73-seat-late.rules \ + src/login/73-seat-numlock.rules MANPAGES += \ man/systemd-logind.conf.5 \ @@ -2106,12 +2107,14 @@ EXTRA_DIST += \ src/login/logind-user.h \ src/login/logind-acl.h \ src/login/73-seat-late.rules.in \ + src/login/73-seat-numlock.rules.in \ units/systemd-logind.service.in \ units/systemd-user-sessions.service.in CLEANFILES += \ src/login/logind-gperf.c \ - src/login/73-seat-late.rules + src/login/73-seat-late.rules \ + src/login/73-seat-numlock.rules endif # ------------------------------------------------------------------------------ @@ -2121,6 +2124,7 @@ SED_PROCESS = \ -e 's,@rootbindir\@,$(rootbindir),g' \ -e 's,@bindir\@,$(bindir),g' \ -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \ + -e 's,@SETLEDS\@,$(SETLEDS),g' \ -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \ -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \ -e 's,@pkgdatadir\@,$(pkgdatadir),g' \ Index: systemd-44/configure.ac =================================================================== --- systemd-44.orig/configure.ac +++ systemd-44/configure.ac @@ -410,6 +410,12 @@ fi with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' ` AC_DEFINE_UNQUOTED(DISTRIBUTION, ["${with_distro}"], [Target Distribution]) +if test z"$with_distro" = z"suse" ; then + AC_PATH_PROG([HWINFO], [hwinfo], [/usr/sbin/hwinfo], [/sbin:/usr/sbin:/usr/bin:/bin]) + AC_DEFINE_UNQUOTED([HWINFO], ["${HWINFO}"], [Path to hwinfo binary. (SUSE)]) +fi +AC_PATH_PROG([SETLEDS], [setleds], [/bin/setleds], [/sbin:/usr/sbin:/usr/bin:/bin]) + # Location of the init scripts as mandated by LSB SYSTEM_SYSVINIT_PATH=/etc/init.d SYSTEM_SYSVRCND_PATH=/etc/rc.d Index: systemd-44/src/login/73-seat-numlock.rules.in =================================================================== --- /dev/null +++ systemd-44/src/login/73-seat-numlock.rules.in @@ -0,0 +1,8 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +SUBSYSTEM=="tty", ACTION=="add", KERNEL=="tty[0-9]|tty1[0-2]", TAG=="systemd", TEST=="/run/numlock-on", RUN+="@SETLEDS@ -D +num <$env{DEVNAME}" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit suspend for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2012-04-23 16:13:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "suspend", Maintainer is "hmacht(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2011-11-28 12:57:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2012-04-23 16:13:47.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 2 08:35:26 UTC 2012 - tittiatcoke(a)gmail.com + +- Added patch from Frederic Crozat to enable plymouth support + +------------------------------------------------------------------- New: ---- suspend-plymouth.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suspend.spec ++++++ --- /var/tmp/diff_new_pack.9Nr4uQ/_old 2012-04-23 16:13:48.000000000 +0200 +++ /var/tmp/diff_new_pack.9Nr4uQ/_new 2012-04-23 16:13:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package suspend # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,15 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: suspend -BuildRequires: glib2-devel gnutls-devel pciutils-devel pkgconfig -BuildRequires: libgcrypt-devel libtool -%if 0%{?suse_version} > 1020 +BuildRequires: glib2-devel +BuildRequires: gnutls-devel +BuildRequires: libgcrypt-devel +BuildRequires: libtool +BuildRequires: pciutils-devel +BuildRequires: pkgconfig +BuildRequires: plymouth-devel BuildRequires: splashy-devel -%endif %if 0%{?mandriva_version} BuildRequires: liblzo-devel %else @@ -36,8 +37,8 @@ Release: 0 Summary: A Set Of Tools To Support Sleep Modes License: GPL-2.0+ -Url: http://sourceforge.net/projects/suspend Group: System/Console +Url: http://sourceforge.net/projects/suspend Source: %name-utils-%{version}.tar.bz2 Source2: configure-suspend-encryption.sh Source3: README.scripts @@ -54,6 +55,8 @@ Patch12: suspend-buildfixes.diff Patch13: suspend-0.80-vbetool-retry-on-errors.diff Patch16: suspend-splash-verbose-debug.diff +#Mandriva patch to enable plymouth support (Thanks to F. Crozat) +Patch17: suspend-plymouth.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 %if 0%{?suse_version} @@ -85,6 +88,7 @@ %patch12 -p0 %patch13 -p0 %patch16 -p1 +%patch17 -p1 cp %{S:3} scripts/ #cp -vb --suffix=-0.5 %{S:99} whitelist.c @@ -95,26 +99,19 @@ --sysconfdir=/etc \ --with-initramfsdir=/usr/sbin \ --enable-encrypt \ -%if 0%{?suse_version} > 1020 + --enable-plymouth \ --enable-splashy \ --disable-resume-static \ -%endif --enable-threads \ -%if 0%{?suse_version} > 1010 --docdir=%{_docdir}/%{name} \ -%else - --datadir=/usr/share \ -%endif --enable-compress make %install make install DESTDIR=$RPM_BUILD_ROOT -%if 0%{?suse_version} > 1100 install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts install -m 755 %{S:4} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-resume.kernel.sh install -m 755 %{S:5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-resume.userspace.sh -%endif install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/sbin/ touch $RPM_BUILD_ROOT/etc/suspend.key @@ -122,7 +119,6 @@ rm -rf $RPM_BUILD_ROOT %post -%if 0%{?suse_version} > 1100 if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then echo "Skipping recreation of existing initial ramdisks, due" echo "to presence of /var/lib/no_initrd_recreation_by_suspend" @@ -133,7 +129,6 @@ if [ -x /sbin/mkinitrd_setup ] ; then mkinitrd_setup fi -%endif if [ "$YAST_IS_RUNNING" != "instsys" -a \ ! -e /.buildenv -a \ -x /sbin/update-bootloader -a \ @@ -141,7 +136,6 @@ /sbin/mkinitrd /sbin/update-bootloader --refresh fi -%if 0%{?suse_version} > 1100 %postun if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then @@ -152,17 +146,14 @@ if [ -x /sbin/mkinitrd_setup ] ; then mkinitrd_setup fi -%endif %files %defattr (-,root,root) %config /etc/suspend.conf -%if 0%{?suse_version} > 1100 %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/boot-resume.kernel.sh /lib/mkinitrd/scripts/boot-resume.userspace.sh -%endif %ghost %config(noreplace) /etc/suspend.key /usr/sbin/s2disk /usr/sbin/s2ram @@ -172,8 +163,5 @@ /usr/sbin/swap-offset /usr/sbin/configure-suspend-encryption.sh %doc README README.s2ram-whitelist README.encryption HOWTO COPYING conf/suspend.conf -%if %suse_version < 1020 -%doc doc/installation-on-SUSE-10.1.txt scripts/ -%endif %changelog ++++++ suspend-plymouth.patch ++++++ diff -urNB suspend-utils-1.0/configure.ac new/configure.ac --- suspend-utils-1.0/configure.ac 2011-03-07 00:24:15.000000000 +0100 +++ new/configure.ac 2012-02-16 16:47:16.909290161 +0100 @@ -74,6 +74,12 @@ , [enable_fbsplash="no"] ) +AC_ARG_ENABLE( + [plymouth], + [AC_HELP_STRING([--enable-plymouth], [enable plymouth support])], + , + [enable_plymouth="no"] +) AC_ARG_WITH( [devdir], [AC_HELP_STRING([--with-devdir=DIR], [use if --enable-create-device, put devices in this directory, default /dev])], @@ -249,6 +255,21 @@ ) fi +if test "${enable_plymouth}" = "yes"; then + CONFIG_FEATURES="${CONFIG_FEATURES} plymouth" + AC_DEFINE([CONFIG_PLYMOUTH], [1], [Define if plymouth enabled]) + PKG_CHECK_MODULES( + [PLYMOUTH], + [ply-splash-core], + , + [AC_MSG_ERROR([Required plymouth-devel was not found])] + ) + AC_DEFINE_UNQUOTED([PLYMOUTH_THEMESDIR],["`$PKG_CONFIG --variable=themesdir ply-splash-core`"], [Plymouth theme directory]) + AC_DEFINE_UNQUOTED([PLYMOUTH_PLUGINSDIR],["`$PKG_CONFIG --variable=pluginsdir ply-splash-core`"], [Plymouth plugins directory]) + AC_DEFINE_UNQUOTED([PLYMOUTH_CONFDIR],["`$PKG_CONFIG --variable=confdir ply-splash-core`"], [Plymouth configuration directory]) + AC_DEFINE_UNQUOTED([PLYMOUTH_POLICYDIR],["`$PKG_CONFIG --variable=policydir ply-splash-core`"], [Plymouth policy directory]) +fi + if test "${enable_threads}" = "yes"; then CONFIG_FEATURES="${CONFIG_FEATURES} threads" AC_DEFINE([CONFIG_THREADS], [1], [Define if threads enabled]) @@ -301,6 +322,7 @@ AM_CONDITIONAL([ENABLE_CREATE_DEVICE], [test "${enable_create_device}" = "yes"]) AM_CONDITIONAL([ENABLE_SPLASHY], [test "${enable_splashy}" = "yes"]) AM_CONDITIONAL([ENABLE_FBSPLASH], [test "${enable_fbsplash}" = "yes"]) +AM_CONDITIONAL([ENABLE_PLYMOUTH], [test "${enable_plymouth}" = "yes"]) AC_CONFIG_FILES([ Makefile doc/Makefile diff -urNB suspend-utils-1.0/Makefile.am new/Makefile.am --- suspend-utils-1.0/Makefile.am 2011-03-07 00:24:15.000000000 +0100 +++ new/Makefile.am 2012-02-16 16:47:16.909290161 +0100 @@ -29,6 +29,9 @@ if ENABLE_FBSPLASH noinst_PROGRAMS+=fbsplash-test endif +if ENABLE_PLYMOUTH +noinst_PROGRAMS+=plymouth-test +endif endif noinst_LIBRARIES=\ libsuspend-common.a @@ -88,6 +91,12 @@ common_s2disk_libs+=\ ${FBSPLASH_LIBS} endif +if ENABLE_PLYMOUTH +AM_CFLAGS+=\ + ${PLYMOUTH_CFLAGS} +common_s2disk_libs+=\ + ${PLYMOUTH_LIBS} +endif libsuspend_common_a_SOURCES=\ swsusp.h suspend_ioctls.h \ @@ -99,6 +108,7 @@ splash.h splash.c \ splashy_funcs.h splashy_funcs.c \ fbsplash_funcs.h fbsplash_funcs.c \ + plymouth_funcs.h plymouth_funcs.c \ bootsplash.h bootsplash.c \ memalloc.h memalloc.c load.c \ whitelist.h whitelist.csv whitelist.c \ @@ -179,6 +189,11 @@ clean-local: rm -f whitelist.c +plymouth_test_SOURCES=\ + plymouth_funcs.c \ + plymouth-test.c +plymouth_test_LDADD=\ + $(PLYMOUTH_LIBS) # # Misc functions # diff -urNB suspend-utils-1.0/plymouth_funcs.c new/plymouth_funcs.c --- suspend-utils-1.0/plymouth_funcs.c 1970-01-01 01:00:00.000000000 +0100 +++ new/plymouth_funcs.c 2012-02-16 17:18:06.983379699 +0100 @@ -0,0 +1,258 @@ +/* + * plymouth_funcs.c + * + * Plymouth (userspace splash) splash method support + * + * Copyright (c) 2009 Frederic Crozat <fcrozat(a)suse.com> + * + * This file is released under the GPLv2. + * + */ + +#include "config.h" + +#ifdef CONFIG_PLYMOUTH +#include <string.h> +#include <stdio.h> +#include <fcntl.h> +#include <unistd.h> +#include <stdlib.h> + +#include "splash.h" +#include "encrypt.h" +#include "plymouth_funcs.h" +#include <ply-event-loop.h> +#include <ply-boot-splash-plugin.h> +#include <ply-boot-splash.h> +//#include <ply-window.h> +#include <ply-progress.h> +#include <ply-utils.h> +#include <ply-terminal.h> +#include <ply-keyboard.h> +#include <ply-pixel-display.h> +#include <ply-text-display.h> +#include <ply-renderer.h> + +static ply_boot_splash_t *ply_splash; +static ply_buffer_t *buffer; +//static ply_window_t *window; +static ply_keyboard_t *keyboard; +static ply_terminal_t *terminal; +static ply_progress_t *ply_progress; +static ply_renderer_t *renderer; +static ply_list_t *pixel_displays; +static ply_text_display_t *text_display; +static int key_pressed = 0; +static char last_key = -1; + +static void keyboard_input_handler (void *user_data, const char *keyboard_input, size_t character_size) { + fprintf(stderr, "key pressed\n"); + key_pressed = 1; + if (character_size > 0) { + last_key = keyboard_input[character_size - 1]; + } +} + +int plymouth_update(const char *arg) { + const char *cmd = "/usr/bin/plymouth"; + pid_t pid = fork(); + if (!pid) { + int fd = open("/dev/null", O_RDWR); + dup2(fd, 2); + close(fd); + execl(cmd, cmd, arg, (char *) NULL); + } + else { + int status; + waitpid(pid, &status, 0); + return status; + } + return 1; +} + +void terminate_plymouth() { + ply_keyboard_stop_watching_for_input (keyboard); + ply_keyboard_remove_input_handler (keyboard, keyboard_input_handler); + ply_boot_splash_unset_keyboard (ply_splash); + ply_boot_splash_hide (ply_splash); + ply_boot_splash_free (ply_splash); + ply_progress_free (ply_progress); + ply_renderer_close (renderer); + ply_renderer_free (renderer); + ply_terminal_close (terminal); + ply_terminal_free (terminal); + ply_buffer_free (buffer); +} + +static int plymouth_init() { + + int ret; + ply_key_file_t *key_file; + char *splash_string; + char *splash_path; + ply_list_t *heads; + ply_list_node_t *node; + + + buffer = ply_buffer_new (); + + key_file = ply_key_file_new (PLYMOUTH_CONFDIR "plymouthd.conf"); + + if ((ret = ply_key_file_load (key_file)) == 0) + { + return ret; + } + splash_string = ply_key_file_get_value (key_file, "Daemon", "Theme"); + + asprintf(&splash_path, PLYMOUTH_THEMESDIR "%s/%s.plymouth", splash_string, splash_string); + free (splash_string); + terminal = ply_terminal_new ("tty63"); + ply_splash = ply_boot_splash_new (splash_path, PLYMOUTH_PLUGINSDIR, buffer); + free (splash_path); + if ((ret = ply_boot_splash_load (ply_splash)) == 0) { + fprintf(stderr,"could not open splash\n"); + return ret; + } + renderer = ply_renderer_new (NULL, NULL, terminal); + if ((ret = ply_renderer_open (renderer))== 0) { + fprintf(stderr,"could not open renderer /dev/fb\n"); + return ret; + } + keyboard = ply_keyboard_new_for_terminal (terminal); + + text_display = ply_text_display_new (terminal); + ply_boot_splash_add_text_display (ply_splash, text_display); + + heads = ply_renderer_get_heads (renderer); + pixel_displays = ply_list_new(); + + + node = ply_list_get_first_node (heads); + + while (node != NULL) + { + ply_list_node_t *next_node; + ply_renderer_head_t *head; + ply_pixel_display_t *display; + + head = ply_list_node_get_data (node); + next_node = ply_list_get_next_node (heads, node); + + display = ply_pixel_display_new (renderer, head); + + ply_list_append_data (pixel_displays, display); + node = next_node; + ply_boot_splash_add_pixel_display (ply_splash, display); + } + + ply_progress = ply_progress_new(); + ply_boot_splash_attach_progress (ply_splash, ply_progress); + ply_boot_splash_attach_to_event_loop (ply_splash, ply_event_loop_get_default()); + + + ply_keyboard_add_input_handler(keyboard, keyboard_input_handler, NULL); + return ret; + +} + +int plymouth_open(int mode) +{ + int ret; + + if ((ret = plymouth_init ()) == 0 ) + { + fprintf(stderr,"could not initialize plymouth : error %d \n",ret); + return -1; + } + + ply_boot_splash_set_keyboard (ply_splash, keyboard); + ply_renderer_activate (renderer); + if (mode==SPL_RESUME) { + ply_boot_splash_show (ply_splash, PLY_BOOT_SPLASH_MODE_RESUME); + } + else { + ply_boot_splash_show (ply_splash, PLY_BOOT_SPLASH_MODE_SUSPEND); + ply_boot_splash_display_message (ply_splash, "Suspending..." ); + } + ply_keyboard_watch_for_input(keyboard); + + ply_event_loop_process_pending_events (ply_event_loop_get_default()); + + return 0; +} + + +inline int plymouth_finish(void) +{ + + terminate_plymouth(); + + return 0; +} + +inline int plymouth_progress(int p) +{ + ply_progress_set_percentage (ply_progress, (double) p / 100); + + ply_event_loop_process_pending_events (ply_event_loop_get_default()); + + return 0; +} + + +void plymouth_read_password(char *buf, int vrfy) +{ +#if 0 +#if CONFIG_ENCRYPT + char *vrfy_buf = vrfy ? buf + PASS_SIZE : buf; + + do { + while (plymouth_get_password(buf,PASS_SIZE, + "Passphrase please (must be non-empty): ") <= 0); + + if (vrfy) + while (plymouth_get_password(vrfy_buf,PASS_SIZE, + "Verify passphrase: ") <= 0); + + } while (vrfy && strncmp(buf, vrfy_buf, PASS_SIZE)); +#endif +#endif +} + + +void plymouth_set_caption(const char *message) +{ + ply_boot_splash_display_message (ply_splash, message); + ply_event_loop_process_pending_events (ply_event_loop_get_default()); +} + +int plymouth_dialog(const char *prompt) +{ + key_pressed = 0; + ply_progress_pause (ply_progress); + ply_boot_splash_display_message (ply_splash, prompt); + while (key_pressed == 0) { + ply_event_loop_process_pending_events (ply_event_loop_get_default()); + } + ply_progress_unpause (ply_progress); + return last_key; +} + +char plymouth_key_pressed(void) { +#if 1 + ply_event_loop_process_pending_events (ply_event_loop_get_default()); + if (key_pressed == 0) { + return 0; + } + else { + int key = last_key; + last_key = -1; + key_pressed = 0; + return key; + } +#endif +// return 0; +} + + +#endif diff -urNB suspend-utils-1.0/plymouth_funcs.h new/plymouth_funcs.h --- suspend-utils-1.0/plymouth_funcs.h 1970-01-01 01:00:00.000000000 +0100 +++ new/plymouth_funcs.h 2012-02-16 17:18:15.332380115 +0100 @@ -0,0 +1,28 @@ +/* + * plymouth_funcs.h + * + * Boot splash related definitions for plymouth method + * + * Copyright (C) 2009 Frederic Crozat <fcrozat(a)suse.com> + * + * This file is released under the GPLv2. + * + */ + +#ifndef PLYMOUTH_FUNCS_H +#define PLYMOUTH_FUNCS_H +#ifdef CONFIG_PLYMOUTH + +int plymouth_open(int mode); +int plymouth_finish(void); +int plymouth_progress(int p); +void plymouth_read_password(char *, int); +int plymouth_dialog(const char *); +void plymouth_set_caption(const char *message); +char plymouth_key_pressed(void); + + + +#endif +#endif /* PLYMOUTH_FUNCS_H */ + diff -urNB suspend-utils-1.0/plymouth-test.c new/plymouth-test.c --- suspend-utils-1.0/plymouth-test.c 1970-01-01 01:00:00.000000000 +0100 +++ new/plymouth-test.c 2012-02-16 17:18:23.931380520 +0100 @@ -0,0 +1,72 @@ +/* + * plymouth-test.c + * + * plymouth (framebuffer splash) splash method support + * + * Copyright (c) 2009 Frederic Crozat <fcrozat(a)suse.com> + * + * This file is released under the GPLv2. + * + */ + +#include "config.h" + +#include <string.h> +#include <stdio.h> +#include <linux/types.h> +#include <syscall.h> +#include <sys/ioctl.h> +#include <sys/types.h> +#include <errno.h> + +#include "swsusp.h" +#include "splash.h" +#include "plymouth_funcs.h" + +int main (void) +{ + char c; + int r; + int i; + printf("plymouth_open...\n"); + r = plymouth_open(SPL_SUSPEND); + printf("plymouth_open=%d\n", r); + if (r) { + return 1; + } + + for (i=0; i<=100; i+=10) { + printf("plymouth_progress (%d)...\n", i); + plymouth_progress(i); + sleep(1); + if (i == 50) { + printf("plymouth_dialog()...\n"); + printf("plymouth_dialog=%c\n", plymouth_dialog ("Hello world!\nPlease press a key: ")); + } +#ifdef CONFIG_ENCRYPT + else if (i==60) { + char pass[PASS_SIZE]; + printf("plymouth_read_password(,0)..\n"); + plymouth_read_password(pass, 0); + printf("plymouth_read_password=%s\n", pass); + } + else if (i==80) { + char pass[PASS_SIZE]; + printf("plymouth_read_password(,1)..\n"); + plymouth_read_password(pass, 1); + printf("plymouth_read_password=%s\n", pass); + } +#endif + + c = plymouth_key_pressed(); + if (c) { + char buffer[SPLASH_GENERIC_MESSAGE_SIZE]; + sprintf(buffer, "Key %c (%02x) pressed", c, (unsigned char)c); + plymouth_set_caption(buffer); + } + } + + printf("plymouth_finish...\n"); + plymouth_finish(); + return 0; +} diff -urNB suspend-utils-1.0/splash.c new/splash.c --- suspend-utils-1.0/splash.c 2011-03-07 00:24:15.000000000 +0100 +++ new/splash.c 2012-02-16 16:48:13.382292845 +0100 @@ -27,6 +27,7 @@ #include "bootsplash.h" #include "splashy_funcs.h" #include "fbsplash_funcs.h" +#include "plymouth_funcs.h" #include "encrypt.h" #define INPUT_PATH "/dev/input/by-path" @@ -202,6 +203,10 @@ splash->key_pressed = simple_key_pressed; splash->set_caption = splash_dummy_set_caption; +#ifdef CONFIG_PLYMOUTH + plymouth_update ("quit"); +#endif + if (!mode) return; @@ -233,6 +238,15 @@ if (!open_input_fd()) splash->key_pressed = key_pressed; #endif +#ifdef CONFIG_PLYMOUTH + } else if (!plymouth_open(mode)) { + splash->finish = plymouth_finish; + splash->progress = plymouth_progress; + splash->dialog = plymouth_dialog; + splash->read_password = plymouth_read_password; + if (!open_input_fd()) + splash->key_pressed = key_pressed; +#endif } else if (0) { /* add another splash system here */ } else { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sg3_utils for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package sg3_utils for openSUSE:Factory checked in at 2012-04-23 16:13:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sg3_utils (Old) and /work/SRC/openSUSE:Factory/.sg3_utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sg3_utils", Maintainer is "hare(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sg3_utils/sg3_utils.changes 2011-09-23 12:46:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sg3_utils.new/sg3_utils.changes 2012-04-23 16:13:43.000000000 +0200 @@ -1,0 +2,49 @@ +Sun Apr 22 11:50:44 UTC 2012 - puzel(a)suse.com + +- Update to version 1.33 + - sg_ses: major rework of indexes (again), now two level + - sg_write_buffer: new --specific option for mode specific + field; new mode 13 (spc4r32) + - sg_vpd: add hp3par volume info vendor VPD page + - fix 'scsi ports' [0x88] page problem + - add 'sinq' pseudo page for standard inquiry response + - add power consumption page + - sg_format: add --poll= option for request sense polling + - improve handling of disks > 2 TB and DIF (protection) + - sg_logs: LB provision lpage extra (sbc3r28) + - sg_modes: application tag mpage subcode 0xf0->0x2 + - sg_write_same: no prot fields when wrprotect=0 + - sg_get_lba_status: reflect change in sbc3r25 to Parameter + Data Length response field (offset reduced from 8 to 4) + - sg_inq, sg_vpd: sync with spc4r33 + - win32: change DataBufferOffset type per MSDN; caused + problem with 64 bit machines (with buffered interface) + - sg_luns: tweak documentation for vendor specific reports + - add man pages for scsi_loging_level, scsi_mandat, + scsi_satl and scsi_temperature + +------------------------------------------------------------------- +Mon Jan 16 19:59:42 UTC 2012 - tabraham(a)novell.com + +- Update to version 1.32 + + sg_sanitize: new utility for command added in sb3r27 + + sg_sat_identify: add '--ident' to output WWN + + sg_ses: major rework of descriptor output + + add --index, --descriptor, --join, --clear, --get, and --set + options + + sg_raw: exit status corrections + + sg_decode_sense: add --nospace and --hex options + + sg_logs: fix bug with large --maxlen + + zero response length when resid implies it is invalid + + add scope field to lb provisioning lpage (sb3r27) + + sg_inq: sync version descriptors with spc4r31 + + sb_lib_data: sync asc/ascq codes with spc4r31 + + sg_vpd: add LBPRZ field in LP provisioning VPD page + + sg_format: allow format of pdt 7 (some MO drives) + + sg_cmd_basic: sg_cmds_process_resp() handle status good + with a sense key other than no_sense (e.g. completed) + + add README.iscsi + +- Updated rescan-scsi-bus.sh to v1.56 + +------------------------------------------------------------------- Old: ---- sg3_utils-1.31.tar.bz2 New: ---- sg3_utils-1.33.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sg3_utils.spec ++++++ --- /var/tmp/diff_new_pack.9Rm1tb/_old 2012-04-23 16:13:46.000000000 +0200 +++ /var/tmp/diff_new_pack.9Rm1tb/_new 2012-04-23 16:13:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sg3_utils # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,22 +16,20 @@ # -Url: http://sg.torque.net/sg/sg3_utils.html +Url: http://sg.danny.cz/sg/sg3_utils.html Name: sg3_utils -%define sgver 1.31 +Version: 1.33 +Release: 0 +Summary: A collection of tools that send SCSI commands to devices License: BSD-3-Clause ; GPL-2.0 ; GPL-2.0+ Group: Hardware/Other -Provides: sg_utils +Source: http://sg.danny.cz/sg/p/sg3_utils-%{version}.tgz +Source2: http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh +Requires(pre): %insserv_prereq Provides: scsi +Provides: sg_utils Obsoletes: scsi <= 1.7_2.38_1.25_0.19_1.02_0.93 -AutoReqProv: on -PreReq: %insserv_prereq -Version: 1.31 -Release: 1 -Summary: A collection of tools that send SCSI commands to devices -Source: http://sg.torque.net/sg/p/sg3_utils-%{sgver}.tar.bz2 -Source2: http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,11 +41,10 @@ or a bridge device are examples of devices that use SCSI command sets. %package devel -License: BSD-3-Clause ; GPL-2.0+ Summary: A collection of tools that send SCSI commands to devices +License: BSD-3-Clause ; GPL-2.0+ Group: Development/Libraries/C and C++ -AutoReqProv: on -Requires: %name = %version +Requires: %{name} = %{version} %description devel The sg3_utils package contains utilities that send SCSI commands to @@ -88,7 +85,7 @@ %attr(755,root,root) %{_bindir}/sg_map %attr(755,root,root) %{_bindir}/sg_turs %attr(755,root,root) %{_bindir}/sg_test_rwbuf -#%attr(755,root,root) %{_bindir}/scsi_devfs_scan +#%%attr(755,root,root) %%{_bindir}/scsi_devfs_scan %attr(755,root,root) %{_bindir}/sgm_dd %attr(755,root,root) %{_bindir}/sg_read %attr(755,root,root) %{_bindir}/sg_logs @@ -133,6 +130,7 @@ %attr(755,root,root) %{_bindir}/sg_write_same %attr(755,root,root) %{_bindir}/sg_decode_sense %attr(755,root,root) %{_bindir}/sg_referrals +%attr(755,root,root) %{_bindir}/sg_sanitize %doc %{_mandir}/man8/sg_dd.8.gz %doc %{_mandir}/man8/sgp_dd.8.gz %doc %{_mandir}/man8/sgm_dd.8.gz @@ -145,7 +143,7 @@ %doc %{_mandir}/man8/sg_turs.8.gz %doc %{_mandir}/man8/sg_inq.8.gz %doc %{_mandir}/man8/sg_test_rwbuf.8.gz -#%doc %{_mandir}/man8/scsi_devfs_scan.8.gz +#%%doc %%{_mandir}/man8/scsi_devfs_scan.8.gz %doc %{_mandir}/man8/sg_start.8.gz %doc %{_mandir}/man8/sg_reset.8.gz %doc %{_mandir}/man8/sg_modes.8.gz @@ -191,24 +189,29 @@ %doc %{_mandir}/man8/sg_write_same.8.gz %doc %{_mandir}/man8/sg_decode_sense.8.gz %doc %{_mandir}/man8/sg_referrals.8.gz +%doc %{_mandir}/man8/sg_sanitize.8.gz +%doc %{_mandir}/man8/scsi_logging_level.8.gz +%doc %{_mandir}/man8/scsi_mandat.8.gz +%doc %{_mandir}/man8/scsi_satl.8.gz +%doc %{_mandir}/man8/scsi_temperature.8.gz %attr(755,root,root) %{_libdir}/libsgutils2.so.* %files devel %defattr(644,root,root) %attr(755,root,root) %{_libdir}/libsgutils2.so %attr(755,root,root) %dir %{_prefix}/include/scsi -%{_prefix}/include/scsi/sg_cmds.h -%{_prefix}/include/scsi/sg_cmds_basic.h -%{_prefix}/include/scsi/sg_cmds_extra.h -%{_prefix}/include/scsi/sg_lib.h -%{_prefix}/include/scsi/sg_pt.h -%{_prefix}/include/scsi/sg_io_linux.h -%{_prefix}/include/scsi/sg_linux_inc.h -%{_prefix}/include/scsi/sg_cmds_mmc.h -%{_prefix}/include/scsi/sg_lib_data.h +%{_includedir}/scsi/sg_cmds.h +%{_includedir}/scsi/sg_cmds_basic.h +%{_includedir}/scsi/sg_cmds_extra.h +%{_includedir}/scsi/sg_lib.h +%{_includedir}/scsi/sg_pt.h +%{_includedir}/scsi/sg_io_linux.h +%{_includedir}/scsi/sg_linux_inc.h +%{_includedir}/scsi/sg_cmds_mmc.h +%{_includedir}/scsi/sg_lib_data.h %clean test ! -z "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT -rm -rf $RPM_BUILD_DIR/sg3_utils-%{sgver} +rm -rf $RPM_BUILD_DIR/sg3_utils-%{version} %changelog ++++++ rescan-scsi-bus.sh ++++++ ++++ 743 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/sg3_utils/rescan-scsi-bus.sh ++++ and /work/SRC/openSUSE:Factory/.sg3_utils.new/rescan-scsi-bus.sh -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit seamonkey for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package seamonkey for openSUSE:Factory checked in at 2012-04-23 16:13:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/seamonkey (Old) and /work/SRC/openSUSE:Factory/.seamonkey.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "seamonkey", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/seamonkey/seamonkey.changes 2012-03-16 13:25:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.seamonkey.new/seamonkey.changes 2012-04-23 16:13:21.000000000 +0200 @@ -1,0 +2,11 @@ +Sat Apr 21 12:29:55 UTC 2012 - wr(a)rosenauer.org + +- update to 2.9b4 +- added mozilla-sle11.patch and add exceptions to be able to build + for SLE11/11.1 +- exclude broken gl locale from build +- fixed build on 11.2-x86_64 by adding mozilla-revert_621446.patch +- added mozilla-gcc47.patch and mailnews-literals.patch to fix + compilation issues with recent gcc 4.7 + +------------------------------------------------------------------- Old: ---- l10n-2.8.tar.bz2 seamonkey-2.8-source.tar.bz2 New: ---- l10n-2.8.99.tar.bz2 mailnews-literals.patch mozilla-gcc47.patch mozilla-revert_621446.patch mozilla-sle11.patch seamonkey-2.8.99-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seamonkey.spec ++++++ --- /var/tmp/diff_new_pack.tP8fL6/_old 2012-04-23 16:13:30.000000000 +0200 +++ /var/tmp/diff_new_pack.tP8fL6/_new 2012-04-23 16:13:30.000000000 +0200 @@ -26,9 +26,7 @@ BuildRequires: hunspell-devel BuildRequires: libgnomeui-devel BuildRequires: libidl-devel -BuildRequires: libiw-devel BuildRequires: libnotify-devel -BuildRequires: libproxy-devel BuildRequires: nss-shared-helper-devel BuildRequires: python BuildRequires: startup-notification-devel @@ -37,10 +35,16 @@ BuildRequires: xorg-x11-libXt-devel BuildRequires: yasm BuildRequires: zip +%if %suse_version > 1110 +BuildRequires: libiw-devel +BuildRequires: libproxy-devel +%else +BuildRequires: wireless-tools +%endif Provides: web_browser -Version: 2.8 +Version: 2.8.99 Release: 0 -%define releasedate 2012031200 +%define releasedate 2012042000 Summary: The successor of the Mozilla Application Suite License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Group: Productivity/Networking/Web/Browsers @@ -59,12 +63,16 @@ Patch1: mozilla-nongnome-proxies.patch Patch2: mozilla-prefer_plugin_pref.patch Patch3: mozilla-shared-nss-db.patch +Patch4: mozilla-sle11.patch Patch5: mozilla-language.patch +Patch6: mozilla-revert_621446.patch Patch8: mozilla-ntlm-full-path.patch Patch10: mozilla-ua-locale.patch +Patch11: mozilla-gcc47.patch Patch12: mozilla-yarr-pcre.patch Patch20: seamonkey-ua-locale.patch Patch21: seamonkey-shared-nss-db.patch +Patch22: mailnews-literals.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /bin/sh coreutils Provides: seamonkey-mail = %{version} @@ -141,7 +149,7 @@ %package translations-other Summary: Extra translations for SeaMonkey Group: System/Localization -Provides: locale(%{name}:be;gl;lt;sk;tr) +Provides: locale(%{name}:be;lt;sk;tr;uk) PreReq: %{name} = %{version} %description translations-other @@ -156,14 +164,20 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%if %suse_version < 1120 +%patch4 -p1 +%endif %patch5 -p1 +%patch6 -p1 %patch8 -p1 %patch10 -p1 +%patch11 -p1 #%patch12 -p1 popd # comm patches %patch20 -p1 %patch21 -p1 +%patch22 -p1 %build # no need to add build time to binaries @@ -205,7 +219,6 @@ ac_add_options --disable-crashreporter ac_add_options --enable-startup-notification ac_add_options --enable-system-hunspell -ac_add_options --enable-libproxy #ac_add_options --enable-system-mozldap EOF %if %has_system_cairo @@ -213,6 +226,11 @@ ac_add_options --enable-system-cairo EOF %endif +%if %suse_version > 1110 +cat << EOF >> $MOZCONFIG +ac_add_options --enable-libproxy +EOF +%endif make -f client.mk build # @@ -229,7 +247,7 @@ touch %{_tmppath}/translations.{common,other} for locale in $(awk '{ print $1; }' ../seamonkey/suite/locales/shipped-locales); do case $locale in - ja-JP-mac|en-US) + ja-JP-mac|en-US|gl) ;; *) pushd $RPM_BUILD_DIR/compare-locales ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.tP8fL6/_old 2012-04-23 16:13:31.000000000 +0200 +++ /var/tmp/diff_new_pack.tP8fL6/_new 2012-04-23 16:13:31.000000000 +0200 @@ -1,9 +1,9 @@ #!/bin/bash -CHANNEL="release" +CHANNEL="beta" BRANCH="releases/comm-$CHANNEL" -RELEASE_TAG="SEAMONKEY_2_8_RELEASE" -VERSION="2.8" +RELEASE_TAG="SEAMONKEY_2_9b4_RELEASE" +VERSION="2.8.99" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH seamonkey ++++++ l10n-2.8.tar.bz2 -> l10n-2.8.99.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/seamonkey/l10n-2.8.tar.bz2 /work/SRC/openSUSE:Factory/.seamonkey.new/l10n-2.8.99.tar.bz2 differ: char 11, line 1 ++++++ mailnews-literals.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent 879e8d044e364396b63af59b3cdc4252fb2ae29a Bug 733867 - Build failure with gcc-4.7.0rc1: "nsMsgFolderCompactor.cpp ... error: unable to find string literal operator ‘operator"" ..." (TM: COMM13) diff --git a/mailnews/base/search/src/nsMsgSearchAdapter.cpp b/mailnews/base/search/src/nsMsgSearchAdapter.cpp --- a/mailnews/base/search/src/nsMsgSearchAdapter.cpp +++ b/mailnews/base/search/src/nsMsgSearchAdapter.cpp @@ -683,17 +683,17 @@ nsresult nsMsgSearchAdapter::EncodeImapV } if (!NS_IsAscii(value)) { nsCAutoString lengthStr; PL_strcat(encoding, "{"); lengthStr.AppendInt((PRInt32) strlen(value)); PL_strcat(encoding, lengthStr.get()); - PL_strcat(encoding, "}"CRLF); + PL_strcat(encoding, "}" CRLF); PL_strcat(encoding, value); return NS_OK; } if (useQuotes) PL_strcat(encoding, "\""); PL_strcat (encoding, value); if (useQuotes) PL_strcat(encoding, "\""); diff --git a/mailnews/base/src/nsMsgFolderCompactor.cpp b/mailnews/base/src/nsMsgFolderCompactor.cpp --- a/mailnews/base/src/nsMsgFolderCompactor.cpp +++ b/mailnews/base/src/nsMsgFolderCompactor.cpp @@ -753,17 +753,17 @@ nsFolderCompactState::OnDataAvailable(ns m_folder->GetMsgDatabase(getter_AddRefs(srcDB)); if (srcDB) { srcDB->SetSummaryValid(false); srcDB->ForceClosed(); } } } -#define EXTRA_KEYWORD_HDR " "MSG_LINEBREAK +#define EXTRA_KEYWORD_HDR " " MSG_LINEBREAK // if status offset isn't in the first block, this code won't work. There's no good reason // for the status offset not to be at the beginning of the message anyway. if (addKeywordHdr) { // if blockOffset is set, we added x-mozilla-status headers so // file pointer is already past them. if (!blockOffset) diff --git a/mailnews/compose/src/nsMsgAppleEncode.cpp b/mailnews/compose/src/nsMsgAppleEncode.cpp --- a/mailnews/compose/src/nsMsgAppleEncode.cpp +++ b/mailnews/compose/src/nsMsgAppleEncode.cpp @@ -133,17 +133,17 @@ int fill_apple_mime_header( strlen(p_ap_encode_obj->fname)); if (status != noErr) return status; PR_snprintf(tmpstr, sizeof(tmpstr), "\"\r\nContent-Disposition: inline; filename=\"%s\"\r\n\r\n\r\n--=\r\n", p_ap_encode_obj->fname); #endif /* 0 */ - PR_snprintf(tmpstr, sizeof(tmpstr), "--%s"CRLF, p_ap_encode_obj->boundary); + PR_snprintf(tmpstr, sizeof(tmpstr), "--%s" CRLF, p_ap_encode_obj->boundary); status = write_stream(p_ap_encode_obj, tmpstr, strlen(tmpstr)); return status; } int ap_encode_file_infor( appledouble_encode_object *p_ap_encode_obj) @@ -374,17 +374,17 @@ int ap_encode_header( status = finish64(p_ap_encode_obj); if (status != noErr) return status; /* ** write out the boundary */ PR_snprintf(rd_buff, sizeof(rd_buff), - CRLF"--%s"CRLF, + CRLF"--%s" CRLF, p_ap_encode_obj->boundary); status = write_stream(p_ap_encode_obj, rd_buff, strlen(rd_buff)); if (status == noErr) status = errDone; } @@ -515,17 +515,17 @@ int ap_encode_data( } /* ** the data portion header information. */ nsCAutoString leafName; resFile->GetNativeLeafName(leafName); PR_snprintf(rd_buff, sizeof(rd_buff), - "Content-Type: %s; name=\"%s\"" CRLF "Content-Transfer-Encoding: base64" CRLF "Content-Disposition: inline; filename=\"%s\""CRLF CRLF, + "Content-Type: %s; name=\"%s\"" CRLF "Content-Transfer-Encoding: base64" CRLF "Content-Disposition: inline; filename=\"%s\"" CRLF CRLF, magic_type, leafName.get(), leafName.get()); status = write_stream(p_ap_encode_obj, rd_buff, strlen(rd_buff)); if (status != noErr) @@ -558,17 +558,17 @@ int ap_encode_data( status = finish64(p_ap_encode_obj); if (status != noErr) return status; /* write out the boundary */ PR_snprintf(rd_buff, sizeof(rd_buff), - CRLF"--%s--"CRLF CRLF, + CRLF"--%s--" CRLF CRLF, p_ap_encode_obj->boundary); status = write_stream(p_ap_encode_obj, rd_buff, strlen(rd_buff)); if (status == noErr) status = errDone; diff --git a/mailnews/compose/src/nsSmtpProtocol.cpp b/mailnews/compose/src/nsSmtpProtocol.cpp --- a/mailnews/compose/src/nsSmtpProtocol.cpp +++ b/mailnews/compose/src/nsSmtpProtocol.cpp @@ -1717,17 +1717,17 @@ PRInt32 nsSmtpProtocol::SendMessageRespo /* else */ return SendQuit(); } PRInt32 nsSmtpProtocol::SendQuit() { m_sendDone = true; nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL); - SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server. + SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server. m_nextState = SMTP_RESPONSE; m_nextStateAfterResponse = SMTP_DONE; return(0); } nsresult nsSmtpProtocol::LoadUrl(nsIURI * aURL, nsISupports * aConsumer ) { if (!aURL) @@ -1964,17 +1964,17 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI /* check for errors during load and call error * state if found */ if(status < 0 && m_nextState != SMTP_FREE) { nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL); // send a quit command to close the connection with the server. - if (SendData(url, "QUIT"CRLF) == NS_OK) + if (SendData(url, "QUIT" CRLF) == NS_OK) { m_nextState = SMTP_RESPONSE; m_nextStateAfterResponse = SMTP_ERROR_DONE; } else { m_nextState = SMTP_ERROR_DONE; /* don't exit! loop around again and do the free case */ diff --git a/mailnews/imap/src/nsImapMailFolder.cpp b/mailnews/imap/src/nsImapMailFolder.cpp --- a/mailnews/imap/src/nsImapMailFolder.cpp +++ b/mailnews/imap/src/nsImapMailFolder.cpp @@ -8304,17 +8304,17 @@ nsImapMailFolder::CopyFileToOfflineStore srcFile->GetFileSize(&fileSize); PRUint32 bytesWritten; rv = NS_OK; msgParser->SetState(nsIMsgParseMailMsgState::ParseHeadersState); msgParser->SetNewMsgHdr(fakeHdr); bool needMoreData = false; char * newLine = nsnull; PRUint32 numBytesInLine = 0; - const char *envelope = "From "CRLF; + const char *envelope = "From " CRLF; offlineStore->Write(envelope, strlen(envelope), &bytesWritten); fileSize += bytesWritten; do { newLine = inputStreamBuffer->ReadNextLine(inputStream, numBytesInLine, needMoreData); if (newLine) { msgParser->ParseAFolderLine(newLine, numBytesInLine); diff --git a/mailnews/imap/src/nsImapProtocol.cpp b/mailnews/imap/src/nsImapProtocol.cpp --- a/mailnews/imap/src/nsImapProtocol.cpp +++ b/mailnews/imap/src/nsImapProtocol.cpp @@ -1404,17 +1404,17 @@ nsImapProtocol::ImapThreadMainLoop() PR_LOG(IMAP, PR_LOG_DEBUG, ("ImapThreadMainLoop leaving [this=%x]\n", this)); } void nsImapProtocol::HandleIdleResponses() { // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages(); nsCAutoString commandBuffer(GetServerCommandTag()); - commandBuffer.Append(" IDLE"CRLF); + commandBuffer.Append(" IDLE" CRLF); do { ParseIMAPandCheckForNewMail(commandBuffer.get()); } while (m_inputStreamBuffer->NextLineAvailable() && GetServerStateParser().Connected()); // if (oldRecent != GetServerStateParser().NumberOfRecentMessages()) @@ -3282,17 +3282,17 @@ void nsImapProtocol::FetchMsgAttribute(c { IncrementCommandTagNumber(); nsCAutoString commandString (GetServerCommandTag()); commandString.Append(" UID fetch "); commandString.Append(messageIds); commandString.Append(" ("); commandString.Append(attribute); - commandString.Append(")"CRLF); + commandString.Append(")" CRLF); nsresult rv = SendData(commandString.get()); if (NS_SUCCEEDED(rv)) ParseIMAPandCheckForNewMail(commandString.get()); GetServerStateParser().SetFetchingFlags(false); GetServerStateParser().SetFetchingEverythingRFC822(false); // always clear this flag after every fetch.... } @@ -5278,17 +5278,17 @@ nsImapProtocol::Expunge() delete search; if (key == 0) return; //no deleted messages to expunge (bug 235004) } } IncrementCommandTagNumber(); nsCAutoString command(GetServerCommandTag()); - command.Append(" expunge"CRLF); + command.Append(" expunge" CRLF); nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) ParseIMAPandCheckForNewMail(); } void nsImapProtocol::HandleMemoryFailure() @@ -5354,17 +5354,17 @@ void nsImapProtocol::ID() if (!gAppName[0]) return; IncrementCommandTagNumber(); nsCString command(GetServerCommandTag()); command.Append(" ID (\"name\" \""); command.Append(gAppName); command.Append("\" \"version\" \""); command.Append(gAppVersion); - command.Append("\")"CRLF); + command.Append("\")" CRLF); nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) ParseIMAPandCheckForNewMail(); } void nsImapProtocol::EnableCondStore() { @@ -5811,17 +5811,17 @@ nsresult nsImapProtocol::AuthLogin(const command.Append(escapedUserName); command.Append("\" \""); // if the password contains a \, login will fail // turn foo\bar into foo\\bar nsCAutoString correctedPassword; EscapeUserNamePasswordString(password.get(), &correctedPassword); command.Append(correctedPassword); - command.Append("\""CRLF); + command.Append("\"" CRLF); rv = SendData(command.get(), true /* suppress logging */); NS_ENSURE_SUCCESS(rv, rv); ParseIMAPandCheckForNewMail(); } else if (flag & kHasAuthNoneCapability) { // TODO What to do? "login <username>" like POP? return NS_ERROR_NOT_IMPLEMENTED; @@ -7442,17 +7442,17 @@ void nsImapProtocol::CreateMailbox(const IncrementCommandTagNumber(); nsCString escapedName; CreateEscapedMailboxName(mailboxName, escapedName); nsCString command(GetServerCommandTag()); command += " create \""; command += escapedName; - command += "\""CRLF; + command += "\"" CRLF; nsresult rv = SendData(command.get()); if(NS_SUCCEEDED(rv)) ParseIMAPandCheckForNewMail(); // If that failed, let's list the parent folder to see if // it allows inferiors, so we won't try to create sub-folders // of the parent folder again in the current session. if (GetServerStateParser().CommandFailed()) @@ -7545,17 +7545,17 @@ void nsImapProtocol::Lsub(const char *ma nsCString escapedPattern; CreateEscapedMailboxName(boxnameWithOnlineDirectory ? boxnameWithOnlineDirectory : mailboxPattern, escapedPattern); nsCString command (GetServerCommandTag()); command += " lsub \"\" \""; command += escapedPattern; - command += "\""CRLF; + command += "\"" CRLF; PR_Free(boxnameWithOnlineDirectory); nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) ParseIMAPandCheckForNewMail(); } @@ -7574,17 +7574,17 @@ void nsImapProtocol::List(const char *ma CreateEscapedMailboxName(boxnameWithOnlineDirectory ? boxnameWithOnlineDirectory : mailboxPattern, escapedPattern); nsCString command (GetServerCommandTag()); command += useXLIST ? " xlist \"\" \"" : " list \"\" \""; command += escapedPattern; - command += "\""CRLF; + command += "\"" CRLF; PR_Free(boxnameWithOnlineDirectory); nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) ParseIMAPandCheckForNewMail(command.get(), true); } @@ -7595,17 +7595,17 @@ void nsImapProtocol::Subscribe(const cha IncrementCommandTagNumber(); nsCString escapedName; CreateEscapedMailboxName(mailboxName, escapedName); nsCString command (GetServerCommandTag()); command += " subscribe \""; command += escapedName; - command += "\""CRLF; + command += "\"" CRLF; nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) ParseIMAPandCheckForNewMail(); } void nsImapProtocol::Unsubscribe(const char *mailboxName) { @@ -7613,31 +7613,31 @@ void nsImapProtocol::Unsubscribe(const c IncrementCommandTagNumber(); nsCString escapedName; CreateEscapedMailboxName(mailboxName, escapedName); nsCString command (GetServerCommandTag()); command += " unsubscribe \""; command += escapedName; - command += "\""CRLF; + command += "\"" CRLF; nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) ParseIMAPandCheckForNewMail(); } void nsImapProtocol::Idle() { IncrementCommandTagNumber(); if (m_urlInProgress) return; nsCAutoString command (GetServerCommandTag()); - command += " IDLE"CRLF; + command += " IDLE" CRLF; nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) { m_idle = true; // we'll just get back a continuation char at first. // + idling... ParseIMAPandCheckForNewMail(); // this will cause us to get notified of data or the socket getting closed. @@ -7654,17 +7654,17 @@ void nsImapProtocol::Idle() // responses, we need to not wait for the server response // on shutdown. void nsImapProtocol::EndIdle(bool waitForResponse /* = true */) { // clear the async wait - otherwise, we seem to have trouble doing a blocking read nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream); if (asyncInputStream) asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull); - nsresult rv = SendData("DONE"CRLF); + nsresult rv = SendData("DONE" CRLF); // set a short timeout if we don't want to wait for a response if (m_transport && !waitForResponse) m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5); if (NS_SUCCEEDED(rv)) { m_idle = false; ParseIMAPandCheckForNewMail(); } @@ -7723,18 +7723,18 @@ void nsImapProtocol::Copy(const char * m nsTArray<nsMsgKey> msgKeys; if (idsAreUid) ParseUidString(messageList, msgKeys); PRInt32 msgCountLeft = msgKeys.Length(); PRUint32 msgsHandled = 0; const char *formatString; formatString = (idsAreUid) - ? "%s uid store %s %s"CRLF - : "%s store %s %s"CRLF; + ? "%s uid store %s %s" CRLF + : "%s store %s %s" CRLF; do { nsCString idString; PRUint32 msgsToHandle = msgCountLeft; if (idsAreUid) AllocateImapUidString(msgKeys.Elements() + msgsHandled, msgsToHandle, m_flagState, idString); diff --git a/mailnews/imap/src/nsImapServerResponseParser.cpp b/mailnews/imap/src/nsImapServerResponseParser.cpp --- a/mailnews/imap/src/nsImapServerResponseParser.cpp +++ b/mailnews/imap/src/nsImapServerResponseParser.cpp @@ -180,17 +180,17 @@ void nsImapServerResponseParser::Initial // continue-req = "+" SP (resp-text / base64) CRLF void nsImapServerResponseParser::ParseIMAPServerResponse(const char *aCurrentCommand, bool aIgnoreBadAndNOResponses, char *aGreetingWithCapability) { NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' && *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string"); - bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF); + bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF); if (sendingIdleDone) fWaitingForMoreClientInput = false; // Reinitialize the parser SetConnected(true); SetSyntaxError(false); // Reinitialize our state diff --git a/mailnews/local/src/nsPop3Protocol.cpp b/mailnews/local/src/nsPop3Protocol.cpp --- a/mailnews/local/src/nsPop3Protocol.cpp +++ b/mailnews/local/src/nsPop3Protocol.cpp @@ -2478,17 +2478,17 @@ PRInt32 nsPop3Protocol::SendList() m_pop3ConData->msg_info = (Pop3MsgInfo *) PR_CALLOC(sizeof(Pop3MsgInfo) * m_pop3ConData->number_of_messages); if (!m_pop3ConData->msg_info) return(MK_OUT_OF_MEMORY); m_pop3ConData->next_state_after_response = POP3_GET_LIST; m_listpos = 0; - return SendData(m_url, "LIST"CRLF); + return SendData(m_url, "LIST" CRLF); } PRInt32 nsPop3Protocol::GetList(nsIInputStream* inputStream, PRUint32 length) { diff --git a/mailnews/mime/src/mimedrft.cpp b/mailnews/mime/src/mimedrft.cpp --- a/mailnews/mime/src/mimedrft.cpp +++ b/mailnews/mime/src/mimedrft.cpp @@ -1468,17 +1468,17 @@ mime_parse_stream_complete (nsMIMESessio //+13 chars for <pre> & </pre> tags and CRLF PRUint32 newbodylen = bodyLen + 14; char* newbody = (char *)PR_MALLOC (newbodylen); if (newbody) { *newbody = 0; PL_strcatn(newbody, newbodylen, "<PRE>"); PL_strcatn(newbody, newbodylen, body); - PL_strcatn(newbody, newbodylen, "</PRE>"CRLF); + PL_strcatn(newbody, newbodylen, "</PRE>" CRLF); PR_Free(body); body = newbody; } } // Body is now HTML, set the format too (so headers are inserted in // correct format). composeFormat = nsIMsgCompFormat::HTML; } diff --git a/mailnews/mime/src/mimemult.cpp b/mailnews/mime/src/mimemult.cpp --- a/mailnews/mime/src/mimemult.cpp +++ b/mailnews/mime/src/mimemult.cpp @@ -275,44 +275,44 @@ MimeMultipart_parse_line (const char *li { MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Type: ")); MimeWriteAString(obj, nsDependentCString(contentType)); PR_Free(contentType); } MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK)); MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\"")); MimeWriteAString(obj, fileName); - MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK)); + MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK)); MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: ")); MimeWriteAString(obj, obj->options->state->detachedFilePath); MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK)); MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-Altered: AttachmentDetached; date=\"")); } else { nsCAutoString header("Content-Type: text/x-moz-deleted; name=\"Deleted: "); header.Append(fileName); status = MimeWriteAString(obj, header); - if (status < 0) + if (status < 0) return status; - status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK)); + status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK)); MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: ")); MimeWriteAString(obj, fileName); - MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\"")); + MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\"")); } nsCString result; char timeBuffer[128]; PRExplodedTime now; PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now); PR_FormatTimeUSEnglish(timeBuffer, sizeof(timeBuffer), "%a %b %d %H:%M:%S %Y", &now); MimeWriteAString(obj, nsDependentCString(timeBuffer)); - MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK)); - MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK)); + MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK)); + MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK)); MimeHeaders_write_raw_headers(mult->hdrs, obj->options, false); } PRInt32 old_nchildren = container->nchildren; status = ((MimeMultipartClass *) obj->clazz)->create_child(obj); if (status < 0) return status; NS_ASSERTION(mult->state != MimeMultipartHeaders, "mult->state shouldn't be MimeMultipartHeaders"); diff --git a/mailnews/news/src/nsNntpIncomingServer.cpp b/mailnews/news/src/nsNntpIncomingServer.cpp --- a/mailnews/news/src/nsNntpIncomingServer.cpp +++ b/mailnews/news/src/nsNntpIncomingServer.cpp @@ -860,17 +860,17 @@ nsNntpIncomingServer::WriteHostInfoFile( dateStr.AppendInt(mLastUpdatedTime); WriteLine(hostInfoStream, dateStr); dateStr ="firstnewdate="; dateStr.AppendInt(firstnewdate); WriteLine(hostInfoStream, dateStr); dateStr = "uniqueid="; dateStr.AppendInt(mUniqueId); WriteLine(hostInfoStream, dateStr); - header.Assign(MSG_LINEBREAK"begingroups"); + header.Assign(MSG_LINEBREAK "begingroups"); WriteLine(hostInfoStream, header); // XXX todo, sort groups first? PRUint32 length = mGroupsOnServer.Length(); for (PRUint32 i = 0; i < length; ++i) { PRUint32 bytesWritten; hostInfoStream->Write(mGroupsOnServer[i].get(), mGroupsOnServer[i].Length(), ++++++ mozilla-gcc47.patch ++++++ # HG changeset patch # Parent debab900e37fdd4f8981c06beef6f193a04bd2b7 Patch to make Mozilla build with gcc 4.7, including - Bug 725655 - gcc 4.7 build failures (missing headers) (TM: Mozilla13) - Bug 734490 - "no viable overloaded 'PRIxPTR'" when building with Clang or GCC 4.7 (TM: Mozilla14) diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc --- a/ipc/chromium/src/base/file_util_linux.cc +++ b/ipc/chromium/src/base/file_util_linux.cc @@ -1,15 +1,18 @@ // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "base/file_util.h" #include <fcntl.h> +#if defined(ANDROID) || defined(OS_POSIX) +#include <unistd.h> +#endif #include <string> #include <vector> #include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/string_util.h" diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc --- a/ipc/chromium/src/base/message_pump_libevent.cc +++ b/ipc/chromium/src/base/message_pump_libevent.cc @@ -1,16 +1,19 @@ // Copyright (c) 2008 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "base/message_pump_libevent.h" #include <errno.h> #include <fcntl.h> +#if defined(ANDROID) || defined(OS_POSIX) +#include <unistd.h> +#endif #include "eintr_wrapper.h" #include "base/logging.h" #include "base/scoped_nsautorelease_pool.h" #include "base/scoped_ptr.h" #include "base/time.h" #include "third_party/libevent/event.h" diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc --- a/ipc/chromium/src/base/time_posix.cc +++ b/ipc/chromium/src/base/time_posix.cc @@ -8,16 +8,19 @@ #include <mach/mach_time.h> #endif #include <sys/time.h> #ifdef ANDROID #include <time64.h> #else #include <time.h> #endif +#if defined(ANDROID) || defined(OS_POSIX) +#include <unistd.h> +#endif #include <limits> #include "base/basictypes.h" #include "base/logging.h" namespace base { diff --git a/layout/base/tests/TestPoisonArea.cpp b/layout/base/tests/TestPoisonArea.cpp --- a/layout/base/tests/TestPoisonArea.cpp +++ b/layout/base/tests/TestPoisonArea.cpp @@ -392,53 +392,53 @@ ReservePoisonArea() { if (sizeof(uintptr_t) == 8) { // Use the hardware-inaccessible region. // We have to avoid 64-bit constants and shifts by 32 bits, since this // code is compiled in 32-bit mode, although it is never executed there. uintptr_t result = (((uintptr_t(0x7FFFFFFFu) << 31) << 1 | uintptr_t(0xF0DEAFFFu)) & ~uintptr_t(PAGESIZE-1)); - printf("INFO | poison area assumed at 0x%.*"PRIxPTR"\n", SIZxPTR, result); + printf("INFO | poison area assumed at 0x%.*" PRIxPTR "\n", SIZxPTR, result); return result; } else { // First see if we can allocate the preferred poison address from the OS. uintptr_t candidate = (0xF0DEAFFF & ~(PAGESIZE-1)); void *result = ReserveRegion(candidate, false); if (result == (void *)candidate) { // success - inaccessible page allocated - printf("INFO | poison area allocated at 0x%.*"PRIxPTR + printf("INFO | poison area allocated at 0x%.*" PRIxPTR " (preferred addr)\n", SIZxPTR, (uintptr_t)result); return candidate; } // That didn't work, so see if the preferred address is within a range // of permanently inacessible memory. if (ProbeRegion(candidate)) { // success - selected page cannot be usable memory if (result != MAP_FAILED) ReleaseRegion(result); - printf("INFO | poison area assumed at 0x%.*"PRIxPTR + printf("INFO | poison area assumed at 0x%.*" PRIxPTR " (preferred addr)\n", SIZxPTR, candidate); return candidate; } // The preferred address is already in use. Did the OS give us a // consolation prize? if (result != MAP_FAILED) { - printf("INFO | poison area allocated at 0x%.*"PRIxPTR + printf("INFO | poison area allocated at 0x%.*" PRIxPTR " (consolation prize)\n", SIZxPTR, (uintptr_t)result); return (uintptr_t)result; } // It didn't, so try to allocate again, without any constraint on // the address. result = ReserveRegion(0, false); if (result != MAP_FAILED) { - printf("INFO | poison area allocated at 0x%.*"PRIxPTR + printf("INFO | poison area allocated at 0x%.*" PRIxPTR " (fallback)\n", SIZxPTR, (uintptr_t)result); return (uintptr_t)result; } printf("ERROR | no usable poison area found\n"); return 0; } } @@ -450,17 +450,17 @@ static uintptr_t ReservePositiveControl() { void *result = ReserveRegion(0, false); if (result == MAP_FAILED) { printf("ERROR | allocating positive control | %s\n", LastErrMsg()); return 0; } - printf("INFO | positive control allocated at 0x%.*"PRIxPTR"\n", + printf("INFO | positive control allocated at 0x%.*" PRIxPTR "\n", SIZxPTR, (uintptr_t)result); return (uintptr_t)result; } /* The "negative control" area confirms that our probe logic does detect a * page that is readable, writable, or executable. */ static uintptr_t @@ -481,17 +481,17 @@ ReserveNegativeControl() // Now mark it executable as well as readable and writable. // (mmap(PROT_EXEC) may fail when applied to anonymous memory.) if (MakeRegionExecutable(result)) { printf("ERROR | making negative control executable | %s\n", LastErrMsg()); return 0; } - printf("INFO | negative control allocated at 0x%.*"PRIxPTR"\n", + printf("INFO | negative control allocated at 0x%.*" PRIxPTR "\n", SIZxPTR, (uintptr_t)result); return (uintptr_t)result; } static void JumpTo(uintptr_t opaddr) { #ifdef __ia64 ++++++ mozilla-revert_621446.patch ++++++ # HG changeset patch # Parent 8da41a2cee774ce4d00b9ac1032a495b8bc560a0 Revert investigation patch for bmo#621446; as it is useless on desktop and breaks the build for certain compilers diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp --- a/netwerk/protocol/http/HttpChannelParent.cpp +++ b/netwerk/protocol/http/HttpChannelParent.cpp @@ -52,29 +52,25 @@ #include "nsIBadCertListener2.h" #include "nsICacheEntryDescriptor.h" #include "nsSerializationHelper.h" #include "nsISerializable.h" #include "nsIAssociatedContentSecurity.h" #include "nsIApplicationCacheService.h" #include "nsIOfflineCacheUpdate.h" #include "nsIRedirectChannelRegistrar.h" -#include "prinit.h" namespace mozilla { namespace net { HttpChannelParent::HttpChannelParent(PBrowserParent* iframeEmbedding) : mIPCClosed(false) , mStoredStatus(0) , mStoredProgress(0) , mStoredProgressMax(0) - , mSentRedirect1Begin(false) - , mSentRedirect1BeginFailed(false) - , mReceivedRedirect2Verify(false) { // Ensure gHttpHandler is initialized: we need the atom table up and running. nsIHttpProtocolHandler* handler; CallGetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &handler); NS_ASSERTION(handler, "no http handler"); mTabParent = do_QueryObject(static_cast<TabParent*>(iframeEmbedding)); } @@ -326,21 +322,16 @@ HttpChannelParent::RecvUpdateAssociatedC mAssociatedContentSecurity->SetCountSubRequestsHighSecurity(high); mAssociatedContentSecurity->SetCountSubRequestsLowSecurity(low); mAssociatedContentSecurity->SetCountSubRequestsBrokenSecurity(broken); mAssociatedContentSecurity->SetCountSubRequestsNoSecurity(no); } return true; } -// Bug 621446 investigation, we don't want conditional PR_Aborts bellow to be -// merged to a single address. -#pragma warning(disable : 4068) -#pragma GCC optimize ("O0") - bool HttpChannelParent::RecvRedirect2Verify(const nsresult& result, const RequestHeaderTuples& changedHeaders) { if (NS_SUCCEEDED(result)) { nsCOMPtr<nsIHttpChannel> newHttpChannel = do_QueryInterface(mRedirectChannel); @@ -348,40 +339,21 @@ HttpChannelParent::RecvRedirect2Verify(c for (PRUint32 i = 0; i < changedHeaders.Length(); i++) { newHttpChannel->SetRequestHeader(changedHeaders[i].mHeader, changedHeaders[i].mValue, changedHeaders[i].mMerge); } } } - if (!mRedirectCallback) { - // Bug 621446 investigation (optimization turned off above) - if (mReceivedRedirect2Verify) - NS_RUNTIMEABORT("Duplicate fire"); - if (mSentRedirect1BeginFailed) - NS_RUNTIMEABORT("Send to child failed"); - if (mSentRedirect1Begin && NS_FAILED(result)) - NS_RUNTIMEABORT("Redirect failed"); - if (mSentRedirect1Begin && NS_SUCCEEDED(result)) - NS_RUNTIMEABORT("Redirect succeeded"); - if (!mRedirectChannel) - NS_RUNTIMEABORT("Missing redirect channel"); - } - - mReceivedRedirect2Verify = true; - mRedirectCallback->OnRedirectVerifyCallback(result); mRedirectCallback = nsnull; return true; } -// Bug 621446 investigation -#pragma GCC reset_options - bool HttpChannelParent::RecvDocumentChannelCleanup() { // From now on only using mAssociatedContentSecurity. Free everything else. mChannel = 0; // Reclaim some memory sooner. mCacheDescriptor = 0; // Else we'll block other channels reading same URI return true; } @@ -583,24 +555,18 @@ HttpChannelParent::StartRedirect(PRUint3 nsHttpChannel *httpChan = static_cast<nsHttpChannel *>(mChannel.get()); nsHttpResponseHead *responseHead = httpChan->GetResponseHead(); bool result = SendRedirect1Begin(newChannelId, IPC::URI(newURI), redirectFlags, responseHead ? *responseHead : nsHttpResponseHead()); - if (!result) { - // Bug 621446 investigation - mSentRedirect1BeginFailed = true; + if (!result) return NS_BINDING_ABORTED; - } - - // Bug 621446 investigation - mSentRedirect1Begin = true; // Result is handled in RecvRedirect2Verify above mRedirectChannel = newChannel; mRedirectCallback = callback; return NS_OK; } diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h --- a/netwerk/protocol/http/HttpChannelParent.h +++ b/netwerk/protocol/http/HttpChannelParent.h @@ -128,18 +128,14 @@ private: nsCOMPtr<nsIChannel> mRedirectChannel; nsCOMPtr<nsIAsyncVerifyRedirectCallback> mRedirectCallback; // state for combining OnStatus/OnProgress with OnDataAvailable // into one IPDL call to child. nsresult mStoredStatus; PRUint64 mStoredProgress; PRUint64 mStoredProgressMax; - - bool mSentRedirect1Begin : 1; - bool mSentRedirect1BeginFailed : 1; - bool mReceivedRedirect2Verify : 1; }; } // namespace net } // namespace mozilla #endif // mozilla_net_HttpChannelParent_h ++++++ mozilla-sle11.patch ++++++ Subject: Patches needed to build on SLE11/11.1 References: https://bugzilla.mozilla.org/show_bug.cgi?id=513422 diff --git a/xpcom/glue/SSE.cpp b/xpcom/glue/SSE.cpp --- a/xpcom/glue/SSE.cpp +++ b/xpcom/glue/SSE.cpp @@ -44,26 +44,77 @@ namespace { // SSE.h has parallel #ifs which declare MOZILLA_SSE_HAVE_CPUID_DETECTION. // We can't declare these functions in the header file, however, because // <intrin.h> conflicts with <windows.h> on MSVC 2005, and some files want to // include both SSE.h and <windows.h>. #ifdef HAVE_CPUID_H // cpuid.h is available on gcc 4.3 and higher on i386 and x86_64 -#include <cpuid.h> +//#include <cpuid.h> enum CPUIDRegister { eax = 0, ebx = 1, ecx = 2, edx = 3 }; +#ifdef __i386__ +#define _my_cpuid(level, a, b, c, d) \ + __asm__ ("xchg{l}\t{%%}ebx, %1\n\t" \ + "cpuid\n\t" \ + "xchg{l}\t{%%}ebx, %1\n\t" \ + : "=a" (a), "=r" (b), "=c" (c), "=d" (d) \ + : "0" (level)) +#else +#define _my_cpuid(level, a, b, c, d) \ + __asm__ ("cpuid\n\t" \ + : "=a" (a), "=b" (b), "=c" (c), "=d" (d) \ + : "0" (level)) +#endif + +static __inline unsigned int +my_cpuid_max (unsigned int __ext, unsigned int *__sig) +{ + unsigned int __eax, __ebx, __ecx, __edx; + +#ifdef __i386__ + __asm__ ("pushf{l|d}\n\t" + "pushf{l|d}\n\t" + "pop{l}\t%0\n\t" + "mov{l}\t{%0, %1|%1, %0}\n\t" + "xor{l}\t{%2, %0|%0, %2}\n\t" + "push{l}\t%0\n\t" + "popf{l|d}\n\t" + "pushf{l|d}\n\t" + "pop{l}\t%0\n\t" + "popf{l|d}\n\t" + : "=&r" (__eax), "=&r" (__ebx) + : "i" (0x00200000)); + + if (!((__eax ^ __ebx) & 0x00200000)) + return 0; +#endif + + /* Host supports cpuid. Return highest supported cpuid input value. */ + _my_cpuid (__ext, __eax, __ebx, __ecx, __edx); + + if (__sig) + *__sig = __ebx; + + return __eax; +} + static bool has_cpuid_bit(unsigned int level, CPUIDRegister reg, unsigned int bit) { unsigned int regs[4]; - return __get_cpuid(level, &regs[0], &regs[1], &regs[2], &regs[3]) && - (regs[reg] & bit); + + unsigned int __ext = level & 0x80000000; + if (my_cpuid_max(__ext, 0) < level) + return false; + + _my_cpuid(level, regs[0], regs[1], regs[2], regs[3]); + return !!(unsigned(regs[reg]) & bit); } #elif defined(_MSC_VER) && _MSC_VER >= 1400 && (defined(_M_IX86) || defined(_M_AMD64)) // MSVC 2005 or newer on x86-32 or x86-64 #include <intrin.h> enum CPUIDRegister { eax = 0, ebx = 1, ecx = 2, edx = 3 }; ++++++ seamonkey-2.8-source.tar.bz2 -> seamonkey-2.8.99-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/seamonkey/seamonkey-2.8-source.tar.bz2 /work/SRC/openSUSE:Factory/.seamonkey.new/seamonkey-2.8.99-source.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sdparm for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package sdparm for openSUSE:Factory checked in at 2012-04-23 16:13:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sdparm (Old) and /work/SRC/openSUSE:Factory/.sdparm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sdparm", Maintainer is "hare(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sdparm/sdparm.changes 2011-09-23 12:45:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sdparm.new/sdparm.changes 2012-04-23 16:13:14.000000000 +0200 @@ -1,0 +2,14 @@ +Sun Apr 22 11:46:53 UTC 2012 - puzel(a)suse.com + +- Update to version 1.07 + - LB provisioning + Block limits VPD pages to sbc3r27 + - Enhanced phy control page: optical mode enabled (spl-r07) + - Phy control and discover page: sync to spl2r02 + - sync with spc4r31+32 (handle status good with sense) + - extented inquiry VPD: add POA_SUP, HRA_SUP and VSA_SUP + - application tag mode page subcode 0xf0->0x2 (sbc3r28) + - add 'sinq' pseudo VPD page for standard inquiry response + - add power consumption mode and VPD pages (spc4r33) + - point out some mode page numbers are vendor specific + +------------------------------------------------------------------- Old: ---- sdparm-1.06.tar.bz2 New: ---- sdparm-1.07.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sdparm.spec ++++++ --- /var/tmp/diff_new_pack.1lLJ4H/_old 2012-04-23 16:13:16.000000000 +0200 +++ /var/tmp/diff_new_pack.1lLJ4H/_new 2012-04-23 16:13:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sdparm # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,16 @@ # - Name: sdparm -Version: 1.06 -Release: 1 -License: BSD-3-Clause +Version: 1.07 +Release: 0 Summary: List or change SCSI disk parameters -Url: http://www.torque.net/sg/sdparm.html +License: BSD-3-Clause Group: Hardware/Other -Source: http://sg.torque.net/sg/p/%{name}-%{version}.tar.bz2 -PreReq: %fillup_prereq -PreReq: %insserv_prereq +Url: http://www.torque.net/sg/sdparm.html +Source: http://sg.danny.cz/sg/p/%{name}-%{version}.tgz +Requires(pre): %fillup_prereq +Requires(pre): %insserv_prereq Provides: scsi:/sbin/sdparm BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -61,7 +60,4 @@ %doc %{_mandir}/man8/sdparm.8.gz %doc README ChangeLog -%clean -test ! -z %{buildroot} -a %{buildroot} != "/" && rm -rf %{buildroot} - %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sane-backends for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package sane-backends for openSUSE:Factory checked in at 2012-04-23 16:13:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sane-backends (Old) and /work/SRC/openSUSE:Factory/.sane-backends.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sane-backends", Maintainer is "jsmeix(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes 2012-03-22 13:36:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 2012-04-23 16:13:08.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Apr 20 12:24:49 CEST 2012 - jsmeix(a)suse.de + +- Configure --enable-libusb_1_0 plus BuildRequires libusb-1_0-devel + to use libusb1 (instead of using libusb0 via libusb-compat), + see https://bugzilla.novell.com/show_bug.cgi?id=559697#c7 + for the libusb versioning numbering. +- Use traditional bash scriptlets for post/postun with + an explicite "exit 0" line at the end to be fail safe + and therefore also "PreReq: /sbin/ldconfig" explicitly, + see the "Shared_libraries" section in + http://en.opensuse.org/openSUSE:Packaging_scriptlet_snippets +- BuildIgnore ghostscript-x11 because BuildRequires texlive-latex + is needed for sane.tex -> sane.dvi -> sane.ps but texlive-latex + requires texlive which requires ghostscript-x11 but the latter + is not needed and blows up the build system. +- Minor cleanups in the spec file. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sane-backends.spec ++++++ --- /var/tmp/diff_new_pack.u3XQay/_old 2012-04-23 16:13:10.000000000 +0200 +++ /var/tmp/diff_new_pack.u3XQay/_new 2012-04-23 16:13:10.000000000 +0200 @@ -18,17 +18,23 @@ Name: sane-backends BuildRequires: libgphoto2-devel -BuildRequires: libjpeg-devel -BuildRequires: libtool -BuildRequires: libusb-compat-devel -BuildRequires: net-snmp-devel -BuildRequires: pkg-config -BuildRequires: texlive-latex %if 0%{?suse_version} > 1130 BuildRequires: libieee1284-devel %else BuildRequires: libieee1284 %endif +BuildRequires: libjpeg-devel +BuildRequires: libtool +BuildRequires: libusb-1_0-devel +BuildRequires: net-snmp-devel +BuildRequires: pkg-config +# texlive-latex is needed to make doc/sane.ps from doc/sane.tex +# but texlive-latex requires texlive which requires ghostscript-x11 +# but ghostscript-x11 is not needed for sane.tex -> sane.dvi -> sane.ps +# so that the needless package ghostscript-x11 blows up the build system +# and is explicitly excluded to be installed in the build system: +BuildRequires: texlive-latex +#!BuildIgnore: ghostscript-x11 Summary: SANE (Scanner Access Now Easy) Scanner Drivers License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain Group: Hardware/Scanner @@ -80,7 +86,7 @@ Source201: create_sane-backends-autoconfig.rules # Patch1 does locale rename: no -> nb: # Patch1 is obsolete since sane-backends-1.0.19 because it uses 'nb'. -# Patch2 fixes too small arrays in backend/niash.c: +# Patch2 fix-buffer-overflow.patch fixes too small arrays in backend/niash.c: Patch2: fix-buffer-overflow.patch # Patch3 replaces fixed HZ compile-time value by sysconf(_SC_CLK_TCK) runtime value: # Patch3 is obsolete since sane-backends-1.0.19 because it is fixed in the source. @@ -93,17 +99,17 @@ # Patch7 lets sanei_scsi_find_devices continue on to look at subsequent devices # if the attach callback returns anything other than SANE_STATUS_GOOD: # Patch7 is obsolete since sane-backends-1.0.20 because it is fixed in the source. -# Patch8 re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously -# removed in sane-backends-1.0.20 so that sane-frontends and xsane can no longer build, -# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527675 +# Patch8 re-add-SANE_CAP_ALWAYS_SETTABLE.patch re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h +# which was erroneously removed in sane-backends-1.0.20 so that sane-frontends and xsane +# can no longer build, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527675 # SANE_CAP_ALWAYS_SETTABLE is still missing in sane-backends-1.0.21 Patch8: re-add-SANE_CAP_ALWAYS_SETTABLE.patch # Patch9 fix-hp3900_config.c.patch fixes a possible for loop overflow in hp3900_config.c # see https://bugzilla.novell.com/show_bug.cgi?id=517281 # and https://alioth.debian.org/tracker/index.php?func=detail&aid=311856&group_id… # which is obsolete since sane-backends-1.0.21 because it is fixed in the source. -# Patch10 fixes undefined 'foo = ++foo modulo bar' operations in mustek_pp_ccd300.c -# see https://bugzilla.novell.com/show_bug.cgi?id=498435 +# Patch10 fix-mustek_pp_ccd300.c.patch fixes undefined 'foo = ++foo modulo bar' operations +# in mustek_pp_ccd300.c see https://bugzilla.novell.com/show_bug.cgi?id=498435 # and https://alioth.debian.org/tracker/index.php?func=detail&aid=311857&group_id… # where the upstream maintainer did not understand what is wrong and closed it as "Wont Fix" # so that we have to keep this patch: @@ -149,23 +155,23 @@ # The libtool script used in sane-backends is slightly modified to support that. # Patch102 was dropped because there is no reason to build them as libtool modules # and it would make our package incompatible with the rest of the SANE world. -# Patch103 installs tools/umax_pp as /usr/bin/umax_pp which is built +# Patch103 install-umax_pp-tool.patch installs tools/umax_pp as /usr/bin/umax_pp which is built # but not installed but it is needed to recover from a failed scan # with scanners which use the umax_pp backend, see http://bugs.debian.org/496833 Patch103: install-umax_pp-tool.patch -# Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am +# Patch104 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am # because it is intentionally removed from the sources in the prep section: Patch104: no-descriptions-external-hpoj.patch -# additional usb id -Patch105: sane-backends-1.0.21-SCX4500W.patch -# fix usb device support in xerox_mfp (bnc#745245) -Patch106: sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch # Patch105 sane-backends-1.0.20-xerox_mfp.diff backports post 1.0.20 xerox_mfp changes # and is therefore removed since sane-backends-1.0.21 which contains those changes. +# Patch106 sane-backends-1.0.21-SCX4500W.patch adds usb id for SCX4500W: +Patch106: sane-backends-1.0.21-SCX4500W.patch +# Patch107 sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch fixes usb device support in xerox_mfp (bnc#745245): +Patch107: sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build -# The postinstall script requires this: -PreReq: coreutils, /bin/sed, /bin/grep +# Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun: +PreReq: /sbin/ldconfig # See https://bugzilla.novell.com/show_bug.cgi?id=437293 %ifarch ppc64 Obsoletes: sane-64bit @@ -193,108 +199,6 @@ that are connected to a server via network from client hosts that run the "net" meta driver. - - -Authors: --------- - Abel Deuring <a.deuring(a)satzbau-gmbh.de> - Andras Major <andras(a)users.sourceforge.net> - Andreas Beck <becka(a)uni-duesseldorf.de> - Andreas Bolsch <ab(a)maths.nott.ac.uk> - Andreas Czechanowski <m075(a)ins.uni-stuttgart.de> - Andreas Nowack <nowack.andreas(a)gmx.de> - Andreas Rick <andreas.rick(a)free.fr> - Andrew Kuchling <amk(a)magnet.com> - Bernd Schroeder <bernd(a)aquila.muc.de> - Bertrik Sikken <bertrik(a)zonnet.nl> - Brian J. Murrell <brian(a)interlinx.bc.ca> - Chris Bagwell <cbagwell(a)users.sourceforge.net> - Chris Pinkham <cpinkham(a)corp.infi.net> - Christian Bucher <cbucher(a)vernetzt.at> - David Etherton <etherton(a)netcom.com> - David F. Skoll <dskoll(a)iname.com> - David Huggins-Daines <bn711(a)freenet.carleton.ca> - David Mosberger <David.Mosberger(a)acm.org> - David Stevenson <david.stevenson(a)zoom.co.uk> - Didier Carlier <didier(a)sema.be> - Earle F. Philhower III <earle(a)ziplabel.com> - Eddy De Greef <eddy_de_greef(a)scarlet.be> - Eugene S. Weiss <yossarian(a)users.sourceforge.net> - Feico W. Dillema <dillema(a)acm.org> - Franck Schneider <schnefra(a)hol.fr> - Frank Zago <sane(a)zago.net> - Frederik Ramm <frederik(a)remote.org> - Fred Odendaal <freshshelf(a)rogers.com> - Gerard Klaver <gerard(a)gkall.hobby.nl> - Gerhard Jaeger <gerhard(a)gjaeger.de> - Giuseppe Sacco <eppesuig(a)debian.org> - Glenn Ramsey <glenn(a)componic.com> - Gordon Matzigkeit <gord(a)gnu.ai.mit.edu> - Guido Muesch <odiug(a)faho.rwth-aachen.de> - Helmut Koeberle <helmut.koeberle(a)bytec.de> - Henning Geinitz <sane(a)geinitz.org> - Henrik Johansson <henrikjo(a)post.urfors.se> - Ilia Sotnikov <hostcc(a)gmail.com> - Ingo Schneider <schneidi(a)informatik.tu-muenchen.de> - Ingo Wilken <Ingo.Wilken(a)informatik.uni-oldenburg.de> - James Perry <jamesp(a)epcc.ed.ac.uk> - Jeff Freedman <jsf(a)hevanet.com> - Jochen Eisinger <jochen.eisinger(a)gmx.net> - Jonathan Bravo Lopez <jkdsoft(a)gmail.com> - Jon Chambers <jon(a)jon.demon.co.uk> - Juergen G. Schimmer <schimmi(a)nbgm.siemens.de> - Julien Blache <jb(a)jblache.org> - Karl Anders Oygard <karlo(a)opera.no> - Karl Heinz Kremer <khk(a)khk.net> - Karsten Festag <karsten.festag(a)gmx.de> - Kazuhiro Sasayama <kaz(a)hypercore.co.jp> - Kazuya Fukuda <kaafuu(a)mug.biglobe.ne.jp> - Kevin Charter <charter(a)cs.rice.edu> - M. Allan Noah <kitno455(a)gmail.com> - Manuel Panea <Manuel.Panea(a)rzg.mpg.de> - Marcio Teixeira <marciot(a)users.sourceforge.net> - Marian Eichholz <eichholz(a)computer.org> - Markus Mertinat <Markus.Mertinat(a)Physik.Uni-Augsburg.DE> - Martijn van Oosterhout <kleptog(a)svana.org> - Matthew Duggan <stauff1(a)users.sourceforge.net> - Matthew Marjanovic <maddog(a)mir.com> - Mattias Ellert <mattias.ellert(a)tsl.uu.se> - Max Vorobiev <pcwizard(a)yandex.ru> - Meino Christian Cramer <mccramer(a)s.netic.de> - M.F. <massifr(a)tiscalinet.it> - Michael Herder <crapmail(a)nurfuerspam.de> - Michael K. Johnson <johnsonm(a)redhat.com> - Michel Roelofs <michelr(a)stack.nl> - Milon Firikis <milonf(a)ariadne-t.gr> - Mitsuru Okaniwa <m-okaniwa(a)bea.hi-ho.ne.jp> - Nathan Rutman <nathan(a)gordian.com> - Oliver Rauch <Oliver.Rauch(a)Rauch-domain.de> - Oliver Schirrmeister <oschirr(a)abm.de> - Oliver Schwartz <oliverschwartz(a)users.sourceforge.net> - Patrick Lessard <palessar(a)cgocable.ca> - Patrick Reynolds <patrickr(a)virginia.edu> - Peter Fales <peter(a)fales-lorenz.net> - Peter Kirchgessner <peter(a)kirchgessner.net> - Petter Reinholdtsen <pere(a)hungry.com> - Pierre Willenbrock <pierre(a)pirsoft.dnsalias.org> - Randolph Bentson <bentson(a)grieg.holmsjoen.com> - Rene Rebe <rene(a)exactcode.de> - Roger Wolff <R.E.Wolff(a)BitWizard.nl> - Roy Zhou <Roy(a)mail.mustek-hz.com.cn> - Sebastien Sable <Sebastien.Sable(a)snv.jussieu.fr> - Sergey Vlasov <vsu(a)altlinux.ru> - Simon Krix <kinsei(a)users.sourceforge.net> - Simon Munton <simon(a)munton.demon.co.uk> - Stephane Voltz <stef.dev(a)free.fr> - Thomas Soumarmon <soumarmt(a)nerim.net> - Tom Martone <tom(a)martoneconsulting.com> - Tom Wang <tom.wang(a)mustek.com.tw> - Tristan Tarrant <ttarrant(a)etnoteam.it> - Troy Rollo <sane(a)troy.rollo.name> - Ullrich Sigwanz <usigwanz(a)freesurf.ch> - Ulrich Deiters <ukd(a)xenon.pc.Uni-Koeln.DE> - Wittawat Yamwong <wittawat(a)web.de> - %package devel Summary: Development files for sane-backends License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain @@ -335,30 +239,26 @@ If you do not like automated driver activation, do not install this package or remove it when it is already installed. - - -Authors: --------- - Johannes Meixner <jsmeix(a)novell.com> - %prep %setup -q # Apply upstream patches first of all: # Then apply non-upstream patches: -# Patch2 fixes too small arrays in backend/niash.c: +# Patch2 fix-buffer-overflow.patch fixes too small arrays in backend/niash.c: %patch2 -# Patch8 re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously removed: +# Patch8 re-add-SANE_CAP_ALWAYS_SETTABLE.patch re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously removed: %patch8 -# Patch10 fixes undefined 'foo = ++foo modulo bar' operations in mustek_pp_ccd300.c: +# Patch10 fix-mustek_pp_ccd300.c.patch fixes undefined 'foo = ++foo modulo bar' operations in mustek_pp_ccd300.c: %patch10 # Patch100... is SUSE specific stuff: -# Patch103 installs tools/umax_pp as /usr/bin/umax_pp: +# Patch103 install-umax_pp-tool.patch installs tools/umax_pp as /usr/bin/umax_pp: %patch103 -# Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am +# Patch104 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am # because it is intentionally removed from the sources in the prep section: %patch104 -%patch105 -p1 +# Patch106 sane-backends-1.0.21-SCX4500W.patch adds usb id for SCX4500W: %patch106 -p1 +# Patch107 sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch fixes usb device support in xerox_mfp (bnc#745245): +%patch107 -p1 # Source100... is SUSE specific stuff: # Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc # because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is dropped. @@ -398,6 +298,8 @@ export LDFLAGS="-L/%_lib $LDFLAGS" # Enable pthread instead of fork (used in Debian since Feb 2009 and no issues so far), # see https://bugzilla.novell.com/show_bug.cgi?id=633780 +# Enable libusb-1.0 support which is available since sane-backends 1.0.20 +# and libusb-1_0 is available at least since openSUSE 11.1. # Disable locking because /var/lock/sane/ would be a world-writable directory. ./configure --prefix=/usr \ --exec-prefix=/usr \ @@ -409,6 +311,7 @@ --with-gphoto2 \ --with-docdir=%{_defaultdocdir}/sane-backends \ --enable-pthread \ + --enable-libusb_1_0 \ --disable-locking # Enable locking for backends where "99" is the group of the lockfile path (LOCKPATH_GROUP) # because "99" is the group of the user who runs the build when norootforbuild is used @@ -606,9 +509,13 @@ rm %{buildroot}%{_defaultdocdir}/sane-backends/{README.os2,README.aix,README.solaris} %find_lang sane-backends -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +exit 0 + +%postun +/sbin/ldconfig +exit 0 %files -f sane-backends.lang %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpm for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2012-04-23 16:13:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpm", Maintainer is "mls(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rpm/rpm-python.changes 2012-01-25 11:09:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm-python.changes 2012-04-23 16:13:04.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Apr 23 11:16:26 CEST 2012 - mls(a)suse.de + +- modified capsule api diff to match rpm upstream + +------------------------------------------------------------------- +Wed Apr 11 16:54:02 UTC 2012 - klaussfreire(a)gmail.com + +- Fix usage of deprecated AsVoidPtr Python/C API, + replaced by Capsule API + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-03-27 09:13:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-04-23 16:13:04.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Apr 20 14:40:50 CEST 2012 - mls(a)suse.de + +- fix some more crashes on malformed header data + [bnc#754281] [bnc#754284] [bnc#754285] +- fix quoting in brp-python-hardlink [bnc#756087] +- change env handling for supplements [bnc#741543] +- fix _fix macros [bnc#728682] +- fix obsoletes handling of installed packages [bnc#714724] +- implement tilde support in version comparison [bnc#466994] + +------------------------------------------------------------------- New: ---- headerchk2.diff helperenv.diff instobscheck.diff python-capsule-api.diff pythonhardlink.diff tilde.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ rpm-python.spec: same change ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.NjMHBg/_old 2012-04-23 16:13:08.000000000 +0200 +++ /var/tmp/diff_new_pack.NjMHBg/_new 2012-04-23 16:13:08.000000000 +0200 @@ -138,6 +138,12 @@ Patch83: findlang-new-help-fix.diff Patch84: langnoc.diff Patch85: rpm-gcc47.patch +Patch86: headerchk2.diff +Patch87: pythonhardlink.diff +Patch88: helperenv.diff +Patch89: instobscheck.diff +Patch90: tilde.diff +Patch91: python-capsule-api.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -154,7 +160,6 @@ %package devel Summary: Include Files and Libraries mandatory for Development -Group: System/Packages Requires: rpm = %{version} # for people confusing the one with the other Recommends: rpm-build = %{version} @@ -169,7 +174,6 @@ %package build Summary: Tools and Scripts to create rpm packages -Group: System/Packages Requires: rpm = %{version} Provides: rpm:%_bindir/rpmbuild Provides: rpmbuild @@ -211,7 +215,8 @@ %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 -%patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 +%patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 -P 86 -P 87 -P 88 -P 89 +%patch -P 90 -P 91 #chmod 755 scripts/find-supplements{,.ksyms} #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms #chmod 755 scripts/firmware.prov ++++++ fileattrs.diff ++++++ --- /var/tmp/diff_new_pack.NjMHBg/_old 2012-04-23 16:13:08.000000000 +0200 +++ /var/tmp/diff_new_pack.NjMHBg/_new 2012-04-23 16:13:08.000000000 +0200 @@ -37,9 +37,9 @@ --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ fileattrs/ksyms.attr 2011-12-15 13:47:26.787456907 +0100 @@ -0,0 +1,4 @@ -+%__ksyms_provides %{__set_helper_env}%{_rpmconfigdir}/find-provides.ksyms %name -+%__ksyms_requires %{__set_helper_env}%{_rpmconfigdir}/find-requires.ksyms %name -+%__ksyms_supplements %{__set_helper_env}%{_rpmconfigdir}/find-supplements.ksyms %name ++%__ksyms_provides %{_rpmconfigdir}/find-provides.ksyms %name ++%__ksyms_requires %{_rpmconfigdir}/find-requires.ksyms %name ++%__ksyms_supplements %{_rpmconfigdir}/find-supplements.ksyms %name +%__ksyms_path (/lib/modules/.*\.ko(\.gz)?)|(/boot/vmlinu[xz].*)$ Index: fileattrs/Makefile.am =================================================================== ++++++ headerchk2.diff ++++++ --- lib/header.c.orig 2012-04-17 16:16:29.000000000 +0000 +++ lib/header.c 2012-04-17 16:53:32.000000000 +0000 @@ -197,7 +197,7 @@ int headerVerifyInfo(int il, int dl, con return i; if (hdrchkAlign(info->type, info->offset)) return i; - if (!negate && hdrchkRange(dl, info->offset)) + if (hdrchkRange(dl, info->offset)) return i; if (hdrchkData(info->count)) return i; @@ -837,10 +837,13 @@ Header headerLoad(void * uh) entry->info.type = htonl(pe->type); entry->info.count = htonl(pe->count); + entry->info.tag = htonl(pe->tag); - if (hdrchkType(entry->info.type)) + if (!ENTRY_IS_REGION(entry)) goto errxit; - if (hdrchkTags(entry->info.count)) + if (entry->info.type != REGION_TAG_TYPE) + goto errxit; + if (entry->info.count != REGION_TAG_COUNT) goto errxit; { int off = ntohl(pe->offset); @@ -856,7 +859,6 @@ Header headerLoad(void * uh) ril = rdl/sizeof(*pe); if (hdrchkTags(ril) || hdrchkData(rdl)) goto errxit; - entry->info.tag = htonl(pe->tag); } else { ril = il; rdl = (ril * sizeof(struct entryInfo_s)); @@ -876,13 +878,12 @@ Header headerLoad(void * uh) indexEntry newEntry = entry + ril; int ne = (h->indexUsed - ril); int rid = entry->info.offset+1; - int rc; /* Load dribble entries from region. */ - rc = regionSwab(newEntry, ne, 0, pe+ril, dataStart, dataEnd, rid); - if (rc < 0) + rdlen = regionSwab(newEntry, ne, rdlen, pe+ril, + dataStart, dataEnd, rid); + if (rdlen < 0) goto errxit; - rdlen += rc; { indexEntry firstEntry = newEntry; int save = h->indexUsed; @@ -905,7 +906,7 @@ Header headerLoad(void * uh) } } rdlen += REGION_TAG_COUNT; - /* XXX should be equality test, but dribbles are sometimes a bit off? */ + /* should be equality test, but can be off if entries are not perfectly aligned */ if (rdlen > dl) goto errxit; } --- lib/package.c.orig 2012-04-17 16:26:00.000000000 +0000 +++ lib/package.c 2012-04-17 16:26:05.000000000 +0000 @@ -241,16 +241,23 @@ static rpmRC headerVerify(rpmKeyring key } /* Is there an immutable header region tag? */ - if (!(entry.info.tag == RPMTAG_HEADERIMMUTABLE - && entry.info.type == RPM_BIN_TYPE - && entry.info.count == REGION_TAG_COUNT)) - { + if (!(entry.info.tag == RPMTAG_HEADERIMMUTABLE)) { rc = RPMRC_NOTFOUND; goto exit; } - /* Is the offset within the data area? */ - if (entry.info.offset >= dl) { + /* Is the region tag sane? */ + if (!(entry.info.type == REGION_TAG_TYPE && + entry.info.count == REGION_TAG_COUNT)) { + rasprintf(&buf, + _("region tag: BAD, tag %d type %d offset %d count %d\n"), + entry.info.tag, entry.info.type, + entry.info.offset, entry.info.count); + goto exit; + } + + /* Is the trailer within the data area? */ + if (entry.info.offset + REGION_TAG_COUNT > dl) { rasprintf(&buf, _("region offset: BAD, tag %d type %d offset %d count %d\n"), entry.info.tag, entry.info.type, @@ -263,10 +270,10 @@ static rpmRC headerVerify(rpmKeyring key (void) memcpy(&info, regionEnd, REGION_TAG_COUNT); regionEnd += REGION_TAG_COUNT; - xx = headerVerifyInfo(1, dl, &info, &entry.info, 1); + xx = headerVerifyInfo(1, il * sizeof(*pe), &info, &entry.info, 1); if (xx != -1 || !(entry.info.tag == RPMTAG_HEADERIMMUTABLE - && entry.info.type == RPM_BIN_TYPE + && entry.info.type == REGION_TAG_TYPE && entry.info.count == REGION_TAG_COUNT)) { rasprintf(&buf, --- lib/signature.c.orig 2012-04-17 16:25:52.000000000 +0000 +++ lib/signature.c 2012-04-17 16:26:05.000000000 +0000 @@ -133,12 +133,19 @@ rpmRC rpmReadSignature(FD_t fd, Header * } /* Is there an immutable header region tag? */ - if (entry.info.tag == RPMTAG_HEADERSIGNATURES - && entry.info.type == RPM_BIN_TYPE - && entry.info.count == REGION_TAG_COUNT) - { - - if (entry.info.offset >= dl) { + if (entry.info.tag == RPMTAG_HEADERSIGNATURES) { + /* Is the region tag sane? */ + if (!(entry.info.type == REGION_TAG_TYPE && + entry.info.count == REGION_TAG_COUNT)) { + rasprintf(&buf, + _("region tag: BAD, tag %d type %d offset %d count %d\n"), + entry.info.tag, entry.info.type, + entry.info.offset, entry.info.count); + goto exit; + } + + /* Is the trailer within the data area? */ + if (entry.info.offset + REGION_TAG_COUNT > dl) { rasprintf(&buf, _("region offset: BAD, tag %d type %d offset %d count %d\n"), entry.info.tag, entry.info.type, @@ -157,10 +164,10 @@ rpmRC rpmReadSignature(FD_t fd, Header * } dataEnd += REGION_TAG_COUNT; - xx = headerVerifyInfo(1, dl, &info, &entry.info, 1); + xx = headerVerifyInfo(1, il * sizeof(*pe), &info, &entry.info, 1); if (xx != -1 || !((entry.info.tag == RPMTAG_HEADERSIGNATURES || entry.info.tag == RPMTAG_HEADERIMAGE) - && entry.info.type == RPM_BIN_TYPE + && entry.info.type == REGION_TAG_TYPE && entry.info.count == REGION_TAG_COUNT)) { rasprintf(&buf, ++++++ helperenv.diff ++++++ --- macros.in.orig 2012-04-18 13:48:07.000000000 +0000 +++ macros.in 2012-04-18 13:47:41.000000000 +0000 @@ -515,7 +515,7 @@ posix.setenv("RPMBUILD_SOURCEDIR",rpm.ex # %__myattr_exclude_magic exclude by magic regex # %__myattr_exclude_path exclude by path regex # -%_fileattrsdir %{_rpmconfigdir}/fileattrs +%_fileattrsdir %{__set_helper_env}%{_rpmconfigdir}/fileattrs #============================================================================== # ---- Database configuration macros. ++++++ instobscheck.diff ++++++ --- lib/depends.c.orig 2012-04-18 14:46:10.000000000 +0000 +++ lib/depends.c 2012-04-18 14:46:15.000000000 +0000 @@ -355,6 +355,7 @@ static int rpmdbProvides(rpmts ts, depCa rpmdbMatchIterator mi = NULL; Header h = NULL; int rc = 0; + int matchnvr = rpmdsTagN(dep) == RPMTAG_OBSOLETENAME; /* See if we already looked this up */ if (depCacheGetEntry(dcache, DNEVR, &cachedrc, NULL, NULL)) { @@ -368,7 +369,7 @@ static int rpmdbProvides(rpmts ts, depCa * taking file state into account: replaced, wrong colored and * not installed files can not satisfy a dependency. */ - if (Name[0] == '/') { + if (Name[0] == '/' && !matchnvr) { mi = rpmtsPrunedIterator(ts, RPMDBI_BASENAMES, Name); while ((h = rpmdbNextIterator(mi)) != NULL) { int fs = RPMFILE_STATE_MISSING; @@ -390,9 +391,16 @@ static int rpmdbProvides(rpmts ts, depCa if (h == NULL) { mi = rpmtsPrunedIterator(ts, RPMDBI_PROVIDENAME, Name); while ((h = rpmdbNextIterator(mi)) != NULL) { - if (rpmdsAnyMatchesDep(h, dep, _rpmds_nopromote)) { - rpmdsNotify(dep, "(db provides)", rc); - break; + if (matchnvr) { + if (rpmdsNVRMatchesDep(h, dep , _rpmds_nopromote)) { + rpmdsNotify(dep, "(db provides)", rc); + break; + } + } else { + if (rpmdsAnyMatchesDep(h, dep, _rpmds_nopromote)) { + rpmdsNotify(dep, "(db provides)", rc); + break; + } } } rpmdbFreeIterator(mi); ++++++ platformin.diff ++++++ --- /var/tmp/diff_new_pack.NjMHBg/_old 2012-04-23 16:13:08.000000000 +0200 +++ /var/tmp/diff_new_pack.NjMHBg/_new 2012-04-23 16:13:08.000000000 +0200 @@ -29,9 +29,9 @@ +@SuSE@#--------------------------------------------------------------------- +@SuSE@# Expanded at end of %prep +@SuSE@# -+@SuSE@%__id_u @__ID_U@ -+@SuSE@%__chown_Rhf @__CHOWN_RHF@ -+@SuSE@%__chgrp_Rhf @__CHGRP_RHF@ ++@SuSE@%__id_u %{__id} -u ++@SuSE@%__chown_Rhf %{__chown} -Rhf ++@SuSE@%__chgrp_Rhf %{__chgrp} -Rhf +@SuSE@%_fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root +@SuSE@%_fixgroup [ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} root +@SuSE@%_fixperms %{__chmod} -Rf @FIXPERMS@ ++++++ python-capsule-api.diff ++++++ --- python/header-py.c.orig 2012-04-23 09:13:33.000000000 +0000 +++ python/header-py.c 2012-04-23 09:14:25.000000000 +0000 @@ -368,8 +368,8 @@ static PyObject *hdr_new(PyTypeObject *s if (obj == NULL) { h = headerNew(); - } else if (PyCObject_Check(obj)) { - h = PyCObject_AsVoidPtr(obj); + } else if (CAPSULE_CHECK(obj)) { + h = CAPSULE_EXTRACT(obj, "rpm._C_Header"); } else if (hdrObject_Check(obj)) { h = headerCopy(((hdrObject*) obj)->h); } else if (PyBytes_Check(obj)) { --- python/rpmsystem-py.h.orig 2012-04-23 09:12:49.000000000 +0000 +++ python/rpmsystem-py.h 2012-04-23 09:13:19.000000000 +0000 @@ -33,6 +33,16 @@ typedef Py_ssize_t (*lenfunc)(PyObject * #define PyBytes_AsString PyString_AsString #endif +#if ((PY_MAJOR_VERSION << 8) | (PY_MINOR_VERSION << 0)) >= 0x0207 +#define CAPSULE_BUILD(ptr,name) PyCapsule_New(ptr, name, NULL) +#define CAPSULE_CHECK(obj) PyCapsule_CheckExact(obj) +#define CAPSULE_EXTRACT(obj,name) PyCapsule_GetPointer(obj, name) +#else +#define CAPSULE_BUILD(ptr,name) PyCObject_FromVoidPtr(ptr, NULL) +#define CAPSULE_CHECK(obj) PyCObject_Check(obj) +#define CAPSULE_EXTRACT(obj,name) PyCObject_AsVoidPtr(obj) +#endif + /* For Python 3, use the PyLong type throughout in place of PyInt */ #if PY_MAJOR_VERSION >= 3 #define PyInt_Check PyLong_Check --- python/spec-py.c.orig 2012-04-23 09:13:41.000000000 +0000 +++ python/spec-py.c 2012-04-23 09:14:56.000000000 +0000 @@ -34,7 +34,7 @@ static PyObject *makeHeader(Header h) PyObject *rpmmod = PyImport_ImportModuleNoBlock("rpm"); if (rpmmod == NULL) return NULL; - PyObject *ptr = PyCObject_FromVoidPtr(h, NULL); + PyObject *ptr = CAPSULE_BUILD(h, "rpm._C_Header"); PyObject *hdr = PyObject_CallMethod(rpmmod, "hdr", "(O)", ptr); Py_XDECREF(ptr); Py_XDECREF(rpmmod); ++++++ pythonhardlink.diff ++++++ --- scripts/brp-python-hardlink.orig 2012-04-18 13:33:39.000000000 +0000 +++ scripts/brp-python-hardlink 2012-04-18 13:34:52.000000000 +0000 @@ -10,8 +10,8 @@ fi find "$RPM_BUILD_ROOT" -type f -name "*.pyc" | while read pyc ; do pyo="${pyc%c}o" if [ -f "$pyo" ] ; then - csha="$(sha1sum -b $pyc | cut -d' ' -f 1)" && \ - osha="$(sha1sum -b $pyo | cut -d' ' -f 1)" && \ + csha="$(sha1sum -b "$pyc" | cut -d' ' -f 1)" && \ + osha="$(sha1sum -b "$pyo" | cut -d' ' -f 1)" && \ if [ "$csha" = "$osha" ] ; then ln -f "$pyc" "$pyo" fi ++++++ tilde.diff ++++++ --- ./build/pack.c.orig 2012-04-20 13:43:49.000000000 +0000 +++ ./build/pack.c 2012-04-20 14:23:57.000000000 +0000 @@ -308,6 +308,44 @@ static rpmRC processScriptFiles(rpmSpec return RPMRC_OK; } +/** + */ +static int depContainsTilde(Header h, rpmTagVal tagEVR) +{ + struct rpmtd_s evrs; + const char *evr = NULL; + + if (headerGet(h, tagEVR, &evrs, HEADERGET_MINMEM)) { + while ((evr = rpmtdNextString(&evrs)) != NULL) + if (strchr(evr, '~')) + break; + rpmtdFreeData(&evrs); + } + return evr != NULL; +} + +static rpmTagVal depevrtags[] = { + RPMTAG_PROVIDEVERSION, + RPMTAG_REQUIREVERSION, + RPMTAG_OBSOLETEVERSION, + RPMTAG_CONFLICTVERSION, + RPMTAG_ORDERVERSION, + RPMTAG_TRIGGERVERSION, + RPMTAG_SUGGESTSVERSION, + RPMTAG_ENHANCESVERSION, + 0 +}; + +static int haveTildeDep(Header h) +{ + int i; + + for (i = 0; depevrtags[i] != 0; i++) + if (depContainsTilde(h, depevrtags[i])) + return 1; + return 0; +} + static rpmRC writeRPM(Header *hdrp, unsigned char ** pkgidp, const char *fileName, CSA_t csa, char **cookie) { @@ -382,6 +420,10 @@ static rpmRC writeRPM(Header *hdrp, unsi free(buf); } + /* check if the package has a dependency with a '~' */ + if (haveTildeDep(h)) + (void) rpmlibNeedsFeature(h, "TildeInVersions", "4.10.0-1"); + /* Create and add the cookie */ if (cookie) { rasprintf(cookie, "%s %d", buildHost(), (int) (*getBuildTime())); --- ./build/parsePreamble.c.orig 2012-04-20 14:29:26.000000000 +0000 +++ ./build/parsePreamble.c 2012-04-20 14:30:18.000000000 +0000 @@ -671,7 +671,7 @@ static int handlePreambleTag(rpmSpec spe case RPMTAG_VERSION: case RPMTAG_RELEASE: SINGLE_TOKEN_ONLY; - if (rpmCharCheck(spec, field, strlen(field), "._+%{}") != RPMRC_OK) return RPMRC_FAIL; + if (rpmCharCheck(spec, field, strlen(field), "._+%{}~") != RPMRC_OK) return RPMRC_FAIL; headerPutString(pkg->header, tag, field); break; case RPMTAG_URL: --- ./build/parseReqs.c.orig 2012-04-20 14:29:22.000000000 +0000 +++ ./build/parseReqs.c 2012-04-20 14:29:57.000000000 +0000 @@ -170,7 +170,7 @@ rpmRC parseRCPOT(rpmSpec spec, Package p } EVR = xmalloc((ve-v) + 1); rstrlcpy(EVR, v, (ve-v) + 1); - if (rpmCharCheck(spec, EVR, ve-v, ".-_+:%{}")) goto exit; + if (rpmCharCheck(spec, EVR, ve-v, ".-_+:%{}~")) goto exit; re = ve; /* ==> next token after EVR string starts here */ } else EVR = NULL; --- ./lib/rpmds.c.orig 2012-04-20 13:44:06.000000000 +0000 +++ ./lib/rpmds.c 2012-04-20 13:44:12.000000000 +0000 @@ -913,6 +913,9 @@ static const struct rpmlibProvides_s rpm { "rpmlib(ScriptletExpansion)", "4.9.0-1", ( RPMSENSE_EQUAL), N_("package scriptlets can be expanded at install time.") }, + { "rpmlib(TildeInVersions)", "4.10.0-1", + ( RPMSENSE_EQUAL), + N_("dependency comparison supports versions with tilde.") }, { NULL, NULL, 0, NULL } }; --- ./lib/rpmvercmp.c.orig 2012-04-20 13:44:06.000000000 +0000 +++ ./lib/rpmvercmp.c 2012-04-20 13:44:12.000000000 +0000 @@ -32,9 +32,18 @@ int rpmvercmp(const char * a, const char two = str2; /* loop through each version segment of str1 and str2 and compare them */ - while (*one && *two) { - while (*one && !risalnum(*one)) one++; - while (*two && !risalnum(*two)) two++; + while (*one || *two) { + while (*one && !risalnum(*one) && *one != '~') one++; + while (*two && !risalnum(*two) && *two != '~') two++; + + /* handle the tilde separator, it sorts before everthing else */ + if (*one == '~' || *two == '~') { + if (*one != '~') return 1; + if (*two != '~') return -1; + one++; + two++; + continue; + } /* If we ran to the end of either, we are finished with the loop */ if (!(*one && *two)) break; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rabbitmq-server for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package rabbitmq-server for openSUSE:Factory checked in at 2012-04-23 16:12:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rabbitmq-server (Old) and /work/SRC/openSUSE:Factory/.rabbitmq-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rabbitmq-server", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/rabbitmq-server/rabbitmq-server.changes 2012-02-20 16:17:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rabbitmq-server.new/rabbitmq-server.changes 2012-04-23 16:12:58.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 13 07:31:46 UTC 2012 - jblunck(a)opensuse.org + +- Require python >= 2.6 for json +- Add _initddir define for SLE11 build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rabbitmq-server.spec ++++++ --- /var/tmp/diff_new_pack.LhM4hO/_old 2012-04-23 16:13:00.000000000 +0200 +++ /var/tmp/diff_new_pack.LhM4hO/_new 2012-04-23 16:13:00.000000000 +0200 @@ -15,16 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define _rabbit_erllibdir %{_libdir}/rabbitmq/lib/rabbitmq_server-%{version} %define _rabbit_libdir %{_libdir}/rabbitmq +%if %{undefined _initddir} +%define _initddir %{_sysconfdir}/init.d +%endif + Name: rabbitmq-server Version: 2.7.1 Release: 0 -License: MPL-1.1 Summary: The RabbitMQ Server -Url: http://www.rabbitmq.com/ +License: MPL-1.1 Group: System/Daemons +Url: http://www.rabbitmq.com/ Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{vers… Source1: rabbitmq-server.init Source2: rabbitmq-script-wrapper @@ -37,8 +42,8 @@ BuildRequires: erlang-src BuildRequires: fdupes BuildRequires: libxslt -BuildRequires: python -BuildRequires: python-simplejson +# require python json module +BuildRequires: python >= 2.6 BuildRequires: unzip BuildRequires: xmlto BuildRequires: zip @@ -60,7 +65,6 @@ scalable implementation of an AMQP broker. %package plugins -License: MPL-1.1 Summary: Plugins for the RabbitMQ server Group: System/Daemons Requires: rabbitmq-server = %{version} @@ -73,7 +77,6 @@ This package includes some plugins for the RabbitMQ server %package -n erlang-rabbitmq-client -License: MPL-1.1 Summary: RabbitMQ AMQP language bindings for Erlang Group: Development/Libraries/Other Requires: erlang -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qpdf for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package qpdf for openSUSE:Factory checked in at 2012-04-23 16:12:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qpdf (Old) and /work/SRC/openSUSE:Factory/.qpdf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qpdf", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/qpdf/qpdf.changes 2012-02-27 18:36:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qpdf.new/qpdf.changes 2012-04-23 16:12:48.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 22 10:32:13 UTC 2012 - dimstar(a)opensuse.org + +- Add qpdf-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- qpdf-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qpdf.spec ++++++ --- /var/tmp/diff_new_pack.J9eeQr/_old 2012-04-23 16:12:57.000000000 +0200 +++ /var/tmp/diff_new_pack.J9eeQr/_new 2012-04-23 16:12:57.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: qpdf Version: 2.3.1 Release: 0 @@ -24,6 +25,7 @@ Url: http://qpdf.sourceforge.net/ Source: http://sourceforge.net/projects/qpdf/files/qpdf/%{version}/qpdf-%{version}.… Patch0: pcre-8.30.diff +Patch1: qpdf-gcc47.patch BuildRequires: gcc-c++ BuildRequires: pcre-devel BuildRequires: zlib-devel @@ -57,6 +59,7 @@ %prep %setup -q %patch0 +%patch1 -p1 %build export CXXFLAGS="%optflags -fvisibility-inlines-hidden" ++++++ qpdf-gcc47.patch ++++++ Index: qpdf-2.3.1/include/qpdf/QPDFExc.hh =================================================================== --- qpdf-2.3.1.orig/include/qpdf/QPDFExc.hh +++ qpdf-2.3.1/include/qpdf/QPDFExc.hh @@ -8,6 +8,7 @@ #ifndef __QPDFEXC_HH__ #define __QPDFEXC_HH__ +#include <unistd.h> #include <qpdf/DLL.h> #include <qpdf/Constants.h> #include <stdexcept> Index: qpdf-2.3.1/include/qpdf/QPDFObjectHandle.hh =================================================================== --- qpdf-2.3.1.orig/include/qpdf/QPDFObjectHandle.hh +++ qpdf-2.3.1/include/qpdf/QPDFObjectHandle.hh @@ -12,6 +12,7 @@ #include <vector> #include <set> #include <map> +#include <unistd.h> #include <qpdf/DLL.h> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0