May 2007 - openSUSE Commits - openSUSE Mailing Lists

commit sensors
by root＠Hilbert.suse.de 28 May '07

28 May '07

Hello community, here is the log from the commit of package sensors checked in at Mon May 28 15:04:56 CEST 2007. -------- --- sensors/sensors.changes 2007-05-09 10:37:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/sensors/sensors.changes 2007-05-28 13:40:59.612579000 +0200 @@ -1,0 +2,7 @@ +Mon May 28 13:43:34 CEST 2007 - jdelvare(a)suse.de + +- Fix two rpmlint errors: /etc/init.d/lm_sensors shouldn't be + marked as a config file, and was missing a Short-Description + tag. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sensors.spec ++++++ --- /var/tmp/diff_new_pack.X26477/_old 2007-05-28 15:04:46.000000000 +0200 +++ /var/tmp/diff_new_pack.X26477/_new 2007-05-28 15:04:47.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: bison flex rrdtool sysfsutils udev URL: http://www.lm-sensors.org/ Version: 2.10.3 -Release: 10 +Release: 19 Summary: Hardware health monitoring for Linux License: GNU General Public License (GPL) Group: System/Monitoring @@ -92,7 +92,7 @@ %files %defattr(-,root,root) %config(noreplace) /etc/sensors.conf -%config /etc/init.d/lm_sensors +/etc/init.d/lm_sensors %attr(660, root, root) %dev(c, 89, 0) /lib/udev/devices/i2c-0 /usr/bin/* /usr/sbin/* @@ -106,6 +106,10 @@ %doc /usr/share/man/man8/*.8.gz %changelog +* Mon May 28 2007 - jdelvare(a)suse.de +- Fix two rpmlint errors: /etc/init.d/lm_sensors shouldn't be + marked as a config file, and was missing a Short-Description + tag. * Wed May 09 2007 - jdelvare(a)suse.de - lm_sensors-no-xeon-script.patch: The decode-xeon.pl script is outdated. It was never ported to work with 2.6 kernels, so it is ++++++ lm_sensors-2.10.3.dif ++++++ --- /var/tmp/diff_new_pack.X26477/_old 2007-05-28 15:04:47.000000000 +0200 +++ /var/tmp/diff_new_pack.X26477/_new 2007-05-28 15:04:47.000000000 +0200 @@ -1,5 +1,5 @@ ---- Makefile -+++ Makefile 2006-11-10 15:39:03.000000000 +0100 +--- Makefile.orig ++++ Makefile @@ -45,8 +45,8 @@ LINUX_HEADERS := $(LINUX)/include # may be used mistakenly. Note: This should point to the directory # *above* the linux/ subdirectory, so to /usr/local/include in the @@ -47,8 +47,8 @@ endif ifeq ($(WARN),1) ---- prog/detect/sensors-detect -+++ prog/detect/sensors-detect 2006-11-10 17:45:13.000000000 +0100 +--- prog/detect/sensors-detect.orig ++++ prog/detect/sensors-detect @@ -2147,7 +2147,9 @@ sub initialize_conf } } @@ -107,8 +107,8 @@ } } ---- prog/init/README -+++ prog/init/README 2006-02-28 13:05:01.000000000 +0100 +--- prog/init/README.orig ++++ prog/init/README @@ -10,7 +10,7 @@ The script lm_sensors.init is a nice sta On RH and other RH-based systems (MDK, notably) use this sort of startup mechanism (i.e. SVR4-based), as opposed to the everything-in-one-script @@ -131,9 +131,9 @@ For more information see the top of the file. To configure this service one should put appropriate "alias i2c-bus-0 xxx" ---- prog/init/lm_sensors.init.suse -+++ prog/init/lm_sensors.init.suse 2006-02-28 13:05:01.000000000 +0100 -@@ -1,19 +1,14 @@ +--- prog/init/lm_sensors.init.suse.orig ++++ prog/init/lm_sensors.init.suse +@@ -1,19 +1,15 @@ #!/bin/sh # ### BEGIN INIT INFO @@ -151,6 +151,7 @@ +# Required-Stop: $remote_fs +# Default-Start: 2 3 5 +# Default-Stop: ++# Short-Description: Load and configure hardware monitoring drivers +# Description: sensors is used for monitoring motherboard sensor values. +# Config file is /etc/sysconfig/lm_sensors ### END INIT INFO @@ -160,7 +161,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -@@ -40,115 +35,91 @@ +@@ -40,115 +36,91 @@ # MODULE_1, MODULE_2, MODULE_3, etc. # If sensors isn't supported by the kernel, try loading the module... @@ -321,7 +322,7 @@ # See how we were called. case "$1" in start) -@@ -163,12 +134,12 @@ case "$1" in +@@ -163,12 +135,12 @@ case "$1" in restart|reload) restart ;; @@ -337,9 +338,9 @@ -exit $RETVAL +rc_exit ---- prog/init/sensord.init -+++ prog/init/sensord.init 2006-02-28 13:05:01.000000000 +0100 -@@ -1,130 +1,83 @@ +--- prog/init/sensord.init.orig ++++ prog/init/sensord.init +@@ -1,130 +1,84 @@ -#!@BASH@ +#!/bin/bash # @@ -372,6 +373,7 @@ +# Required-Stop: $remote_fs +# Default-Start: 2 3 5 +# Default-Stop: ++# Short-Description: Hardware monitoring daemon +# Description: This shell script takes care of starting and stopping +# sensord, the lm_sensors hardware health monitoring daemon. +### END INIT INFO @@ -508,7 +510,7 @@ } # See how we were called. -@@ -135,9 +88,6 @@ case "$1" in +@@ -135,9 +89,6 @@ case "$1" in stop) stop ;; @@ -518,7 +520,7 @@ restart) stop start -@@ -145,11 +95,11 @@ case "$1" in +@@ -145,11 +96,11 @@ case "$1" in reload) reload ;; @@ -532,8 +534,8 @@ exit 1 ;; esac ---- prog/pwm/fancontrol -+++ prog/pwm/fancontrol 2006-02-28 13:05:01.000000000 +0100 +--- prog/pwm/fancontrol.orig ++++ prog/pwm/fancontrol @@ -188,10 +188,10 @@ function restorefans() do pwmo=${AFCPWM[$fcvcount]} @@ -583,8 +585,8 @@ done # some old stuff/missing features, will clean this up soon ---- prog/pwm/pwmconfig -+++ prog/pwm/pwmconfig 2006-02-28 13:05:01.000000000 +0100 +--- prog/pwm/pwmconfig.orig ++++ prog/pwm/pwmconfig @@ -248,6 +248,9 @@ echo PLOTTER=gnuplot STEP=15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit powertop
by root＠Hilbert.suse.de 28 May '07

28 May '07

Hello community, here is the log from the commit of package powertop checked in at Mon May 28 15:04:40 CEST 2007. -------- --- powertop/powertop.changes 2007-05-26 11:17:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/powertop/powertop.changes 2007-05-28 13:19:15.591175000 +0200 @@ -1,0 +2,20 @@ +Mon May 28 13:02:15 CEST 2007 - thoenig(a)suse.de + +- Update to PowerTOP 1.5 +- Changes: + * fix resize-corrupts-screen-content bug + * add interrupts to the wakeups/second data in the emulated + (non-mobile) case + * calculate a long term power usage from battery charge deltas; + this should help people whos battery doesn't report discharge + rates, and also will provide a less noisy datapoint + * Add option to use `kill` on some known power hogs if they are + actually waking up a lot: + - beagle (even latest wakes up 10 times/second when not + indexing) + - hal (suggest to stop cdrom polling) + - gnome-power-manager + These only show if these actually wake up the cpu 'a lot'; + so if these get fixed then the suggestion will not display. + +------------------------------------------------------------------- Old: ---- powertop-1.4.tar.gz New: ---- powertop-1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powertop.spec ++++++ --- /var/tmp/diff_new_pack.y25432/_old 2007-05-28 15:04:29.000000000 +0200 +++ /var/tmp/diff_new_pack.y25432/_new 2007-05-28 15:04:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package powertop (Version 1.4) +# spec file for package powertop (Version 1.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,8 +12,8 @@ Name: powertop URL: http://www.linuxpowertop.org Summary: PowerTOP is a Linux tool to find out what is using power on a laptop -Version: 1.4 -Release: 2 +Version: 1.5 +Release: 1 License: GNU General Public License (GPL) Group: System/Monitoring Source0: %{name}-%{version}.tar.gz @@ -53,6 +53,23 @@ %{_mandir}/man*/%{name}.1.gz %changelog +* Mon May 28 2007 - thoenig(a)suse.de +- Update to PowerTOP 1.5 +- Changes: + * fix resize-corrupts-screen-content bug + * add interrupts to the wakeups/second data in the emulated + (non-mobile) case + * calculate a long term power usage from battery charge deltas; + this should help people whos battery doesn't report discharge + rates, and also will provide a less noisy datapoint + * Add option to use `kill` on some known power hogs if they are + actually waking up a lot: + - beagle (even latest wakes up 10 times/second when not + indexing) + - hal (suggest to stop cdrom polling) + - gnome-power-manager + These only show if these actually wake up the cpu 'a lot'; + so if these get fixed then the suggestion will not display. * Sat May 26 2007 - schwab(a)suse.de - Don't strip binaries. * Sat May 26 2007 - thoenig(a)suse.de ++++++ powertop-1.4.tar.gz -> powertop-1.5.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/bluetooth.c new/powertop-1.5/bluetooth.c --- old/powertop-1.4/bluetooth.c 2007-05-24 23:23:47.000000000 +0200 +++ new/powertop-1.5/bluetooth.c 2007-05-27 18:00:35.000000000 +0200 @@ -90,8 +90,8 @@ void turn_bluetooth_off(void) { - system("hciconfig hci0 down"); - system("rmmod hci_usb"); + system("hciconfig hci0 down &> /dev/null"); + system("rmmod hci_usb &> /dev/null"); } void suggest_bluetooth_off(void) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/Changelog new/powertop-1.5/Changelog --- old/powertop-1.4/Changelog 2007-05-25 22:52:40.000000000 +0200 +++ new/powertop-1.5/Changelog 2007-05-27 20:14:02.000000000 +0200 @@ -1,3 +1,18 @@ +1.5 -- + * fix resize-corrupts-screen-content bug + * add interrupts to the wakeups/second data in the emulated + (non-mobile) case + * calculate a long term power usage from battery charge deltas; + this should help people whos battery doesn't report discharge + rates, and also will provide a less noisy datapoint + * Add option to use `kill` on some known power hogs if they are + actually waking up a lot: + - beagle (even latest wakes up 10 times/second when not indexing) + - hal (suggest to stop cdrom polling) + - gnome-power-manager + These only show if these actually wake up the cpu 'a lot'; so if + these get fixed then the suggestion will not display. + 1.4 -- May 25th, 2007 * use gettext to allow translation (with lots of thanks to the various translators, especially diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/config.c new/powertop-1.5/config.c --- old/powertop-1.4/config.c 2007-05-24 22:21:53.000000000 +0200 +++ new/powertop-1.5/config.c 2007-05-27 18:01:37.000000000 +0200 @@ -44,7 +44,7 @@ if (configcount) return; if (access("/proc/config.gz", R_OK) == 0) { - file = popen("zcat /proc/config.gz", "r"); + file = popen("zcat /proc/config.gz 2> /dev/null", "r"); while (file && !feof(file)) { char line[100]; if (fgets(line, 100, file) == NULL) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/cpufreq.c new/powertop-1.5/cpufreq.c --- old/powertop-1.4/cpufreq.c 2007-05-25 22:46:38.000000000 +0200 +++ new/powertop-1.5/cpufreq.c 2007-05-26 19:21:25.000000000 +0200 @@ -60,7 +60,7 @@ closedir(dir); } -void suggest_ondemand_governer(void) +void suggest_ondemand_governor(void) { DIR *dir; struct dirent *dirent; @@ -94,7 +94,7 @@ if (strlen(gov)==0) strcpy(gov, line); else - /* if the governers are inconsistent, warn */ + /* if the governors are inconsistent, warn */ if (strcmp(gov, line)) ret = 1; fclose(file); @@ -102,19 +102,19 @@ closedir(dir); - /* if the governer is set to userspace, also warn */ + /* if the governor is set to userspace, also warn */ if (strstr(gov, "userspace")) ret = 1; - /* if the governer is set to performance, also warn */ + /* if the governor is set to performance, also warn */ /* FIXME: check if this is fair on all cpus */ if (strstr(gov, "performance")) ret = 1; if (ret) { - add_suggestion(_("Suggestion: Enable the ondemand cpu speed governer for all processors via: \n" - " echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq_scaling_governor \n"), - 15, 'O', _(" O - enable Ondemand governer "), activate_ondemand); + add_suggestion(_("Suggestion: Enable the ondemand cpu speed governor for all processors via: \n" + " echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor \n"), + 15, 'O', _(" O - enable Ondemand governor "), activate_ondemand); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/display.c new/powertop-1.5/display.c --- old/powertop-1.4/display.c 2007-05-25 23:00:24.000000000 +0200 +++ new/powertop-1.5/display.c 2007-05-27 20:10:38.000000000 +0200 @@ -30,6 +30,8 @@ #include <sys/types.h> #include <dirent.h> #include <ncurses.h> +#include <time.h> +#include <wchar.h> #include "powertop.h" @@ -106,6 +108,9 @@ strcpy(status_bar_slots[0], _(" Q - Quit ")); strcpy(status_bar_slots[1], _(" R - Refresh ")); + + werase(stdscr); + refresh(); } void initialize_curses(void) @@ -138,7 +143,7 @@ wbkgd(title_bar_window, COLOR_PAIR(PT_COLOR_HEADER_BAR)); werase(title_bar_window); - mvwprintw(title_bar_window, 0, 0, " PowerTOP version 1.4 (C) 2007 Intel Corporation"); + mvwprintw(title_bar_window, 0, 0, " PowerTOP version 1.5 (C) 2007 Intel Corporation"); wrefresh(title_bar_window); @@ -173,14 +178,25 @@ } -void show_acpi_power_line(double rate, double cap) +void show_acpi_power_line(double rate, double cap, double capdelta, time_t ti) { + char buffer[1024]; + + sprintf(buffer, _("no ACPI power usage estimate available") ); + werase(acpi_power_window); - if (rate > 0) { - mvwprintw(acpi_power_window, 0, 0, _("Power usage (ACPI estimate) : %5.1f W (%3.1f hours left)"), rate, cap/rate); - } else { - mvwprintw(acpi_power_window, 0, 0, _("no ACPI power usage estimate available")); - } + if (rate > 0.001) { + char *c; + sprintf(buffer, _("Power usage (ACPI estimate) : %5.1f W (%3.1f hours left)"), rate, cap/rate); + strcat(buffer, " "); + c = &buffer[strlen(buffer)]; + if (ti>180 && capdelta > 0) + sprintf(c, _("(long term: %5.1f W, %3.1f hours)"), 3600*capdelta / ti, cap / (3600*capdelta/ti+0.01)); + } + else if (ti>120 && capdelta > 0.001) + sprintf(buffer, _("Power usage (5 minute ACPI estimate) : %5.1f W (%3.1f hours left)"), 3600*capdelta / ti, cap / (3600*capdelta/ti+0.01)); + + mvwprintw(acpi_power_window, 0, 0, buffer); wrefresh(acpi_power_window); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/Makefile new/powertop-1.5/Makefile --- old/powertop-1.4/Makefile 2007-05-25 23:29:15.000000000 +0200 +++ new/powertop-1.5/Makefile 2007-05-26 19:12:07.000000000 +0200 @@ -6,7 +6,7 @@ CC?=gcc powertop: powertop.c config.c process.c misctips.c bluetooth.c display.c suggestions.c wireless.c cpufreq.c Makefile powertop.h - $(CC) ${CFLAGS} powertop.c config.c process.c misctips.c bluetooth.c display.c suggestions.c wireless.c cpufreq.c -lncurses -o powertop + $(CC) ${CFLAGS} powertop.c config.c process.c misctips.c bluetooth.c display.c suggestions.c wireless.c cpufreq.c -lncursesw -o powertop @(cd po/ && $(MAKE)) powertop.1.gz: powertop.1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/misctips.c new/powertop-1.5/misctips.c --- old/powertop-1.4/misctips.c 2007-05-25 18:09:12.000000000 +0200 +++ new/powertop-1.5/misctips.c 2007-05-26 17:03:51.000000000 +0200 @@ -98,21 +98,23 @@ { FILE *file; char buffer[1024]; - file = fopen("/proc/timer_list", "r"); + file = fopen("/sys/devices/system/clocksource/clocksource0/available_clocksource", "r"); if (!file) return; memset(buffer, 0, 1024); - while (!feof(file)) { - if (!fgets(buffer, 1023, file)) { - fclose(file); - return; - } - if (strstr(buffer, "Clock Event Device: hpet")) { - fclose(file); - return; - } + + if (!fgets(buffer, 1023, file)) { + fclose(file); + return; + } + + if (strstr(buffer, "hpet")) { + fclose(file); + return; } + fclose(file); + add_suggestion( _("Suggestion: enable the HPET (Multimedia Timer) in your BIOS or add \n" "the kernel patch to force-enable HPET. HPET support allows Linux to \n" "have much longer sleep intervals."), 7, 0, NULL, NULL); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/po/de.po new/powertop-1.5/po/de.po --- old/powertop-1.4/po/de.po 2007-05-25 23:52:32.000000000 +0200 +++ new/powertop-1.5/po/de.po 2007-05-26 19:21:53.000000000 +0200 @@ -34,7 +34,7 @@ msgstr " N - NMI Wächter ausschalten" #: cpufreq.c:118 -msgid " O - enable Ondemand governer " +msgid " O - enable Ondemand governor " msgstr " O - Ondemand Regulator aktivieren" #: display.c:107 @@ -169,7 +169,7 @@ msgid "" "Suggestion: Enable the CONFIG_CPU_FREQ_GOV_ONDEMAND kernel configuration " "option.\n" -"The 'ondemand' CPU speed governer will minimize the CPU power usage while\n" +"The 'ondemand' CPU speed governor will minimize the CPU power usage while\n" "giving you performance when it is needed." msgstr "" "Vorschlag: Aktivieren Sie die Option CONFIG_CPU_FREQ_GOV_ONDEMAND Ihres " @@ -218,10 +218,10 @@ #: cpufreq.c:116 msgid "" -"Suggestion: Enable the ondemand cpu speed governer for all processors via: \n" -" echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq_scaling_governor \n" +"Suggestion: Enable the ondemand cpu speed governor for all processors via: \n" +" echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor \n" msgstr "Vorschlag: Aktivieren Sie den Ondemand Regulator durch: \n" -" echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq_scaling_governor \n" +" echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor \n" #: wireless.c:97 #, c-format diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/po/es.po new/powertop-1.5/po/es.po --- old/powertop-1.4/po/es.po 2007-05-25 23:52:45.000000000 +0200 +++ new/powertop-1.5/po/es.po 2007-05-26 19:21:54.000000000 +0200 @@ -33,7 +33,7 @@ msgstr " N - Apagar el vigilante de NMI " #: cpufreq.c:118 -msgid " O - enable Ondemand governer " +msgid " O - enable Ondemand governor " msgstr " O - Encender el goverando basado en demanda " #: display.c:107 @@ -176,7 +176,7 @@ msgid "" "Suggestion: Enable the CONFIG_CPU_FREQ_GOV_ONDEMAND kernel configuration " "option.\n" -"The 'ondemand' CPU speed governer will minimize the CPU power usage while\n" +"The 'ondemand' CPU speed governor will minimize the CPU power usage while\n" "giving you performance when it is needed." msgstr "" "Sugerencia: Active la opción del núcleo CONFIG_CPU_FREQ_GOV_ONDEMAND.\n" @@ -226,12 +226,12 @@ #: cpufreq.c:116 msgid "" -"Suggestion: Enable the ondemand cpu speed governer for all processors via: \n" -" echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq_scaling_governor \n" +"Suggestion: Enable the ondemand cpu speed governor for all processors via: \n" +" echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor \n" msgstr "" "Sugerencia: Active el gobernador de velocidad de CPU en demanda en\n" "todos los procesadores ejecutando:\n" -" echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq_scaling_governor \n" +" echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor \n" #: wireless.c:97 #, c-format diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/po/fi.po new/powertop-1.5/po/fi.po --- old/powertop-1.4/po/fi.po 2007-05-25 23:29:21.000000000 +0200 +++ new/powertop-1.5/po/fi.po 2007-05-26 19:21:55.000000000 +0200 @@ -30,7 +30,7 @@ msgstr " N - Sulje NMI-valvoja " #: cpufreq.c:118 -msgid " O - enable Ondemand governer " +msgid " O - enable Ondemand governor " msgstr " O - Käytä ondemand-suorituskykyprofiilia " #: display.c:107 @@ -167,7 +167,7 @@ msgid "" "Suggestion: Enable the CONFIG_CPU_FREQ_GOV_ONDEMAND kernel configuration " "option.\n" -"The 'ondemand' CPU speed governer will minimize the CPU power usage while\n" +"The 'ondemand' CPU speed governor will minimize the CPU power usage while\n" "giving you performance when it is needed." msgstr "" "Ehdotus: Käytä ytimen CONFIG_CPU_FREQ_GOV_ONDEMAND-asetusta. ”ondemand”-" @@ -214,12 +214,12 @@ #: cpufreq.c:116 msgid "" -"Suggestion: Enable the ondemand cpu speed governer for all processors via: \n" -" echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq_scaling_governor \n" +"Suggestion: Enable the ondemand cpu speed governor for all processors via: \n" +" echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor \n" msgstr "" "Ehdotus: Aseta ondemand-suorituskykyprofiili kaikille suorittimille " "komennolla:\n" -"\techo ondemand > /sys/devices/system/cpu/cpu0/cpufreq_scaling_governor\n" +"\techo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor\n" #: wireless.c:97 #, c-format diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/po/fr.po new/powertop-1.5/po/fr.po --- old/powertop-1.4/po/fr.po 2007-05-25 12:00:36.000000000 +0200 +++ new/powertop-1.5/po/fr.po 2007-05-26 16:10:43.000000000 +0200 @@ -147,7 +147,7 @@ #: powertop.c:549 msgid "" "Suggestion: Enable the CONFIG_CPU_FREQ_GOV_ONDEMAND kernel configuration option.\n" -"The 'ondemand' CPU speed governer will minimize the CPU power usage while\n" +"The 'ondemand' CPU speed governor will minimize the CPU power usage while\n" "giving you performance when it is needed." msgstr "" "Suggestion : activez l'option de configuration du noyau \n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/po/hu.po new/powertop-1.5/po/hu.po --- old/powertop-1.4/po/hu.po 2007-05-24 03:48:09.000000000 +0200 +++ new/powertop-1.5/po/hu.po 2007-05-26 16:10:43.000000000 +0200 @@ -158,7 +158,7 @@ msgid "" "Suggestion: Enable the CONFIG_CPU_FREQ_GOV_ONDEMAND kernel configuration " "option.\n" -"The 'ondemand' CPU speed governer will minimize the CPU power usage while\n" +"The 'ondemand' CPU speed governor will minimize the CPU power usage while\n" "giving you performance when it is needed." msgstr "" "Tanács: Endedélyezd a CONFIG_CPU_FREQ_GOV_ONDEMAND kernel konfigurációs opciót.\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/po/it.po new/powertop-1.5/po/it.po --- old/powertop-1.4/po/it.po 2007-05-24 16:51:25.000000000 +0200 +++ new/powertop-1.5/po/it.po 2007-05-26 16:10:43.000000000 +0200 @@ -164,7 +164,7 @@ msgid "" "Suggestion: Enable the CONFIG_CPU_FREQ_GOV_ONDEMAND kernel configuration " "option.\n" -"The 'ondemand' CPU speed governer will minimize the CPU power usage while\n" +"The 'ondemand' CPU speed governor will minimize the CPU power usage while\n" "giving you performance when it is needed." msgstr "" "Suggerimento: Abilitare CONFIG_CPU_FREQ_GOV_ONDEMAND nel kernel\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/po/nl.po new/powertop-1.5/po/nl.po --- old/powertop-1.4/po/nl.po 2007-05-22 19:23:21.000000000 +0200 +++ new/powertop-1.5/po/nl.po 2007-05-26 16:10:43.000000000 +0200 @@ -146,7 +146,7 @@ msgid "" "Suggestion: Enable the CONFIG_CPU_FREQ_GOV_ONDEMAND kernel configuration " "option.\n" -"The 'ondemand' CPU speed governer will minimize the CPU power usage while\n" +"The 'ondemand' CPU speed governor will minimize the CPU power usage while\n" "giving you performance when it is needed." msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/po/ru.po new/powertop-1.5/po/ru.po --- old/powertop-1.4/po/ru.po 2007-05-23 05:09:38.000000000 +0200 +++ new/powertop-1.5/po/ru.po 2007-05-26 16:10:43.000000000 +0200 @@ -168,11 +168,11 @@ msgid "" "Suggestion: Enable the CONFIG_CPU_FREQ_GOV_ONDEMAND kernel configuration " "option.\n" -"The 'ondemand' CPU speed governer will minimize the CPU power usage while\n" +"The 'ondemand' CPU speed governor will minimize the CPU power usage while\n" "giving you performance when it is needed." msgstr "" "Совет: Включите опцию CONFIG_CPU_FREQ_GOV_ONDEMAND в конфигурации ядра.\n" -"'ondemand' cpufreq governer минимизирует потребление энергии ЦП, наращивая\n" +"'ondemand' cpufreq governor минимизирует потребление энергии ЦП, наращивая\n" "производительность при необходимости." #: powertop.c:555 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/powertop.c new/powertop-1.5/powertop.c --- old/powertop-1.4/powertop.c 2007-05-25 23:50:01.000000000 +0200 +++ new/powertop-1.5/powertop.c 2007-05-27 20:10:46.000000000 +0200 @@ -33,6 +33,7 @@ #include <ctype.h> #include <assert.h> #include <locale.h> +#include <time.h> #include "powertop.h" @@ -42,7 +43,7 @@ int ticktime = 5; -int interrupt_0; +int interrupt_0, total_interrupt; static int maxcstate = 0; int topcstate = 0; @@ -68,6 +69,12 @@ int linesize; int linectotal; + +double last_bat_cap = 0; +double prev_bat_cap = 0; +time_t last_bat_time = 0; +time_t prev_bat_time = 0; + void push_line(char *string, int count) { int i; @@ -134,10 +141,12 @@ { FILE *file; char line[1024]; + char line2[1024]; char *name; uint64_t delta; interrupt_0 = 0; + total_interrupt = 0; file = fopen("/proc/interrupts", "r"); if (!file) @@ -180,11 +189,13 @@ c = strchr(name, '\n'); if (c) *c = 0; - sprintf(line, " <interrupt> : %s", name); + sprintf(line2, " <interrupt> : %s", name); if (nr > 0 && delta > 0) - push_line(line, delta); + push_line(line2, delta); if (nr==0) interrupt_0 = delta; + else + total_interrupt += delta; } fclose(file); } @@ -339,10 +350,24 @@ rate += watts_drawn + voltage * amperes_drawn; } cap += watts_left + voltage * amperes_left; + } closedir(dir); - show_acpi_power_line(rate, cap); + if (!last_bat_time) { + last_bat_time = prev_bat_time = time(NULL); + last_bat_cap = prev_bat_cap = cap; + } + if (time(NULL) - last_bat_time >= 400) { + prev_bat_cap = last_bat_cap; + prev_bat_time = last_bat_time; + last_bat_time = time(NULL); + last_bat_cap = cap; + } + + if (prev_bat_cap - cap < 0.001 && rate < 0.001) + last_bat_time = 0; + show_acpi_power_line(rate, cap, prev_bat_cap - cap, time(NULL) - prev_bat_time); } char cstate_lines[6][200]; @@ -353,6 +378,8 @@ int ncursesinited=0; FILE *file = NULL; uint64_t cur_usage[8], cur_duration[8]; + double wakeups_per_second = 0; + read_data(&start_usage[0], &start_duration[0]); setlocale (LC_ALL, ""); @@ -367,7 +394,7 @@ memset(cur_usage, 0, sizeof(cur_usage)); memset(cur_duration, 0, sizeof(cur_duration)); - printf(_("PowerTOP 1.4 (C) 2007 Intel Corporation \n\n")); + printf("PowerTOP 1.5 (C) 2007 Intel Corporation \n\n"); if (getuid() != 0) printf(_("PowerTOP needs to be run as root to collect enough information\n")); printf(_("Collecting data for %i seconds \n"), ticktime); @@ -513,17 +540,19 @@ if (strstr(line, "total events")) { int d; d = strtoull(line, NULL, 10) / sysconf(_SC_NPROCESSORS_ONLN); - if (totalevents == 0) /* No c-state info available, use timerstats instead */ - totalevents = d * sysconf(_SC_NPROCESSORS_ONLN); + if (totalevents == 0) { /* No c-state info available, use timerstats instead */ + totalevents = d * sysconf(_SC_NPROCESSORS_ONLN) + total_interrupt; + if (d < interrupt_0) + totalevents += interrupt_0 - d; + } if (d>0 && d < interrupt_0) push_line(" <interrupt> : extra timer interrupt", interrupt_0 - d); } if (totalevents && ticktime) { - double d; - d = totalevents * 1.0 / ticktime / sysconf(_SC_NPROCESSORS_ONLN); - show_wakeups(d); + wakeups_per_second = totalevents * 1.0 / ticktime / sysconf(_SC_NPROCESSORS_ONLN); + show_wakeups(wakeups_per_second); } print_battery(); count_lines(); @@ -560,18 +589,15 @@ suggest_kernel_config("CONFIG_USB_SUSPEND", 1, _("Suggestion: Enable the CONFIG_USB_SUSPEND kernel configuration option.\nThis option will automatically disable UHCI USB when not in use, and may\nsave approximately 1 Watt of power."), 20); - suggest_process_death("beagled : schedule_timeout", lines, min(linehead,20), - _("Suggestion: Disable or remove 'beagle' from your system. \n" - "Beagle is the program that indexes for easy desktop search, however it's \n" - "not very efficient and costs a significant amount of battery life."), 30); suggest_kernel_config("CONFIG_CPU_FREQ_GOV_ONDEMAND", 1, _("Suggestion: Enable the CONFIG_CPU_FREQ_GOV_ONDEMAND kernel configuration option.\n" - "The 'ondemand' CPU speed governer will minimize the CPU power usage while\n" "giving you performance when it is needed."), 5); + "The 'ondemand' CPU speed governor will minimize the CPU power usage while\n" "giving you performance when it is needed."), 5); suggest_kernel_config("CONFIG_NO_HZ", 1, _("Suggestion: Enable the CONFIG_NO_HZ kernel configuration option.\nThis option is required to get any kind of longer sleep times in the CPU."), 50); suggest_kernel_config("CONFIG_HPET_TIMER", 1, _("Suggestion: Enable the CONFIG_HPET kernel configuration option.\n" "Without HPET support the kernel needs to wake up every 20 miliseconds for \n" "some housekeeping tasks."), 10); - if (!access("/sys/module/snd_ac97_codec", F_OK)) + if (!access("/sys/module/snd_ac97_codec", F_OK) && + access("/sys/module/snd_ac97_codec/parameters/power_save", F_OK)) suggest_kernel_config("CONFIG_SND_AC97_POWER_SAVE", 1, _("Suggestion: Enable the CONFIG_SND_AC97_POWER_SAVE kernel configuration option.\n" "This option will automatically power down your sound codec when not in use,\n" @@ -579,16 +605,48 @@ suggest_kernel_config("CONFIG_IRQBALANCE", 0, _("Suggestion: Disable the CONFIG_IRQBALANCE kernel configuration option.\n" "The in-kernel irq balancer is obsolete and wakes the CPU up far more than needed."), 3); + + /* suggest to stop beagle if it shows up in the top 20 and wakes up more than 10 times in the measurement */ + suggest_process_death("beagled : schedule_timeout", "beagled", lines, min(linehead,20), 10.0, + _("Suggestion: Disable or remove 'beagle' from your system. \n" + "Beagle is the program that indexes for easy desktop search, however it's \n" + "not very efficient and costs a significant amount of battery life."), 30); + suggest_process_death("beagled : futex_wait (hrtimer_wakeup)", "beagled", lines, min(linehead,20), 10.0, + _("Suggestion: Disable or remove 'beagle' from your system. \n" + "Beagle is the program that indexes for easy desktop search, however it's \n" + "not very efficient and costs a significant amount of battery life."), 30); + + /* suggest to stop gnome-power-manager if it shows up in the top 10 and wakes up more than 10 times in the measurement */ + suggest_process_death("gnome-power-man : schedule_timeout (process_timeout)", "gnome-power-manager", lines, min(linehead,10), 10.0, + _("Suggestion: Disable or remove 'gnome-power-manager' from your system. \n" + "Despite its name, some versions of gnome-power-manager end up costing more power \n" + "than it'll ever save."), 5); + + /* suggest to stop pcscd if it shows up in the top 50 and wakes up at all*/ + suggest_process_death("pcscd : do_nanosleep (hrtimer_wakeup)", "pcscd", lines, min(linehead,50), 1.0, + _("Suggestion: Disable or remove 'pcscd' from your system. \n" + "pcscd tends to keep the USB subsystem out of power save mode\n" + "and your processor out of deeper powersave states."), 30); + + + /* suggest to stop hal polilng if it shows up in the top 50 and wakes up too much*/ + suggest_process_death("hald-addon-stor : do_nanosleep (hrtimer_wakeup)", "hald-addon-storage", lines, min(linehead,50), 2.0, + _("Suggestion: Disable 'hal' from polling your cdrom with: hal-stop-polling /dev/scd0\n" + "'hal' is the component that auto-opens a file browser when you plug in a CD\n" + "but disables SATA power saving from kicking in."), 30); + + suggest_bluetooth_off(); suggest_nmi_watchdog(); suggest_laptop_mode(); suggest_hpet(); suggest_ac97_powersave(); suggest_wireless_powersave(); - suggest_ondemand_governer(); + suggest_ondemand_governor(); - pick_suggestion(); + if (!key) + pick_suggestion(); show_title_bar(); fflush(stdout); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/powertop.h new/powertop-1.5/powertop.h --- old/powertop-1.4/powertop.h 2007-05-25 22:44:05.000000000 +0200 +++ new/powertop-1.5/powertop.h 2007-05-26 23:07:34.000000000 +0200 @@ -40,7 +40,7 @@ extern int linesize; extern int linectotal; -void suggest_process_death(char *process, struct line *lines, int linecount, char *comment, int weight); +void suggest_process_death(char *process_match, char *process_name, struct line *lines, int linecount, double minwakeups, char *comment, int weight); void suggest_kernel_config(char *string, int onoff, char *comment, int weight); void suggest_laptop_mode(void); void suggest_bluetooth_off(void); @@ -48,7 +48,7 @@ void suggest_hpet(void); void suggest_ac97_powersave(void); void suggest_wireless_powersave(void); -void suggest_ondemand_governer(void); +void suggest_ondemand_governor(void); @@ -83,7 +83,7 @@ void show_title_bar(void); void setup_windows(void); void initialize_curses(void); -void show_acpi_power_line(double rate, double cap); +void show_acpi_power_line(double rate, double cap, double capdelta, time_t time); void show_cstates(void); void show_wakeups(double d); void show_timerstats(int nostats, int ticktime); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/process.c new/powertop-1.5/process.c --- old/powertop-1.4/process.c 2007-05-24 22:49:32.000000000 +0200 +++ new/powertop-1.5/process.c 2007-05-27 18:01:02.000000000 +0200 @@ -32,15 +32,26 @@ #include "powertop.h" -void suggest_process_death(char *process, struct line *lines, int linecount, char *comment, int weight) +char process_to_kill[1024]; + +void do_kill(void) +{ + char line[2048]; + sprintf(line, "killall %s &> /dev/null", process_to_kill); + system(line); +} + +void suggest_process_death(char *process_match, char *tokill, struct line *lines, int linecount, double minwakeups, char *comment, int weight) { int i; - int found = 0; for (i = 0; i < linecount; i++) { - if (strstr(lines[i].string, process)) { - found++; - add_suggestion(comment, weight, 0, NULL, NULL); + if (strstr(lines[i].string, process_match)) { + char hotkey_string[300]; + sprintf(hotkey_string, " K - kill %s ", tokill); + strcpy(process_to_kill, tokill); + if (minwakeups < lines[i].count) + add_suggestion(comment, weight, 'K' , hotkey_string, do_kill); break; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.4/suggestions.c new/powertop-1.5/suggestions.c --- old/powertop-1.4/suggestions.c 2007-05-24 23:08:15.000000000 +0200 +++ new/powertop-1.5/suggestions.c 2007-05-26 23:37:11.000000000 +0200 @@ -70,6 +70,9 @@ ptr = next; } suggestions = NULL; + strcpy(status_bar_slots[9],""); + suggestion_key = 255; + suggestion_activate = NULL; total_weight = 0; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit php5
by root＠Hilbert.suse.de 28 May '07

28 May '07

Hello community, here is the log from the commit of package php5 checked in at Mon May 28 15:04:23 CEST 2007. -------- --- php5/php5.changes 2007-05-04 13:16:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/php5/php5.changes 2007-05-28 10:15:08.000000000 +0200 @@ -1,0 +2,56 @@ +Mon May 21 12:00:45 CEST 2007 - mmarek(a)suse.cz + +- fixed the dba extension adding -ldb-4.x to global LDFLAGS, + causing unnecessary dependency in /usr/bin/php5 + [http://bugs.php.net/bug.php?id=41455] + +------------------------------------------------------------------- +Sat May 19 22:59:37 UTC 2007 - judas_iscariote(a)shorewall.net + +- updated suhosin to version 0.9.20, security fix + bugfixes +see http://www.hardened-php.net/suhosin/changelog.html for more detail. + +------------------------------------------------------------------- +Mon May 14 03:13:01 UTC 2007 - judas_iscariote(a)shorewall.net + +- fix devel package, in the reality PHP does not currenly require expat. + headers provides a expat compatibility layer but it is no longer in use + by our packages as libxml2 is always prefered, (and HAVE_LIBEXPAT is not defined) + +------------------------------------------------------------------- +Fri May 11 13:22:29 UTC 2007 - judas_iscariote(a)shorewall.net + +- update php5-test-fixes fixing another bug in zend_compile.c +- use rpm macros in the spec file +- when removing apache2-mod_php5, unload it from apache first. +- when updating apache2-mod_php5 restart apache with restart on update macro. + +------------------------------------------------------------------- +Sun May 6 21:49:54 UTC 2007 - judas_iscariote(a)shorewall.net + +- HTTP_RAW_POST_DATA superglobal broken (php5-phpbug-41293.patch) +- better fix for MOPB 41. + +------------------------------------------------------------------- +Sat May 5 00:59:25 UTC 2007 - judas_iscariote(a)shorewall.net + +- remove --enable-memory-limit configure flag, it disappeared in 5.2.1, + nowdays memory_limit is always enabled. + +------------------------------------------------------------------- +Fri May 4 09:58:35 UTC 2007 - judas_iscariote(a)shorewall.net + +- add php5-test-fixes.patch fixing a test case that wont pass on i586 +as well a real fix for Zend/tests/bug41117_1.phpt problem, that was commited +after the release was done. there is another test case that fails in 10.2 +ext/pcre/tests/bug40195.phpt but this is not a PHP problem but a bug in PCRE. + +- added missing fix for PMOPB-45-2007 PHP ext/filter Email Validation Vulnerability (minor) + +------------------------------------------------------------------- +Fri May 4 05:58:13 UTC 2007 - judas_iscariote(a)shorewall.net + +- php5-devel package now requires pcre-devel for > 10.1 as 5.2.2 installs + php_pcre.h header that needs it. + +------------------------------------------------------------------- Old: ---- suhosin-0.9.19.tgz New: ---- get_ini_settings.php php5-avoid-libdb-dependency.patch php5-MOPB-41-betterfix.patch php5-phpbug-41293.patch php5-PMOPB-45-2007.patch php5-test-fixes.patch suhosin-0.9.20.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.W23404/_old 2007-05-28 15:03:54.000000000 +0200 +++ /var/tmp/diff_new_pack.W23404/_new 2007-05-28 15:03:54.000000000 +0200 @@ -11,7 +11,7 @@ # norootforbuild Name: php5 -%define suhosin_version 0.9.19 +%define suhosin_version 0.9.20 %define suhosin_patch_version 0.9.6.2 %define with_suhosin_patch 1 %define pkg_name php5 @@ -22,7 +22,7 @@ %else BuildRequires: krb5-devel %endif -BuildRequires: apache2-devel bison curl-devel db-devel gmp-devel gtk-devel imap imap-devel libmcrypt-devel libtidy-devel libtiff-devel libxslt-devel mhash-devel mm-devel mysql-devel net-snmp-devel openldap2 openldap2-devel orbit-devel pam-devel pkgconfig postfix postgresql-devel qt3-devel tcpd-devel unixODBC-devel update-alternatives zip +BuildRequires: apache2-devel bison curl-devel db-devel gmp-devel gtk-devel imap imap-devel libmcrypt-devel libtidy-devel libtiff-devel libxslt-devel mhash-devel mm-devel mysql-devel ncurses-devel net-snmp-devel openldap2 openldap2-devel orbit-devel pam-devel pkgconfig postfix postgresql-devel qt3-devel tcpd-devel unixODBC-devel update-alternatives zip %if %{with_spell} BuildRequires: aspell-devel %endif @@ -58,7 +58,7 @@ ######################################## # apache macros ######################################## -%define apxs2 /usr/sbin/apxs2 +%define apxs2 %{_sbindir}/apxs2 %define apache2_mmn %(MMN=$(%{apxs2} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) %define apache2_libexecdir %(%{apxs2} -q LIBEXECDIR) %define apache2_sysconfdir %(%{apxs2} -q SYSCONFDIR) @@ -67,14 +67,15 @@ ### ### Version: 5.2.2 -Release: 2 -License: Other uncritical OpenSource License +Release: 13 +License: Other uncritical OpenSource License, Other License(s), see package Group: Productivity/Networking/Web/Servers Provides: php zend php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter +Provides: php-dbx php-dio php-fam php-filepro php-yp Autoreqprov: on PreReq: update-alternatives #extensions that are no longer here -Obsoletes: php5-dbx php5-dio php5-fam php5-filepro php5-yp +Obsoletes: php-dbx php-dio php-fam php-filepro php-yp Source0: php-%{version}.tar.bz2 Source1: php-suse-addons.tar.bz2 Source2: suhosin-%{suhosin_version}.tgz @@ -93,6 +94,15 @@ Patch8: php5-really-norpath.patch # compiler warnings Patch9: php5-warnings.patch +#wrong test case and post release fix for one. +Patch10: php5-test-fixes.patch +#HTTP_RAW_POST_DATA broked. +Patch11: php5-phpbug-41293.patch +# /usr/bin/php5 linked against libdb +Patch12: php5-avoid-libdb-dependency.patch +#please use patch30 and up for security fixes +Patch30: php5-PMOPB-45-2007.patch +Patch31: php5-MOPB-41-betterfix.patch URL: http://www.php.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Icon: php5.xpm @@ -118,9 +128,13 @@ Summary: Include files of PHP5 Group: Development/Libraries/C and C++ #this is required by the installed development headers -Requires: %{name} = %{version} glibc-devel libxml2-devel libexpat-devel +Requires: %{name} = %{version} glibc-devel libxml2-devel #this is needed for "pecl" functionality Requires: autoconf automake libtool +# 5.2.2 or later installs php_pcre.h that requires pcre-devel +%if 0%{?suse_version} > 1010 +Requires: pcre-devel +%endif Conflicts: php4-devel %description devel @@ -567,7 +581,7 @@ Summary: PHP5 Extension Module Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version} %{name}-pdo = %{version} -Obsoletes: %{name}-mysqli < 5.2.0 +Obsoletes: %{name}-mysqli < %{version} %description mysql PHP functions for access to MySQL database servers. @@ -1063,9 +1077,9 @@ %prep %setup -q -n php-%{version} -a 1 -tar xf %{S:2} -C ext -mv ext/suhosin-%{suhosin_version} ext/suhosin -cp %{S:4} pear/README.SUSE +%{__tar} xf %{S:2} -C ext +%{__mv} ext/suhosin-%{suhosin_version} ext/suhosin +%{__cp} %{S:4} pear/README.SUSE %patch1 %patch2 %patch3 -p1 @@ -1076,16 +1090,22 @@ %endif %patch8 -p1 %patch9 +%patch10 +%patch11 +%patch12 +#security fixes +%patch30 +%patch31 # we build three SAPI -mkdir -p build-apache2 -mkdir -p build-fastcgi/sapi/cgi/libfcgi -mkdir -p build-cli/ext/sqlite/libsqlite/src/ +%{__mkdir} -p build-apache2 +%{__mkdir} -p build-fastcgi/sapi/cgi/libfcgi +%{__mkdir} -p build-cli/ext/sqlite/libsqlite/src/ # THis happends only with bison 1.875 %if 0%{?suse_version} < 1010 # our bison seems to generate wrong parser, so use the pregenerated ones... for sapi in apache2 fastcgi cli ; do - mkdir build-$sapi/Zend - cp \ + %{__mkdir} build-$sapi/Zend + %{__cp} \ Zend/zend_language_scanner.c \ Zend/zend_language_parser.h \ Zend/zend_language_parser.c \ @@ -1096,9 +1116,10 @@ %endif %build +#find %{_libdir} -name "*.la" | xargs grep 'dependency_libs=''' # Force use of system libtool(when newer than the included) %if 0%{?suse_version} > 1000 -libtoolize --force --copy +%{__libtoolize} --force --copy cat `aclocal --print-ac-dir`/libtool.m4 > build/libtool.m4 %endif #get rid of bundled libraries which are not used in 10.2 and later @@ -1107,7 +1128,7 @@ %endif # regenerate configure etc. # workaround: suhosin-patch updates timestamp of configure, confusing buildconf -rm configure +%{__rm} configure ./buildconf --force # export flags CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -D_GNU_SOURCE -pipe" @@ -1151,7 +1172,6 @@ --enable-spl \ --enable-filter \ --disable-debug \ - --enable-memory-limit \ --enable-inline-optimization \ --disable-rpath \ --disable-static \ @@ -1284,9 +1304,9 @@ # Run tests, using the CLI SAPI export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 LANG=POSIX LC_ALL=POSIX unset TZ -make test +%{__make} test set +x -for f in `find .. -name \*.diff -type f -print`; do +for f in `find .. -name "*.diff" -type f -print`; do echo "TEST FAILURE: $f --" cat "$f" echo "-- $f result ends." @@ -1305,20 +1325,20 @@ # do the actual installation Install apache2 #need it for yast module -mv %{buildroot}%{apache2_libexecdir}/libphp5.so %{buildroot}%{apache2_libexecdir}/mod_php5.so +%{__mv} %{buildroot}%{apache2_libexecdir}/libphp5.so %{buildroot}%{apache2_libexecdir}/mod_php5.so Install fastcgi Install cli # generate php.ini from php.ini-recommendedt: -install -d -m 755 %{buildroot}/%{php_sysconf}/conf.d -install -d -m 755 %{buildroot}/%{php_sysconf}/apache2 -install -d -m 755 %{buildroot}/%{php_sysconf}/cli -install -d -m 755 %{buildroot}/%{php_sysconf}/fastcgi -sed "s=@extdir@=%{extension_dir}=" php.ini-recommended \ +%{__install} -d -m 755 %{buildroot}/%{php_sysconf}/conf.d +%{__install} -d -m 755 %{buildroot}/%{php_sysconf}/apache2 +%{__install} -d -m 755 %{buildroot}/%{php_sysconf}/cli +%{__install} -d -m 755 %{buildroot}/%{php_sysconf}/fastcgi +%{__sed} "s=@extdir@=%{extension_dir}=" php.ini-recommended \ > %{buildroot}/%{php_sysconf}/apache2/php.ini -sed "s=@extdir@=%{extension_dir}=" php.ini-recommended \ +%{__sed} "s=@extdir@=%{extension_dir}=" php.ini-recommended \ | sed -r 's/^(html_errors|implicit_flush|max_execution_time|register_argc_argv)/;\1/' \ > %{buildroot}/%{php_sysconf}/cli/php.ini -sed "s=@extdir@=%{extension_dir}=" php.ini-recommended \ +%{__sed} "s=@extdir@=%{extension_dir}=" php.ini-recommended \ > %{buildroot}/%{php_sysconf}/fastcgi/php.ini # prepare configuration files for each extension extern_modules="" @@ -1336,34 +1356,34 @@ echo "extension=$ext.so" >> %{buildroot}/%{php_sysconf}/conf.d/$ext.ini done #suhosin configuration -install -m 644 ext/suhosin/suhosin.ini %{buildroot}/%{php_sysconf}/conf.d/suhosin.ini +%{__install} -m 644 ext/suhosin/suhosin.ini %{buildroot}/%{php_sysconf}/conf.d/suhosin.ini # list of builtin modules builtin_modules=`./build-cli/sapi/cli/php -m | egrep -v '^(\[.*)?$' | sort | tr '\n' ' '` # update readme -sed "s=@EXTERN_MODULES@=$extern_modules=;s=@BUILTIN_MODULES@=$builtin_modules=" php-suse-addons/README.SUSE > README.SUSE +%{__sed} "s=@EXTERN_MODULES@=$extern_modules=;s=@BUILTIN_MODULES@=$builtin_modules=" php-suse-addons/README.SUSE > README.SUSE # apache configuration -mkdir -p %{buildroot}%{apache2_sysconfdir}/conf.d -install -m 644 php-suse-addons/sysconfig.apache2 %{buildroot}/%{apache2_sysconfdir}/conf.d/%{pkg_name}.conf +%{__mkdir} -p %{buildroot}%{apache2_sysconfdir}/conf.d +%{__install} -m 644 php-suse-addons/sysconfig.apache2 %{buildroot}/%{apache2_sysconfdir}/conf.d/%{pkg_name}.conf # rename to php5 pushd %{buildroot}%{cgi_dir} -#mv php php5 -rm php-config5 phpize5 +#%{__mv} php php5 +%{__rm} php-config5 phpize5 popd pushd %{buildroot}/%{_bindir} -#mv php php5 -mv pear pear5 -mv pecl pecl5 +#%{__mv} php php5 +%{__mv} pear pear5 +%{__mv} pecl pecl5 popd #pushd %{buildroot}/%{_mandir}/man1 -#mv php.1 php5.1 +#%{__mv} php.1 php5.1 #popd # directory for sessions -install -d %{buildroot}/var/lib/%{pkg_name} +%{__install} -d %{buildroot}/var/lib/%{pkg_name} # documentation -mv sapi/cli/README README.CLI -mv sapi/cgi/README.FastCGI README.FastCGI -rm -rf %{buildroot}/{.channels,.depdb*,.filemap,.lock,usr/bin/peardev} -install -d -m 0755 %{buildroot}/%{peardir}/test +%{__mv} sapi/cli/README README.CLI +%{__mv} sapi/cgi/README.FastCGI README.FastCGI +%{__rm} -rf %{buildroot}/{.channels,.depdb*,.filemap,.lock,usr/bin/peardev} +%{__install} -d -m 0755 %{buildroot}/%{peardir}/test %post update-alternatives --install %{_bindir}/php php %{_bindir}/php5 5 \ @@ -1414,6 +1434,20 @@ fi fi +%preun -n apache2-mod_php5 +if [ "$1" = "0" ] +then + if [ -x /usr/sbin/a2enmod ] + then + if a2enmod -q php5; then + a2dismod php5 + fi + fi +fi + +%postun -n apache2-mod_php5 +%restart_on_update apache2 + %clean rm -rf %{buildroot} @@ -1718,8 +1752,39 @@ %config(noreplace) %{php_sysconf}/conf.d/zlib.ini %changelog +* Mon May 21 2007 - mmarek(a)suse.cz +- fixed the dba extension adding -ldb-4.x to global LDFLAGS, + causing unnecessary dependency in /usr/bin/php5 + [http://bugs.php.net/bug.php?id=41455] +* Sat May 19 2007 - judas_iscariote(a)shorewall.net +- updated suhosin to version 0.9.20, security fix + bugfixes + see http://www.hardened-php.net/suhosin/changelog.html for more detail. +* Mon May 14 2007 - judas_iscariote(a)shorewall.net +- fix devel package, in the reality PHP does not currenly require expat. + headers provides a expat compatibility layer but it is no longer in use + by our packages as libxml2 is always prefered, (and HAVE_LIBEXPAT is not defined) +* Fri May 11 2007 - judas_iscariote(a)shorewall.net +- update php5-test-fixes fixing another bug in zend_compile.c +- use rpm macros in the spec file +- when removing apache2-mod_php5, unload it from apache first. +- when updating apache2-mod_php5 restart apache with restart on update macro. +* Sun May 06 2007 - judas_iscariote(a)shorewall.net +- HTTP_RAW_POST_DATA superglobal broken (php5-phpbug-41293.patch) +- better fix for MOPB 41. +* Sat May 05 2007 - judas_iscariote(a)shorewall.net +- remove --enable-memory-limit configure flag, it disappeared in 5.2.1, + nowdays memory_limit is always enabled. * Fri May 04 2007 - prusnak(a)suse.cz - changed expat to libexpat-devel in Requires of devel subpackage +* Fri May 04 2007 - judas_iscariote(a)shorewall.net +- add php5-test-fixes.patch fixing a test case that wont pass on i586 + as well a real fix for Zend/tests/bug41117_1.phpt problem, that was commited + after the release was done. there is another test case that fails in 10.2 + ext/pcre/tests/bug40195.phpt but this is not a PHP problem but a bug in PCRE. +- added missing fix for PMOPB-45-2007 PHP ext/filter Email Validation Vulnerability (minor) +* Fri May 04 2007 - judas_iscariote(a)shorewall.net +- php5-devel package now requires pcre-devel for > 10.1 as 5.2.2 installs + php_pcre.h header that needs it. * Thu May 03 2007 - mmarek(a)suse.cz - fixed some new compiler warnings * Thu May 03 2007 - judas_iscariote(a)shorewall.net ++++++ php5-avoid-libdb-dependency.patch ++++++ breaking out of the for loop right after the link test leaves $LIBS and $LDFLAGS with their temporary values --- ext/dba/config.m4.orig +++ ext/dba/config.m4 @@ -172,6 +172,7 @@ dnl parameters(version, library list, fu AC_DEFUN([PHP_DBA_DB_CHECK],[ for LIB in $2; do if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then + unset PHP_DBA_DB_CHECK_found_it PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$PHP_LIBDIR, -l$LIB,[ AC_TRY_LINK([ #include "$THIS_INCLUDE" @@ -185,10 +186,14 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[ #endif ],[ THIS_LIBS=$LIB - break + PHP_DBA_DB_CHECK_found_it=1 ]) ]) ]) + if test -n "$PHP_DBA_DB_CHECK_found_it"; then + unset PHP_DBA_DB_CHECK_found_it + break + fi fi done if test -z "$THIS_LIBS"; then ++++++ php5-MOPB-41-betterfix.patch ++++++ Index: ext/sqlite/sess_sqlite.c =================================================================== RCS file: /repository/php-src/ext/sqlite/sess_sqlite.c,v retrieving revision 1.18.2.1.2.1 retrieving revision 1.18.2.1.2.2 diff -u -r1.18.2.1.2.1 -r1.18.2.1.2.2 --- ext/sqlite/sess_sqlite.c 1 Jan 2007 09:36:07 -0000 1.18.2.1.2.1 +++ ext/sqlite/sess_sqlite.c 5 May 2007 15:36:15 -0000 1.18.2.1.2.2 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sess_sqlite.c,v 1.18.2.1.2.1 2007/01/01 09:36:07 sebastian Exp $ */ +/* $Id: sess_sqlite.c,v 1.18.2.1.2.2 2007/05/05 15:36:15 iliaa Exp $ */ #include "php.h" @@ -110,9 +110,13 @@ case SQLITE_ROW: if (rowdata[0] != NULL) { *vallen = strlen(rowdata[0]); - *val = emalloc(*vallen); - *vallen = sqlite_decode_binary(rowdata[0], *val); - (*val)[*vallen] = '\0'; + if (*vallen) { + *val = emalloc(*vallen); + *vallen = sqlite_decode_binary(rowdata[0], *val); + (*val)[*vallen] = '\0'; + } else { + *val = STR_EMPTY_ALLOC(); + } } break; default: Index: ext/sqlite/sqlite.c =================================================================== RCS file: /repository/php-src/ext/sqlite/sqlite.c,v retrieving revision 1.166.2.13.2.7 retrieving revision 1.166.2.13.2.8 diff -u -r1.166.2.13.2.7 -r1.166.2.13.2.8 --- ext/sqlite/sqlite.c 6 Mar 2007 02:17:13 -0000 1.166.2.13.2.7 +++ ext/sqlite/sqlite.c 5 May 2007 15:36:15 -0000 1.166.2.13.2.8 @@ -17,7 +17,7 @@ | Marcus Boerger <helly(a)php.net> | +----------------------------------------------------------------------+ - $Id: sqlite.c,v 1.166.2.13.2.7 2007/03/06 02:17:13 stas Exp $ + $Id: sqlite.c,v 1.166.2.13.2.8 2007/05/05 15:36:15 iliaa Exp $ */ #ifdef HAVE_CONFIG_H @@ -73,7 +73,7 @@ extern int sqlite_decode_binary(const unsigned char *in, unsigned char *out); #define php_sqlite_encode_binary(in, n, out) sqlite_encode_binary((const unsigned char *)in, n, (unsigned char *)out) -#define php_sqlite_decode_binary(in, out) sqlite_decode_binary((const unsigned char *)in, (unsigned char *)out) +#define php_sqlite_decode_binary(in, out) in && *in ? sqlite_decode_binary((const unsigned char *)in, (unsigned char *)out) : 0 static int sqlite_count_elements(zval *object, long *count TSRMLS_DC); @@ -1133,7 +1133,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "SQLite support", "enabled"); - php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.7 2007/03/06 02:17:13 stas Exp $"); + php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.8 2007/05/05 15:36:15 iliaa Exp $"); php_info_print_table_row(2, "SQLite Library", sqlite_libversion()); php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding()); php_info_print_table_end(); ++++++ php5-phpbug-41293.patch ++++++ Index: main/php_content_types.c =================================================================== RCS file: /repository/php-src/main/php_content_types.c,v retrieving revision 1.32.2.1.2.2 retrieving revision 1.32.2.1.2.4 diff -u -r1.32.2.1.2.2 -r1.32.2.1.2.4 --- main/php_content_types.c 1 Apr 2007 19:09:36 -0000 1.32.2.1.2.2 +++ main/php_content_types.c 7 May 2007 23:27:59 -0000 1.32.2.1.2.4 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_content_types.c,v 1.32.2.1.2.2 2007/04/01 19:09:36 iliaa Exp $ */ +/* $Id: php_content_types.c,v 1.32.2.1.2.4 2007/05/07 23:27:59 iliaa Exp $ */ #include "php.h" #include "SAPI.h" @@ -37,21 +37,21 @@ */ SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader) { - char *data = NULL; - int length = 0; + char *data; + int length; /* $HTTP_RAW_POST_DATA registration */ - if(!strcmp(SG(request_info).request_method, "POST")) { - if(NULL == SG(request_info).post_entry && SG(request_info).post_data) { + if (!strcmp(SG(request_info).request_method, "POST")) { + if (NULL == SG(request_info).post_entry) { /* no post handler registered, so we just swallow the data */ sapi_read_standard_form_data(TSRMLS_C); + } + + /* For unknown content types we create HTTP_RAW_POST_DATA even if always_populate_raw_post_data off, + * this is in-effecient, but we need to keep doing it for BC reasons (for now) */ + if ((PG(always_populate_raw_post_data) || NULL == SG(request_info).post_entry) && SG(request_info).post_data) { length = SG(request_info).post_data_length; data = estrndup(SG(request_info).post_data, length); - } else if(PG(always_populate_raw_post_data) && SG(request_info).post_data) { - length = SG(request_info).post_data_length; - data = estrndup(SG(request_info).post_data, length); - } - if(data) { SET_VAR_STRINGL("HTTP_RAW_POST_DATA", data, length); } } @@ -62,11 +62,10 @@ in the long run post handlers should be changed to not touch request_info.post_data for memory preservation reasons */ - if(SG(request_info).post_data) { + if (SG(request_info).post_data) { SG(request_info).raw_post_data = estrndup(SG(request_info).post_data, SG(request_info).post_data_length); SG(request_info).raw_post_data_length = SG(request_info).post_data_length; } - } /* }}} */ ++++++ php5-PMOPB-45-2007.patch ++++++ Index: ext/filter/logical_filters.c =================================================================== RCS file: /repository/php-src/ext/filter/logical_filters.c,v retrieving revision 1.1.2.21 retrieving revision 1.1.2.22 diff -u -r1.1.2.21 -r1.1.2.22 --- ext/filter/logical_filters.c 1 Jan 2007 09:36:00 -0000 1.1.2.21 +++ ext/filter/logical_filters.c 3 May 2007 23:38:27 -0000 1.1.2.22 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: logical_filters.c,v 1.1.2.21 2007/01/01 09:36:00 sebastian Exp $ */ +/* $Id: logical_filters.c,v 1.1.2.22 2007/05/03 23:38:27 iliaa Exp $ */ #include "php_filter.h" #include "filter_private.h" @@ -469,7 +469,7 @@ void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */ { /* From http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */ - const char regexp[] = "/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\\-])+\\.)+[A-Za-z\\-]+))$/"; + const char regexp[] = "/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\\-])+\\.)+[A-Za-z\\-]+))$/D"; pcre *re = NULL; pcre_extra *pcre_extra = NULL; ++++++ php5-test-fixes.patch ++++++ Index: Zend/zend_compile.c =================================================================== RCS file: /repository/ZendEngine2/zend_compile.c,v retrieving revision 1.647.2.27.2.37 diff -u -r1.647.2.27.2.37 zend_compile.c --- Zend/zend_compile.c 2 May 2007 17:24:15 -0000 1.647.2.27.2.37 +++ Zend/zend_compile.c 11 May 2007 12:59:33 -0000 @@ -1265,9 +1268,18 @@ void zend_do_receive_arg(zend_uchar op, znode *var, znode *offset, znode *initialization, znode *class_type, znode *varname, zend_uchar pass_by_reference TSRMLS_DC) { - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); + zend_op *opline; zend_arg_info *cur_arg_info; + if (CG(active_op_array)->scope && + ((CG(active_op_array)->fn_flags & ZEND_ACC_STATIC) == 0) && + (Z_TYPE(varname->u.constant) == IS_STRING) && + (Z_STRLEN(varname->u.constant) == sizeof("this")-1) && + (memcmp(Z_STRVAL(varname->u.constant), "this", sizeof("this")) == 0)) { + zend_error(E_COMPILE_ERROR, "Cannot re-assign $this"); + } + + opline = get_next_op(CG(active_op_array) TSRMLS_CC); CG(active_op_array)->num_args++; opline->opcode = op; opline->result = *var; @@ -3801,7 +3813,11 @@ /* Change "write context" into "read context" */ fetch->extended_value = 0; /* reset ZEND_FE_RESET_VARIABLE */ while (fetch != end) { - (--fetch)->opcode -= 3; /* FETCH_W -> FETCH_R */ + --fetch; + if (fetch->opcode == ZEND_FETCH_DIM_W && fetch->op2.op_type == IS_UNUSED) { + zend_error(E_COMPILE_ERROR, "Cannot use [] for reading"); + } + fetch->opcode -= 3; /* FETCH_W -> FETCH_R */ } /* prevent double SWITCH_FREE */ zend_stack_top(&CG(foreach_copy_stack), (void **) &foreach_copy); Index: Zend/tests/double_to_string.phpt =================================================================== RCS file: /repository/ZendEngine2/tests/double_to_string.phpt,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- Zend/tests/double_to_string.phpt 26 Apr 2007 23:29:34 -0000 1.1.2.4 +++ Zend/tests/double_to_string.phpt 4 May 2007 08:27:33 -0000 1.1.2.5 @@ -36,7 +36,7 @@ string(7) "2.9E+17" string(7) "2.9E+14" string(14) "29000000000000" -string(14) "29000000000000" +string(%d) "2%s" string(14) "29000000000001" string(13) "29000.7123123" string(15) "239234242.71231" ++++++ suhosin-0.9.19.tgz -> suhosin-0.9.20.tgz ++++++ ++++ 26781 lines of diff (skipped) ++++++ suhosin-patch-5.2.2-0.9.6.2.patch.gz ++++++ +++ empty output from diff against suhosin-patch-5.2.2-0.9.6.2.patch.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patterns-openSUSE
by root＠Hilbert.suse.de 28 May '07

28 May '07

Hello community, here is the log from the commit of package patterns-openSUSE checked in at Mon May 28 15:03:41 CEST 2007. -------- --- patterns-openSUSE/patterns-openSUSE.changes 2007-05-14 13:18:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/patterns-openSUSE/patterns-openSUSE.changes 2007-05-28 13:35:20.000000000 +0200 @@ -1,0 +2,10 @@ +Mon May 28 13:34:42 CEST 2007 - aj(a)suse.de + +- Add yast2-mcs-manager to XFCE pattern. + +------------------------------------------------------------------- +Tue May 15 20:04:58 CEST 2007 - aj(a)suse.de + +- Remove evms packages from default installs. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.E22163/_old 2007-05-28 15:03:25.000000000 +0200 +++ /var/tmp/diff_new_pack.E22163/_new 2007-05-28 15:03:25.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: Patterns for Installation (full ftp tree) Version: 10.3 -Release: 45 +Release: 51 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-openSUSE-data.tar.bz2 Source1: preprocess @@ -176,6 +176,10 @@ /CD1/suse/setup/descr/non_oss*.pat %changelog +* Mon May 28 2007 - aj(a)suse.de +- Add yast2-mcs-manager to XFCE pattern. +* Tue May 15 2007 - aj(a)suse.de +- Remove evms packages from default installs. * Mon May 14 2007 - lrupp(a)suse.de - move deleted package yast2-mail-aliases to Prc * Fri May 11 2007 - aj(a)suse.de ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/ENHANCED-BASIS new/patterns-openSUSE-data/data/ENHANCED-BASIS --- old/patterns-openSUSE-data/data/ENHANCED-BASIS 2007-05-02 13:33:24.000000000 +0200 +++ new/patterns-openSUSE-data/data/ENHANCED-BASIS 2007-05-28 13:35:20.000000000 +0200 @@ -19,7 +19,6 @@ ethtool e2fsprogs eject -evms file fillup findutils diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/XFCE new/patterns-openSUSE-data/data/XFCE --- old/patterns-openSUSE-data/data/XFCE 2007-03-30 10:35:46.000000000 +0200 +++ new/patterns-openSUSE-data/data/XFCE 2007-05-28 13:35:20.000000000 +0200 @@ -21,6 +21,7 @@ xfce4-mixer xfce4-panel-plugins xfprint +yast2-mcs-manager -Prc: +Psg: xfce4-dev-tools diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/YAST_BASIS new/patterns-openSUSE-data/data/YAST_BASIS --- old/patterns-openSUSE-data/data/YAST_BASIS 2007-05-14 13:17:17.000000000 +0200 +++ new/patterns-openSUSE-data/data/YAST_BASIS 2007-05-28 13:35:20.000000000 +0200 @@ -44,7 +44,6 @@ yast2-security yast2-slp yast2-storage -yast2-storage-evms yast2-storage-lib yast2-sudo yast2-support @@ -64,7 +63,6 @@ autoyast2-installation inst-source-utils yast2-metapackage-handler -yast2-mail-aliases yast2-samba-server -Prc: +Psg: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openSUSE-release
by root＠Hilbert.suse.de 28 May '07

28 May '07

Hello community, here is the log from the commit of package openSUSE-release checked in at Mon May 28 15:03:18 CEST 2007. -------- --- openSUSE-release/openSUSE-release.changes 2007-05-03 08:40:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/openSUSE-release/openSUSE-release.changes 2007-05-28 11:27:01.936810000 +0200 @@ -1,0 +2,5 @@ +Mon May 28 11:26:58 CEST 2007 - aj(a)suse.de + +- Alpha4plus. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.P21604/_old 2007-05-28 15:03:13.000000000 +0200 +++ /var/tmp/diff_new_pack.P21604/_new 2007-05-28 15:03:13.000000000 +0200 @@ -14,7 +14,7 @@ License: GNU General Public License (GPL) Group: System/Fhs Version: 10.3 -Release: 20 +Release: 26 Provides: aaa_version distribution-release Provides: suse-release-oss = %{version}-%{release} Provides: suse-release = %{version}-%{release} @@ -27,7 +27,7 @@ Autoreqprov: on Summary: SuSE release version files BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define betaversion "Alpha4" +%define betaversion "Alpha4plus" %description This package contains the files: /etc/SuSE-release, /etc/issue, and @@ -57,6 +57,8 @@ %config(noreplace) /etc/issue.net %changelog +* Mon May 28 2007 - aj(a)suse.de +- Alpha4plus. * Thu May 03 2007 - aj(a)suse.de - Alpha4. * Thu Apr 12 2007 - aj(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit octave
by root＠Hilbert.suse.de 28 May '07

28 May '07

Hello community, here is the log from the commit of package octave checked in at Mon May 28 15:03:06 CEST 2007. -------- --- octave/octave.changes 2007-04-21 15:22:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/octave/octave.changes 2007-05-28 10:08:17.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 25 12:56:18 CEST 2007 - pgajdos(a)suse.cz + +- made subpackage octave-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.X19812/_old 2007-05-28 15:02:54.000000000 +0200 +++ /var/tmp/diff_new_pack.X19812/_new 2007-05-28 15:02:54.000000000 +0200 @@ -20,7 +20,7 @@ PreReq: %install_info_prereq Autoreqprov: on Version: 2.1.73 -Release: 45 +Release: 63 Summary: A High Level Programming Language Source: %{name}-%{version}.tar.bz2 Patch: octave-%{version}.diff @@ -40,6 +40,21 @@ -------- John W. Eaton <jwe(a)bevo.che.wisc.edu> +%package devel +Summary: Development files for octave +Group: Productivity/Scientific/Math +Requires: %{name} = %{version} + +%description devel +This package contains all necessary include files and libraries needed +to develop applications that require these. + + + +Authors: +-------- + John W. Eaton <jwe(a)bevo.che.wisc.edu> + %prep %setup -q %patch @@ -78,7 +93,7 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/ install -d $RPM_BUILD_ROOT/%_infodir install -d $RPM_BUILD_ROOT/%_mandir make exec_prefix=$RPM_BUILD_ROOT/usr \ @@ -115,15 +130,28 @@ %defattr(-,root,root) %doc COPYING NEWS README THANKS PROJECTS doc/ChangeLog %doc doc/faq/Octave-FAQ.{dvi,ps} doc/interpreter/octave.{dvi,ps} -%doc doc/liboctave/liboctave.{dvi,ps} doc/refcard/refcard-a4.{dvi,ps} -/usr/bin/* +%doc doc/refcard/refcard-a4.{dvi,ps} +/usr/bin/mkoctfile* +/usr/bin/octave-bug* +/usr/bin/octave +/usr/bin/octave-2.1.73 %doc %{_infodir}/*.gz -%doc %{_mandir}/man1/*.gz -/usr/include/* +%doc %{_mandir}/man1/octave.1.gz +%doc %{_mandir}/man1/octave-bug.1.gz %_libdir/octave* /usr/share/octave/ +%files devel +%defattr(-,root,root) +/usr/include/* +/usr/bin/*-config* +%doc %{_mandir}/man1/octave-config.1.gz +%doc %{_mandir}/man1/mkoctfile.1.gz +%doc doc/liboctave/liboctave.{dvi,ps} + %changelog +* Fri May 25 2007 - pgajdos(a)suse.cz +- made subpackage octave-devel * Sat Apr 21 2007 - aj(a)suse.de - Use texlive. * Thu Jun 22 2006 - ro(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-gettext
by root＠Hilbert.suse.de 27 May '07

27 May '07

Hello community, here is the log from the commit of package perl-gettext checked in at Sun May 27 18:38:31 CEST 2007. -------- --- perl-gettext/perl-gettext.changes 2006-01-25 21:30:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-gettext/perl-gettext.changes 2007-05-27 18:18:01.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 27 18:17:53 CEST 2007 - rguenther(a)suse.de + +- add perl BuildRequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-gettext.spec ++++++ --- /var/tmp/diff_new_pack.D15330/_old 2007-05-27 18:38:16.000000000 +0200 +++ /var/tmp/diff_new_pack.D15330/_new 2007-05-27 18:38:16.000000000 +0200 @@ -1,25 +1,26 @@ # # spec file for package perl-gettext (Version 1.05) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: perl-gettext -License: Artistic License, Unknown +License: Artistic License, No license agreement found in package Group: Development/Libraries/Perl +BuildRequires: perl Obsoletes: perl_gtx Provides: perl_gtx Requires: perl = %{perl_version} Autoreqprov: on Summary: gettext for perl Version: 1.05 -Release: 1 +Release: 49 Source: gettext-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -54,7 +55,9 @@ /var/adm/perl-modules/%{name} %doc README -%changelog -n perl-gettext +%changelog +* Sun May 27 2007 - rguenther(a)suse.de +- add perl BuildRequires * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Jul 11 2005 - schubi(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit notification-daemon-xfce
by root＠Hilbert.suse.de 27 May '07

27 May '07

Hello community, here is the log from the commit of package notification-daemon-xfce checked in at Sun May 27 18:37:54 CEST 2007. -------- --- notification-daemon-xfce/notification-daemon-xfce.changes 2007-03-22 11:00:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/notification-daemon-xfce/notification-daemon-xfce.changes 2007-05-26 13:03:31.000000000 +0200 @@ -1,0 +2,19 @@ +Sat May 26 12:42:49 CEST 2007 - bwalle(a)suse.de + +- updated to 0.3.7 + o Fixed a compatibility issue with dbus-glib 0.72. Patch by Pawel + Worach. (Bug #95) + o The background of the window in the standard theme is now just + slightly transparent when compiled against GTK+ 2.10 and when + using a composite manager. Patch by Matt Walton. (Ticket #110) + o Fix several rendering glitches with the borders in the standard + theme. + o Fix a memory leak when removing a notification. Patch by Sven + Wegener. (Bug #105). + o Added initial accessibility support with the standard theme + engine. + o Clicking anywhere in a notification should now close the + notification. This was happening only on the body text + sometimes. + +------------------------------------------------------------------- Old: ---- notification-daemon-xfce-0.3.6-dbus-prefix.patch notification-daemon-xfce-0.3.6.tar.bz2 New: ---- notification-daemon-xfce-0.3.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notification-daemon-xfce.spec ++++++ --- /var/tmp/diff_new_pack.t13590/_old 2007-05-27 18:37:43.000000000 +0200 +++ /var/tmp/diff_new_pack.t13590/_new 2007-05-27 18:37:43.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package notification-daemon-xfce (Version 0.3.6) +# spec file for package notification-daemon-xfce (Version 0.3.7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,8 +11,8 @@ # norootforbuild Name: notification-daemon-xfce -Version: 0.3.6 -Release: 8 +Version: 0.3.7 +Release: 1 License: GNU General Public License (GPL) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/GUI/Other @@ -25,7 +25,6 @@ BuildRequires: libsexy-devel perl-XML-Parser Provides: notification-daemon Source0: %{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-dbus-prefix.patch URL: http://goodies.xfce.org/projects/applications/notification-daemon-xfce Summary: Port of GNOME's notification-daemon for the Xfce desktop @@ -51,7 +50,6 @@ %prep %setup -q -%patch0 %build %configure --disable-static @@ -86,6 +84,22 @@ %{_libexecdir}/notification-daemon-xfce-1.0/engines/* %changelog +* Sat May 26 2007 - bwalle(a)suse.de +- updated to 0.3.7 + o Fixed a compatibility issue with dbus-glib 0.72. Patch by Pawel + Worach. (Bug #95) + o The background of the window in the standard theme is now just + slightly transparent when compiled against GTK+ 2.10 and when + using a composite manager. Patch by Matt Walton. (Ticket #110) + o Fix several rendering glitches with the borders in the standard + theme. + o Fix a memory leak when removing a notification. Patch by Sven + Wegener. (Bug #105). + o Added initial accessibility support with the standard theme + engine. + o Clicking anywhere in a notification should now close the + notification. This was happening only on the body text + sometimes. * Thu Mar 22 2007 - prusnak(a)suse.cz - fixed building with new dbus (dbus-prefix.patch) * Thu Mar 08 2007 - prusnak(a)suse.cz ++++++ notification-daemon-xfce-0.3.6.tar.bz2 -> notification-daemon-xfce-0.3.7.tar.bz2 ++++++ ++++ 11375 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnu-efi
by root＠Hilbert.suse.de 27 May '07

27 May '07

Hello community, here is the log from the commit of package gnu-efi checked in at Sun May 27 18:37:49 CEST 2007. -------- --- arch/i386/gnu-efi/gnu-efi.changes 2007-05-26 23:54:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnu-efi/gnu-efi.changes 2007-05-27 18:37:22.847651000 +0200 @@ -1,0 +2,6 @@ +Sun May 27 00:49:15 CEST 2007 - schwab(a)suse.de + +- Remove completely pointless devel package. +- added rpmlintrc instead + +------------------------------------------------------------------- New: ---- rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnu-efi.spec ++++++ --- /var/tmp/diff_new_pack.J13203/_old 2007-05-27 18:37:42.000000000 +0200 +++ /var/tmp/diff_new_pack.J13203/_new 2007-05-27 18:37:42.000000000 +0200 @@ -14,11 +14,12 @@ BuildRequires: kernel-source Summary: Library for EFI Applications Version: 3.0c -Release: 53 +Release: 54 Group: Development/Libraries/Other Autoreqprov: on License: BSD License and BSD-like, GNU General Public License (GPL) Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-%{version}.tar.gz +Source1: rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -32,24 +33,6 @@ David Mosberger <davidm(a)hpl.hp.com> Stephane Eranian <eranian(a)hpl.hp.com> -%package devel -Summary: Library for EFI Applications -Group: Development/Libraries/Other -Provides: gnu-efi:/usr/include/efi/efi.h -Requires: gnu-efi = %{version} -Autoreqprov: on - -%description devel -Library for EFI applications. - - - -Authors: --------- - Johannes Erdfelt <jerdfelt(a)valinux.com> - David Mosberger <davidm(a)hpl.hp.com> - Stephane Eranian <eranian(a)hpl.hp.com> - %prep %setup -q @@ -72,19 +55,19 @@ %files %defattr(-, root, root) %doc README.* +%{_prefix}/include/efi %{_prefix}/%{_lib}/crt0-efi-*.o %{_prefix}/%{_lib}/elf_*_efi.lds +%{_prefix}/%{_lib}/libefi.a +%{_prefix}/%{_lib}/libgnuefi.a %if 0 %{_prefix}/%{_lib}/%{name} %endif -%files devel -%defattr(-, root, root) -%{_prefix}/include/efi -%{_prefix}/%{_lib}/libefi.a -%{_prefix}/%{_lib}/libgnuefi.a - %changelog +* Sun May 27 2007 - schwab(a)suse.de +- Remove completely pointless devel package. +- added rpmlintrc instead * Sat May 26 2007 - ro(a)suse.de - split off devel package * Fri Feb 23 2007 - schwab(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libiniparser
by root＠Hilbert.suse.de 27 May '07

27 May '07

Hello community, here is the log from the commit of package libiniparser checked in at Sun May 27 18:37:36 CEST 2007. -------- --- libiniparser/libiniparser.changes 2007-05-20 23:07:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/libiniparser/libiniparser.changes 2007-05-27 16:03:51.000000000 +0200 @@ -1,0 +2,8 @@ +Sun May 27 13:58:43 CEST 2007 - lmuelle(a)suse.de + +- Update to version 2.17. + + Apply some const and fix c++ warnings. + + Merge revision 19928 from samba.org subversion. + + Applied patches to the Makefile to build a shared library. + +------------------------------------------------------------------- Old: ---- iniparser-2.15.diff iniparser-2.15.tar.bz2 shared-library.diff New: ---- iniparser-2.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libiniparser.spec ++++++ --- /var/tmp/diff_new_pack.n11449/_old 2007-05-27 18:37:09.000000000 +0200 +++ /var/tmp/diff_new_pack.n11449/_new 2007-05-27 18:37:09.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libiniparser (Version 2.15) +# spec file for package libiniparser (Version 2.17) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,16 +11,14 @@ # norootforbuild Name: libiniparser -Version: 2.15 -Release: 33 +Version: 2.17 +Release: 1 License: X11/MIT Group: System/Libraries URL: http://ndevilla.free.fr/iniparser/ Autoreqprov: on Summary: Library to parse ini files Source: http://ndevilla.free.fr/iniparser/iniparser-%{version}.tar.bz2 -Patch: shared-library.diff -Patch1: iniparser-%{version}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -56,8 +54,6 @@ %prep %setup -n iniparser-%{version} -%patch -p1 -%patch1 %build %{__make} default check @@ -87,6 +83,11 @@ %doc html %changelog +* Sun May 27 2007 - lmuelle(a)suse.de +- Update to version 2.17. + + Apply some const and fix c++ warnings. + + Merge revision 19928 from samba.org subversion. + + Applied patches to the Makefile to build a shared library. * Sun May 20 2007 - lmuelle(a)suse.de - Remove requires on release from devel packages. * Wed Sep 27 2006 - gd(a)suse.de ++++++ iniparser-2.15.tar.bz2 -> iniparser-2.17.tar.bz2 ++++++ ++++ 1655 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0