May 2007 - openSUSE Commits - openSUSE Mailing Lists

commit thunar
by root＠Hilbert.suse.de 22 May '07

22 May '07

Hello community, here is the log from the commit of package thunar checked in at Tue May 22 15:12:39 CEST 2007. -------- --- thunar/thunar.changes 2007-01-26 01:06:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/thunar/thunar.changes 2007-05-22 11:31:06.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 22 11:30:54 CEST 2007 - prusnak(a)suse.cz + +- sync with BuildService +- fixed desktop file + +------------------------------------------------------------------- Old: ---- thunar-desktop_file.patch New: ---- thunar-desktop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thunar.spec ++++++ --- /var/tmp/diff_new_pack.G29093/_old 2007-05-22 15:12:24.000000000 +0200 +++ /var/tmp/diff_new_pack.G29093/_new 2007-05-22 15:12:24.000000000 +0200 @@ -20,11 +20,11 @@ BuildRequires: xfce4-panel-devel >= 4.3 Summary: Various tools for xfce4 Version: 0.8.0 -Release: 1 +Release: 28 License: GNU General Public License (GPL) URL: http://www.xfce.org/ Source: Thunar-%{version}.tar.bz2 -Patch0: thunar-desktop_file.patch +Patch0: thunar-desktop.patch Group: System/GUI/Other %if %suse_version > 1000 Recommends: ivman @@ -84,19 +84,12 @@ %patch0 %build -export CFLAGS="$RPM_OPT_FLAGS" -./configure --prefix=%{_prefix} \ - --datadir=%{_datadir} \ - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --sysconfdir=%{_sysconfdir} \ - --libexecdir=%{_libexecdir} \ +%configure \ --enable-dbus \ --with-volume-manager=hal \ --enable-startup-notification \ --enable-pcre -make +make %{?jobs:-j%jobs} %install make DESTDIR=$RPM_BUILD_ROOT install @@ -154,7 +147,10 @@ %dir %{_includedir}/thunarx-1 %dir %{_includedir}/thunarx-1/thunarx -%changelog -n thunar +%changelog +* Tue May 22 2007 - prusnak(a)suse.cz +- sync with BuildService +- fixed desktop file * Sun Jan 21 2007 - bwalle(a)suse.de - removed halmount patch, is no longer required - upgraded to 0.8.0 ++++++ thunar-desktop_file.patch -> thunar-desktop.patch ++++++ --- thunar/thunar-desktop_file.patch 2006-07-21 09:28:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/thunar/thunar-desktop.patch 2007-05-22 11:30:45.000000000 +0200 @@ -1,6 +1,6 @@ --- Thunar-bulk-rename.desktop.in.in +++ Thunar-bulk-rename.desktop.in.in -@@ -1,13 +1,13 @@ +@@ -1,13 +1,12 @@ [Desktop Entry] Encoding=UTF-8 -_Name=Bulk Rename @@ -16,11 +16,10 @@ Type=Application Categories=Application;System;Utility;Core;GTK;Filesystem; - -+X-SuSE-translate=false # vi:set encoding=UTF-8: --- Thunar.desktop.in.in +++ Thunar.desktop.in.in -@@ -1,13 +1,13 @@ +@@ -1,13 +1,12 @@ [Desktop Entry] Encoding=UTF-8 -_Name=Thunar File Manager @@ -36,5 +35,4 @@ Type=Application Categories=Application;System;Utility;Core;GTK;FileManager; - -+X-SuSE-translate=false # vi:set encoding=UTF-8: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 Terminal
by root＠Hilbert.suse.de 22 May '07

22 May '07

Hello community, here is the log from the commit of package Terminal checked in at Tue May 22 15:12:32 CEST 2007. -------- --- Terminal/Terminal.changes 2007-01-23 01:00:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/Terminal/Terminal.changes 2007-05-22 11:17:48.000000000 +0200 @@ -0,0 +1,5 @@ +Tue May 22 11:15:15 CEST 2007 - prusnak(a)suse.cz + +- sync with BuildService +- fixed desktop file + Old: ---- Terminal-desktop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Terminal.spec ++++++ --- /var/tmp/diff_new_pack.r28285/_old 2007-05-22 15:12:16.000000000 +0200 +++ /var/tmp/diff_new_pack.r28285/_new 2007-05-22 15:12:16.000000000 +0200 @@ -14,13 +14,11 @@ BuildRequires: dbus-1-devel exo-devel gtk2-devel libpng-devel startup-notification update-desktop-files vte vte-devel Summary: This is the Terminal emulator application Version: 0.2.6 -Release: 1 -License: BSD License and BSD-like +Release: 28 +License: GNU General Public License (GPL) URL: http://www.xfce.org/ -Source: %name-%{version}.tar.bz2 -Patch0: %name-desktop.patch -# this is from http://xfce-diary.blogspot.com/2006/03/transparent-terminal-hack.html -Patch4: %name-fix-firefox.diff +Source: %{name}-%{version}.tar.bz2 +Patch0: %{name}-fix-firefox.diff Group: System/Console BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -43,21 +41,13 @@ %prep %setup -q -%patch0 -p1 %if %suse_version > 1010 -%patch4 -p1 +%patch0 -p1 %endif %build -export CFLAGS="$RPM_OPT_FLAGS" -./configure --prefix=%{_prefix} \ - --datadir=%{_datadir} \ - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --sysconfdir=%{_sysconfdir} \ - --libexecdir=%{_libexecdir} -make +%configure +make %{?jobs:-j%jobs} %install make DESTDIR=$RPM_BUILD_ROOT install @@ -90,7 +80,10 @@ %{_datadir}/pixmaps/terminal.xpm %{_mandir}/*/* -%changelog -n Terminal +%changelog +* Tue May 22 2007 - prusnak(a)suse.cz +- sync with BuildService +- fixed desktop file * Sun Jan 21 2007 - bwalle(a)suse.de - updated to 0.2.6 - removed transparency and tab reordering patch because it's ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tar
by root＠Hilbert.suse.de 22 May '07

22 May '07

Hello community, here is the log from the commit of package tar checked in at Tue May 22 15:12:10 CEST 2007. -------- --- tar/tar.changes 2007-05-15 19:20:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/tar/tar.changes 2007-05-22 13:55:40.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 22 13:37:49 CEST 2007 - mkoenig(a)suse.de + +- fix build + +------------------------------------------------------------------- New: ---- tar-1.6.1-futimens.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tar.spec ++++++ --- /var/tmp/diff_new_pack.b27299/_old 2007-05-22 15:12:03.000000000 +0200 +++ /var/tmp/diff_new_pack.b27299/_new 2007-05-22 15:12:03.000000000 +0200 @@ -19,12 +19,13 @@ PreReq: %install_info_prereq Autoreqprov: on Version: 1.16.1 -Release: 14 +Release: 16 Summary: GNU implementation of tar ((t)ape (ar)chiver) Source0: %name-%version.tar.bz2 Patch0: tar-disable_languages.patch Patch1: tar-disable-listed02-test.diff Patch2: tar-manpage.patch +Patch3: tar-1.6.1-futimens.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _bindir /bin @@ -63,6 +64,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build rm -f po/no.* po/ky.* @@ -104,6 +106,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 22 2007 - mkoenig(a)suse.de +- fix build * Tue May 15 2007 - coolo(a)suse.de - use %%find_lang * Wed Jan 24 2007 - mkoenig(a)suse.de ++++++ tar-1.6.1-futimens.patch ++++++ Index: tar-1.16.1/lib/utimens.c =================================================================== --- tar-1.16.1.orig/lib/utimens.c +++ tar-1.16.1/lib/utimens.c @@ -73,7 +73,7 @@ struct utimbuf Return 0 on success, -1 (setting errno) on failure. */ int -futimens (int fd ATTRIBUTE_UNUSED, +my_futimens (int fd ATTRIBUTE_UNUSED, char const *file, struct timespec const timespec[2]) { /* There's currently no interface to set file timestamps with @@ -166,5 +166,5 @@ futimens (int fd ATTRIBUTE_UNUSED, int utimens (char const *file, struct timespec const timespec[2]) { - return futimens (-1, file, timespec); + return my_futimens (-1, file, timespec); } Index: tar-1.16.1/lib/utimens.h =================================================================== --- tar-1.16.1.orig/lib/utimens.h +++ tar-1.16.1/lib/utimens.h @@ -1,3 +1,3 @@ #include "timespec.h" -int futimens (int, char const *, struct timespec const [2]); +int my_futimens (int, char const *, struct timespec const [2]); int utimens (char const *, struct timespec const [2]); Index: tar-1.16.1/src/misc.c =================================================================== --- tar-1.16.1.orig/src/misc.c +++ tar-1.16.1/src/misc.c @@ -518,7 +518,7 @@ set_file_atime (int fd, char const *file } #endif - return futimens (fd, file, timespec); + return my_futimens (fd, file, timespec); } /* A description of a working directory. */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 22 May '07

22 May '07

Hello community, here is the log from the commit of package powertop checked in at Tue May 22 15:11:56 CEST 2007. -------- --- powertop/powertop.changes 2007-05-15 10:29:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/powertop/powertop.changes 2007-05-22 13:56:05.667313000 +0200 @@ -1,0 +2,15 @@ +Tue May 22 13:41:56 CEST 2007 - thoenig(a)suse.de + +- Update to PowerTOP 1.3 +- Remove patch powertop-fix-compiler-warnings-thoenig-02.patch: + merged upstream +- Changes: + * Add suggestion for CONFIG_SND_AC97_POWER_SAVE + * Fix inefficient code for readdir (Vince Pinter) + * Highlight the worst offenders in bold (Vince Pinter) + * Fix crash when running on 2.4 kernels (Harald Fernengel) + * Check fgets() return values (Timom Hoenig @ SuSE) + * add suggestion to enable laptop mode (when disabled) + * add suggestion to disable bluetooth when unused + +------------------------------------------------------------------- Old: ---- powertop-1.2.tar.gz powertop-fix-compiler-warnings-thoenig-02.patch New: ---- powertop-1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powertop.spec ++++++ --- /var/tmp/diff_new_pack.m26156/_old 2007-05-22 15:11:22.000000000 +0200 +++ /var/tmp/diff_new_pack.m26156/_new 2007-05-22 15:11:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package powertop (Version 1.2) +# spec file for package powertop (Version 1.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,12 +13,11 @@ 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.2 +Version: 1.3 Release: 1 License: GNU General Public License (GPL) Group: System/Monitoring Source0: %{name}-%{version}.tar.gz -Patch0: %{name}-fix-compiler-warnings-thoenig-02.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Autoreqprov: on @@ -35,7 +34,6 @@ %prep %setup -%patch0 -p0 %build CFLAGS="$RPM_OPT_FLAGS" make @@ -53,6 +51,18 @@ %{_bindir}/%{name} %changelog +* Tue May 22 2007 - thoenig(a)suse.de +- Update to PowerTOP 1.3 +- Remove patch powertop-fix-compiler-warnings-thoenig-02.patch: + merged upstream +- Changes: + * Add suggestion for CONFIG_SND_AC97_POWER_SAVE + * Fix inefficient code for readdir (Vince Pinter) + * Highlight the worst offenders in bold (Vince Pinter) + * Fix crash when running on 2.4 kernels (Harald Fernengel) + * Check fgets() return values (Timom Hoenig @ SuSE) + * add suggestion to enable laptop mode (when disabled) + * add suggestion to disable bluetooth when unused * Tue May 15 2007 - thoenig(a)suse.de - Update to PowerTOP 1.2 (skipped 1.1) - Fix battery code to work with both, mA and mW ++++++ powertop-1.2.tar.gz -> powertop-1.3.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.2/bluetooth.c new/powertop-1.3/bluetooth.c --- old/powertop-1.2/bluetooth.c 1970-01-01 01:00:00.000000000 +0100 +++ new/powertop-1.3/bluetooth.c 2007-05-22 00:23:46.000000000 +0200 @@ -0,0 +1,128 @@ +/* + * Copyright 2007, Intel Corporation + * + * This file is part of PowerTOP + * + * This program file 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; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program in a file named COPYING; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * Authors: + * Arjan van de Ven <arjan(a)linux.intel.com> + */ + +#include <unistd.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <stdint.h> +#include <sys/types.h> +#include <dirent.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <sys/ioctl.h> +#include <errno.h> + +#include "powertop.h" + + +/* structure definitions copied from include/net/bluetooth/hci.h from the 2.6.20 kernel */ +#define HCIGETDEVINFO _IOR('H', 211, int) +#define BTPROTO_HCI 1 + +#define __u16 uint16_t +#define __u8 uint8_t +#define __u32 uint32_t + +typedef struct { + __u8 b[6]; +} __attribute__((packed)) bdaddr_t; + +struct hci_dev_stats { + __u32 err_rx; + __u32 err_tx; + __u32 cmd_tx; + __u32 evt_rx; + __u32 acl_tx; + __u32 acl_rx; + __u32 sco_tx; + __u32 sco_rx; + __u32 byte_rx; + __u32 byte_tx; +}; + + +struct hci_dev_info { + __u16 dev_id; + char name[8]; + + bdaddr_t bdaddr; + + __u32 flags; + __u8 type; + + __u8 features[8]; + + __u32 pkt_type; + __u32 link_policy; + __u32 link_mode; + + __u16 acl_mtu; + __u16 acl_pkts; + __u16 sco_mtu; + __u16 sco_pkts; + + struct hci_dev_stats stat; +}; + +static int previous_bytes = -1; + +void suggest_bluetooth_off(void) +{ + struct hci_dev_info devinfo; + int fd; + int ret; + int thisbytes = 0; + + if (suggestioncount > 0) + return; + + fd = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI); + if (fd < 0) + return; + + memset(&devinfo, 0, sizeof(devinfo)); + strcpy(devinfo.name, "hci0"); + ret = ioctl(fd, HCIGETDEVINFO, (void *) &devinfo); + if (ret < 0) + goto out; + + if ( (devinfo.flags & 1) == 0) /* interface down already */ + goto out; + + thisbytes += devinfo.stat.byte_rx; + thisbytes += devinfo.stat.byte_tx; + + if (thisbytes == previous_bytes) { + printf( "Suggestion: Disable the unused bluetooth interface with the following command:\n" + " hciconfig hci0 down \n" + "Bluetooth is a radio and consumes quite some power, and keeps USB busy as well.\n"); + suggestioncount++; + } + previous_bytes = thisbytes; + +out: + close(fd); + return; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.2/Changelog new/powertop-1.3/Changelog --- old/powertop-1.2/Changelog 2007-05-15 01:41:39.000000000 +0200 +++ new/powertop-1.3/Changelog 2007-05-22 00:24:05.000000000 +0200 @@ -1,3 +1,12 @@ +1.3 -- + * Add suggestion for CONFIG_SND_AC97_POWER_SAVE + * Fix inefficient code for readdir (Vince Pinter) + * Highlight the worst offenders in bold (Vince Pinter) + * Fix crash when running on 2.4 kernels (Harald Fernengel) + * Check fgets() return values (Timom Hoenig @ SuSE) + * add suggestion to enable laptop mode (when disabled) + * add suggestion to disable bluetooth when unused + 1.2 -- May 14th, 2007 * Manpage contributed by Carlo Segre from the Debian project * Fix "shows power usage even on AC" bug, spotted by Steinar diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.2/config.c new/powertop-1.3/config.c --- old/powertop-1.2/config.c 2007-05-13 19:22:30.000000000 +0200 +++ new/powertop-1.3/config.c 2007-05-18 20:32:09.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, Intel Corporation + * Copyright 2007, Intel Corporation * * This file is part of PowerTOP * @@ -47,7 +47,8 @@ file = popen("zcat /proc/config.gz", "r"); while (file && !feof(file)) { char line[100]; - fgets(line, 100, file); + if (fgets(line, 100, file) == NULL) + break; strcpy(configlines[configcount++], line); } pclose(file); @@ -56,7 +57,10 @@ file = fopen("/proc/sys/kernel/osrelease", "r"); if (!file) return; - fgets(version, 100, file); + if (fgets(version, 100, file) == NULL) { + fclose(file); + return; + } fclose(file); c = strchr(version, '\n'); if (c) @@ -71,7 +75,8 @@ return; while (!feof(file)) { char line[100]; - fgets(line, 100, file); + if (fgets(line, 100, file) == NULL) + break; strcpy(configlines[configcount++], line); } fclose(file); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.2/Makefile new/powertop-1.3/Makefile --- old/powertop-1.2/Makefile 2007-05-14 18:36:35.000000000 +0200 +++ new/powertop-1.3/Makefile 2007-05-22 00:06:36.000000000 +0200 @@ -3,8 +3,8 @@ CFLAGS?=-O2 -g ${WARNFLAGS} CC?=gcc -powertop: powertop.c config.c process.c Makefile powertop.h - $(CC) ${CFLAGS} powertop.c config.c process.c -o powertop +powertop: powertop.c config.c process.c misctips.c bluetooth.c Makefile powertop.h + $(CC) ${CFLAGS} powertop.c config.c process.c misctips.c bluetooth.c -o powertop install: powertop mkdir -p ${DESTDIR}${BINDIR} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.2/misctips.c new/powertop-1.3/misctips.c --- old/powertop-1.2/misctips.c 1970-01-01 01:00:00.000000000 +0100 +++ new/powertop-1.3/misctips.c 2007-05-21 22:36:39.000000000 +0200 @@ -0,0 +1,58 @@ +/* + * Copyright 2007, Intel Corporation + * + * This file is part of PowerTOP + * + * This program file 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; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program in a file named COPYING; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * Authors: + * Arjan van de Ven <arjan(a)linux.intel.com> + */ + +#include <unistd.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <stdint.h> +#include <sys/types.h> +#include <dirent.h> + +#include "powertop.h" + +void suggest_laptop_mode(void) +{ + FILE *file; + int i; + char buffer[1024]; + if (suggestioncount > 0) + return; + file = fopen("/proc/sys/vm/laptop_mode", "r"); + if (!file) + return; + memset(buffer, 0, 1024); + if (!fgets(buffer, 1023, file)) { + fclose(file); + return; + } + i = strtoul(buffer, NULL, 10); + if (i<1) { + printf( "Suggestion: Enable laptop-mode by executing the following command:\n" + " echo 5 > /proc/sys/vm/laptop_mode \n" + "and/or putting this command into /etc/rc.local\n"); + suggestioncount++; + } + fclose(file); +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.2/powertop.c new/powertop-1.3/powertop.c --- old/powertop-1.2/powertop.c 2007-05-15 01:41:30.000000000 +0200 +++ new/powertop-1.3/powertop.c 2007-05-22 00:38:51.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, Intel Corporation + * Copyright 2007, Intel Corporation * * This file is part of PowerTOP * @@ -135,7 +135,8 @@ int nr = -1; uint64_t count = 0; memset(line, 0, sizeof(line)); - fgets(line, 1024, file); + if (fgets(line, 1024, file) == NULL) + break; c = strchr(line, ':'); if (!c) continue; @@ -153,9 +154,13 @@ c = newc; } c = strchr(c, ' '); + if (!c) + continue; while (c && *c == ' ') c++; c = strchr(c, ' '); + if (!c) + continue; while (c && *c == ' ') c++; name = c; @@ -199,12 +204,13 @@ while (!feof(file)) { memset(line, 0, 4096); - fgets(line, 4096, file); + if (fgets(line, 4096, file) == NULL) + break; c = strstr(line, "age["); if (!c) continue; c += 4; - usage[clevel] += strtoull(c, NULL, 10); + usage[clevel] += 1+strtoull(c, NULL, 10); c = strstr(line, "ation["); if (!c) continue; @@ -256,6 +262,10 @@ { printf("\33[41m\33[1m"); } +void bold(void) +{ + printf("\33[1m"); +} void normal(void) { printf("\33[0m"); @@ -294,11 +304,16 @@ double watts_drawn = 0.0; double amperes_left = 0.0; double watts_left = 0.0; + char line[1024]; + + if (strlen(dirent->d_name) < 3) + continue; + sprintf(filename, "/proc/acpi/battery/%s/state", dirent->d_name); file = fopen(filename, "r"); if (!file) continue; - char line[1024]; + while (fgets(line, 1024, file) != NULL) { char *c; if (strstr(line, "present:") && strstr(line, "no")) @@ -355,7 +370,7 @@ memset(cur_usage, 0, sizeof(cur_usage)); memset(cur_duration, 0, sizeof(cur_duration)); - printf("PowerTOP 1.2 (C) 2007 Intel Corporation \n\n"); + printf("PowerTOP 1.3 (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); @@ -381,7 +396,7 @@ totalevents += cur_usage[i] - last_usage[i]; } - printf("\33[H\33[J\33[47m\33[30m PowerTOP version 1.2 (C) 2007 Intel Corporation \n"); + printf("\33[H\33[J\33[47m\33[30m PowerTOP version 1.3 (C) 2007 Intel Corporation \n"); normal(); printf("\n"); if (totalevents == 0) { @@ -420,7 +435,8 @@ while (file && !feof(file)) { char *count, *pid, *process, *func; int cnt; - fgets(line, 1024, file); + if (fgets(line, 1024, file) == NULL) + break; if (strstr(line, "total events")) break; c = count = &line[0]; @@ -489,19 +505,25 @@ sort_lines(); printf("\nTop causes for wakeups:\n"); for (i = 0; i < linehead; i++) - if (lines[i].count > 0 && counter++ < 10) + if (lines[i].count > 0 && counter++ < 10) { + if ((lines[i].count * 1.0 / ticktime) >= 10.0) + bold(); + else + normal(); printf(" %5.1f%% (%4.1f) %s \n", lines[i].count * 100.0 / linectotal, lines[i].count * 1.0 / ticktime, lines[i].string); - fflush(stdout); + } } else { if (getuid() == 0) { printf("No detailed statistics available; please enable the CONFIG_TIMER_STATS kernel option\n"); printf("This option is located in the Kernel Debugging section of menuconfig\n"); printf("(which is CONFIG_DEBUG_KERNEL=y in the config file)\n"); + printf("Note: this is only available in 2.6.21 and later kernels\n"); } else printf("No detailed statistics available; PowerTOP needs root privileges for that\n"); } + normal(); if (maxsleep < 5.0) ticktime = 5; else if (maxsleep < 30.0) @@ -515,22 +537,29 @@ printf("\n"); suggestioncount = 0; + 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."); 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."); - 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."); + suggest_bluetooth_off(); 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."); 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."); - suggest_kernel_config("CONFIG_HPET", 1, + 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."); + suggest_laptop_mode(); + 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" + "and can save approximately half a Watt of power."); 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."); + fflush(stdout); sleep(3); /* quiet down the effects of any IO to xterms */ read_data(&cur_usage[0], &cur_duration[0]); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.2/powertop.h new/powertop-1.3/powertop.h --- old/powertop-1.2/powertop.h 2007-05-13 19:25:35.000000000 +0200 +++ new/powertop-1.3/powertop.h 2007-05-22 00:17:31.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, Intel Corporation + * Copyright 2007, Intel Corporation * * This file is part of PowerTOP * @@ -33,6 +33,8 @@ void suggest_process_death(char *process, struct line *lines, int linecount, char *comment); void suggest_kernel_config(char *string, int onoff, char *comment); +void suggest_laptop_mode(void); +void suggest_bluetooth_off(void); extern int suggestioncount; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powertop-1.2/process.c new/powertop-1.3/process.c --- old/powertop-1.2/process.c 2007-05-13 19:22:42.000000000 +0200 +++ new/powertop-1.3/process.c 2007-05-18 20:32:28.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, Intel Corporation + * Copyright 2007, Intel Corporation * * This file is part of PowerTOP * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mousepad
by root＠Hilbert.suse.de 22 May '07

22 May '07

Hello community, here is the log from the commit of package mousepad checked in at Tue May 22 15:11:16 CEST 2007. -------- --- mousepad/mousepad.changes 2007-01-26 00:56:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/mousepad/mousepad.changes 2007-05-22 11:26:12.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 22 11:26:05 CEST 2007 - prusnak(a)suse.cz + +- sync with BuildService + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mousepad.spec ++++++ --- /var/tmp/diff_new_pack.M21975/_old 2007-05-22 15:09:00.000000000 +0200 +++ /var/tmp/diff_new_pack.M21975/_new 2007-05-22 15:09:00.000000000 +0200 @@ -12,11 +12,11 @@ Name: mousepad BuildRequires: cairo-devel dbus-1-devel gtk2-devel pango-devel perl-XML-Parser startup-notification update-desktop-files -BuildRequires: libxfce4util-devel => 4.3 -BuildRequires: libxfcegui4-devel => 4.3 +BuildRequires: libxfce4util-devel >= 4.3 +BuildRequires: libxfcegui4-devel >= 4.3 Summary: Various tools for xfce4 Version: 0.2.12 -Release: 1 +Release: 22 License: GNU General Public License (GPL) URL: http://www.xfce.org/ Source: mousepad-%{version}.tar.bz2 @@ -41,15 +41,8 @@ %patch %build -export CFLAGS="$RPM_OPT_FLAGS" -./configure --prefix=%{_prefix} \ - --datadir=%{_datadir} \ - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --sysconfdir=%{_sysconfdir} \ - --libexecdir=%{_libexecdir} -make +%configure +make %{?jobs:-j%jobs} %install make DESTDIR=$RPM_BUILD_ROOT install @@ -65,7 +58,9 @@ %{_datadir}/locale/*/*/*.mo %{_datadir}/pixmaps/*.png -%changelog -n mousepad +%changelog +* Tue May 22 2007 - prusnak(a)suse.cz +- sync with BuildService * Thu Jan 25 2007 - bwalle(a)suse.de - updated to 4.4.0 * Sun Nov 05 2006 - bwalle(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 libusb
by root＠Hilbert.suse.de 22 May '07

22 May '07

Hello community, here is the log from the commit of package libusb checked in at Tue May 22 15:08:25 CEST 2007. -------- --- libusb/libusb.changes 2007-04-17 13:22:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/libusb/libusb.changes 2007-05-22 13:06:34.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 22 13:06:08 CEST 2007 - olh(a)suse.de + +- split libusb-devel package (#203989) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libusb.spec ++++++ --- /var/tmp/diff_new_pack.h16985/_old 2007-05-22 15:07:11.000000000 +0200 +++ /var/tmp/diff_new_pack.h16985/_new 2007-05-22 15:07:11.000000000 +0200 @@ -17,7 +17,7 @@ Group: System/Libraries Summary: USB Libraries Version: 0.1.12 -Release: 38 +Release: 46 Provides: %{name}-devel = %{version}-%{release} Source0: libusb-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,6 +33,22 @@ Thomas Sailer <sailer(a)ife.ee.ethz.ch> Brad Hards <bradh(a)frogmouth.net> - C++ bindings. +%package devel +Group: System/Libraries +Summary: USB Libraries +Requires: %{name} = %{version} + +%description devel +Libusb is a library that allows userspace access to USB devices. + + + +Authors: +-------- + Johannes Erdfelt <johannes(a)erdfelt.com> + Thomas Sailer <sailer(a)ife.ee.ethz.ch> + Brad Hards <bradh(a)frogmouth.net> - C++ bindings. + %prep %setup -q @@ -51,14 +67,20 @@ %files %defattr(-,root,root) +%{_libdir}/libusb*.so.* + +%files devel +%defattr(-,root,root) %{_bindir}/libusb-config /usr/include/*.h -%{_libdir}/libusb*.so* +%{_libdir}/libusb*.so %{_libdir}/libusb*.a %{_libdir}/libusb*.la %{_libdir}/pkgconfig/libusb.pc %changelog +* Tue May 22 2007 - olh(a)suse.de +- split libusb-devel package (#203989) * Tue Apr 17 2007 - sbrabec(a)suse.cz - Provide libusb-devel. * Sun Mar 05 2006 - olh(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 gtk-xfce-engine
by root＠Hilbert.suse.de 22 May '07

22 May '07

Hello community, here is the log from the commit of package gtk-xfce-engine checked in at Tue May 22 15:06:57 CEST 2007. -------- --- gtk-xfce-engine/gtk-xfce-engine.changes 2007-04-13 11:50:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/gtk-xfce-engine/gtk-xfce-engine.changes 2007-05-22 11:22:52.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 22 11:22:30 CEST 2007 - prusnak(a)suse.cz + +- sync with BuildService + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk-xfce-engine.spec ++++++ --- /var/tmp/diff_new_pack.j15439/_old 2007-05-22 15:06:48.000000000 +0200 +++ /var/tmp/diff_new_pack.j15439/_new 2007-05-22 15:06:48.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: dbus-1-devel gtk2-devel update-desktop-files Summary: Port of Xfce Engine to GTK+-2.0 Version: 2.4.1 -Release: 1 +Release: 14 License: GNU General Public License (GPL) URL: http://www.xfce.org/ Source0: %{name}-%{version}.tar.bz2 @@ -35,13 +35,7 @@ %setup -q %build -export CFLAGS="$RPM_OPT_FLAGS" -./configure \ - --prefix=/opt/gnome \ - --datadir=%{_datadir} \ - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} +%configure make %{?jobs:-j%jobs} %install @@ -57,6 +51,8 @@ %{_datadir}/themes/* %changelog +* Tue May 22 2007 - prusnak(a)suse.cz +- sync with BuildService * Tue Apr 10 2007 - bwalle(a)suse.de - update to 4.4.1 (no upstream changelog for this subpackage) * Sun Jan 21 2007 - bwalle(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 dhcp
by root＠Hilbert.suse.de 22 May '07

22 May '07

Hello community, here is the log from the commit of package dhcp checked in at Tue May 22 15:06:42 CEST 2007. -------- --- dhcp/dhcp.changes 2007-05-14 15:38:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcp/dhcp.changes 2007-05-22 10:17:31.000000000 +0200 @@ -1,0 +2,8 @@ +Tue May 22 09:37:59 CEST 2007 - mt(a)suse.de + +- Bug 275592: Added ldap and ndsd to the Should-Start/Stop LSB + init info tags of the dhcp-server init script. +- Bug #241113: Added copying of /etc/openldap/ldap.conf and + more base libraries into the chroot jail. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcp.spec ++++++ --- /var/tmp/diff_new_pack.Yl9484/_old 2007-05-22 15:05:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Yl9484/_new 2007-05-22 15:05:16.000000000 +0200 @@ -23,7 +23,7 @@ Group: Productivity/Networking/Boot/Servers Autoreqprov: on Version: 3.0.5 -Release: 34 +Release: 37 Summary: Common Files Used by ISC DHCP Software URL: http://www.isc.org/isc/dhcp.html Source0: http://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz @@ -519,6 +519,11 @@ %doc %{_mandir}/man3/dhcpctl.3.gz %changelog +* Tue May 22 2007 - mt(a)suse.de +- Bug 275592: Added ldap and ndsd to the Should-Start/Stop LSB + init info tags of the dhcp-server init script. +- Bug #241113: Added copying of /etc/openldap/ldap.conf and + more base libraries into the chroot jail. * Mon May 14 2007 - mt(a)suse.de - Bug #265337: Fix to generate proper "host ... {" block begin brace even if no harware address is specified for the host. ++++++ rc.dhcpd ++++++ --- dhcp/rc.dhcpd 2007-05-14 15:27:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcp/rc.dhcpd 2007-05-22 10:15:11.000000000 +0200 @@ -13,9 +13,9 @@ ### BEGIN INIT INFO # Provides: dhcpd # Required-Start: $local_fs $remote_fs $network -# Should-Start: $named $syslog $time +# Should-Start: $named $syslog $time ldap ndsd # Required-Stop: $local_fs $remote_fs $network -# Should-Stop: $named $syslog +# Should-Stop: $named $syslog ldap ndsd # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: DHCP Server @@ -57,6 +57,7 @@ DAEMON_PIDFILE=/var/run/dhcpd.pid STARTPROC_LOGFILE=/var/log/rc.dhcpd.log SUPPORTS_HUP="no" +LDAP_CONF=/etc/openldap/ldap.conf # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status @@ -159,7 +160,7 @@ if test "$DHCPD_RUN_CHROOTED" = "yes" ; then ## copy the conf file to the chroot jail (dhcpd has to be restarted anyway, ## when it has changed) and change path to leases file - for i in $DAEMON_CONF $DHCPD_CONF_INCLUDE_FILES; do + for i in $DAEMON_CONF $DHCPD_CONF_INCLUDE_FILES $LDAP_CONF; do if test -d "${i}" ; then test -d "$CHROOT_PREFIX/${i}" || \ mkdir -p "$CHROOT_PREFIX/${i}" @@ -169,13 +170,14 @@ fi done rm -f $CHROOT_PREFIX/dev/urandom - for i in $DAEMON_CONF $DHCPD_CONF_INCLUDE_FILES /etc/{resolv.conf,host.conf,hosts,localtime} /dev/urandom; do + for i in $DAEMON_CONF $DHCPD_CONF_INCLUDE_FILES $LDAP_CONF /etc/{resolv.conf,host.conf,hosts,localtime} /dev/urandom; do if ! test -e "$i"; then continue; fi # neither of them is absolutely necessary - cp -aL "$i" "$CHROOT_PREFIX/${i%/*}/" &>/dev/null \ + cp -aL "$i" "${CHROOT_PREFIX}/${i%/*}/" &>/dev/null \ || { echo "...$0:$LINENO: could not copy $i to chroot jail"; rc_failed; rc_status -v1; exit 6; } done libdir=/$(basename $(echo /var/lib/dhcp/lib*)) - for i in /$libdir/{libresolv.so.2,libnss_dns{,6}.so.2}; do + for i in /$libdir/{libresolv.so.2,libnss_dns{,6}.so.2} \ + /$libdir/{libpthread.so.0,libdl.so.2} ; do if [ -s "$i" ]; then cp -pL "$i" "/var/lib/dhcp/$libdir/" \ || { echo "...$0:$LINENO: could not copy $i to chroot jail"; rc_failed; rc_status -v1; exit 6; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 dhcpcd
by root＠Hilbert.suse.de 22 May '07

22 May '07

Hello community, here is the log from the commit of package dhcpcd checked in at Tue May 22 15:06:41 CEST 2007. -------- --- dhcpcd/dhcpcd.changes 2007-05-11 09:08:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcpcd/dhcpcd.changes 2007-05-22 14:31:11.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 22 14:30:56 CEST 2007 - schwab(a)suse.de + +- Fix unaligned data. + +------------------------------------------------------------------- New: ---- dhcpcd-1.3.22pl4-unaligned.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcpcd.spec ++++++ --- /var/tmp/diff_new_pack.eF9703/_old 2007-05-22 15:05:17.000000000 +0200 +++ /var/tmp/diff_new_pack.eF9703/_new 2007-05-22 15:05:17.000000000 +0200 @@ -12,7 +12,7 @@ Name: dhcpcd Version: 1.3.22pl4 -Release: 258 +Release: 262 Summary: A DHCP Client Daemon URL: http://www.phystech.com/download/dhcpcd.html License: GNU General Public License (GPL) @@ -46,6 +46,7 @@ Patch15: dhcpcd-1.3.22pl4-dhcpMsgSize.dif Patch16: dhcpcd-alignment Patch17: dhcpcd-1.3.22pl4-reuseaddr.dif +Patch18: dhcpcd-1.3.22pl4-unaligned.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define localstatedir /var/lib/dhcpcd/ #define debugging 1 @@ -79,6 +80,7 @@ %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 cp %{S:3} %{S:4} %{S:5} . for i in README dhcpcd.8 pathnames.h; do cp -p $i $i.orig @@ -97,7 +99,6 @@ make CFLAGS="$RPM_OPT_FLAGS -Wall -fPIE %{debug_cflags}" LDFLAGS=-pie %install -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/usr/sbin mkdir -p $RPM_BUILD_ROOT/%{localstatedir} @@ -121,6 +122,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 22 2007 - schwab(a)suse.de +- Fix unaligned data. * Fri May 11 2007 - varkoly(a)suse.de - make rpm build more verbose if ./config failed * Wed Dec 20 2006 - poeml(a)suse.de ++++++ dhcpcd-1.3.22pl4-unaligned.diff ++++++ --- client.h +++ client.h @@ -181,7 +181,7 @@ struct packed_ether_header ethhdr; char udpipmsg[IPPACKET_SIZE]; char pad_for_tokenring_header[sizeof(struct trh_hdr) + sizeof(struct trllc)]; -} __attribute__((packed)) udpipMessage; +} __attribute__((packed,aligned(2))) udpipMessage; typedef struct dhcpOptions { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 control-center2
by root＠Hilbert.suse.de 22 May '07

22 May '07

Hello community, here is the log from the commit of package control-center2 checked in at Tue May 22 15:05:08 CEST 2007. -------- --- GNOME/control-center2/control-center2.changes 2007-05-17 10:19:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/control-center2/control-center2.changes 2007-05-22 12:20:11.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 22 12:20:06 CEST 2007 - sbrabec(a)suse.cz + +- Removed X-SuSE tag from the upstream desktop file. +- Added MIME based default option for default applications FTP + preferences (GNOME#426638#c13). + +------------------------------------------------------------------- New: ---- control-center-no-x-suse.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ control-center2.spec ++++++ --- /var/tmp/diff_new_pack.kZ7573/_old 2007-05-22 15:04:50.000000000 +0200 +++ /var/tmp/diff_new_pack.kZ7573/_new 2007-05-22 15:04:50.000000000 +0200 @@ -18,7 +18,7 @@ Obsoletes: fontilus themus acme Provides: fontilus themus acme Version: 2.18.0 -Release: 25 +Release: 26 Summary: The GNOME Control Center for the GNOME 2.x Desktop Source: %{_name}-%{version}.tar.bz2 Source1: control-center-art.tar.bz2 @@ -45,6 +45,7 @@ Patch26: control-center2-static-libslab.patch Patch27: control-center2-shell-schemas.patch Patch28: control-center2-use-preferences-menu.patch +Patch29: control-center-no-x-suse.patch Patch100: control-center2-po-update.patch URL: http://www.gnome.org Requires: nautilus @@ -113,6 +114,7 @@ %patch26 %patch27 -p1 %patch28 +%patch29 gnome-patch-translation-update %build @@ -235,6 +237,10 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue May 22 2007 - sbrabec(a)suse.cz +- Removed X-SuSE tag from the upstream desktop file. +- Added MIME based default option for default applications FTP + preferences (GNOME#426638#c13). * Thu May 17 2007 - rodrigo(a)suse.de - Look for gnome-passwd.glade file in the correct dir (#272702) * Mon May 14 2007 - maw(a)suse.de ++++++ control-center-default-applications-ftp+news.patch ++++++ --- /var/tmp/diff_new_pack.kZ7573/_old 2007-05-22 15:04:51.000000000 +0200 +++ /var/tmp/diff_new_pack.kZ7573/_new 2007-05-22 15:04:51.000000000 +0200 @@ -1,3 +1,5 @@ +http://bugzilla.gnome.org/show_bug.cgi?id=426638 +================================================================================ --- capplets/default-applications/gnome-da-capplet.c +++ capplets/default-applications/gnome-da-capplet.c @@ -63,9 +63,15 @@ @@ -32,7 +34,7 @@ if (error != NULL) { g_warning (_("Error saving configuration: %s"), error->message); -@@ -217,6 +229,79 @@ +@@ -217,6 +229,97 @@ } static void @@ -56,11 +58,7 @@ + if (current_index == 0) { + is_custom_active = FALSE; + cs = gconf_change_set_new (); -+ ftp_cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, NULL); -+ gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_FTP_EXEC, ftp_cmd); -+ g_free (ftp_cmd); -+ ftp_term = gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, NULL); -+ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, ftp_term); ++ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_ENABLED, FALSE); + + gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error); + @@ -69,17 +67,18 @@ + g_error_free (error); + error = NULL; + } -+ } -+ else { -+ current_index--; -+ if (current_index < g_list_length (capplet->ftp_clients)) { -+ item = (GnomeDAFtpItem*) g_list_nth_data (capplet->ftp_clients, current_index); -+ is_custom_active = FALSE; ++ ftp_cmd = g_strdup (""); + ++ } else { ++ if (current_index == 1) { ++ is_custom_active = FALSE; + cs = gconf_change_set_new (); -+ -+ gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_FTP_EXEC, item->generic.command); -+ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, item->run_in_terminal); ++ ftp_cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, NULL); ++ gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_FTP_EXEC, ftp_cmd); ++ g_free (ftp_cmd); ++ ftp_term = gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, NULL); ++ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, ftp_term); ++ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_ENABLED, TRUE); + + gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error); + @@ -88,16 +87,37 @@ + g_error_free (error); + error = NULL; + } -+ -+ gconf_change_set_unref (cs); + } + else { -+ is_custom_active = TRUE; ++ current_index -= 2; ++ if (current_index < g_list_length (capplet->ftp_clients)) { ++ item = (GnomeDAFtpItem*) g_list_nth_data (capplet->ftp_clients, current_index); ++ is_custom_active = FALSE; ++ ++ cs = gconf_change_set_new (); ++ ++ gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_FTP_EXEC, item->generic.command); ++ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, item->run_in_terminal); ++ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_FTP_ENABLED, TRUE); ++ ++ gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error); ++ ++ if (error != NULL) { ++ g_warning (_("Error saving configuration: %s"), error->message); ++ g_error_free (error); ++ error = NULL; ++ } ++ ++ gconf_change_set_unref (cs); ++ } ++ else { ++ is_custom_active = TRUE; ++ } ++ + } ++ ftp_cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_FTP_EXEC, NULL); + + } -+ -+ ftp_cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_FTP_EXEC, NULL); + gtk_entry_set_text (GTK_ENTRY (capplet->ftp_client_command_entry), ftp_cmd); + g_free (ftp_cmd); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->ftp_client_terminal_checkbutton), @@ -112,7 +132,7 @@ mail_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet) { GtkTreeIter iter; -@@ -268,6 +353,57 @@ +@@ -268,6 +371,57 @@ } static void @@ -170,7 +190,7 @@ terminal_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet) { GtkTreeIter iter; -@@ -351,7 +487,9 @@ +@@ -351,7 +505,9 @@ const gchar *icon; } icons[] = { { "web_browser_image", "web-browser" }, @@ -180,7 +200,7 @@ /* { "messenger_image", "im" }, * { "image_image", "image-viewer" }, * { "sound_image", "gnome-audio" }, -@@ -372,7 +510,9 @@ +@@ -372,7 +528,9 @@ } refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers); @@ -190,7 +210,7 @@ refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals); } -@@ -496,6 +636,42 @@ +@@ -496,6 +654,46 @@ } static void @@ -200,26 +220,30 @@ + gint index; + gboolean is_custom_active; + -+ if (!strcmp (command, gtk_entry_get_text (GTK_ENTRY (capplet->web_browser_command_entry)))) { -+ is_custom_active = FALSE; ++ if (!command) { + index = 0; ++ is_custom_active = FALSE; ++ } ++ else if (!strcmp (command, gtk_entry_get_text (GTK_ENTRY (capplet->web_browser_command_entry)))) { ++ is_custom_active = FALSE; ++ index = 1; + } + else { + + entry = g_list_find_custom (capplet->ftp_clients, command, (GCompareFunc) generic_item_comp); + + if (entry) { -+ index = g_list_position (capplet->ftp_clients, entry) + 1; ++ index = g_list_position (capplet->ftp_clients, entry) + 2; + is_custom_active = FALSE; + } + else { + /* index of 'Custom' combo box entry */ -+ index = g_list_length (capplet->ftp_clients) + 2; ++ index = g_list_length (capplet->ftp_clients) + 3; + is_custom_active = TRUE; + } + } + -+ gtk_entry_set_text (GTK_ENTRY (capplet->ftp_client_command_entry), command); ++ gtk_entry_set_text (GTK_ENTRY (capplet->ftp_client_command_entry), (command ? command : "")); + + gtk_editable_set_editable (GTK_EDITABLE (capplet->ftp_client_command_entry), is_custom_active); + gtk_widget_set_sensitive (capplet->ftp_client_command_label, is_custom_active); @@ -233,7 +257,7 @@ mail_reader_update_combo_box (GnomeDACapplet *capplet, const gchar *command) { GList *entry; -@@ -525,6 +701,35 @@ +@@ -525,6 +723,35 @@ } static void @@ -269,7 +293,7 @@ terminal_update_combo_box (GnomeDACapplet *capplet, const gchar *command) { GList *entry; -@@ -562,11 +767,20 @@ +@@ -562,11 +789,20 @@ GError *error = NULL; GList *list_entry; @@ -290,27 +314,27 @@ if (strcmp (entry->key, DEFAULT_APPS_KEY_HTTP_EXEC) == 0) { gchar *short_browser, *pos; const gchar *value_str = gconf_value_get_string (value); -@@ -579,6 +793,9 @@ +@@ -579,6 +815,9 @@ gconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_EXEC, value); gconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_EXEC, value); gconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_EXEC, value); -+ if (current_index == 0) { ++ if (current_index == 1) { + gconf_change_set_set (cs, DEFAULT_APPS_KEY_FTP_EXEC, value); + } pos = strstr (value_str, " "); if (pos == NULL) short_browser = g_strdup (value_str); -@@ -618,6 +835,9 @@ +@@ -618,6 +857,9 @@ gconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_NEEDS_TERM, value); gconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_NEEDS_TERM, value); gconf_change_set_set (cs, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, value); -+ if (current_index == 0) { ++ if (current_index == 1) { + gconf_change_set_set (cs, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, value); + } gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error); -@@ -632,6 +852,26 @@ +@@ -632,6 +874,35 @@ } static void @@ -323,8 +347,17 @@ + if (!(value = gconf_entry_get_value (entry))) + return; + ++ if (strcmp (entry->key, DEFAULT_APPS_KEY_FTP_ENABLED) == 0) { ++ if (gconf_value_get_bool (value)) ++ ftp_client_update_combo_box (capplet, gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_FTP_EXEC, NULL)); ++ else ++ ftp_client_update_combo_box (capplet, NULL); ++ } + if (strcmp (entry->key, DEFAULT_APPS_KEY_FTP_EXEC) == 0) { -+ ftp_client_update_combo_box (capplet, gconf_value_get_string (value)); ++ if (gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_FTP_ENABLED, NULL)) ++ ftp_client_update_combo_box (capplet, gconf_value_get_string (value)); ++ else ++ ftp_client_update_combo_box (capplet, NULL); + } + /* TODO: Remove when GConfPropertyEditor will be used */ + else if (strcmp (entry->key, DEFAULT_APPS_KEY_FTP_NEEDS_TERM) == 0) { @@ -337,7 +370,7 @@ mail_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet) { GConfValue *value; -@@ -652,6 +892,26 @@ +@@ -652,6 +923,26 @@ } static void @@ -364,7 +397,7 @@ term_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet) { GConfValue *value; -@@ -685,7 +945,7 @@ +@@ -685,7 +976,7 @@ } static void @@ -373,7 +406,7 @@ { GList *entry; GtkTreeModel *model; -@@ -697,8 +957,13 @@ +@@ -697,8 +988,13 @@ theme = gtk_icon_theme_get_default (); } @@ -382,18 +415,26 @@ + if (ftp) + /* FIXME: Add one another separator between Default web browser and list. */ + gtk_combo_box_set_row_separator_func (combo_box, is_separator, -+ GINT_TO_POINTER (g_list_length (app_list)+1), NULL); ++ GINT_TO_POINTER (g_list_length (app_list)+2), NULL); + else + gtk_combo_box_set_row_separator_func (combo_box, is_separator, + GINT_TO_POINTER (g_list_length (app_list)), NULL); model = GTK_TREE_MODEL (gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING)); gtk_combo_box_set_model (combo_box, model); -@@ -718,6 +983,17 @@ +@@ -718,6 +1014,25 @@ "text", TEXT_COL, NULL); + if (ftp) { ++ pixbuf = gtk_icon_theme_load_icon (theme, "stock_autocompletion", 22, 0, NULL); ++ gtk_list_store_append (GTK_LIST_STORE (model), &iter); ++ gtk_list_store_set (GTK_LIST_STORE (model), &iter, ++ PIXBUF_COL, pixbuf, ++ TEXT_COL, _("File type based"), ++ -1); ++ if (pixbuf) ++ g_object_unref (pixbuf); + pixbuf = gtk_icon_theme_load_icon (theme, "web-browser", 22, 0, NULL); + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, @@ -407,7 +448,7 @@ for (entry = app_list; entry != NULL; entry = g_list_next (entry)) { GnomeDAItem *item; item = (GnomeDAItem *) entry->data; -@@ -781,25 +1057,37 @@ +@@ -781,25 +1096,37 @@ capplet->new_win_radiobutton = glade_xml_get_widget (capplet->xml, "web_browser_new_win_radiobutton"); capplet->new_tab_radiobutton = glade_xml_get_widget (capplet->xml, "web_browser_new_tab_radiobutton"); @@ -448,29 +489,35 @@ /* update ui to gconf content */ value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, NULL); -@@ -818,6 +1106,21 @@ +@@ -818,6 +1145,27 @@ gconf_value_free (value); } -+ value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_FTP_EXEC, NULL); -+ if (value) ++ value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_FTP_ENABLED, NULL); ++ if (gconf_value_get_bool (value)) + { -+ ftp_client_update_combo_box (capplet, gconf_value_get_string (value)); -+ gconf_value_free (value); -+ } ++ value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_FTP_EXEC, NULL); ++ if (value) ++ { ++ ftp_client_update_combo_box (capplet, gconf_value_get_string (value)); ++ gconf_value_free (value); ++ } + -+ value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, NULL); -+ if (value) -+ { -+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->ftp_client_terminal_checkbutton), -+ gconf_value_get_bool (value)); -+ gconf_value_free (value); ++ value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_FTP_NEEDS_TERM, NULL); ++ if (value) ++ { ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->ftp_client_terminal_checkbutton), ++ gconf_value_get_bool (value)); ++ gconf_value_free (value); ++ } + } ++ else ++ ftp_client_update_combo_box (capplet, NULL); + value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_MAILER_EXEC, NULL); if (value) { -@@ -833,6 +1136,21 @@ +@@ -833,6 +1181,21 @@ gconf_value_free (value); } @@ -492,7 +539,7 @@ if (value) { value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_EXEC, NULL); -@@ -849,18 +1167,26 @@ +@@ -849,18 +1212,26 @@ } g_signal_connect (capplet->web_combo_box, "changed", G_CALLBACK (web_combo_changed_cb), capplet); @@ -519,7 +566,7 @@ g_signal_connect (capplet->terminal_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet); g_signal_connect (capplet->terminal_exec_flag_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet); -@@ -903,9 +1229,15 @@ +@@ -903,9 +1274,15 @@ gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_HTTP_PATH, (GConfClientNotifyFunc) web_gconf_changed_cb, capplet, NULL, NULL); @@ -537,13 +584,14 @@ capplet, NULL, NULL); --- capplets/default-applications/gnome-da-capplet.h +++ capplets/default-applications/gnome-da-capplet.h -@@ -45,10 +45,18 @@ +@@ -45,10 +45,19 @@ #define DEFAULT_APPS_KEY_ABOUT_NEEDS_TERM DEFAULT_APPS_KEY_ABOUT_PATH"/needs_terminal" #define DEFAULT_APPS_KEY_ABOUT_EXEC DEFAULT_APPS_KEY_ABOUT_PATH"/command" +#define DEFAULT_APPS_KEY_FTP_PATH "/desktop/gnome/url-handlers/ftp" +#define DEFAULT_APPS_KEY_FTP_NEEDS_TERM DEFAULT_APPS_KEY_FTP_PATH"/needs_terminal" +#define DEFAULT_APPS_KEY_FTP_EXEC DEFAULT_APPS_KEY_FTP_PATH"/command" ++#define DEFAULT_APPS_KEY_FTP_ENABLED DEFAULT_APPS_KEY_FTP_PATH"/enabled" + #define DEFAULT_APPS_KEY_MAILER_PATH "/desktop/gnome/url-handlers/mailto" #define DEFAULT_APPS_KEY_MAILER_NEEDS_TERM DEFAULT_APPS_KEY_MAILER_PATH"/needs_terminal" @@ -556,7 +604,7 @@ #define DEFAULT_APPS_KEY_BROWSER_PATH "/desktop/gnome/applications/browser" #define DEFAULT_APPS_KEY_BROWSER_EXEC DEFAULT_APPS_KEY_BROWSER_PATH"/exec" #define DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM DEFAULT_APPS_KEY_BROWSER_PATH"/needs_term" -@@ -68,7 +76,9 @@ +@@ -68,7 +77,9 @@ GtkWidget *window; GtkWidget *web_combo_box; @@ -566,7 +614,7 @@ GtkWidget *term_combo_box; GtkWidget *web_browser_command_entry; -@@ -78,10 +88,18 @@ +@@ -78,10 +89,18 @@ GtkWidget *new_win_radiobutton; GtkWidget *new_tab_radiobutton; @@ -585,7 +633,7 @@ GtkWidget *terminal_command_entry; GtkWidget *terminal_command_label; GtkWidget *terminal_exec_flag_entry; -@@ -90,7 +108,9 @@ +@@ -90,7 +109,9 @@ GConfClient *gconf; GList *web_browsers; ++++++ control-center-no-x-suse.patch ++++++ --- shell/gnomecc.desktop.in.in +++ shell/gnomecc.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -X-SuSE-translate=true Encoding=UTF-8 _Name=Control Center _GenericName=The GNOME configuration tool ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-x11
by root＠Hilbert.suse.de 22 May '07

22 May '07

Hello community, here is the log from the commit of package yast2-x11 checked in at Tue May 22 15:04:45 CEST 2007. -------- --- yast2-x11/yast2-x11.changes 2007-05-09 12:24:37.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-x11/yast2-x11.changes 2007-05-22 14:43:40.577319000 +0200 @@ -1,0 +2,13 @@ +Tue May 22 14:40:50 CEST 2007 - ms(a)suse.de + +- 2.15.9 +- fixed x11 setup on Xen para-virtualized framebuffer (#267220) + +------------------------------------------------------------------- +Tue May 22 11:25:41 CEST 2007 - ms(a)suse.de + +- 2.15.8 +- disabled test button due to problems with multiple X-Server + instances (#264646) + +------------------------------------------------------------------- Old: ---- yast2-x11-2.15.7.tar.bz2 New: ---- yast2-x11-2.15.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-x11.spec ++++++ --- /var/tmp/diff_new_pack.XJ6298/_old 2007-05-22 15:04:38.000000000 +0200 +++ /var/tmp/diff_new_pack.XJ6298/_new 2007-05-22 15:04:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-x11 (Version 2.15.7) +# spec file for package yast2-x11 (Version 2.15.9) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-x11 -Version: 2.15.7 +Version: 2.15.9 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-x11-2.15.7.tar.bz2 +Source0: yast2-x11-2.15.9.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer qt3-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite %ifnarch s390 s390x @@ -44,7 +44,7 @@ Thomas Roelz %prep -%setup -n yast2-x11-2.15.7 +%setup -n yast2-x11-2.15.9 %build %{prefix}/bin/y2tool y2autoconf @@ -81,6 +81,13 @@ %doc %{prefix}/share/doc/packages/yast2-x11 %changelog +* Tue May 22 2007 - ms(a)suse.de +- 2.15.9 +- fixed x11 setup on Xen para-virtualized framebuffer (#267220) +* Tue May 22 2007 - ms(a)suse.de +- 2.15.8 +- disabled test button due to problems with multiple X-Server + instances (#264646) * Wed May 09 2007 - ms(a)suse.de - 2.15.7 - fixed yast2 x11 proposal in case of 8bit framebuffer (#265498) ++++++ yast2-x11-2.15.7.tar.bz2 -> yast2-x11-2.15.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.15.7/configure new/yast2-x11-2.15.9/configure --- old/yast2-x11-2.15.7/configure 2007-05-09 12:17:44.000000000 +0200 +++ new/yast2-x11-2.15.9/configure 2007-05-22 13:48:07.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-x11 2.15.7. +# Generated by GNU Autoconf 2.60 for yast2-x11 2.15.8. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='yast2-x11' PACKAGE_TARNAME='yast2-x11' -PACKAGE_VERSION='2.15.7' -PACKAGE_STRING='yast2-x11 2.15.7' +PACKAGE_VERSION='2.15.8' +PACKAGE_STRING='yast2-x11 2.15.8' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1418,7 +1418,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-x11 2.15.7 to adapt to many kinds of systems. +\`configure' configures yast2-x11 2.15.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1489,7 +1489,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-x11 2.15.7:";; + short | recursive ) echo "Configuration of yast2-x11 2.15.8:";; esac cat <<\_ACEOF @@ -1594,7 +1594,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-x11 configure 2.15.7 +yast2-x11 configure 2.15.8 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1608,7 +1608,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-x11 $as_me 2.15.7, which was +It was created by yast2-x11 $as_me 2.15.8, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2409,7 +2409,7 @@ # Define the identity of the package. PACKAGE='yast2-x11' - VERSION='2.15.7' + VERSION='2.15.8' cat >>confdefs.h <<_ACEOF @@ -2636,7 +2636,7 @@ -VERSION="2.15.7" +VERSION="2.15.8" RPMNAME="yast2-x11" MAINTAINER="Marcus Schaefer <ms(a)suse.de>" @@ -21421,7 +21421,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-x11 $as_me 2.15.7, which was +This file was extended by yast2-x11 $as_me 2.15.8, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21474,7 +21474,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-x11 config.status 2.15.7 +yast2-x11 config.status 2.15.8 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.15.7/configure.in new/yast2-x11-2.15.9/configure.in --- old/yast2-x11-2.15.7/configure.in 2007-05-09 12:17:30.000000000 +0200 +++ new/yast2-x11-2.15.9/configure.in 2007-05-22 13:47:53.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-x11, 2.15.7, http://bugs.opensuse.org/, yast2-x11) +AC_INIT(yast2-x11, 2.15.8, http://bugs.opensuse.org/, yast2-x11) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.7" +VERSION="2.15.8" RPMNAME="yast2-x11" MAINTAINER="Marcus Schaefer <ms(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.15.7/src/proposal/x11_proposal.ycp new/yast2-x11-2.15.9/src/proposal/x11_proposal.ycp --- old/yast2-x11-2.15.7/src/proposal/x11_proposal.ycp 2007-04-24 10:09:19.000000000 +0200 +++ new/yast2-x11-2.15.9/src/proposal/x11_proposal.ycp 2007-05-22 13:47:46.000000000 +0200 @@ -218,13 +218,14 @@ //====================================== // Test your configuration now //-------------------------------------- - if (! isFbdevBased) { - proposal = proposal - + LI - + "<a href=\"sax-test\">" - + XMessages::testConfig + "</a>" - + IL; - } + // deactivated due to problems with multiple X-Server instances + //if (! isFbdevBased) { + // proposal = proposal + // + LI + // + "<a href=\"sax-test\">" + // + XMessages::testConfig + "</a>" + // + IL; + //} //====================================== // End proposal... //-------------------------------------- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.15.7/src/XLib.pm new/yast2-x11-2.15.9/src/XLib.pm --- old/yast2-x11-2.15.7/src/XLib.pm 2007-05-09 12:15:36.000000000 +0200 +++ new/yast2-x11-2.15.9/src/XLib.pm 2007-05-22 14:42:28.000000000 +0200 @@ -501,6 +501,9 @@ $color = GetFbColor(); } my @list = @{$mDesktop->getResolutions($color)}; + if (! @list) { + push (@list,"800x600"); + } my $result = shift (@list); return $result; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.15.7/VERSION new/yast2-x11-2.15.9/VERSION --- old/yast2-x11-2.15.7/VERSION 2007-05-09 12:16:38.000000000 +0200 +++ new/yast2-x11-2.15.9/VERSION 2007-05-22 14:42:28.000000000 +0200 @@ -1 +1 @@ -2.15.7 +2.15.9 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 autoyast2
by root＠Hilbert.suse.de 22 May '07

22 May '07

Hello community, here is the log from the commit of package autoyast2 checked in at Tue May 22 15:04:43 CEST 2007. -------- --- autoyast2/autoyast2.changes 2007-05-16 12:41:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2007-05-22 11:12:56.544966000 +0200 @@ -1,0 +2,6 @@ +Tue May 22 10:57:06 CEST 2007 - ug(a)suse.de + +- reactivate hardware detection during autoinstall +- 2.15.10 + +------------------------------------------------------------------- Old: ---- autoyast2-2.15.9.tar.bz2 New: ---- autoyast2-2.15.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.ky3874/_old 2007-05-22 15:04:02.000000000 +0200 +++ /var/tmp/diff_new_pack.ky3874/_new 2007-05-22 15:04:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package autoyast2 (Version 2.15.9) +# spec file for package autoyast2 (Version 2.15.10) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: autoyast2 URL: http://www.suse.de/~ug -Version: 2.15.9 +Version: 2.15.10 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.15.9.tar.bz2 +Source0: autoyast2-2.15.10.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets fop java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update Requires: yast2-core yast2-xml libxslt yast2-installation @@ -49,7 +49,7 @@ Anas Nashif %package installation -Version: 2.15.9 +Version: 2.15.10 Release: 1 Summary: YaST2 - Auto Installation Modules Group: System/YaST @@ -69,7 +69,7 @@ Anas Nashif %prep -%setup -n autoyast2-2.15.9 +%setup -n autoyast2-2.15.10 %build %{prefix}/bin/y2tool y2autoconf @@ -210,6 +210,9 @@ %dir /var/lib/autoinstall/autoconf %changelog +* Tue May 22 2007 - ug(a)suse.de +- reactivate hardware detection during autoinstall +- 2.15.10 * Wed May 16 2007 - ug(a)suse.de - always remove the installation network - 2.15.9 ++++++ autoyast2-2.15.9.tar.bz2 -> autoyast2-2.15.10.tar.bz2 ++++++ ++++ 1793 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.15.9/configure.in new/autoyast2-2.15.10/configure.in --- old/autoyast2-2.15.9/configure.in 2007-05-16 12:40:39.000000000 +0200 +++ new/autoyast2-2.15.10/configure.in 2007-05-22 10:57:59.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.15.9, http://bugs.opensuse.org/, autoyast2) +AC_INIT(autoyast2, 2.15.10, http://bugs.opensuse.org/, autoyast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.9" +VERSION="2.15.10" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.15.9/src/clients/inst_autoinit.ycp new/autoyast2-2.15.10/src/clients/inst_autoinit.ycp --- old/autoyast2-2.15.9/src/clients/inst_autoinit.ycp 2007-04-03 10:07:49.000000000 +0200 +++ new/autoyast2-2.15.10/src/clients/inst_autoinit.ycp 2007-05-22 10:57:53.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Parses XML Profile for automatic installation * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: inst_autoinit.ycp 37279 2007-04-03 08:07:47Z ug $ + * $Id: inst_autoinit.ycp 38076 2007-05-22 08:57:52Z ug $ * */ @@ -163,7 +163,7 @@ } Progress::Title(_("Probing hardware...")); - WFM::CallFunction("inst_startup", [] ); + WFM::CallFunction("inst_system_analysis", [] ); if( ! profileFetched ) { symbol ret = processProfile(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.15.9/VERSION new/autoyast2-2.15.10/VERSION --- old/autoyast2-2.15.9/VERSION 2007-05-16 12:30:36.000000000 +0200 +++ new/autoyast2-2.15.10/VERSION 2007-05-22 10:57:02.000000000 +0200 @@ -1 +1 @@ -2.15.9 +2.15.10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-add-on-creator
by root＠Hilbert.suse.de 22 May '07

22 May '07

Hello community, here is the log from the commit of package yast2-add-on-creator checked in at Tue May 22 15:04:32 CEST 2007. -------- --- yast2-add-on-creator/yast2-add-on-creator.changes 2007-05-21 13:33:36.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-add-on-creator/yast2-add-on-creator.changes 2007-05-22 10:56:13.348773000 +0200 @@ -1,0 +2,6 @@ +Tue May 22 10:42:36 CEST 2007 - jsuchome(a)suse.cz + +- enable rpm directory with .rpm extension (#276861) +- 2.15.9 + +------------------------------------------------------------------- Old: ---- yast2-add-on-creator-2.15.8.tar.bz2 New: ---- yast2-add-on-creator-2.15.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on-creator.spec ++++++ --- /var/tmp/diff_new_pack.RU5242/_old 2007-05-22 15:04:23.000000000 +0200 +++ /var/tmp/diff_new_pack.RU5242/_new 2007-05-22 15:04:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-add-on-creator (Version 2.15.8) +# spec file for package yast2-add-on-creator (Version 2.15.9) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-add-on-creator -Version: 2.15.8 +Version: 2.15.9 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-add-on-creator-2.15.8.tar.bz2 +Source0: yast2-add-on-creator-2.15.9.tar.bz2 prefix: /usr Requires: yast2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite @@ -33,7 +33,7 @@ Jiř� Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-add-on-creator-2.15.8 +%setup -n yast2-add-on-creator-2.15.9 %build %{prefix}/bin/y2tool y2autoconf @@ -69,6 +69,9 @@ %doc %{prefix}/share/doc/packages/yast2-add-on-creator %changelog +* Tue May 22 2007 - jsuchome(a)suse.cz +- enable rpm directory with .rpm extension (#276861) +- 2.15.9 * Mon May 21 2007 - jsuchome(a)suse.cz - fixed signing content file (#275883) - fixed exporting gpg key (#275900) ++++++ yast2-add-on-creator-2.15.8.tar.bz2 -> yast2-add-on-creator-2.15.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.8/src/add-on-creator.ycp new/yast2-add-on-creator-2.15.9/src/add-on-creator.ycp --- old/yast2-add-on-creator-2.15.8/src/add-on-creator.ycp 2007-04-11 14:01:03.000000000 +0200 +++ new/yast2-add-on-creator-2.15.9/src/add-on-creator.ycp 2007-05-22 10:42:23.000000000 +0200 @@ -272,13 +272,16 @@ boolean CreateAddOn (map<string,any> options) { AddOnCreator::clone = false; - AddOnCreator::rpm_path = options["rpm_dir"]:""; - if (AddOnCreator::rpm_path == "") + string rpm_dir = options["rpm_dir"]:""; + if (rpm_dir == "") { // error message Report::Error (_("Path to directory with packages is missing.")); return false; } + if (substring (rpm_dir, size (rpm_dir) - 1, 1) != "/") + rpm_dir = rpm_dir + "/"; + AddOnCreator::rpm_path = rpm_dir; if (!haskey (options, "content")) { // error message diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.8/src/AddOnCreator.ycp new/yast2-add-on-creator-2.15.9/src/AddOnCreator.ycp --- old/yast2-add-on-creator-2.15.8/src/AddOnCreator.ycp 2007-05-21 10:26:55.000000000 +0200 +++ new/yast2-add-on-creator-2.15.9/src/AddOnCreator.ycp 2007-05-21 13:32:05.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: AddOnCreator settings, input and output functions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: AddOnCreator.ycp 37776 2007-05-02 11:43:20Z jsuchome $ + * $Id: AddOnCreator.ycp 38061 2007-05-21 11:34:03Z jsuchome $ * * Representation of the configuration of add-on-creator. * Input and output routines. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.8/src/complex.ycp new/yast2-add-on-creator-2.15.9/src/complex.ycp --- old/yast2-add-on-creator-2.15.8/src/complex.ycp 2007-04-19 14:45:22.000000000 +0200 +++ new/yast2-add-on-creator-2.15.9/src/complex.ycp 2007-05-22 10:42:23.000000000 +0200 @@ -330,7 +330,11 @@ UI::SetFocus (`id(`required_rpm_path)); continue; } + if (substring (dir, size (dir) - 1, 1) != "/") + dir = dir + "/"; AddOnCreator::rpm_path = dir; + if (req_dir != "" && substring (req_dir, size (req_dir) - 1, 1) != "/") + req_dir = req_dir + "/"; AddOnCreator::required_rpm_path = req_dir; if (requires == "") requires = (string) UI::QueryWidget (`id(`other_val), `Value); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.8/VERSION new/yast2-add-on-creator-2.15.9/VERSION --- old/yast2-add-on-creator-2.15.8/VERSION 2007-05-21 13:21:50.000000000 +0200 +++ new/yast2-add-on-creator-2.15.9/VERSION 2007-05-22 10:42:34.000000000 +0200 @@ -1 +1 @@ -2.15.8 +2.15.9 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xdg-utils
by root＠Hilbert.suse.de 22 May '07

22 May '07

Hello community, here is the log from the commit of package xdg-utils checked in at Tue May 22 15:04:16 CEST 2007. -------- --- xdg-utils/xdg-utils.changes 2006-11-06 09:49:13.000000000 +0100 +++ /mounts/work_src_done/NOARCH/xdg-utils/xdg-utils.changes 2007-05-22 14:25:26.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 22 14:25:00 CEST 2007 - dmueller(a)suse.de + +- add xdg-su (#275937) + +------------------------------------------------------------------- New: ---- xdg-su.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-utils.spec ++++++ --- /var/tmp/diff_new_pack.BS4491/_old 2007-05-22 15:04:11.000000000 +0200 +++ /var/tmp/diff_new_pack.BS4491/_new 2007-05-22 15:04:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xdg-utils (Version 1.0.1) # -# Copyright (c) 2006 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. # @@ -16,11 +16,12 @@ Group: System/GUI/Other Summary: Utilities to uniformly interface desktop environments Version: 1.0.1 -Release: 1 +Release: 41 BuildArch: noarch URL: http://portland.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%{version}.tar.bz2 +Patch0: xdg-su.diff %description The xdg-utils package is a set of simple scripts that provide basic @@ -41,6 +42,7 @@ %prep %setup -q -n %name-%{version} +%patch0 %build %configure @@ -63,7 +65,7 @@ #/usr/bin/xdg-menu /usr/bin/xdg-mime /usr/bin/xdg-open -#/usr/bin/xdg-su +/usr/bin/xdg-su /usr/bin/xdg-screensaver #%{_mandir}/man1/xdg-copy.1.gz #%{_mandir}/man1/xdg-desktop.1.gz @@ -74,10 +76,12 @@ #%{_mandir}/man1/xdg-menu.1.gz %{_mandir}/man1/xdg-mime.1.gz %{_mandir}/man1/xdg-open.1.gz -#%{_mandir}/man1/xdg-su.1.gz +%{_mandir}/man1/xdg-su.1.gz %{_mandir}/man1/xdg-screensaver.1.gz -%changelog -n xdg-utils +%changelog +* Tue May 22 2007 - dmueller(a)suse.de +- add xdg-su (#275937) * Mon Nov 06 2006 - dmueller(a)suse.de - update to 1.0.1: * Several shell syntax issues causing failures on Ubuntu 6.10 ++++++ xdg-su.diff ++++++ ++++ 894 lines (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 python
by root＠Hilbert.suse.de 22 May '07

22 May '07

Hello community, here is the log from the commit of package python checked in at Tue May 22 02:06:25 CEST 2007. -------- --- python/python.changes 2007-03-29 13:32:15.000000000 +0200 +++ /mounts/work_users/ro/STABLE/python/python.changes 2007-05-22 01:13:37.477954000 +0200 @@ -1,0 +2,5 @@ +Tue May 22 01:13:28 CEST 2007 - ro(a)suse.de + +- make setup.py accept db-4.5 + +------------------------------------------------------------------- New: ---- Python-2.5-db45.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.Ls2396/_old 2007-05-22 02:05:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Ls2396/_new 2007-05-22 02:05:09.000000000 +0200 @@ -12,12 +12,12 @@ Name: python-doc URL: http://www.python.org/ -License: Other License(s), see package +License: Python Copyright Group: Development/Languages/Python BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.5 -Release: 29 +Release: 38 %define pyver %{version} BuildArch: noarch %define tarname Python-%{pyver} ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.Ls2396/_old 2007-05-22 02:05:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Ls2396/_new 2007-05-22 02:05:10.000000000 +0200 @@ -19,7 +19,7 @@ Obsoletes: python-nothreads python21 Summary: Python Interpreter Version: 2.5 -Release: 38 +Release: 50 %define tarname Python-%{version} Source0: %{tarname}.tar.bz2 Source6: README.SUSE @@ -39,6 +39,7 @@ Patch25: python-2.4.2-canonicalize2.patch Patch26: python-2.4-localpath.patch Patch27: python-2.5c1-dirs-fix.patch +Patch28: Python-2.5-db45.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define python_version %(echo %{version} | head -c 3) %define idle_name idle @@ -199,6 +200,7 @@ %patch25 %patch26 %patch27 +%patch28 # some cleanup find . -name .cvsignore -type f -print0 | xargs -0 rm -f find . -name CVS -type d -print0 | xargs -0 rm -rf @@ -476,6 +478,8 @@ %attr(755, root, root) %{_bindir}/smtpd.py %changelog +* Tue May 22 2007 - ro(a)suse.de +- make setup.py accept db-4.5 * Thu Mar 29 2007 - aj(a)suse.de - Add ncurses-devel to BuildRequires. * Sat Mar 24 2007 - aj(a)suse.de ++++++ Python-2.5-db45.patch ++++++ --- Modules/_bsddb.c +++ Modules/_bsddb.c @@ -4129,6 +4129,8 @@ } +#if (DBVER < 45) + static PyObject* DBEnv_set_lk_max(DBEnvObject* self, PyObject* args) { @@ -4145,6 +4147,7 @@ RETURN_NONE(); } +#endif #if (DBVER >= 32) @@ -5233,7 +5236,9 @@ {"set_lg_regionmax",(PyCFunction)DBEnv_set_lg_regionmax, METH_VARARGS}, #endif {"set_lk_detect", (PyCFunction)DBEnv_set_lk_detect, METH_VARARGS}, +#if (DBVER < 45) {"set_lk_max", (PyCFunction)DBEnv_set_lk_max, METH_VARARGS}, +#endif #if (DBVER >= 32) {"set_lk_max_locks", (PyCFunction)DBEnv_set_lk_max_locks, METH_VARARGS}, {"set_lk_max_lockers", (PyCFunction)DBEnv_set_lk_max_lockers, METH_VARARGS}, @@ -5835,7 +5840,9 @@ ADD_INT(d, DB_AFTER); ADD_INT(d, DB_APPEND); ADD_INT(d, DB_BEFORE); +#if (DBVER < 45) ADD_INT(d, DB_CACHED_COUNTS); +#endif #if (DBVER >= 41) _addIntToDict(d, "DB_CHECKPOINT", 0); #else @@ -5870,7 +5877,9 @@ ADD_INT(d, DB_POSITION); ADD_INT(d, DB_PREV); ADD_INT(d, DB_PREV_NODUP); +#if (DBVER < 45) ADD_INT(d, DB_RECORDCOUNT); +#endif ADD_INT(d, DB_SET); ADD_INT(d, DB_SET_RANGE); ADD_INT(d, DB_SET_RECNO); --- setup.py +++ setup.py @@ -609,7 +609,7 @@ # a release. Most open source OSes come with one or more # versions of BerkeleyDB already installed. - max_db_ver = (4, 4) + max_db_ver = (4, 5) min_db_ver = (3, 3) db_setup_debug = False # verbose debug prints from this script? @@ -626,7 +626,7 @@ '/sw/include/db3', ] # 4.x minor number specific paths - for x in (0,1,2,3,4): + for x in (0,1,2,3,4,5): db_inc_paths.append('/usr/include/db4%d' % x) db_inc_paths.append('/usr/include/db4.%d' % x) db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x) @@ -649,7 +649,7 @@ for dn in inc_dirs: std_variants.append(os.path.join(dn, 'db3')) std_variants.append(os.path.join(dn, 'db4')) - for x in (0,1,2,3,4): + for x in (0,1,2,3,4,5): std_variants.append(os.path.join(dn, "db4%d"%x)) std_variants.append(os.path.join(dn, "db4.%d"%x)) for x in (2,3): ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 tomcat_apparmor
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package tomcat_apparmor checked in at Tue May 22 01:02:52 CEST 2007. -------- --- tomcat_apparmor/tomcat_apparmor.changes 2007-01-30 01:30:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/tomcat_apparmor/tomcat_apparmor.changes 2007-05-21 23:31:50.506757000 +0200 @@ -1,0 +2,7 @@ +Mon May 21 23:30:34 CEST 2007 - dreynolds(a)suse.de + +- Ported plugin to tomcat5.5: +- Changes to logging interface +- Changes to request pipeline + +------------------------------------------------------------------- Old: ---- tomcat_apparmor-2.0-161.tar.gz New: ---- tomcat_apparmor-2.0.2-688.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat_apparmor.spec ++++++ --- /var/tmp/diff_new_pack.H11937/_old 2007-05-22 01:02:42.000000000 +0200 +++ /var/tmp/diff_new_pack.H11937/_new 2007-05-22 01:02:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package tomcat_apparmor (Version 2.0) +# spec file for package tomcat_apparmor (Version 2.0.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,22 +14,22 @@ %if ! %{?distro:1}0 %define distro suse %endif -Summary: Tomcat 5 plugin for AppArmor change_hat -Version: 2.0 -Release: 30 -Group: System/Libraries -Source0: %{name}-%{version}-161.tar.gz -License: GNU General Public License (GPL) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -URL: http://developer.novell.com/wiki/index.php/Novell_AppArmor -Prereq: tomcat5, servletapi5, libapparmor -BuildRequires: ant apparmor-docs java java2-devel-packages libapparmor servletapi5 tomcat5 %if %{distro} == "suse" -%define CATALINA_HOME /usr/share/tomcat5 +%define CATALINA_HOME /usr/share/tomcat55 %endif %define APPARMOR_DOC_DIR /usr/share/doc/packages/apparmor-docs/ %define JNI_SO libJNIChangeHat.so %define JAR_FILE changeHatValve.jar +Summary: Tomcat 5 plugin for AppArmor change_hat +Version: 2.0.2 +Release: 1 +Group: System/Libraries +Source0: %{name}-%{version}-688.tar.gz +License: GNU General Public License (GPL) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +URL: http://developer.novell.com/wiki/index.php/Novell_AppArmor +Prereq: tomcat55, servletapi5, libapparmor +BuildRequires: ant apparmor-docs java java2-devel-packages libapparmor servletapi5 tomcat55 %description tomcat_apparmor - is a plugin for Apache Tomcat version 5.x that @@ -46,16 +46,13 @@ %prep %setup -q -# set lib path correctly -sed -i -e 's|INCLUDE=/usr/lib/jvm/java/include|INCLUDE=%{_libdir}/jvm/java/include|g' src/jni_src/Makefile %build [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT} -ant -Ddist=${RPM_BUILD_DIR}/%{name}-%{version} -Dtarget=1.4 jar jni_so +ant -Dinstall_lib=%{_lib} -Dcatalina_home=%{CATALINA_HOME} -Ddist=${RPM_BUILD_DIR}/%{name}-%{version} -Dtarget=1.4 jar jni_so %install -export LIB=%{_lib} -ant -Dlib=%{_lib} -Ddist=${RPM_BUILD_DIR}/%{name}-%{version} -Dversion=%{version} -Drelease=%{release} -Dcatalina_home=%{CATALINA_HOME} -Dinstall_root=${RPM_BUILD_ROOT} -Dinstall_lib=%{_lib} install_jar install_jni +ant -Ddist=${RPM_BUILD_DIR}/%{name}-%{version} -Dversion=%{version} -Drelease=%{release} -Dcatalina_home=%{CATALINA_HOME} -Dinstall_root=${RPM_BUILD_ROOT} -Dinstall_lib=%{_lib} install_jar install_jni mkdir -p ${RPM_BUILD_ROOT}%{APPARMOR_DOC_DIR} install ${RPM_BUILD_DIR}/%{name}-%{version}/README.tomcat_apparmor ${RPM_BUILD_ROOT}%{APPARMOR_DOC_DIR} @@ -75,7 +72,11 @@ %postun ldconfig -%changelog -n tomcat_apparmor +%changelog +* Mon May 21 2007 - dreynolds(a)suse.de +- Ported plugin to tomcat5.5: +- Changes to logging interface +- Changes to request pipeline * Tue Jan 30 2007 - ro(a)suse.de - remove self-provides * Tue Nov 21 2006 - dbornkessel(a)suse.de ++++++ tomcat_apparmor-2.0-161.tar.gz -> tomcat_apparmor-2.0.2-688.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomcat_apparmor-2.0/build.xml new/tomcat_apparmor-2.0.2/build.xml --- old/tomcat_apparmor-2.0/build.xml 2006-10-11 19:42:22.000000000 +0200 +++ new/tomcat_apparmor-2.0.2/build.xml 2007-05-21 22:59:34.000000000 +0200 @@ -18,10 +18,10 @@ <include name="**/*.jar"/> </fileset> - <fileset id="tomcat.jars" dir="/usr/share/tomcat5/server/lib"> + <fileset id="tomcat.jars" dir="${catalina_home}/server/lib"> <include name="**/*.jar"/> </fileset> - <fileset id="servlet.jars" dir="/usr/share/tomcat5/common/lib"> + <fileset id="servlet.jars" dir="${catalina_home}/common/lib"> <include name="**/*.jar"/> </fileset> @@ -54,6 +54,7 @@ <target name="jni_so" depends="compile" description="Build JNI library"> <mkdir dir="${dist}"/> <exec dir="${jni_src}" executable="/usr/bin/make"> + <arg value="LIB=${install_lib}"/> <arg value="DESTDIR=${dist}"/> <arg value="VERSION=${version}"/> <arg value="RELEASE=${release}"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomcat_apparmor-2.0/common/apparmor.css new/tomcat_apparmor-2.0.2/common/apparmor.css --- old/tomcat_apparmor-2.0/common/apparmor.css 1970-01-01 01:00:00.000000000 +0100 +++ new/tomcat_apparmor-2.0.2/common/apparmor.css 2007-04-25 23:43:55.000000000 +0200 @@ -0,0 +1,30 @@ +BODY {background:rgb(000,000,000); color:rgb(225,225,225); +margin-left: 1%; margin-right: 5%} +H1 {color:rgb(240,240,240); font-size:115%;} +H2 {color:rgb(240,240,240); font-size:109%;} +H3 {color:rgb(240,240,240); font-size:104%;} +TD.sidebar {width:18em; background:rgb(020,020,020); vertical-align:top;} +TD.main {width:250em; background:rgb(020,020,020); padding-top:5px; +padding-bottom:5px; padding-left:10px; padding-right:10px; } +TD.sidebarhead {background:rgb(038,038,038);} +TD.footer {background:rgb(020,020,020); padding:5px; } +TD.block {background: #9c9c9c; color:rgb(000,000,000)} + +P {font-size:102%} +P {margin-left:.5em; margin-right:.5em} +P {color:rgb(225,225,225)} + +P.sidebar {font-size:98% } +P.sidebarhead {font-size:98%; font-weight:bold; } + +UL {font-size:102%} +UL {margin-left:.5em; margin-right:.5em} +UL {color:rgb(225,225,225)} + +IMG {border:none} + +:link, :visited, :active { text-decoration:underline; } + +:link { color: white } +:visited { color: rgb(225,225,225)} +:active { color: gray } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomcat_apparmor-2.0/common/Make-po.rules new/tomcat_apparmor-2.0.2/common/Make-po.rules --- old/tomcat_apparmor-2.0/common/Make-po.rules 1970-01-01 01:00:00.000000000 +0100 +++ new/tomcat_apparmor-2.0.2/common/Make-po.rules 2007-04-25 23:43:55.000000000 +0200 @@ -0,0 +1,45 @@ +# $Id: Make-po.rules 238 2006-11-15 09:22:15Z steve-beattie $ +# ------------------------------------------------------------------ +# +# Copyright (C) 2002-2005 Novell/SUSE +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public +# License published by the Free Software Foundation. +# +# ------------------------------------------------------------------ +# +# The including makefile needs to define LANG, which lists the lang +# files to include; e.g. LANG=en_US de_DE, where en_US.po and de_DE.po +# exist +LOCALEDIR=/usr/share/locale + +XGETTEXT_ARGS=--copyright-holder="NOVELL, Inc." --msgid-bugs-address=apparmor-general(a)forge.novell.com -d ${NAME} + +# When making the .pot file, it's expected that the parent Makefile will +# pass in the list of sources in the SOURCES variable +PARENT_SOURCES=$(foreach source, ${SOURCES}, ../${source}) + +LANGS=$(patsubst %.po, %, $(wildcard *.po)) +TARGET_MOS=$(foreach lang, $(filter-out $(DISABLED_LANGS),$(LANGS)), ${lang}.mo) + +.PHONY: all +all: ${TARGET_MOS} + +${NAME}.pot: ${PARENT_SOURCES} + xgettext ${XGETTEXT_ARGS} ${PARENT_SOURCES} -o $@ + +%.mo: %.po + msgfmt -c -o $@ $< + +.PHONY: install +install: ${TARGET_MOS} + mkdir -p $(DESTDIR)/${LOCALEDIR} + for lang in ${LANGS} ; do \ + mkdir -p ${DESTDIR}/${LOCALEDIR}/$${lang}/LC_MESSAGES ; \ + install -m 644 $${lang}.mo ${DESTDIR}/${LOCALEDIR}/$${lang}/LC_MESSAGES/${NAME}.mo ; \ + done + +.PHONY: clean +clean: + rm -f *.mo Make.rules diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomcat_apparmor-2.0/common/Make.rules new/tomcat_apparmor-2.0.2/common/Make.rules --- old/tomcat_apparmor-2.0/common/Make.rules 1970-01-01 01:00:00.000000000 +0100 +++ new/tomcat_apparmor-2.0.2/common/Make.rules 2007-04-25 23:43:55.000000000 +0200 @@ -0,0 +1,287 @@ +# $Id: Make.rules 537 2007-04-03 21:12:16Z steve-beattie $ +# ------------------------------------------------------------------ +# +# Copyright (C) 2002-2005 Novell/SUSE +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public +# License published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, contact Novell, Inc. +# ------------------------------------------------------------------ +# Make.rules - common make targets and variables for building the SHASS +# product. +# +# NOTES: +# - must define the package NAME before including this file. +# - After checking in to cvs, you'll need to delele the hardlinked +# Make.rules files that already exist in the individual application +# directories + +DISTRIBUTION=AppArmor +VERSION=2.0.2 + +# OVERRIDABLE variables +# Set these variables before including Make.rules to change its behavior +# SPECFILE - for packages that have a non-standard specfile name +# EXTERNAL_PACKAGE - for packages that have upstream versions that +# we're locally modifying (e.g. imnxcerttool/gnutls). +# +# use 'make BUILDIR=/some/where/else/' to override the /usr/src/redhat +# location -- it *should* pick out the right thing to do based on the +# .rpmmacros file, but you can still use BUILDDIR to override that. +TESTBUILDDIR=$(shell [ -f ${HOME}/.rpmmacros ] && awk '/^%_topdir/ {print $$2}' ${HOME}/.rpmmacros) +ifndef BUILDDIR +BUILDDIR=$(shell if [ -d "${TESTBUILDDIR}" ] ; then \ + echo ${TESTBUILDDIR} | sed "s^/$$^^" ; \ + elif [ -d "/usr/src/redhat" ] ; then \ + echo "/usr/src/redhat" ; \ + elif [ -d "/usr/src/packages" ] ; then \ + echo "/usr/src/packages" ; \ + else \ + echo "/tmp/${NAME}" ; \ + fi ;) +endif +RPMHOSTVENDOR=$(shell rpm --eval "%{_host_vendor}") +ifndef DISTRO +DISTRO=$(shell if [ -f /etc/slackware-version ] ; then \ + echo slackware ; \ + elif [ -f /etc/debian_version ] ; then \ + echo debian ;\ + elif [ ${RPMHOSTVENDOR} = "suse" ] ; then \ + echo suse ;\ + elif [ ${RPMHOSTVENDOR} = "redhat" ] ; then \ + echo rhel4 ;\ + else \ + echo unknown ;\ + fi) +endif +RPMARG=--define "_topdir $(BUILDDIR:/=)" \ + --define "vendor NOVELL, Inc." \ + --define "distribution ${DISTRIBUTION}" \ + --define "debug_package %{nil}" \ + --define "immunix_version ${VERSION}" \ + $(shell [ -d ${BUILDDIR}/BUILDROOT ] && echo --define \"buildroot $(BUILDDIR:/=)/BUILDROOT\") \ + $(shell [ -n "${DISTRO}" ] && echo --define \"distro ${DISTRO}\") + +#REPO_VERSION=$(shell if [ -x /usr/bin/svn ] ; then \ +# if ! /usr/bin/svn info -r HEAD . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; then \ +# /usr/bin/svn info . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; \ +# fi ; \ +# fi) +REPO_VERSION=$(shell if [ -x /usr/bin/svn ] ; then \ + /usr/bin/svn info . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; \ + fi) +REPO_URL=$(shell if [ -x /usr/bin/svn ] ; then \ + /usr/bin/svn info . 2> /dev/null | grep "^URL:" | sed "s/^URL: //" ; \ + fi) +COMMON_REPO_URL=$(shell if [ -x /usr/bin/svn ] ; then \ + /usr/bin/svn info $(COMMONDIR) 2> /dev/null | grep "^URL:" | sed "s/^URL: //" ; \ + fi) + +ifdef EXTERNAL_PACKAGE +RPMARG+=--define "_sourcedir $(shell pwd)" +endif + +ifndef SPECFILE +SPECFILE = $(NAME).spec +endif +RELEASE = $(shell rpm -q --specfile --define "_sourcedir ." ${RPMARG} --qf "%{RELEASE}" ${SPECFILE}) +RELEASE_DIR = $(NAME)-$(VERSION) +TARBALL = $(NAME)-$(VERSION)-${REPO_VERSION}.tar.gz +TAR = /bin/tar czvp -h --exclude .svn --exclude CVS --exclude .cvsignore --exclude ${TARBALL} --exclude ${RELEASE_DIR}/${RELEASE_DIR} $(shell test -f ${NAME}.exclude && echo "-X ${NAME}.exclude") +LDCONFIG = /sbin/ldconfig + +CVSPKG_VERSION=$(shell rpm -q --specfile --define "_sourcedir ." ${RPMARG} ${SPECFILE} | head -1 | tr "." "_") + +RPMSUBDIRS=SOURCES SPECS BUILD BUILDROOT SRPMS RPMS/i386 RPMS/i586 \ + RPMS/i686 RPMS/athlon RPMS/noarch RPMS/x86_64 +BUILDRPMSUBDIRS=$(foreach subdir, $(RPMSUBDIRS), $(BUILDDIR:/=)/$(subdir)) + +.PHONY: cvs_tag +cvs_tag: + cvs tag IMMUNIX-${CVSPKG_VERSION} + +.PHONY: checkin +checkin: + if cvs -q up -d | grep -q "^\?" ; then echo "Hey! You have" \ + "files in the directory you have not added into cvs."; exit 1; \ + fi + cvs ci + make cvs_tag + +ifdef EXTERNAL_PACKAGE +.PHONY: rpm +rpm: clean $(BUILDRPMSUBDIRS) + rpmbuild -ba ${RPMARG} ${SPECFILE} + +else +.PHONY: rpm +rpm: clean $(TARBALL) $(BUILDRPMSUBDIRS) + cp $(TARBALL) $(BUILDDIR)/SOURCES/ + cp ${SPECFILE} $(BUILDDIR)/SPECS/ + rpmbuild -ba ${RPMARG} ${SPECFILE} + +.PHONY: ${SPECFILE} +${SPECFILE}: ${SPECFILE}.in + sed -e "s/@@immunix_version@@/${VERSION}/g" \ + -e "s/@@repo_version@@/${REPO_VERSION}/g" $< > $@ + +${TARBALL}: clean ${SPECFILE} + -rm -rf $(RELEASE_DIR) + mkdir $(RELEASE_DIR) + $(TAR) . | tar xz -C $(RELEASE_DIR) + $(TAR) -f $@ $(RELEASE_DIR) + rm -rf $(RELEASE_DIR) + +.PHONY: tarball +tarball: clean $(TARBALL) + +.PHONY: dist +dist: clean $(SPECFILE) + -rm -rf $(RELEASE_DIR) + svn export -r $(REPO_VERSION) $(REPO_URL) $(RELEASE_DIR) + svn export $(COMMON_REPO_URL) $(RELEASE_DIR)/common + make -C $(RELEASE_DIR) $(SPECFILE) REPO_VERSION=${REPO_VERSION} COMMONDIR_EXISTS=false + $(TAR) -f $(TARBALL) $(RELEASE_DIR) + rm -rf $(RELEASE_DIR) + +endif + +.PHONY: version +.SILENT: version +version: + rpm -q --define "_sourcedir ." ${RPMARG} --specfile ${SPECFILE} + +.PHONY: build_dir +build_dir: $(BUILDRPMSUBDIRS) + +$(BUILDRPMSUBDIRS): + mkdir -p $(BUILDRPMSUBDIRS) + +.PHONY: _clean +.SILENT: _clean +_clean: + -rm -f ${NAME}-${VERSION}-*.tar.gz + -rm -f ${MANPAGES} ${HTMLMANPAGES} pod2htm*.tmp + +# ===================== +# manpages +# ===================== + +POD2MAN = /usr/bin/pod2man +POD2HTML = /usr/bin/pod2html +MANDIR = /usr/share/man +DOCDIR = /usr/share/doc/${NAME}-${VERSION} + +# get list of directory numbers based on definition of MANPAGES variable +MANDIRS=$(sort $(foreach dir, 1 2 3 4 5 6 7 8, $(patsubst %.${dir}, ${dir}, $(filter %.${dir}, ${MANPAGES})))) +HTMLMANPAGES=$(foreach manpage, ${MANPAGES}, ${manpage}.html) + +.PHONY: install_manpages +install_manpages: $(MANPAGES) + $(foreach dir, ${MANDIRS}, \ + install -d ${DESTDIR}/${MANDIR}/man${dir} ; \ + install -m 644 $(filter %.${dir}, ${MANPAGES}) ${DESTDIR}/${MANDIR}/man${dir}; \ + $(foreach aa_page, $(filter %.${dir}, ${AA_MANPAGES}), \ + ln -sf $(aa_page) ${DESTDIR}/${MANDIR}/man${dir}/${aa_page:%=aa-%};)) + +%.1: %.pod + $(POD2MAN) $< --release=NOVELL/SUSE --center=AppArmor --section=1 > $@ + +%.2: %.pod + $(POD2MAN) $< --release=NOVELL/SUSE --center=AppArmor --section=2 > $@ + +%.3: %.pod + $(POD2MAN) $< --release=NOVELL/SUSE --center=AppArmor --section=3 > $@ + +%.4: %.pod + $(POD2MAN) $< --release=NOVELL/SUSE --center=AppArmor --section=4 > $@ + +%.5: %.pod + $(POD2MAN) $< --release=NOVELL/SUSE --center=AppArmor --section=5 > $@ + +%.6: %.pod + $(POD2MAN) $< --release=NOVELL/SUSE --center=AppArmor --section=6 > $@ + +%.7: %.pod + $(POD2MAN) $< --release=NOVELL/SUSE --center=AppArmor --section=7 > $@ + +%.8: %.pod + $(POD2MAN) $< --release=NOVELL/SUSE --center=AppArmor --section=8 > $@ + +%.1.html: %.pod + $(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@ + +%.2.html: %.pod + $(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@ + +%.3.html: %.pod + $(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@ + +%.4.html: %.pod + $(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@ + +%.5.html: %.pod + $(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@ + +%.6.html: %.pod + $(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@ + +%.7.html: %.pod + $(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@ + +%.8.html: %.pod + $(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@ + +# ===================== +# Slackware poo +# ===================== +.PHONY: slack +slack: + rm -rf ${BUILDDIR} + mkdir -p ${BUILDDIR}/install + make install DESTDIR=${BUILDDIR} DISTRO=slackware + # comment line is there so grep always has something to match + ( echo "# install script pulled from ${SPECFILE}" ; rpm -q --specfile --define "_sourcedir ." ${RPMARG} --qf "%{POSTIN}\n" ${SPECFILE}) | grep -v "^(none)$$" >> ${BUILDDIR}/install/doinst.sh + ( cd ${BUILDDIR} && makepkg -l y -c y -p ${PWD}/${NAME}-${VERSION}-${RELEASE}.tgz ) + +# ===================== +# Debian poo +# ===================== +.PHONY: deb +deb: ${TARBALL} + rm -rf ${BUILDDIR} + mkdir -p ${BUILDDIR} + tar -xvzf ${TARBALL} -C ${BUILDDIR} + ( cd ${BUILDDIR}/${RELEASE_DIR} && sh -c "DEBFULLNAME='NOVELL, Inc' dh_make -e apparmor-general(a)forge.novell.com --library -f ~/svn/immunix/immunix/libimmunix/libimmunix-2.0.tar.gz << EOM \ +\ +EOM" ) + make ${NAME}-deb -C ${BUILDDIR}/${RELEASE_DIR} + # ( cd ${BUILDDIR}/${RELEASE_DIR} && dpkg-buildpackage -b -sd -rfakeroot) + +DEBIAN_DISTRO=stable + +DEB_CHANGELOG_OUTPUT="${NAME} (${VERSION}-${RELEASE}) ${DEBIAN_DISTRO}; urgency=low\n\ + \n * Automatically generated by the AppArmor Build System.\n\ + \n -- AppArmor Development Team <apparmor-general(a)forge.novell.com> $(shell date -R)" + + +.PHONY: debian/changelog +debian/changelog: + echo -e ${DEB_CHANGELOG_OUTPUT} > $@ + +A2PS_ARGS=-Ec -g --line-numbers=1 +ENSCRIPT_ARGS=-C -2jGr -f Courier6 -E +%.c.ps: %.c + #a2ps ${A2PS_ARGS} $< -o $@ + enscript ${ENSCRIPT_ARGS} -o $@ $< + +%.pm.ps: %.pm + enscript ${ENSCRIPT_ARGS} -o $@ $< diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomcat_apparmor-2.0/Makefile new/tomcat_apparmor-2.0.2/Makefile --- old/tomcat_apparmor-2.0/Makefile 2006-10-11 19:42:09.000000000 +0200 +++ new/tomcat_apparmor-2.0.2/Makefile 2007-05-21 22:59:34.000000000 +0200 @@ -18,27 +18,24 @@ all: COMMONDIR=../../../common/ -include Make.rules +include common/Make.rules COMMONDIR_EXISTS=$(strip $(shell [ -d ${COMMONDIR} ] && echo true)) ifeq ($(COMMONDIR_EXISTS), true) -Make.rules: $(COMMONDIR)/Make.rules - ln -f $(COMMONDIR)/Make.rules . - -po/Make.rules: $(COMMONDIR)/Make-po.rules - make -C po Make.rules +common/Make.rules: $(COMMONDIR)/Make.rules + ln -sf $(COMMONDIR) . endif LIB = lib -CATALINA_HOME = /usr/share/tomcat5 +CATALINA_HOME = /usr/share/tomcat55 + -# By default build 1.4 bytecode -all: - ant -Dtarget=1.4 jar jni_so +all: + ant -Dcatalina_home=${CATALINA_HOME} -Dtarget=1.5 jar jni_so clean: ant clean - rm -f tomcat_apparmor.spec tomcat_apparmor-*.tar.gz + rm -f tomcat_apparmor.spec ${NAME}-*.tar.gz Make.rules install: $(SPECFILE) ant -Dversion=$(VERSION) -Drelease=$(RELEASE) -Dcatalina_home=${CATALINA_HOME} -Dinstall_lib=${LIB} install_jar install_jni diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomcat_apparmor-2.0/Make.rules new/tomcat_apparmor-2.0.2/Make.rules --- old/tomcat_apparmor-2.0/Make.rules 2006-10-06 20:08:44.000000000 +0200 +++ new/tomcat_apparmor-2.0.2/Make.rules 1970-01-01 01:00:00.000000000 +0100 @@ -1,197 +0,0 @@ -# $Id: Make.rules 11 2006-04-12 21:19:42Z steve-beattie $ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2005 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. -# ------------------------------------------------------------------ -# Make.rules - common make targets and variables for building the SHASS -# product. -# -# NOTES: -# - must define the package NAME before including this file. -# - After checking in to cvs, you'll need to delele the hardlinked -# Make.rules files that already exist in the individual application -# directories - -DISTRIBUTION=Novell AppArmor -VERSION=2.0 - -# OVERRIDABLE variables -# Set these variables before including Make.rules to change its behavior -# SPECFILE - for packages that have a non-standard specfile name -# EXTERNAL_PACKAGE - for packages that have upstream versions that -# we're locally modifying (e.g. imnxcerttool/gnutls). -# -# use 'make BUILDIR=/some/where/else/' to override the /usr/src/redhat -# location -- it *should* pick out the right thing to do based on the -# .rpmmacros file, but you can still use BUILDDIR to override that. -TESTBUILDDIR=$(shell [ -f ${HOME}/.rpmmacros ] && awk '/^%_topdir/ {print $$2}' ${HOME}/.rpmmacros) -ifdef BUILDDIR -#BUILDDIR:=$(BUILDDIR,/=) -else -BUILDDIR=$(shell if [ -d "${TESTBUILDDIR}" ] ; then \ - echo ${TESTBUILDDIR} | sed "s^/$$^^" ; \ - elif [ -d "/usr/src/redhat" ] ; then \ - echo "/usr/src/redhat" ; \ - elif [ -d "/usr/src/packages" ] ; then \ - echo "/usr/src/packages" ; \ - else \ - echo "/tmp/${NAME}" ; \ - fi ;) -endif -RPMHOSTVENDOR=$(shell rpm --eval "%{_host_vendor}") -ifndef DISTRO -DISTRO=$(shell if [ -f /etc/slackware-version ] ; then \ - echo slackware ; \ - elif [ -f /etc/debian_version ] ; then \ - echo debian ;\ - elif [ ${RPMHOSTVENDOR} = "suse" ] ; then \ - echo suse ;\ - elif [ ${RPMHOSTVENDOR} = "redhat" ] ; then \ - echo rhel4 ;\ - else \ - echo unknown ;\ - fi) -endif -RPMARG=--define "_topdir ${BUILDDIR}" \ - --define "vendor NOVELL, Inc." \ - --define "distribution ${DISTRIBUTION}" \ - --define "debug_package %{nil}" \ - --define "immunix_version ${VERSION}" \ - $(shell [ -d ${BUILDDIR}/BUILDROOT ] && echo --define \"buildroot ${BUILDDIR}/BUILDROOT\") \ - $(shell [ -n "${DISTRO}" ] && echo --define \"distro ${DISTRO}\") - -#REPO_VERSION=$(shell if [ -x /usr/bin/svn ] ; then \ -# if ! /usr/bin/svn info -r HEAD . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; then \ -# /usr/bin/svn info . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; \ -# fi ; \ -# fi) -REPO_VERSION=$(shell if [ -x /usr/bin/svn ] ; then \ - /usr/bin/svn info . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; \ - fi) - -ifdef EXTERNAL_PACKAGE -RPMARG+=--define "_sourcedir $(shell pwd)" -endif - -ifndef SPECFILE -SPECFILE = $(NAME).spec -endif -RELEASE = $(shell rpm -q --specfile --define "_sourcedir ." ${RPMARG} --qf "%{RELEASE}" ${SPECFILE}) -RELEASE_DIR = $(NAME)-$(VERSION) -TARBALL = $(NAME)-$(VERSION)-${REPO_VERSION}.tar.gz -TAR = /bin/tar czvp --exclude .svn --exclude CVS --exclude .cvsignore --exclude ${TARBALL} --exclude ${RELEASE_DIR}/${RELEASE_DIR} $(shell test -f ${NAME}.exclude && echo "-X ${NAME}.exclude") - -CVSPKG_VERSION=$(shell rpm -q --specfile --define "_sourcedir ." ${RPMARG} ${SPECFILE} | head -1 | tr "." "_") - -RPMSUBDIRS=SOURCES SPECS BUILD BUILDROOT SRPMS RPMS/i386 RPMS/i586 \ - RPMS/i686 RPMS/athlon RPMS/noarch RPMS/x86_64 -BUILDRPMSUBDIRS=$(foreach subdir, $(RPMSUBDIRS), $(BUILDDIR)/$(subdir)) - -.PHONY: cvs_tag -cvs_tag: - cvs tag IMMUNIX-${CVSPKG_VERSION} - -.PHONY: checkin -checkin: - if cvs -q up -d | grep -q "^\?" ; then echo "Hey! You have" \ - "files in the directory you have not added into cvs."; exit 1; \ - fi - cvs ci - make cvs_tag - -ifdef EXTERNAL_PACKAGE -.PHONY: rpm -rpm: clean $(BUILDRPMSUBDIRS) - rpmbuild -ba ${RPMARG} ${SPECFILE} - -else -.PHONY: rpm -rpm: clean $(TARBALL) $(BUILDRPMSUBDIRS) - cp $(TARBALL) $(BUILDDIR)/SOURCES/ - cp ${SPECFILE} $(BUILDDIR)/SPECS/ - rpmbuild -ba ${RPMARG} ${SPECFILE} - -.PHONY: ${SPECFILE} -${SPECFILE}: ${SPECFILE}.in - sed -e "s/@@immunix_version@@/${VERSION}/g" \ - -e "s/@@repo_version@@/${REPO_VERSION}/g" $< > $@ - -${TARBALL}: clean ${SPECFILE} - -rm -rf $(RELEASE_DIR) - mkdir $(RELEASE_DIR) - $(TAR) . | tar xz -C $(RELEASE_DIR) - $(TAR) -f $@ $(RELEASE_DIR) - rm -rf $(RELEASE_DIR) - -.PHONY: tarball -tarball: clean $(TARBALL) -endif - -.PHONY: version -.SILENT: version -version: - rpm -q --define "_sourcedir ." ${RPMARG} --specfile ${SPECFILE} - -.PHONY: build_dir -build_dir: $(BUILDRPMSUBDIRS) - -$(BUILDRPMSUBDIRS): - mkdir -p $(BUILDRPMSUBDIRS) - -# ===================== -# Slackware poo -# ===================== -.PHONY: slack -slack: - rm -rf ${BUILDDIR} - mkdir -p ${BUILDDIR}/install - make install DESTDIR=${BUILDDIR} DISTRO=slackware - # comment line is there so grep always has something to match - ( echo "# install script pulled from ${SPECFILE}" ; rpm -q --specfile --define "_sourcedir ." ${RPMARG} --qf "%{POSTIN}\n" ${SPECFILE}) | grep -v "^(none)$$" >> ${BUILDDIR}/install/doinst.sh - ( cd ${BUILDDIR} && makepkg -l y -c y -p ${PWD}/${NAME}-${VERSION}-${RELEASE}.tgz ) - -# ===================== -# Debian poo -# ===================== -.PHONY: deb -deb: ${TARBALL} - rm -rf ${BUILDDIR} - mkdir -p ${BUILDDIR} - tar -xvzf ${TARBALL} -C ${BUILDDIR} - ( cd ${BUILDDIR}/${RELEASE_DIR} && sh -c "DEBFULLNAME='NOVELL, Inc' dh_make -e apparmor-general(a)forge.novell.com --library -f ~/svn/immunix/immunix/libimmunix/libimmunix-2.0.tar.gz << EOM \ -\ -EOM" ) - make ${NAME}-deb -C ${BUILDDIR}/${RELEASE_DIR} - # ( cd ${BUILDDIR}/${RELEASE_DIR} && dpkg-buildpackage -b -sd -rfakeroot) - -DEBIAN_DISTRO=stable - -DEB_CHANGELOG_OUTPUT="${NAME} (${VERSION}-${RELEASE}) ${DEBIAN_DISTRO}; urgency=low\n\ - \n * Automatically generated by the AppArmor Build System.\n\ - \n -- AppArmor Development Team <apparmor-general(a)forge.novell.com> $(shell date -R)" - - -.PHONY: debian/changelog -debian/changelog: - echo -e ${DEB_CHANGELOG_OUTPUT} > $@ - -A2PS_ARGS=-Ec -g --line-numbers=1 -ENSCRIPT_ARGS=-C -2jGr -f Courier6 -E -%.c.ps: %.c - #a2ps ${A2PS_ARGS} $< -o $@ - enscript ${ENSCRIPT_ARGS} -o $@ $< - -%.pm.ps: %.pm - enscript ${ENSCRIPT_ARGS} -o $@ $< diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomcat_apparmor-2.0/src/com/novell/apparmor/catalina/valves/ChangeHatValve.java new/tomcat_apparmor-2.0.2/src/com/novell/apparmor/catalina/valves/ChangeHatValve.java --- old/tomcat_apparmor-2.0/src/com/novell/apparmor/catalina/valves/ChangeHatValve.java 2006-10-13 23:19:59.000000000 +0200 +++ new/tomcat_apparmor-2.0.2/src/com/novell/apparmor/catalina/valves/ChangeHatValve.java 2007-05-21 22:59:34.000000000 +0200 @@ -1,11 +1,11 @@ -/* ------------------------------------------------------------------ - * - * Copyright (C) 2002-2005 Novell/SUSE - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License published by the Free Software Foundation. - * +/* ------------------------------------------------------------------ + * + * Copyright (C) 2002-2007 Novell/SUSE + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License published by the Free Software Foundation. + * * ------------------------------------------------------------------ */ package com.novell.apparmor.catalina.valves; @@ -13,10 +13,7 @@ import com.novell.apparmor.JNIChangeHat; import java.io.IOException; import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import org.apache.catalina.HttpRequest; import org.apache.catalina.Container; -import org.apache.catalina.HttpResponse; import org.apache.catalina.valves.ValveBase; import java.security.SecureRandom; @@ -28,9 +25,9 @@ private static String DEFAULT_HAT = "DEFAULT"; private static int SERVLET_PATH_MEDIATION = 0; private static int URI_MEDIATION = 1; - + private int mediationType = ChangeHatValve.SERVLET_PATH_MEDIATION; - + /* * * Property setter called during the parsing of the server.xml. @@ -53,18 +50,18 @@ this.mediationType = ChangeHatValve.SERVLET_PATH_MEDIATION; } } - + /* * * Return an int value representing the currently configured * <code>mediationType</code> for this instance. * */ - int getMediationType() { + public int getMediationType() { return this.mediationType; } - - + + /* * * Return an instance of <code>SecureRandom</code> creating one if necessary @@ -76,7 +73,7 @@ } return ChangeHatValve.randomNumberGenerator; } - + /* * * Call to return a random cookie from the <code>SecureRandom</code> PRNG @@ -85,13 +82,15 @@ int getCookie() { SecureRandom rnd = getRndGen(); if ( rnd == null ) { - this.getContainer().getLogger().log( "[APPARMOR] can't initialize SecureRandom for cookie generation for change_hat() call.", container.getLogger().ERROR); + this.getContainer().getLogger().error( + "[APPARMOR] can't initialize SecureRandom for cookie" + + " generation for change_hat() call."); return 0; } return rnd.nextInt(); } - - + + /* * * Call out to AppArmor change_hat(2) to change the security @@ -110,82 +109,71 @@ * @exception ServletException if a servlet error has occurred * */ - public void invoke( org.apache.catalina.Request request, - org.apache.catalina.Response response, - org.apache.catalina.ValveContext context ) + public void invoke( org.apache.catalina.connector.Request request, + org.apache.catalina.connector.Response response ) throws IOException, ServletException { - + Container container = this.getContainer(); int cookie, result; boolean inSubHat = false; - container.getLogger().log(this.getClass().toString() + - "[APPARMOR] Request received [" + request.getInfo() - + "]", container.getLogger().DEBUG); - - if ( !( request instanceof HttpRequest) - || !(response instanceof HttpResponse) ) { - container.getLogger().log(this.getClass().toString() - + "[APPARMOR] Non HttpRequest received. Not changing context. " - + "[" + request.getInfo() + "]", container.getLogger().ERROR); - context.invokeNext(request, response); - return; - } - - HttpRequest httpRequest = (HttpRequest) request; - HttpServletRequest servletRequest = (HttpServletRequest) - httpRequest.getRequest(); - + container.getLogger().debug(this.getClass().toString() + + "[APPARMOR] Request received [" + request.getInfo() + + "]"); + String hatname = ChangeHatValve.DEFAULT_HAT;; if ( getMediationType() == ChangeHatValve.SERVLET_PATH_MEDIATION ) { - hatname = servletRequest.getServletPath(); + hatname = request.getServletPath(); } else if ( getMediationType() == ChangeHatValve.URI_MEDIATION ) { - hatname = servletRequest.getRequestURI(); + hatname = request.getRequestURI(); } - + /* * Select the AppArmor container for this request: - * - * 1. try hat name from either URI or ServletPath + * + * 1. try hat name from either URI or ServletPath * (based on configuration) - * - * 2. try hat name of the defined DEFAULT_HAT - * + * + * 2. try hat name of the defined DEFAULT_HAT + * * 3. run in the current AppArmor context */ - + cookie = getCookie(); - container.getLogger().log("[APPARMOR] ChangeHat to [" + hatname - + "] cookie [" + cookie + "]", container.getLogger().DEBUG); + if ( hatname == null || "".equals(hatname) ) { + hatname = ChangeHatValve.DEFAULT_HAT; + } + container.getLogger().debug("[APPARMOR] ChangeHat to [" + hatname + + "] cookie [" + cookie + "]"); + result = changehat_wrapper.changehat_in(hatname, cookie); + if ( result == JNIChangeHat.EPERM ) { - container.getLogger().log("[APPARMOR] change_hat valve " + + container.getLogger().error("[APPARMOR] change_hat valve " + "configured but Tomcat process is not confined by an " + - "AppArmor profile.", container.getLogger().ERROR); - context.invokeNext(request, response); + "AppArmor profile."); + getNext().invoke(request, response); } else { if ( result == JNIChangeHat.EACCES ) { - changehat_wrapper.changehat_out(cookie); - result = changehat_wrapper.changehat_in(ChangeHatValve.DEFAULT_HAT, - cookie); - if ( result != 0 ) { - changehat_wrapper.changehat_out(cookie); - container.getLogger().log("[APPARMOR] ChangeHat to [" + hatname - + "] failed. Running in parent context.", - container.getLogger().ERROR); - } else { - inSubHat = true; - } - } else if ( result != 0 ) { - changehat_wrapper.changehat_out(cookie); - container.getLogger().log("[APPARMOR] ChangeHat to [" + hatname - + "] failed. Running in parent context.", - container.getLogger().ERROR); - } else { - inSubHat = true; - } - context.invokeNext(request, response); - if ( inSubHat ) changehat_wrapper.changehat_out(cookie); + changehat_wrapper.changehat_out(cookie); + result = changehat_wrapper.changehat_in(ChangeHatValve.DEFAULT_HAT, + cookie); + if ( result != 0 ) { + changehat_wrapper.changehat_out(cookie); + container.getLogger().error("[APPARMOR] ChangeHat to [" + hatname + + "] failed. Running in parent context."); + } else { + inSubHat = true; + } + } else if ( result != 0 ) { + changehat_wrapper.changehat_out(cookie); + container.getLogger().error("[APPARMOR] ChangeHat to [" + hatname + + "] failed. Running in parent context."); + } else { + inSubHat = true; + } + getNext().invoke(request, response); + if ( inSubHat ) changehat_wrapper.changehat_out(cookie); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomcat_apparmor-2.0/src/jni_src/JNIChangeHat.c new/tomcat_apparmor-2.0.2/src/jni_src/JNIChangeHat.c --- old/tomcat_apparmor-2.0/src/jni_src/JNIChangeHat.c 2006-10-06 20:07:51.000000000 +0200 +++ new/tomcat_apparmor-2.0.2/src/jni_src/JNIChangeHat.c 2007-05-21 22:59:05.000000000 +0200 @@ -22,8 +22,13 @@ (JNIEnv *env, jobject obj, jstring hatnameUTF, jint token) { - int len = (*env)->GetStringLength(env, hatnameUTF); + int len; jint result = 0; + + if ( hatnameUTF == NULL ) { + return ( EINVAL ); + } + len = (*env)->GetStringLength(env, hatnameUTF); if ( len > 0 ) { if ( len > 128 ) { len = 128; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomcat_apparmor-2.0/src/jni_src/Makefile new/tomcat_apparmor-2.0.2/src/jni_src/Makefile --- old/tomcat_apparmor-2.0/src/jni_src/Makefile 2006-10-12 05:36:22.000000000 +0200 +++ new/tomcat_apparmor-2.0.2/src/jni_src/Makefile 2007-05-21 22:59:34.000000000 +0200 @@ -1,15 +1,15 @@ -INCLUDE=/usr/lib/jvm/java/include -TOP=../.. -CLASSPATH=${TOP}/build -CFLAGS=-g -O2 -Wall -Wstrict-prototypes -Wl,-soname,$@.${SO_VERS} -pipe -fpic -D_REENTRANT -INCLUDES=-I$(INCLUDE) -I$(INCLUDE)/linux -CLASSFILE=${CLASSPATH}/com/novell/apparmor/${JAVA_CLASSNAME}.class -DESTDIR=${TOP}/dist -SO_VERS = 1 -LIB = lib/ -LIBDIR = /usr/${LIB} -JAVA_CLASSNAME=JNIChangeHat -TARGET=lib${JAVA_CLASSNAME} +TOP = ../.. +CLASSPATH = ${TOP}/build +LIB = lib/ +LIBDIR = /usr/${LIB} +INCLUDE = ${LIBDIR}/jvm/java/include +CFLAGS = -g -O2 -Wall -Wstrict-prototypes -Wl,-soname,$@.${SO_VERS} -pipe -fpic -D_REENTRANT +INCLUDES = -I$(INCLUDE) -I$(INCLUDE)/linux +CLASSFILE = ${CLASSPATH}/com/novell/apparmor/${JAVA_CLASSNAME}.class +DESTDIR = ${TOP}/dist +SO_VERS = 1 +JAVA_CLASSNAME = JNIChangeHat +TARGET = lib${JAVA_CLASSNAME} all: ${TARGET}.so diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomcat_apparmor-2.0/tomcat_apparmor.spec new/tomcat_apparmor-2.0.2/tomcat_apparmor.spec --- old/tomcat_apparmor-2.0/tomcat_apparmor.spec 2006-10-17 17:56:44.000000000 +0200 +++ new/tomcat_apparmor-2.0.2/tomcat_apparmor.spec 2007-05-21 23:07:20.000000000 +0200 @@ -22,19 +22,25 @@ %define distro suse %endif +%if %{distro} == "suse" +%define CATALINA_HOME /usr/share/tomcat5 +%endif +%define APPARMOR_DOC_DIR /usr/share/doc/packages/apparmor-docs/ +%define JNI_SO libJNIChangeHat.so +%define JAR_FILE changeHatValve.jar + Summary: Tomcat 5 plugin for AppArmor change_hat Name: tomcat_apparmor -Version: 2.0 -Release: 161 +Version: 2.0.2 +Release: 688 Group: System/Libraries -Source0: %{name}-%{version}-161.tar.gz +Source0: %{name}-%{version}-688.tar.gz License: LGPL BuildRoot: %{?_tmppath:}%{!?_tmppath:/var/tmp}/%{name}-%{version}-build Url: http://developer.novell.com/wiki/index.php/Novell_AppArmor -Prereq: tomcat5, servletapi5, libapparmor -BuildRequires: tomcat5, servletapi5 ant, java, libapparmor, java2-devel-packages, apparmor-docs -Provides: tomcat_apparmor +Prereq: tomcat55, servletapi5, libapparmor +BuildRequires: tomcat55, servletapi5, ant, java, libapparmor, java2-devel-packages, apparmor-docs %description tomcat_apparmor - is a plugin for Apache Tomcat version 5.x that provides @@ -43,13 +49,6 @@ container. The AppArmor containers, or "hats", can be created for invidual URL processing or per servlet. -%if %{distro} == "suse" -%define CATALINA_HOME /usr/share/tomcat5 -%endif -%define APPARMOR_DOC_DIR /usr/share/doc/packages/apparmor-docs/ -%define JNI_SO libJNIChangeHat.so -%define JAR_FILE changeHatValve.jar - %prep %setup -q @@ -57,7 +56,7 @@ %build [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT} -ant -Ddist=${RPM_BUILD_DIR}/%{name}-%{version} -Dtarget=1.4 jar jni_so +ant -Dinstall_lib=%{_lib} -Dcatalina_home=%{CATALINA_HOME} -Ddist=${RPM_BUILD_DIR}/%{name}-%{version} -Dtarget=1.4 jar jni_so %install ant -Ddist=${RPM_BUILD_DIR}/%{name}-%{version} -Dversion=%{version} -Drelease=%{release} -Dcatalina_home=%{CATALINA_HOME} -Dinstall_root=${RPM_BUILD_ROOT} -Dinstall_lib=%{_lib} install_jar install_jni diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomcat_apparmor-2.0/tomcat_apparmor.spec.in new/tomcat_apparmor-2.0.2/tomcat_apparmor.spec.in --- old/tomcat_apparmor-2.0/tomcat_apparmor.spec.in 2006-10-17 17:48:33.000000000 +0200 +++ new/tomcat_apparmor-2.0.2/tomcat_apparmor.spec.in 2007-05-21 22:59:34.000000000 +0200 @@ -22,6 +22,13 @@ %define distro suse %endif +%if %{distro} == "suse" +%define CATALINA_HOME /usr/share/tomcat5 +%endif +%define APPARMOR_DOC_DIR /usr/share/doc/packages/apparmor-docs/ +%define JNI_SO libJNIChangeHat.so +%define JAR_FILE changeHatValve.jar + Summary: Tomcat 5 plugin for AppArmor change_hat Name: tomcat_apparmor @@ -32,9 +39,8 @@ License: LGPL BuildRoot: %{?_tmppath:}%{!?_tmppath:/var/tmp}/%{name}-%{version}-build Url: http://developer.novell.com/wiki/index.php/Novell_AppArmor -Prereq: tomcat5, servletapi5, libapparmor -BuildRequires: tomcat5, servletapi5 ant, java, libapparmor, java2-devel-packages, apparmor-docs -Provides: tomcat_apparmor +Prereq: tomcat55, servletapi5, libapparmor +BuildRequires: tomcat55, servletapi5, ant, java, libapparmor, java2-devel-packages, apparmor-docs %description tomcat_apparmor - is a plugin for Apache Tomcat version 5.x that provides @@ -43,13 +49,6 @@ container. The AppArmor containers, or "hats", can be created for invidual URL processing or per servlet. -%if %{distro} == "suse" -%define CATALINA_HOME /usr/share/tomcat5 -%endif -%define APPARMOR_DOC_DIR /usr/share/doc/packages/apparmor-docs/ -%define JNI_SO libJNIChangeHat.so -%define JAR_FILE changeHatValve.jar - %prep %setup -q @@ -57,7 +56,7 @@ %build [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT} -ant -Ddist=${RPM_BUILD_DIR}/%{name}-%{version} -Dtarget=1.4 jar jni_so +ant -Dinstall_lib=%{_lib} -Dcatalina_home=%{CATALINA_HOME} -Ddist=${RPM_BUILD_DIR}/%{name}-%{version} -Dtarget=1.4 jar jni_so %install ant -Ddist=${RPM_BUILD_DIR}/%{name}-%{version} -Dversion=%{version} -Drelease=%{release} -Dcatalina_home=%{CATALINA_HOME} -Dinstall_root=${RPM_BUILD_ROOT} -Dinstall_lib=%{_lib} install_jar install_jni ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rt2x00
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package rt2x00 checked in at Tue May 22 01:02:31 CEST 2007. -------- --- arch/i386/rt2x00/rt2x00.changes 2007-04-19 23:57:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/rt2x00/rt2x00.changes 2007-05-22 00:23:36.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 22 00:23:07 CEST 2007 - dmueller(a)suse.de + +- update to 2.0.0: + * many bugfixes + +------------------------------------------------------------------- Old: ---- rt2x00-cvs-2007032607.tar.bz2 rt2x00-fixes.diff New: ---- rt2x00-2.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rt2x00.spec ++++++ --- /var/tmp/diff_new_pack.d10523/_old 2007-05-22 01:02:15.000000000 +0200 +++ /var/tmp/diff_new_pack.d10523/_new 2007-05-22 01:02:15.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package rt2x00 (Version 2007032607) +# spec file for package rt2x00 (Version 2.0.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,17 +14,16 @@ Name: rt2x00 BuildRequires: kernel-source kernel-syms module-init-tools Summary: Kernel Modules for Ralink Cards -Version: 2007032607 -Release: 4 +Version: 2.0.0 +Release: 1 Group: System/Kernel License: GNU General Public License (GPL) BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://rt2x00.serialmonkey.com/ Autoreqprov: on -Source: rt2x00-cvs-%{version}.tar.bz2 +Source: rt2x00-2.0.0.tar.bz2 Patch1: rt2x00.diff Patch2: rt2x00-2.6.21.diff -Patch3: rt2x00-fixes.diff Source100: preamble ExclusiveArch: %ix86 x86_64 ppc ppc64 %suse_kernel_module_package -n rt2x00 -p %_sourcedir/preamble kdump um @@ -57,12 +56,11 @@ Ivo van Doorn %prep -%setup -n rt2x00-cvs-%{version} +%setup -n rt2x00-%{version} %patch1 -p1 %if %suse_version > 1020 %patch2 -p1 %endif -%patch3 %build make config_header @@ -70,7 +68,7 @@ mkdir obj for flavor in %flavors_to_build; do rm -rf obj/$flavor - cp -r rt2x00-cvs-%{version} obj/$flavor + cp -r rt2x00-%{version} obj/$flavor make -C /usr/src/linux-obj/%_target_cpu/$flavor modules \ M=$PWD/obj/$flavor/$i done @@ -88,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 22 2007 - dmueller(a)suse.de +- update to 2.0.0: + * many bugfixes * Thu Apr 19 2007 - ro(a)suse.de - no debuginfo (no main package) * Wed Apr 04 2007 - dmueller(a)suse.de ++++++ rt2x00-cvs-2007032607.tar.bz2 -> rt2x00-2.0.0.tar.bz2 ++++++ ++++ 13096 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 lsvpd
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package lsvpd checked in at Tue May 22 01:02:07 CEST 2007. -------- --- lsvpd/lsvpd.changes 2007-03-29 11:21:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/lsvpd/lsvpd.changes 2007-05-21 23:31:12.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 21 23:31:06 CEST 2007 - dmueller(a)suse.de + +- build against db 4.3 + +------------------------------------------------------------------- New: ---- db43.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lsvpd.spec ++++++ --- /var/tmp/diff_new_pack.lT9529/_old 2007-05-22 01:01:45.000000000 +0200 +++ /var/tmp/diff_new_pack.lT9529/_new 2007-05-22 01:01:45.000000000 +0200 @@ -11,11 +11,11 @@ # norootforbuild Name: lsvpd -BuildRequires: db42-devel gcc-c++ pciutils scsi usbutils zlib-devel +BuildRequires: db43-devel gcc-c++ pciutils scsi usbutils zlib-devel URL: http://sourceforge.net/projects/linux-diag/ Summary: VPD Hardware Inventory Utilities for Linux Version: 1.0.3 -Release: 9 +Release: 23 License: GNU General Public License (GPL) Group: System/Monitoring BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -25,6 +25,7 @@ Patch2: lsvpd.include-path.patch Patch3: lsvpd.non-void-function.patch Patch4: lsvpd.sgutils_dep.patch +Patch5: db43.diff %description The lsvpd package contains both the lsvpd, lscfg and lsmcode commands. @@ -47,6 +48,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 %build autoreconf -fi @@ -95,6 +97,8 @@ %{_mandir}/*/* %changelog +* Mon May 21 2007 - dmueller(a)suse.de +- build against db 4.3 * Thu Mar 29 2007 - olh(a)suse.de - add zlib-devel to buildrequires * Wed Feb 14 2007 - olh(a)suse.de ++++++ db43.diff ++++++ --- Makefile.am +++ Makefile.am @@ -71,15 +71,15 @@ lsvio_SOURCES = src/output/lsvio.cpp \ lsmcode_SOURCES = src/output/lsmcode.cpp \ $(lib_h_files) -vpdupdate_LDADD = -L. -ldb_cxx-4.2 -lstdc++ -lz -lsgutils ./libvpd-1.0.la +vpdupdate_LDADD = -L. -ldb_cxx-4.3 -lstdc++ -lz -lsgutils ./libvpd-1.0.la vpdupdate_LDFLAGS = -Wall -lsvpd_LDADD = -L. -ldb_cxx-4.2 -lstdc++ -lz ./libvpd-1.0.la +lsvpd_LDADD = -L. -ldb_cxx-4.3 -lstdc++ -lz ./libvpd-1.0.la lsvpd_LDFLAGS = -Wall -lscfg_LDADD = -L. -ldb_cxx-4.2 -lstdc++ -lz ./libvpd-1.0.la +lscfg_LDADD = -L. -ldb_cxx-4.3 -lstdc++ -lz ./libvpd-1.0.la lscfg_LDFLAGS = -Wall -lsvio_LDADD = -L. -ldb_cxx-4.2 -lstdc++ -lz ./libvpd-1.0.la +lsvio_LDADD = -L. -ldb_cxx-4.3 -lstdc++ -lz ./libvpd-1.0.la lsvio_LDFLAGS = -Wall -lsmcode_LDADD = -L. -ldb_cxx-4.2 -lstdc++ -lz ./libvpd-1.0.la +lsmcode_LDADD = -L. -ldb_cxx-4.3 -lstdc++ -lz ./libvpd-1.0.la lsmcode_LDFLAGS = -Wall libvpd_1_0_la_LDFLAGS = -module @@ -98,11 +98,11 @@ else AM_CXXFLAGS += -DUSB_IDS='"/usr/share/misc/usb.ids"' endif -if DB_CXX_H4_2 -AM_CXXFLAGS += -DDB_CXX='<db4.2/db_cxx.h>' +if DB_CXX_H4_3 +AM_CXXFLAGS += -DDB_CXX='<db4.3/db_cxx.h>' else -if DB_CXX_H42 -AM_CXXFLAGS += -DDB_CXX='<db42/db_cxx.h>' +if DB_CXX_H43 +AM_CXXFLAGS += -DDB_CXX='<db43/db_cxx.h>' else if DB_CXX_H AM_CXXFLAGS += -DDB_CXX='<db_cxx.h>' --- configure.in +++ configure.in @@ -41,8 +41,8 @@ AM_CONDITIONAL(PCI_IDS_LOC, [test -e /usr/share/pci.ids ]) AM_CONDITIONAL(USB_IDS_LOC, [test -e /usr/share/usb.ids ]) #db_cxx.h location conditional. AM_CONDITIONAL(DB_CXX_H, [ test -e /usr/include/db_cxx.h ]) -AM_CONDITIONAL(DB_CXX_H42, [ test -e /usr/include/db42/db_cxx.h ]) -AM_CONDITIONAL(DB_CXX_H4_2, [ test -e /usr/include/db4.2/db_cxx.h ]) +AM_CONDITIONAL(DB_CXX_H43, [ test -e /usr/include/db43/db_cxx.h ]) +AM_CONDITIONAL(DB_CXX_H4_3, [ test -e /usr/include/db4.3/db_cxx.h ]) #finished AC_CONFIG_FILES([Makefile lsvpd.spec debian/changelog]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xen
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package xen checked in at Mon May 21 22:28:44 CEST 2007. -------- --- arch/i386/xen/xen.changes 2007-05-11 22:49:58.000000000 +0200 +++ xen/xen.changes 2007-05-21 18:42:18.000000000 +0200 @@ -1,0 +2,24 @@ +Mon May 21 10:41:41 MDT 2007 - ccoffing(a)novell.com + +- vm-install bug fixes: + + #211342: better progress bar + + #259994: disk size would reset when editing path + + #247073: handle autoyast URLs + + #254311: physical disks were showing as 0.0 GB + +------------------------------------------------------------------- +Wed May 16 16:05:22 MDT 2007 - ccoffing(a)novell.com + +- Properly quote pathnames in domUloader to fix EVMS. (#274484) +- Allow user to specify a default 'keymap' in xend's configuration + file. (#258818 and 241149) + +------------------------------------------------------------------- +Mon May 14 12:46:35 MDT 2007 - plc(a)novell.com + +- Added upstream python patches for keymap specification in + PV config file. Added upstream ALTGR fix, sign extension fix + and modified patch 323 so that upstream patches applied cleanly. + (#258818) + +------------------------------------------------------------------- Old: ---- xend-localtime.diff xend_vbd_type.patch xen-lost-mouse.diff New: ---- 15048-localtime.diff 32on64-call-gates.patch 32on64-cpuid.patch 32on64-ioemu.patch check-libvncserver.patch check-xenapi.patch edd.patch edid.patch guest-copy.patch hvm-debug-msg.patch hvm-efer.patch hvm-hypercall-context.patch hvm-hypercall-debug.patch hvm-pio-read.patch hvm-shared-info-size.patch intpte_t-cast.patch inval-sh-ldt.patch kill-sh_mapcache.patch page-cacheability.patch ptwr-sanity.patch realmode.patch svm-reg-save.patch vmx-no-cstar.patch vnc-i18n-keys.diff x86-nmi-inject.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.y15063/_old 2007-05-21 22:27:54.000000000 +0200 +++ /var/tmp/diff_new_pack.y15063/_new 2007-05-21 22:27:54.000000000 +0200 @@ -35,7 +35,7 @@ BuildRequires: kernel-source kernel-syms xorg-x11 %endif Version: 3.1.0_15040 -Release: 1 +Release: 5 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -58,58 +58,82 @@ Source14: xmclone.sh Source15: dom0config Source16: network-multi_bridge -Patch0: xen-config.diff -Patch1: xend-config.diff -Patch2: xen-destdir.diff -Patch3: xen-vm-install.diff -Patch4: xen-rpmoptflags.diff -Patch5: xen-warnings.diff -Patch6: xen-changeset.diff -Patch7: xen-paths.diff -Patch8: xen-xmexample.diff -Patch9: xen-xmexample-nbd.diff -Patch10: xen-bootloader-dryrun.diff -Patch12: xen-domUloader.diff -Patch13: xen-linguas.diff -Patch14: xen-messages.diff -Patch15: xen-network-bridge.diff -Patch16: xen-no-dummy-nfs-ip.diff -Patch17: serial-split.patch -Patch18: xen-xm-top-needs-root.diff -Patch19: xen-tightvnc-args.diff -Patch20: xen-max-free-mem.diff -Patch21: xen-bonding.diff -Patch22: xen-ioapic-ack-default.diff -Patch23: xen-lost-mouse.diff -Patch24: xen-lowmem-emergency-pool.diff -Patch25: block-losetup-retry.diff -Patch26: block-flags.diff -Patch28: xen-hvm-default-bridge.diff -Patch29: xen-hvm-netfront.diff -Patch30: xen-hvm-default-pae.diff -Patch31: xm-test-cleanup.diff -Patch32: x86-extra-trap-info.patch -Patch33: x86_emulate.patch -Patch34: vgacon-50-lines.patch -Patch35: vgacon-keep.patch -Patch36: cross-build-fix.diff -Patch37: bridge-hostonly.diff -Patch38: xen-generate-foreign-headers.diff -Patch39: tools-xc_kexec.diff -Patch40: tools-kboot.diff -Patch41: libxen_permissive.patch -Patch42: xend_vbd_type.patch -Patch43: xend_multiple_create.patch -Patch44: xen-ioemu-hvm-pv-support.diff -Patch45: xenapi-console-protocol.patch -Patch46: xen-disable-qemu-monitor.diff -Patch47: supported_module.diff -Patch48: disable_emulated_device.diff -Patch49: pv-driver-build.patch -Patch50: xend-localtime.diff -Patch51: qemu-security-etch1.diff -Patch52: netfront_mac.patch -# Misc unused patches / need to be re-ported: +# Upstream patches +Patch0: 15048-localtime.diff +# Our patches +Patch100: xen-config.diff +Patch101: xend-config.diff +Patch102: xen-destdir.diff +Patch103: xen-vm-install.diff +Patch104: xen-rpmoptflags.diff +Patch105: xen-warnings.diff +Patch106: xen-changeset.diff +Patch107: xen-paths.diff +Patch108: xen-xmexample.diff +Patch109: xen-xmexample-nbd.diff +Patch110: xen-bootloader-dryrun.diff +Patch112: xen-domUloader.diff +Patch113: xen-linguas.diff +Patch114: xen-messages.diff +Patch115: xen-network-bridge.diff +Patch116: xen-no-dummy-nfs-ip.diff +Patch117: serial-split.patch +Patch118: xen-xm-top-needs-root.diff +Patch119: xen-tightvnc-args.diff +Patch120: xen-max-free-mem.diff +Patch121: xen-bonding.diff +Patch122: xen-ioapic-ack-default.diff +Patch123: xen-lowmem-emergency-pool.diff +Patch124: block-losetup-retry.diff +Patch125: block-flags.diff +Patch126: xen-hvm-default-bridge.diff +Patch127: xen-hvm-netfront.diff +Patch128: xen-hvm-default-pae.diff +Patch129: xm-test-cleanup.diff +Patch130: cross-build-fix.diff +Patch131: bridge-hostonly.diff +Patch132: xen-generate-foreign-headers.diff +Patch133: tools-xc_kexec.diff +Patch134: tools-kboot.diff +Patch135: libxen_permissive.patch +Patch136: xend_multiple_create.patch +Patch137: xen-ioemu-hvm-pv-support.diff +Patch138: xenapi-console-protocol.patch +Patch139: xen-disable-qemu-monitor.diff +Patch140: supported_module.diff +Patch141: disable_emulated_device.diff +Patch142: pv-driver-build.patch +Patch143: qemu-security-etch1.diff +Patch144: netfront_mac.patch +Patch145: vnc-i18n-keys.diff +# Patches from Jan +Patch170: inval-sh-ldt.patch +Patch171: 32on64-cpuid.patch +Patch172: 32on64-ioemu.patch +Patch173: check-libvncserver.patch +Patch174: check-xenapi.patch +Patch175: kill-sh_mapcache.patch +Patch176: intpte_t-cast.patch +Patch177: ptwr-sanity.patch +Patch178: hvm-pio-read.patch +Patch179: hvm-shared-info-size.patch +Patch180: hvm-hypercall-context.patch +Patch181: hvm-efer.patch +Patch182: hvm-hypercall-debug.patch +Patch183: svm-reg-save.patch +Patch184: vmx-no-cstar.patch +Patch185: hvm-debug-msg.patch +Patch186: guest-copy.patch +Patch187: page-cacheability.patch +Patch188: realmode.patch +Patch189: edd.patch +Patch190: edid.patch +Patch191: 32on64-call-gates.patch +Patch192: x86-nmi-inject.patch +Patch193: x86_emulate.patch +Patch194: vgacon-keep.patch +Patch195: vgacon-50-lines.patch +Patch196: x86-extra-trap-info.patch Patch300: xen-enable-hvm-debug.diff URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/ Prefix: /usr @@ -508,58 +532,80 @@ %setup -q -c -n %xen_build_dir/tools -D -T -a 1 cd .. %patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 %if %{?with_install}0 -%patch3 -p1 +%patch103 -p1 %endif -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch12 -p1 -#%patch13 -p1 # po files are misnamed upstream -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -#%patch33 -p1 # check if upstream -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -#%patch43 -p1 # check if bug still exists in 3.1.0 -#%patch44 -p1 # re-port -%patch45 -p1 -%patch46 -p1 -%patch47 -p1 -#%patch48 -p1 # Currently not disabling FV devices when loading PV drivers -%patch49 -p1 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 +%patch104 -p1 +%patch105 -p1 +%patch106 -p1 +%patch107 -p1 +%patch108 -p1 +%patch109 -p1 +%patch110 -p1 +%patch112 -p1 +#%patch113 -p1 # po files are misnamed upstream +%patch114 -p1 +%patch115 -p1 +%patch116 -p1 +%patch117 -p1 +%patch118 -p1 +%patch119 -p1 +%patch120 -p1 +%patch121 -p1 +%patch122 -p1 +%patch123 -p1 +%patch124 -p1 +%patch125 -p1 +%patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 +%patch131 -p1 +%patch132 -p1 +%patch133 -p1 +%patch134 -p1 +%patch135 -p1 +#%patch136 -p1 # check if bug still exists in 3.1.0 +#%patch137 -p1 # re-port +%patch138 -p1 +%patch139 -p1 +%patch140 -p1 +#%patch141 -p1 # Currently not disabling FV devices when loading PV drivers +%patch142 -p1 +%patch143 -p1 +%patch144 -p1 +%patch145 -p1 +%patch170 -p1 +%patch171 -p1 +%patch172 -p1 +%patch173 -p1 +%patch174 -p1 +%patch175 -p1 +%patch176 -p1 +%patch177 -p1 +%patch178 -p1 +%patch179 -p1 +%patch180 -p1 +%patch181 -p1 +%patch182 -p1 +%patch183 -p1 +%patch184 -p1 +%patch185 -p1 +%patch186 -p1 +%patch187 -p1 +%patch188 -p1 +%patch189 -p1 +%patch190 -p1 +%patch191 -p1 +%patch192 -p1 +%patch193 -p1 +%patch194 -p1 +%patch195 -p1 +%patch196 -p1 XEN_EXTRAVERSION=%version-%release XEN_EXTRAVERSION=${XEN_EXTRAVERSION#%{xvers}} sed -i "s/XEN_EXTRAVERSION[ ]*.=.*\$/XEN_EXTRAVERSION = $XEN_EXTRAVERSION/" xen/Makefile @@ -879,6 +925,21 @@ %{insserv_cleanup} %changelog +* Mon May 21 2007 - ccoffing(a)novell.com +- vm-install bug fixes: + + #211342: better progress bar + + #259994: disk size would reset when editing path + + #247073: handle autoyast URLs + + #254311: physical disks were showing as 0.0 GB +* Wed May 16 2007 - ccoffing(a)novell.com +- Properly quote pathnames in domUloader to fix EVMS. (#274484) +- Allow user to specify a default 'keymap' in xend's configuration + file. (#258818 and 241149) +* Mon May 14 2007 - plc(a)novell.com +- Added upstream python patches for keymap specification in + PV config file. Added upstream ALTGR fix, sign extension fix + and modified patch 323 so that upstream patches applied cleanly. + (#258818) * Fri May 11 2007 - ccoffing(a)novell.com - Update to xen-3.1-testing rc10 (changeset 15040). - Update .desktop with proper group. (#258600) ++++++ xend-localtime.diff -> 15048-localtime.diff ++++++ --- arch/i386/xen/xend-localtime.diff 2007-05-11 22:23:58.000000000 +0200 +++ xen/15048-localtime.diff 2007-05-17 20:00:53.000000000 +0200 @@ -12,7 +12,7 @@ =================================================================== --- xen-3.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py +++ xen-3.1-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -1490,8 +1490,7 @@ class XendDomainInfo: +@@ -1472,8 +1472,7 @@ class XendDomainInfo: try: self.image = image.create(self, self.info) ++++++ 32on64-call-gates.patch ++++++ Index: 2007-05-14/xen/arch/x86/traps.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/traps.c 2007-05-14 14:39:42.000000000 +0200 +++ 2007-05-14/xen/arch/x86/traps.c 2007-05-14 14:40:03.000000000 +0200 @@ -1091,6 +1091,63 @@ static int read_descriptor(unsigned int return 1; } +#ifdef CONFIG_COMPAT/* XXX __x86_64__ */ +static int read_gate_descriptor(unsigned int gate_sel, + const struct vcpu *v, + unsigned int *sel, + unsigned long *off, + unsigned int *ar) +{ + struct desc_struct desc; + const struct desc_struct *pdesc; + + + pdesc = (const struct desc_struct *)(!(gate_sel & 4) ? + GDT_VIRT_START(v) : + LDT_VIRT_START(v)) + + (gate_sel >> 3); + if ( gate_sel < 4 || + (gate_sel >= FIRST_RESERVED_GDT_BYTE && !(gate_sel & 4)) || + __get_user(desc, pdesc) ) + return 0; + + *sel = (desc.a >> 16) & 0x0000fffc; + *off = (desc.a & 0x0000ffff) | (desc.b & 0xffff0000); + *ar = desc.b & 0x0000ffff; + /* + * check_descriptor() clears the DPL field and stores the + * guest requested DPL in the selector's RPL field. + */ + ASSERT(!(*ar & _SEGMENT_DPL)); + *ar |= (desc.a >> (16 - 13)) & _SEGMENT_DPL; + + if ( !is_pv_32on64_vcpu(v) ) + { + if ( (*ar & 0x1f00) != 0x0c00 || + (gate_sel >= FIRST_RESERVED_GDT_BYTE - 8 && !(gate_sel & 4)) || + __get_user(desc, pdesc + 1) || + (desc.b & 0x1f00) ) + return 0; + + *off |= (unsigned long)desc.a << 32; + return 1; + } + + switch ( *ar & 0x1f00 ) + { + case 0x0400: + *off &= 0xffff; + break; + case 0x0c00: + break; + default: + return 0; + } + + return 1; +} +#endif + /* Has the guest requested sufficient permission for this I/O access? */ static inline int guest_io_okay( unsigned int port, unsigned int bytes, @@ -1158,6 +1215,8 @@ unsigned long guest_to_host_gpr_switch(u #define insn_fetch(type, base, eip, limit) \ ({ unsigned long _rc, _ptr = (base) + (eip); \ type _x; \ + if ( ad_default < 8 ) \ + _ptr = (unsigned int)_ptr; \ if ( (limit) < sizeof(_x) - 1 || (eip) > (limit) - (sizeof(_x) - 1) ) \ goto fail; \ if ( (_rc = copy_from_user(&_x, (type *)_ptr, sizeof(_x))) != 0 ) \ @@ -1760,6 +1819,336 @@ static int emulate_privileged_op(struct return 0; } +static inline int check_stack_limit(unsigned int ar, unsigned int limit, + unsigned int esp, unsigned int decr) +{ + return esp - decr < esp - 1 && + (!(ar & _SEGMENT_EC) ? esp - 1 <= limit : esp - decr > limit); +} + +static int emulate_gate_op(struct cpu_user_regs *regs) +{ +#ifdef CONFIG_COMPAT/* XXX __x86_64__ */ + struct vcpu *v = current; + unsigned int sel, ar, dpl, nparm, opnd_sel; + unsigned int op_default, op_bytes, ad_default, ad_bytes; + unsigned long off, eip, opnd_off, base, limit; + int jump; + + /* Check whether this fault is due to the use of a call gate. */ + if ( !read_gate_descriptor(regs->error_code, v, &sel, &off, &ar) || + ((ar >> 13) & 3) < (regs->cs & 3) || + (ar & _SEGMENT_TYPE) != 0xc00 ) + return do_guest_trap(TRAP_gp_fault, regs, 1); + if ( !(ar & _SEGMENT_P) ) + return do_guest_trap(TRAP_no_segment, regs, 1); + dpl = (ar >> 13) & 3; + nparm = ar & 0x1f; + + /* + * Decode instruction (and perhaps operand) to determine RPL, + * whether this is a jump or a call, and the call return offset. + */ + if ( !read_descriptor(regs->cs, v, regs, &base, &limit, &ar, 0) || + !(ar & _SEGMENT_S) || + !(ar & _SEGMENT_P) || + !(ar & _SEGMENT_CODE) ) + return do_guest_trap(TRAP_gp_fault, regs, 1); + + op_bytes = op_default = ar & _SEGMENT_DB ? 4 : 2; + ad_default = ad_bytes = op_default; + opnd_sel = opnd_off = 0; + jump = -1; + for ( eip = regs->eip; eip - regs->_eip < 10; ) + { + switch ( insn_fetch(u8, base, eip, limit) ) + { + case 0x66: /* operand-size override */ + op_bytes = op_default ^ 6; /* switch between 2/4 bytes */ + continue; + case 0x67: /* address-size override */ + ad_bytes = ad_default != 4 ? 4 : 2; /* switch to 2/4 bytes */ + continue; + case 0x2e: /* CS override */ + opnd_sel = regs->cs; + ASSERT(opnd_sel); + continue; + case 0x3e: /* DS override */ + opnd_sel = read_sreg(regs, ds); + if ( !opnd_sel ) + opnd_sel = dpl; + continue; + case 0x26: /* ES override */ + opnd_sel = read_sreg(regs, es); + if ( !opnd_sel ) + opnd_sel = dpl; + continue; + case 0x64: /* FS override */ + opnd_sel = read_sreg(regs, fs); + if ( !opnd_sel ) + opnd_sel = dpl; + continue; + case 0x65: /* GS override */ + opnd_sel = read_sreg(regs, gs); + if ( !opnd_sel ) + opnd_sel = dpl; + continue; + case 0x36: /* SS override */ + opnd_sel = regs->ss; + if ( !opnd_sel ) + opnd_sel = dpl; + continue; + case 0xea: + ++jump; + /* FALLTHROUGH */ + case 0x9a: + ++jump; + opnd_sel = regs->cs; + opnd_off = eip; + ad_bytes = ad_default; + eip += op_bytes + 2; + break; + case 0xff: + { + unsigned int modrm; + + switch ( (modrm = insn_fetch(u8, base, eip, limit)) & 0xf8 ) + { + case 0x28: case 0x68: case 0xa8: + ++jump; + /* FALLTHROUGH */ + case 0x18: case 0x58: case 0x98: + ++jump; + if ( ad_bytes != 2 ) + { + if ( (modrm & 7) == 4 ) + { + unsigned int sib = insn_fetch(u8, base, eip, limit); + + modrm = (modrm & ~7) | (sib & 7); + if ( (sib >>= 3) != 4 ) + opnd_off = *(unsigned long *)decode_register(sib & 7, regs, 0); + opnd_off <<= sib >> 3; + } + if ( (modrm & 7) != 5 || (modrm & 0xc0) ) + opnd_off += *(unsigned long *)decode_register(modrm & 7, regs, 0); + else + modrm |= 0x87; + if ( !opnd_sel ) + { + switch ( modrm & 7 ) + { + default: + opnd_sel = read_sreg(regs, ds); + break; + case 4: case 5: + opnd_sel = regs->ss; + break; + } + } + } + else + { + switch ( modrm & 7 ) + { + case 0: case 1: case 7: + opnd_off = regs->ebx; + break; + case 6: + if ( !(modrm & 0xc0) ) + modrm |= 0x80; + else + case 2: case 3: + { + opnd_off = regs->ebp; + if ( !opnd_sel ) + opnd_sel = regs->ss; + } + break; + } + if ( !opnd_sel ) + opnd_sel = read_sreg(regs, ds); + switch ( modrm & 7 ) + { + case 0: case 2: case 4: + opnd_off += regs->esi; + break; + case 1: case 3: case 5: + opnd_off += regs->edi; + break; + } + } + switch ( modrm & 0xc0 ) + { + case 0x40: + opnd_off += insn_fetch(s8, base, eip, limit); + break; + case 0x80: + opnd_off += insn_fetch(s32, base, eip, limit); + break; + } + if ( ad_bytes == 4 ) + opnd_off = (unsigned int)opnd_off; + else if ( ad_bytes == 2 ) + opnd_off = (unsigned short)opnd_off; + break; + } + } + break; + } + break; + } + + if ( jump < 0 ) + { + fail: + return do_guest_trap(TRAP_gp_fault, regs, 1); + } + + if ( (opnd_sel != regs->cs && + !read_descriptor(opnd_sel, v, regs, &base, &limit, &ar, 0)) || + !(ar & _SEGMENT_S) || + !(ar & _SEGMENT_P) || + ((ar & _SEGMENT_CODE) && !(ar & _SEGMENT_WR)) ) + return do_guest_trap(TRAP_gp_fault, regs, 1); + + opnd_off += op_bytes; +#define ad_default ad_bytes + opnd_sel = insn_fetch(u16, base, opnd_off, limit); +#undef ad_default + ASSERT((opnd_sel & ~3) == regs->error_code); + if ( dpl < (opnd_sel & 3) ) + return do_guest_trap(TRAP_gp_fault, regs, 1); + + if ( !read_descriptor(sel, v, regs, &base, &limit, &ar, 0) || + !(ar & _SEGMENT_S) || + !(ar & _SEGMENT_CODE) || + (!jump || (ar & _SEGMENT_EC) ? + ((ar >> 13) & 3) > (regs->cs & 3) : + ((ar >> 13) & 3) != (regs->cs & 3)) ) + { + regs->error_code = sel; + return do_guest_trap(TRAP_gp_fault, regs, 1); + } + if ( !(ar & _SEGMENT_P) ) + { + regs->error_code = sel; + return do_guest_trap(TRAP_no_segment, regs, 1); + } + if ( off > limit ) + { + regs->error_code = 0; + return do_guest_trap(TRAP_gp_fault, regs, 1); + } + + if ( !jump ) + { + unsigned int ss, esp, *stkp; + int rc; +#define push(item) do \ + { \ + --stkp; \ + esp -= 4; \ + rc = __put_user(item, stkp); \ + if ( rc ) \ + { \ + propagate_page_fault((unsigned long)(stkp + 1) - rc, \ + PFEC_write_access); \ + return 0; \ + } \ + } while ( 0 ) + + if ( ((ar >> 13) & 3) < (regs->cs & 3) ) + { + sel |= (ar >> 13) & 3; + /* Inner stack known only for kernel ring. */ + if ( (sel & 3) != GUEST_KERNEL_RPL(v->domain) ) + return do_guest_trap(TRAP_gp_fault, regs, 1); + esp = v->arch.guest_context.kernel_sp; + ss = v->arch.guest_context.kernel_ss; + if ( (ss & 3) != (sel & 3) || + !read_descriptor(ss, v, regs, &base, &limit, &ar, 0) || + ((ar >> 13) & 3) != (sel & 3) || + !(ar & _SEGMENT_S) || + (ar & _SEGMENT_CODE) || + !(ar & _SEGMENT_WR) ) + { + regs->error_code = ss & ~3; + return do_guest_trap(TRAP_invalid_tss, regs, 1); + } + if ( !(ar & _SEGMENT_P) || + !check_stack_limit(ar, limit, esp, (4 + nparm) * 4) ) + { + regs->error_code = ss & ~3; + return do_guest_trap(TRAP_stack_error, regs, 1); + } + stkp = (unsigned int *)(unsigned long)((unsigned int)base + esp); + if ( !compat_access_ok(stkp - 4 - nparm, (4 + nparm) * 4) ) + return do_guest_trap(TRAP_gp_fault, regs, 1); + push(regs->ss); + push(regs->esp); + if ( nparm ) + { + const unsigned int *ustkp; + + if ( !read_descriptor(regs->ss, v, regs, &base, &limit, &ar, 0) || + ((ar >> 13) & 3) != (regs->cs & 3) || + !(ar & _SEGMENT_S) || + (ar & _SEGMENT_CODE) || + !(ar & _SEGMENT_WR) || + !check_stack_limit(ar, limit, esp + nparm * 4, nparm * 4) ) + return do_guest_trap(TRAP_gp_fault, regs, 1); + ustkp = (unsigned int *)(unsigned long)((unsigned int)base + regs->_esp + nparm * 4); + if ( !compat_access_ok(ustkp - nparm, nparm * 4) ) + return do_guest_trap(TRAP_gp_fault, regs, 1); + do + { + unsigned int parm; + + --ustkp; + rc = __get_user(parm, ustkp); + if ( rc ) + { + propagate_page_fault((unsigned long)(ustkp + 1) - rc, 0); + return 0; + } + push(parm); + } while ( --nparm ); + } + } + else + { + sel |= (regs->cs & 3); + esp = regs->esp; + ss = regs->ss; + if ( !read_descriptor(ss, v, regs, &base, &limit, &ar, 0) || + ((ar >> 13) & 3) != (sel & 3) ) + return do_guest_trap(TRAP_gp_fault, regs, 1); + if ( !check_stack_limit(ar, limit, esp, 2 * 4) ) + { + regs->error_code = 0; + return do_guest_trap(TRAP_stack_error, regs, 1); + } + stkp = (unsigned int *)(unsigned long)((unsigned int)base + esp); + if ( !compat_access_ok(stkp - 2, 2 * 4) ) + return do_guest_trap(TRAP_gp_fault, regs, 1); + } + push(regs->cs); + push(eip); +#undef push + regs->esp = esp; + regs->ss = ss; + } + else + sel |= (regs->cs & 3); + + regs->eip = off; + regs->cs = sel; +#endif + + return 0; +} + asmlinkage int do_general_protection(struct cpu_user_regs *regs) { struct vcpu *v = current; @@ -1805,6 +2194,8 @@ asmlinkage int do_general_protection(str return do_guest_trap(vector, regs, 0); } } + else if ( is_pv_32on64_vcpu(v) && regs->error_code ) + return emulate_gate_op(regs); /* Emulate some simple privileged and I/O instructions. */ if ( (regs->error_code == 0) && Index: 2007-05-14/xen/arch/x86/x86_64/mm.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/x86_64/mm.c 2007-05-03 09:45:09.000000000 +0200 +++ 2007-05-14/xen/arch/x86/x86_64/mm.c 2007-05-14 14:40:03.000000000 +0200 @@ -372,14 +372,16 @@ int check_descriptor(const struct domain { u32 a = d->a, b = d->b; u16 cs; + unsigned int dpl; /* A not-present descriptor will always fault, so is safe. */ if ( !(b & _SEGMENT_P) ) goto good; /* Check and fix up the DPL. */ - if ( (b & _SEGMENT_DPL) < (GUEST_KERNEL_RPL(dom) << 13) ) - d->b = b = (b & ~_SEGMENT_DPL) | (GUEST_KERNEL_RPL(dom) << 13); + dpl = (b >> 13) & 3; + __fixup_guest_selector(dom, dpl); + b = (b & ~_SEGMENT_DPL) | (dpl << 13); /* All code and data segments are okay. No base/limit checking. */ if ( (b & _SEGMENT_S) ) @@ -397,18 +399,33 @@ int check_descriptor(const struct domain if ( (b & _SEGMENT_TYPE) != 0xc00 ) goto bad; - /* Validate and fix up the target code selector. */ + /* Validate the target code selector. */ cs = a >> 16; - fixup_guest_code_selector(dom, cs); if ( !guest_gate_selector_okay(dom, cs) ) goto bad; - a = d->a = (d->a & 0xffffU) | (cs << 16); +#ifdef __x86_64__ + /* + * Force DPL to zero, causing a GP fault with its error code indicating + * the gate in use, allowing emulation. This is necessary because with + * native guests (kernel in ring 3) call gates cannot be used directly + * to transition from user to kernel mode (and whether a gate is used + * to enter the kernel can only be determined when the gate is being + * used), and with compat guests call gates cannot be used at all as + * there are only 64-bit ones. + * Store the original DPL in the selector's RPL field. + */ + b &= ~_SEGMENT_DPL; + cs = (cs & ~3) | dpl; +#endif + a = (a & 0xffffU) | (cs << 16); /* Reserved bits must be zero. */ - if ( (b & 0xe0) != 0 ) + if ( b & (CONFIG_PAGING_LEVELS < 4 || is_pv_32on64_domain(dom) ? 0xe0 : 0xff) ) goto bad; good: + d->a = a; + d->b = b; return 1; bad: return 0; ++++++ 32on64-cpuid.patch ++++++ Index: 2007-04-27/xen/arch/x86/traps.c =================================================================== --- 2007-04-27.orig/xen/arch/x86/traps.c 2007-04-27 11:02:48.000000000 +0200 +++ 2007-04-27/xen/arch/x86/traps.c 2007-05-09 17:56:43.000000000 +0200 @@ -594,6 +594,8 @@ static int emulate_forced_invalid_op(str else if ( regs->eax == 0x80000001 ) { /* Modify Feature Information. */ + if ( is_pv_32on64_vcpu(current) ) + clear_bit(X86_FEATURE_SYSCALL % 32, &d); clear_bit(X86_FEATURE_RDTSCP % 32, &d); } else ++++++ 32on64-ioemu.patch ++++++ Index: 2007-04-27/tools/ioemu/target-i386-dm/helper2.c =================================================================== --- 2007-04-27.orig/tools/ioemu/target-i386-dm/helper2.c 2007-04-23 12:41:32.000000000 +0200 +++ 2007-04-27/tools/ioemu/target-i386-dm/helper2.c 2007-05-09 17:58:07.000000000 +0200 @@ -322,7 +322,7 @@ void cpu_ioreq_pio(CPUState *env, ioreq_ do_outp(env, req->addr, req->size, req->data); } else { for (i = 0; i < req->count; i++) { - unsigned long tmp; + unsigned long tmp = 0; read_physical((target_phys_addr_t) req->data + (sign * i * req->size), @@ -354,7 +354,7 @@ void cpu_ioreq_move(CPUState *env, ioreq } } } else { - unsigned long tmp; + target_ulong tmp; if (req->dir == IOREQ_READ) { for (i = 0; i < req->count; i++) { @@ -380,14 +380,14 @@ void cpu_ioreq_move(CPUState *env, ioreq void cpu_ioreq_and(CPUState *env, ioreq_t *req) { - unsigned long tmp1, tmp2; + target_ulong tmp1, tmp2; if (req->data_is_ptr != 0) hw_error("expected scalar value"); read_physical(req->addr, req->size, &tmp1); if (req->dir == IOREQ_WRITE) { - tmp2 = tmp1 & (unsigned long) req->data; + tmp2 = tmp1 & (target_ulong) req->data; write_physical(req->addr, req->size, &tmp2); } req->data = tmp1; @@ -395,14 +395,14 @@ void cpu_ioreq_and(CPUState *env, ioreq_ void cpu_ioreq_add(CPUState *env, ioreq_t *req) { - unsigned long tmp1, tmp2; + target_ulong tmp1, tmp2; if (req->data_is_ptr != 0) hw_error("expected scalar value"); read_physical(req->addr, req->size, &tmp1); if (req->dir == IOREQ_WRITE) { - tmp2 = tmp1 + (unsigned long) req->data; + tmp2 = tmp1 + (target_ulong) req->data; write_physical(req->addr, req->size, &tmp2); } req->data = tmp1; @@ -410,14 +410,14 @@ void cpu_ioreq_add(CPUState *env, ioreq_ void cpu_ioreq_sub(CPUState *env, ioreq_t *req) { - unsigned long tmp1, tmp2; + target_ulong tmp1, tmp2; if (req->data_is_ptr != 0) hw_error("expected scalar value"); read_physical(req->addr, req->size, &tmp1); if (req->dir == IOREQ_WRITE) { - tmp2 = tmp1 - (unsigned long) req->data; + tmp2 = tmp1 - (target_ulong) req->data; write_physical(req->addr, req->size, &tmp2); } req->data = tmp1; @@ -425,14 +425,14 @@ void cpu_ioreq_sub(CPUState *env, ioreq_ void cpu_ioreq_or(CPUState *env, ioreq_t *req) { - unsigned long tmp1, tmp2; + target_ulong tmp1, tmp2; if (req->data_is_ptr != 0) hw_error("expected scalar value"); read_physical(req->addr, req->size, &tmp1); if (req->dir == IOREQ_WRITE) { - tmp2 = tmp1 | (unsigned long) req->data; + tmp2 = tmp1 | (target_ulong) req->data; write_physical(req->addr, req->size, &tmp2); } req->data = tmp1; @@ -440,14 +440,14 @@ void cpu_ioreq_or(CPUState *env, ioreq_t void cpu_ioreq_xor(CPUState *env, ioreq_t *req) { - unsigned long tmp1, tmp2; + target_ulong tmp1, tmp2; if (req->data_is_ptr != 0) hw_error("expected scalar value"); read_physical(req->addr, req->size, &tmp1); if (req->dir == IOREQ_WRITE) { - tmp2 = tmp1 ^ (unsigned long) req->data; + tmp2 = tmp1 ^ (target_ulong) req->data; write_physical(req->addr, req->size, &tmp2); } req->data = tmp1; @@ -495,8 +495,9 @@ void cpu_ioreq_xchg(CPUState *env, ioreq void __handle_ioreq(CPUState *env, ioreq_t *req) { - if (!req->data_is_ptr && req->dir == IOREQ_WRITE && req->size != 4) - req->data &= (1UL << (8 * req->size)) - 1; + if (!req->data_is_ptr && req->dir == IOREQ_WRITE && + req->size < sizeof(target_ulong)) + req->data &= ((target_ulong)1 << (8 * req->size)) - 1; switch (req->type) { case IOREQ_TYPE_PIO: ++++++ check-libvncserver.patch ++++++ Index: 2007-04-27/tools/check/check_libvncserver =================================================================== --- 2007-04-27.orig/tools/check/check_libvncserver 2006-12-04 08:49:57.000000000 +0100 +++ 2007-04-27/tools/check/check_libvncserver 2007-04-27 09:31:02.000000000 +0200 @@ -10,6 +10,7 @@ fi RC=0 LIBVNCSERVER_CONFIG="$(which libvncserver-config)" +tmpfile=$(mktemp) if test -z ${LIBVNCSERVER_CONFIG}; then RC=1 @@ -22,6 +23,16 @@ if test $RC -ne 0; then echo "FAILED" echo " *** libvncserver-config is missing. " echo " *** Please install libvncserver." +elif ! ld $($LIBVNCSERVER_CONFIG --libs) -o $tmpfile >/dev/null 2>&1; then + echo "FAILED" + echo " *** dependency libraries for libvncserver are missing: " + RC=1 + for i in $(ld $($LIBVNCSERVER_CONFIG --libs) -o $tmpfile 2>&1 >/dev/null); do + case $i in + -l*) echo lib${i#-l} + esac + done fi +rm -f $tmpfile exit $RC ++++++ check-xenapi.patch ++++++ Index: 2007-04-18/tools/check/Makefile =================================================================== --- 2007-04-18.orig/tools/check/Makefile 2006-12-14 22:49:54.000000000 +0100 +++ 2007-04-18/tools/check/Makefile 2007-04-24 16:32:39.000000000 +0200 @@ -7,7 +7,7 @@ all: build # Check this machine is OK for building on. .PHONY: build build: - XENFB_TOOLS=$(XENFB_TOOLS) ./chk build + XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ./chk build # Check this machine is OK for installing on. # DO NOT use this check from 'make install' in the parent @@ -15,7 +15,7 @@ build: # copy rather than actually installing. .PHONY: install install: - XENFB_TOOLS=$(XENFB_TOOLS) ./chk install + XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ./chk install .PHONY: clean clean: Index: 2007-04-18/tools/check/check_curl =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ 2007-04-18/tools/check/check_curl 2007-04-24 16:41:08.000000000 +0200 @@ -0,0 +1,38 @@ +#!/bin/sh +# CHECK-BUILD CHECK-INSTALL + +if [ ! "$LIBXENAPI_BINDINGS" = "y" ] +then + echo -n "unused, " + exit 0 +fi + +RC=0 + +CURL_CONFIG="$(which curl-config)" +tmpfile=$(mktemp) + +if test -z ${CURL_CONFIG}; then + RC=1 +else + ${CURL_CONFIG} --libs 2>&1 > /dev/null + RC=$? +fi + +if test $RC -ne 0; then + echo "FAILED" + echo " *** curl-config is missing. " + echo " *** Please install curl-devel." +elif ! ld $($CURL_CONFIG --libs) -o $tmpfile >/dev/null 2>&1; then + echo "FAILED" + echo " *** dependency libraries for curl are missing: " + RC=1 + for i in $(ld $($CURL_CONFIG --libs) -o $tmpfile 2>&1 >/dev/null); do + case $i in + -l*) echo lib${i#-l} + esac + done +fi +rm -f $tmpfile + +exit $RC Index: 2007-04-18/tools/check/check_xml2 =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ 2007-04-18/tools/check/check_xml2 2007-04-24 16:41:16.000000000 +0200 @@ -0,0 +1,38 @@ +#!/bin/sh +# CHECK-BUILD CHECK-INSTALL + +if [ ! "$LIBXENAPI_BINDINGS" = "y" ] +then + echo -n "unused, " + exit 0 +fi + +RC=0 + +XML2_CONFIG="$(which xml2-config)" +tmpfile=$(mktemp) + +if test -z ${XML2_CONFIG}; then + RC=1 +else + ${XML2_CONFIG} --libs 2>&1 > /dev/null + RC=$? +fi + +if test $RC -ne 0; then + echo "FAILED" + echo " *** xml2-config is missing. " + echo " *** Please install libxml2-devel." +elif ! ld $($XML2_CONFIG --libs) -o $tmpfile >/dev/null 2>&1; then + echo "FAILED" + echo " *** dependency libraries for xml2 are missing: " + RC=1 + for i in $(ld $($XML2_CONFIG --libs) -o $tmpfile 2>&1 >/dev/null); do + case $i in + -l*) echo lib${i#-l} + esac + done +fi +rm -f $tmpfile + +exit $RC ++++++ domUloader.py ++++++ --- arch/i386/xen/domUloader.py 2007-04-17 16:42:56.000000000 +0200 +++ xen/domUloader.py 2007-05-17 17:16:13.000000000 +0200 @@ -115,9 +115,9 @@ if not os.path.exists(ldev): break i += 1 - fd = os.popen("losetup %s %s 2> /dev/null" % (ldev, self.pdev)) + fd = os.popen("losetup %s '%s' 2> /dev/null" % (ldev, self.pdev)) if not fd.close(): - verbose_print("losetup %s %s" % (ldev, self.pdev)) + verbose_print("losetup %s '%s'" % (ldev, self.pdev)) self.ldev = ldev break if not self.ldev: @@ -149,13 +149,14 @@ self.loopsetup() # TODO: We could use fdisk -l instead and look at the type of # partitions; this way we could also detect LVM and support it. - fd = os.popen("kpartx -l %s" % self.physdev()) + fd = os.popen("kpartx -l '%s'" % self.physdev()) pcount = 0 for line in fd.readlines(): line = line.strip() verbose_print("kpartx -l: %s" % (line,)) (pname, params) = line.split(':') - pno = int(traildigits(pname.strip())) + pname = pname.strip() + pno = int(traildigits(pname)) #if pname.rfind('/') != -1: # pname = pname[pname.rfind('/')+1:] #pname = self.pdev[:self.pdev.rfind('/')] + '/' + pname @@ -177,8 +178,8 @@ if not self.mapped: self.loopsetup() if self.pcount: - verbose_print("kpartx -a %s" % self.physdev()) - fd = os.popen("kpartx -a %s" % self.physdev()) + verbose_print("kpartx -a '%s'" % self.physdev()) + fd = os.popen("kpartx -a '%s'" % self.physdev()) fd.close() self.mapped += 1 @@ -192,8 +193,8 @@ self.mapped -= 1 if not self.mapped: if self.pcount: - verbose_print("kpartx -d %s" % self.physdev()) - fd = os.popen("kpartx -d %s" % self.physdev()) + verbose_print("kpartx -d '%s'" % self.physdev()) + fd = os.popen("kpartx -d '%s'" % self.physdev()) fd.close() self.loopclean() @@ -251,11 +252,11 @@ if fstype: mopts += " -t %s" % fstype mopts += " -o %s" % options - verbose_print("mount %s %s %s" % (mopts, self.pdev, mtpt)) - fd = os.popen("mount %s %s %s" % (mopts, self.pdev, mtpt)) + verbose_print("mount %s '%s' %s" % (mopts, self.pdev, mtpt)) + fd = os.popen("mount %s '%s' %s" % (mopts, self.pdev, mtpt)) err = fd.close() if err: - raise RuntimeError("Error %i from mount %s %s on %s" % \ + raise RuntimeError("Error %i from mount %s '%s' on %s" % \ (err, mopts, self.pdev, mtpt)) self.mountpoint = mtpt ++++++ edd.patch ++++++ ++++ 660 lines (skipped) ++++++ edid.patch ++++++ Index: 2007-03-19/xen/arch/x86/Makefile =================================================================== --- 2007-03-19.orig/xen/arch/x86/Makefile 2007-03-19 14:07:47.000000000 +0100 +++ 2007-03-19/xen/arch/x86/Makefile 2007-03-19 14:07:50.000000000 +0100 @@ -78,7 +78,7 @@ xen.lds: $(TARGET_SUBARCH)/xen.lds.S $(H boot/mkelf32: boot/mkelf32.c $(HOSTCC) $(HOSTCFLAGS) -o $@ $< -boot/$(TARGET_SUBARCH).o: boot/realmode.S boot/edd.S +boot/$(TARGET_SUBARCH).o: boot/realmode.S boot/edd.S boot/video.S .PHONY: clean clean:: Index: 2007-03-19/xen/arch/x86/boot/realmode.S =================================================================== --- 2007-03-19.orig/xen/arch/x86/boot/realmode.S 2007-03-21 14:35:06.000000000 +0100 +++ 2007-03-19/xen/arch/x86/boot/realmode.S 2007-03-21 14:35:14.000000000 +0100 @@ -142,4 +142,11 @@ eddbuf: .skip EDDMAXNR * (EDDEXTSIZE + edd_mbr_sig_buf: .skip EDD_MBR_SIG_MAX * 4 eddnr: .skip 1 edd_mbr_sig_nr_buf: .skip 1 + + .globl ddc_capabilities, edid_transfer_time, edid +ddc_capabilities: .skip 1 +edid_transfer_time: .skip 1 +edid: .skip 128 .previous + +#include "video.S" Index: 2007-03-19/xen/arch/x86/boot/video.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ 2007-03-19/xen/arch/x86/boot/video.S 2007-03-19 14:07:50.000000000 +0100 @@ -0,0 +1,35 @@ +store_edid: + movl $0x13131313, %eax # memset block with 0x13 + movw $32, %cx + movw $SYM_REAL(edid), %di + cld + rep + stosl + + pushw %es # save ES + xorw %di, %di # Report Capability + movw %di, %es # ES:DI must be 0:0 + movw $0x4f15, %ax + xorw %bx, %bx + xorw %cx, %cx + int $0x10 + popw %es # restore ES + + testb %ah, %ah # call successful + jnz no_edid + + cmpb $0x4f, %al # function supported + jne no_edid + + movb %bl, SYM_REAL(ddc_capabilities) + movb %bh, SYM_REAL(edid_transfer_time) + + movw $0x4f15, %ax # do VBE/DDC + movw $0x01, %bx + xorw %cx, %cx + xorw %dx, %dx + movw $SYM_REAL(edid), %di + int $0x10 + +no_edid: + ret Index: 2007-03-19/xen/arch/x86/boot/x86_32.S =================================================================== --- 2007-03-19.orig/xen/arch/x86/boot/x86_32.S 2007-03-19 14:07:47.000000000 +0100 +++ 2007-03-19/xen/arch/x86/boot/x86_32.S 2007-03-19 14:07:50.000000000 +0100 @@ -92,6 +92,8 @@ __start: pushl $SYM_PHYS(edd) call realmode + pushl $SYM_PHYS(store_edid) + call realmode #ifdef CONFIG_X86_PAE /* Initialize low and high mappings of all memory with 2MB pages */ Index: 2007-03-19/xen/arch/x86/boot/x86_64.S =================================================================== --- 2007-03-19.orig/xen/arch/x86/boot/x86_64.S 2007-03-19 14:07:47.000000000 +0100 +++ 2007-03-19/xen/arch/x86/boot/x86_64.S 2007-03-19 14:07:50.000000000 +0100 @@ -75,6 +75,8 @@ __start: lss SYM_PHYS(.Lstack_start),%esp pushl $SYM_PHYS(edd) call realmode + pushl $SYM_PHYS(store_edid) + call realmode /* We begin by interrogating the CPU for the presence of long mode. */ mov $0x80000000,%eax Index: 2007-03-19/xen/arch/x86/platform_hypercall.c =================================================================== --- 2007-03-19.orig/xen/arch/x86/platform_hypercall.c 2007-03-19 14:07:47.000000000 +0100 +++ 2007-03-19/xen/arch/x86/platform_hypercall.c 2007-03-19 14:07:50.000000000 +0100 @@ -24,10 +24,15 @@ #include <asm/mtrr.h> #include "cpu/mtrr/mtrr.h" +struct ddc { + uint8_t capabilities, edid_transfer_time, edid[128]; +}; + #ifndef COMPAT typedef long ret_t; DEFINE_SPINLOCK(xenpf_lock); struct edd edd; +struct ddc ddc; # undef copy_from_compat # define copy_from_compat copy_from_guest # undef copy_to_compat @@ -35,6 +40,7 @@ struct edd edd; #else extern spinlock_t xenpf_lock; extern struct edd edd; +extern struct ddc ddc; #endif ret_t do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op) @@ -219,6 +225,21 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe else ret = -ESRCH; break; + case XEN_FW_DDC_INFO: + if ( op->u.firmware_info.index == 0 ) + { + op->u.firmware_info.u.ddc_info.capabilities = ddc.capabilities; + op->u.firmware_info.u.ddc_info.edid_transfer_time = ddc.edid_transfer_time; + if ( copy_field_to_guest(u_xenpf_op, op, u.firmware_info.u.ddc_info.capabilities) || + copy_field_to_guest(u_xenpf_op, op, u.firmware_info.u.ddc_info.edid_transfer_time) || + copy_to_compat(op->u.firmware_info.u.ddc_info.edid, + ddc.edid, + ARRAY_SIZE(ddc.edid)) ) + ret = -EFAULT; + } + else + ret = -ESRCH; + break; default: ret = -EINVAL; break; @@ -238,11 +259,17 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe #ifndef COMPAT static int __init firmware_init(void) { + extern uint8_t ddc_capabilities, edid_transfer_time, edid[]; + memcpy(edd.mbr_signature, edd_mbr_sig_buf, sizeof(edd.mbr_signature)); memcpy(edd.edd_info, eddbuf, sizeof(edd.edd_info)); edd.mbr_signature_nr = edd_mbr_sig_nr_buf; edd.edd_info_nr = eddnr; + ddc.capabilities = ddc_capabilities; + ddc.edid_transfer_time = edid_transfer_time; + memcpy(ddc.edid, edid, sizeof(ddc.edid)); + return 0; } __initcall(firmware_init); Index: 2007-03-19/xen/include/public/platform.h =================================================================== --- 2007-03-19.orig/xen/include/public/platform.h 2007-03-19 14:07:47.000000000 +0100 +++ 2007-03-19/xen/include/public/platform.h 2007-03-19 14:07:50.000000000 +0100 @@ -119,6 +119,7 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_platform_q #define XEN_FW_EDD_INFO 2 /* from int 13 AH=41 */ #define XEN_FW_EDD_PARAMS 3 /* from int 13 AH=48 */ #define XEN_FW_MBR_SIGNATURE 4 +#define XEN_FW_DDC_INFO 5 /* from int 10 AX=4f15 */ struct xenpf_firmware_info { /* IN variables. */ uint32_t type; @@ -138,6 +139,12 @@ struct xenpf_firmware_info { /* first uint16_t of buffer must be set to buffer size */ XEN_GUEST_HANDLE(void) edd_params; uint32_t mbr_signature; + struct { + uint8_t capabilities; + uint8_t edid_transfer_time; + /* must refer to 128-byte buffer */ + XEN_GUEST_HANDLE(uint8_t) edid; + } ddc_info; } u; }; typedef struct xenpf_firmware_info xenpf_firmware_info_t; ++++++ guest-copy.patch ++++++ Index: 2007-05-14/xen/arch/x86/mm.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/mm.c 2007-05-14 13:44:25.000000000 +0200 +++ 2007-05-14/xen/arch/x86/mm.c 2007-05-14 14:33:33.000000000 +0200 @@ -2896,7 +2896,7 @@ long do_set_gdt(XEN_GUEST_HANDLE(ulong) if ( entries > FIRST_RESERVED_GDT_ENTRY ) return -EINVAL; - if ( copy_from_guest((unsigned long *)frames, frame_list, nr_pages) ) + if ( copy_from_guest(frames, frame_list, nr_pages) ) return -EFAULT; LOCK_BIGLOCK(current->domain); @@ -3077,7 +3077,7 @@ long arch_memory_op(int op, XEN_GUEST_HA else if ( (d = rcu_lock_domain_by_id(fmap.domid)) == NULL ) return -ESRCH; - rc = copy_from_guest(&d->arch.e820[0], fmap.map.buffer, + rc = copy_from_guest(d->arch.e820, fmap.map.buffer, fmap.map.nr_entries) ? -EFAULT : 0; d->arch.nr_e820 = fmap.map.nr_entries; @@ -3098,7 +3098,7 @@ long arch_memory_op(int op, XEN_GUEST_HA return -EFAULT; map.nr_entries = min(map.nr_entries, d->arch.nr_e820); - if ( copy_to_guest(map.buffer, &d->arch.e820[0], map.nr_entries) || + if ( copy_to_guest(map.buffer, d->arch.e820, map.nr_entries) || copy_to_guest(arg, &map, 1) ) return -EFAULT; @@ -3122,7 +3122,7 @@ long arch_memory_op(int op, XEN_GUEST_HA buffer = guest_handle_cast(memmap.buffer, e820entry_t); count = min((unsigned int)e820.nr_map, memmap.nr_entries); - if ( copy_to_guest(buffer, &e820.map[0], count) < 0 ) + if ( copy_to_guest(buffer, e820.map, count) < 0 ) return -EFAULT; memmap.nr_entries = count; @@ -3135,7 +3135,7 @@ long arch_memory_op(int op, XEN_GUEST_HA case XENMEM_machphys_mapping: { - struct xen_machphys_mapping mapping = { + static const struct xen_machphys_mapping mapping = { .v_start = MACH2PHYS_VIRT_START, .v_end = MACH2PHYS_VIRT_END, .max_mfn = MACH2PHYS_NR_ENTRIES - 1 Index: 2007-05-14/xen/arch/x86/traps.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/traps.c 2007-05-14 13:43:46.000000000 +0200 +++ 2007-05-14/xen/arch/x86/traps.c 2007-05-14 14:33:33.000000000 +0200 @@ -1117,7 +1117,7 @@ static inline int guest_io_okay( * read as 0xff (no access allowed). */ TOGGLE_MODE(); - switch ( __copy_from_guest_offset(&x.bytes[0], v->arch.iobmp, + switch ( __copy_from_guest_offset(x.bytes, v->arch.iobmp, port>>3, 2) ) { default: x.bytes[0] = ~0; Index: 2007-05-14/xen/common/domctl.c =================================================================== --- 2007-05-14.orig/xen/common/domctl.c 2007-04-26 09:25:12.000000000 +0200 +++ 2007-05-14/xen/common/domctl.c 2007-05-14 14:33:33.000000000 +0200 @@ -43,7 +43,7 @@ void cpumask_to_xenctl_cpumap( bitmap_long_to_byte(bytemap, cpus_addr(*cpumask), NR_CPUS); - copy_to_guest(xenctl_cpumap->bitmap, &bytemap[0], copy_bytes); + copy_to_guest(xenctl_cpumap->bitmap, bytemap, copy_bytes); for ( i = copy_bytes; i < guest_bytes; i++ ) copy_to_guest_offset(xenctl_cpumap->bitmap, i, &zero, 1); @@ -63,7 +63,7 @@ void xenctl_cpumap_to_cpumask( if ( guest_handle_is_null(xenctl_cpumap->bitmap) ) return; - copy_from_guest(&bytemap[0], xenctl_cpumap->bitmap, copy_bytes); + copy_from_guest(bytemap, xenctl_cpumap->bitmap, copy_bytes); bitmap_byte_to_long(cpus_addr(*cpumask), bytemap, NR_CPUS); } Index: 2007-05-14/xen/common/kernel.c =================================================================== --- 2007-05-14.orig/xen/common/kernel.c 2007-05-14 13:43:09.000000000 +0200 +++ 2007-05-14/xen/common/kernel.c 2007-05-14 14:33:33.000000000 +0200 @@ -142,7 +142,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL { xen_extraversion_t extraversion; safe_strcpy(extraversion, xen_extra_version()); - if ( copy_to_guest(arg, (char *)extraversion, sizeof(extraversion)) ) + if ( copy_to_guest(arg, extraversion, ARRAY_SIZE(extraversion)) ) return -EFAULT; return 0; } @@ -167,7 +167,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL memset(info, 0, sizeof(info)); arch_get_xen_caps(&info); - if ( copy_to_guest(arg, (char *)info, sizeof(info)) ) + if ( copy_to_guest(arg, info, ARRAY_SIZE(info)) ) return -EFAULT; return 0; } @@ -187,7 +187,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL { xen_changeset_info_t chgset; safe_strcpy(chgset, xen_changeset()); - if ( copy_to_guest(arg, (char *)chgset, sizeof(chgset)) ) + if ( copy_to_guest(arg, chgset, ARRAY_SIZE(chgset)) ) return -EFAULT; return 0; } @@ -229,8 +229,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL case XENVER_guest_handle: { - if ( copy_to_guest(arg, (char *)current->domain->handle, - sizeof(current->domain->handle)) ) + if ( copy_to_guest(arg, current->domain->handle, + ARRAY_SIZE(current->domain->handle)) ) return -EFAULT; return 0; } Index: 2007-05-14/xen/common/perfc.c =================================================================== --- 2007-05-14.orig/xen/common/perfc.c 2007-04-26 09:25:12.000000000 +0200 +++ 2007-05-14/xen/common/perfc.c 2007-05-14 14:33:33.000000000 +0200 @@ -227,7 +227,7 @@ static int perfc_copy_info(XEN_GUEST_HAN } BUG_ON(v != perfc_nbr_vals); - if ( copy_to_guest(desc, (xen_sysctl_perfc_desc_t *)perfc_d, NR_PERFCTRS) ) + if ( copy_to_guest(desc, perfc_d, NR_PERFCTRS) ) return -EFAULT; if ( copy_to_guest(val, perfc_vals, perfc_nbr_vals) ) return -EFAULT; Index: 2007-05-14/xen/drivers/char/console.c =================================================================== --- 2007-05-14.orig/xen/drivers/char/console.c 2007-04-23 10:01:44.000000000 +0200 +++ 2007-05-14/xen/drivers/char/console.c 2007-05-14 14:33:33.000000000 +0200 @@ -326,7 +326,7 @@ static long guest_console_write(XEN_GUES CONSOLEIO_write, count, buffer); kcount = min_t(int, count, sizeof(kbuf)-1); - if ( copy_from_guest((char *)kbuf, buffer, kcount) ) + if ( copy_from_guest(kbuf, buffer, kcount) ) return -EFAULT; kbuf[kcount] = '\0'; Index: 2007-05-14/xen/include/asm-x86/guest_access.h =================================================================== --- 2007-05-14.orig/xen/include/asm-x86/guest_access.h 2007-04-23 10:01:46.000000000 +0200 +++ 2007-05-14/xen/include/asm-x86/guest_access.h 2007-05-14 14:33:33.000000000 +0200 @@ -32,11 +32,12 @@ * specifying an offset into the guest array. */ #define copy_to_guest_offset(hnd, off, ptr, nr) ({ \ - typeof(ptr) _x = (hnd).p; \ - const typeof(ptr) _y = (ptr); \ + const typeof(*(ptr)) *_s = (ptr); \ + char (*_d)[sizeof(*_s)] = (void *)(hnd).p; \ + ((void)((hnd).p == (ptr))); \ is_hvm_vcpu(current) ? \ - copy_to_user_hvm(_x+(off), _y, sizeof(*_x)*(nr)) : \ - copy_to_user(_x+(off), _y, sizeof(*_x)*(nr)); \ + copy_to_user_hvm(_d+(off), _s, sizeof(*_s)*(nr)) : \ + copy_to_user(_d+(off), _s, sizeof(*_s)*(nr)); \ }) /* @@ -44,29 +45,31 @@ * specifying an offset into the guest array. */ #define copy_from_guest_offset(ptr, hnd, off, nr) ({ \ - const typeof(ptr) _x = (hnd).p; \ - typeof(ptr) _y = (ptr); \ + const typeof(*(ptr)) *_s = (hnd).p; \ + typeof(*(ptr)) *_d = (ptr); \ is_hvm_vcpu(current) ? \ - copy_from_user_hvm(_y, _x+(off), sizeof(*_x)*(nr)) :\ - copy_from_user(_y, _x+(off), sizeof(*_x)*(nr)); \ + copy_from_user_hvm(_d, _s+(off), sizeof(*_d)*(nr)) :\ + copy_from_user(_d, _s+(off), sizeof(*_d)*(nr)); \ }) /* Copy sub-field of a structure to guest context via a guest handle. */ #define copy_field_to_guest(hnd, ptr, field) ({ \ - typeof(&(ptr)->field) _x = &(hnd).p->field; \ - const typeof(&(ptr)->field) _y = &(ptr)->field; \ + const typeof(&(ptr)->field) _s = &(ptr)->field; \ + void *_d = &(hnd).p->field; \ + ((void)((hnd).p == (ptr))); \ is_hvm_vcpu(current) ? \ - copy_to_user_hvm(_x, _y, sizeof(*_x)) : \ - copy_to_user(_x, _y, sizeof(*_x)); \ + copy_to_user_hvm(_d, _s, sizeof(*_s)) : \ + copy_to_user(_d, _s, sizeof(*_s)); \ }) /* Copy sub-field of a structure from guest context via a guest handle. */ #define copy_field_from_guest(ptr, hnd, field) ({ \ - const typeof(&(ptr)->field) _x = &(hnd).p->field; \ - typeof(&(ptr)->field) _y = &(ptr)->field; \ + const void *_s = &(hnd).p->field; \ + typeof(&(ptr)->field) _d = &(ptr)->field; \ + ((void)((hnd).p == (ptr))); \ is_hvm_vcpu(current) ? \ - copy_from_user_hvm(_y, _x, sizeof(*_x)) : \ - copy_from_user(_y, _x, sizeof(*_x)); \ + copy_from_user_hvm(_d, _s, sizeof(*_d)) : \ + copy_from_user(_d, _s, sizeof(*_d)); \ }) /* @@ -78,35 +81,37 @@ array_access_ok((hnd).p, (nr), sizeof(*(hnd).p))) #define __copy_to_guest_offset(hnd, off, ptr, nr) ({ \ - typeof(ptr) _x = (hnd).p; \ - const typeof(ptr) _y = (ptr); \ + const typeof(*(ptr)) *_s = (ptr); \ + char (*_d)[sizeof(*_s)] = (void *)(hnd).p; \ + ((void)((hnd).p == (ptr))); \ is_hvm_vcpu(current) ? \ - copy_to_user_hvm(_x+(off), _y, sizeof(*_x)*(nr)) : \ - __copy_to_user(_x+(off), _y, sizeof(*_x)*(nr)); \ + copy_to_user_hvm(_d+(off), _s, sizeof(*_s)*(nr)) : \ + __copy_to_user(_d+(off), _s, sizeof(*_s)*(nr)); \ }) #define __copy_from_guest_offset(ptr, hnd, off, nr) ({ \ - const typeof(ptr) _x = (hnd).p; \ - typeof(ptr) _y = (ptr); \ + const typeof(*(ptr)) *_s = (hnd).p; \ + typeof(*(ptr)) *_d = (ptr); \ is_hvm_vcpu(current) ? \ - copy_from_user_hvm(_y, _x+(off),sizeof(*_x)*(nr)) : \ - __copy_from_user(_y, _x+(off), sizeof(*_x)*(nr)); \ + copy_from_user_hvm(_d, _s+(off), sizeof(*_d)*(nr)) :\ + __copy_from_user(_d, _s+(off), sizeof(*_d)*(nr)); \ }) #define __copy_field_to_guest(hnd, ptr, field) ({ \ - typeof(&(ptr)->field) _x = &(hnd).p->field; \ - const typeof(&(ptr)->field) _y = &(ptr)->field; \ + const typeof(&(ptr)->field) _s = &(ptr)->field; \ + void *_d = &(hnd).p->field; \ + ((void)(&(hnd).p->field == &(ptr)->field)); \ is_hvm_vcpu(current) ? \ - copy_to_user_hvm(_x, _y, sizeof(*_x)) : \ - __copy_to_user(_x, _y, sizeof(*_x)); \ + copy_to_user_hvm(_d, _s, sizeof(*_s)) : \ + __copy_to_user(_d, _s, sizeof(*_s)); \ }) #define __copy_field_from_guest(ptr, hnd, field) ({ \ - const typeof(&(ptr)->field) _x = &(hnd).p->field; \ - typeof(&(ptr)->field) _y = &(ptr)->field; \ + const typeof(&(ptr)->field) _s = &(hnd).p->field; \ + typeof(&(ptr)->field) _d = &(ptr)->field; \ is_hvm_vcpu(current) ? \ - copy_from_user_hvm(_y, _x, sizeof(*_x)) : \ - __copy_from_user(_y, _x, sizeof(*_x)); \ + copy_from_user_hvm(_d, _s, sizeof(*_d)) : \ + __copy_from_user(_d, _s, sizeof(*_d)); \ }) #endif /* __ASM_X86_GUEST_ACCESS_H__ */ Index: 2007-05-14/xen/include/xen/compat.h =================================================================== --- 2007-05-14.orig/xen/include/xen/compat.h 2007-04-23 10:01:47.000000000 +0200 +++ 2007-05-14/xen/include/xen/compat.h 2007-05-14 14:33:33.000000000 +0200 @@ -44,9 +44,10 @@ * specifying an offset into the guest array. */ #define copy_to_compat_offset(hnd, off, ptr, nr) ({ \ - const typeof(ptr) _x = (typeof(**(hnd)._) *)(full_ptr_t)(hnd).c; \ - const typeof(*(ptr)) *const _y = (ptr); \ - copy_to_user(_x + (off), _y, sizeof(*_x) * (nr)); \ + const typeof(*(ptr)) *_s = (ptr); \ + char (*_d)[sizeof(*_s)] = (void *)(full_ptr_t)(hnd).c; \ + ((void)((typeof(**(hnd)._) *)(full_ptr_t)(hnd).c == (ptr))); \ + copy_to_user(_d + (off), _s, sizeof(*_s) * (nr)); \ }) /* @@ -54,9 +55,9 @@ * specifying an offset into the guest array. */ #define copy_from_compat_offset(ptr, hnd, off, nr) ({ \ - const typeof(ptr) _x = (typeof(**(hnd)._) *)(full_ptr_t)(hnd).c; \ - const typeof(ptr) _y = (ptr); \ - copy_from_user(_y, _x + (off), sizeof(*_x) * (nr)); \ + const typeof(*(ptr)) *_s = (typeof(**(hnd)._) *)(full_ptr_t)(hnd).c; \ + typeof(*(ptr)) *_d = (ptr); \ + copy_from_user(_d, _s + (off), sizeof(*_d) * (nr)); \ }) #define copy_to_compat(hnd, ptr, nr) \ @@ -67,16 +68,18 @@ /* Copy sub-field of a structure to guest context via a compat handle. */ #define copy_field_to_compat(hnd, ptr, field) ({ \ - typeof((ptr)->field) *const _x = &((typeof(**(hnd)._) *)(full_ptr_t)(hnd).c)->field; \ - const typeof((ptr)->field) *const _y = &(ptr)->field; \ - copy_to_user(_x, _y, sizeof(*_x)); \ + const typeof(&(ptr)->field) _s = &(ptr)->field; \ + void *_d = &((typeof(**(hnd)._) *)(full_ptr_t)(hnd).c)->field; \ + ((void)((typeof(**(hnd)._) *)(full_ptr_t)(hnd).c == (ptr))); \ + copy_to_user(_d, _s, sizeof(*_s)); \ }) /* Copy sub-field of a structure from guest context via a compat handle. */ #define copy_field_from_compat(ptr, hnd, field) ({ \ - typeof((ptr)->field) *const _x = &((typeof(**(hnd)._) *)(full_ptr_t)(hnd).c)->field; \ - typeof((ptr)->field) *const _y = &(ptr)->field; \ - copy_from_user(_y, _x, sizeof(*_x)); \ + const void *_s = &((typeof(**(hnd)._) *)(full_ptr_t)(hnd).c)->field; \ + typeof(&(ptr)->field) _d = &(ptr)->field; \ + ((void)((typeof(**(hnd)._) *)(full_ptr_t)(hnd).c == (ptr))); \ + copy_from_user(_d, _s, sizeof(*_d)); \ }) /* @@ -87,15 +90,16 @@ compat_array_access_ok((void *)(full_ptr_t)(hnd).c, (nr), sizeof(**(hnd)._)) #define __copy_to_compat_offset(hnd, off, ptr, nr) ({ \ - const typeof(ptr) _x = (typeof(**(hnd)._) *)(full_ptr_t)(hnd).c; \ - const typeof(*(ptr)) *const _y = (ptr); \ - __copy_to_user(_x + (off), _y, sizeof(*_x) * (nr)); \ + const typeof(*(ptr)) *_s = (ptr); \ + char (*_d)[sizeof(*_s)] = (void *)(full_ptr_t)(hnd).c; \ + ((void)((typeof(**(hnd)._) *)(full_ptr_t)(hnd).c == (ptr))); \ + __copy_to_user(_d + (off), _s, sizeof(*_s) * (nr)); \ }) #define __copy_from_compat_offset(ptr, hnd, off, nr) ({ \ - const typeof(ptr) _x = (typeof(**(hnd)._) *)(full_ptr_t)(hnd).c; \ - const typeof(ptr) _y = (ptr); \ - __copy_from_user(_y, _x + (off), sizeof(*_x) * (nr)); \ + const typeof(*(ptr)) *_s = (typeof(**(hnd)._) *)(full_ptr_t)(hnd).c; \ + typeof(*(ptr)) *_d = (ptr); \ + __copy_from_user(_d, _s + (off), sizeof(*_d) * (nr)); \ }) #define __copy_to_compat(hnd, ptr, nr) \ @@ -105,15 +109,17 @@ __copy_from_compat_offset(ptr, hnd, 0, nr) #define __copy_field_to_compat(hnd, ptr, field) ({ \ - typeof((ptr)->field) *const _x = &((typeof(**(hnd)._) *)(full_ptr_t)(hnd).c)->field; \ - const typeof((ptr)->field) *const _y = &(ptr)->field; \ - __copy_to_user(_x, _y, sizeof(*_x)); \ + const typeof(&(ptr)->field) _s = &(ptr)->field; \ + void *_d = &((typeof(**(hnd)._) *)(full_ptr_t)(hnd).c)->field; \ + ((void)((typeof(**(hnd)._) *)(full_ptr_t)(hnd).c == (ptr))); \ + __copy_to_user(_d, _s, sizeof(*_s)); \ }) #define __copy_field_from_compat(ptr, hnd, field) ({ \ - typeof((ptr)->field) *const _x = &((typeof(**(hnd)._) *)(full_ptr_t)(hnd).c)->field; \ - typeof((ptr)->field) *const _y = &(ptr)->field; \ - __copy_from_user(_y, _x, sizeof(*_x)); \ + const void *_s = &((typeof(**(hnd)._) *)(full_ptr_t)(hnd).c)->field; \ + typeof(&(ptr)->field) _d = &(ptr)->field; \ + ((void)((typeof(**(hnd)._) *)(full_ptr_t)(hnd).c == (ptr))); \ + __copy_from_user(_d, _s, sizeof(*_d)); \ }) ++++++ hvm-debug-msg.patch ++++++ Index: 2007-05-14/xen/arch/x86/hvm/svm/emulate.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/hvm/svm/emulate.c 2007-04-23 10:01:41.000000000 +0200 +++ 2007-05-14/xen/arch/x86/hvm/svm/emulate.c 2007-05-14 14:33:28.000000000 +0200 @@ -145,9 +145,8 @@ unsigned long get_effective_addr_modrm64 struct vcpu *v = current; struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; - HVM_DBG_LOG(DBG_LEVEL_1, "get_effective_addr_modrm64(): prefix = %x, " - "length = %d, operand[0,1] = %x %x.\n", prefix, *size, operand [0], - operand [1]); + HVM_DBG_LOG(DBG_LEVEL_1, "prefix = %x, length = %d, operand[0,1] = %x %x", + prefix, *size, operand[0], operand[1]); if ((NULL == size) || (NULL == operand) || (1 > *size)) { Index: 2007-05-14/xen/arch/x86/hvm/svm/svm.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/hvm/svm/svm.c 2007-05-14 14:33:08.000000000 +0200 +++ 2007-05-14/xen/arch/x86/hvm/svm/svm.c 2007-05-14 14:33:28.000000000 +0200 @@ -135,7 +135,7 @@ static inline int long_mode_do_msr_write struct vcpu *v = current; struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; - HVM_DBG_LOG(DBG_LEVEL_1, "msr %x msr_content %"PRIx64"\n", + HVM_DBG_LOG(DBG_LEVEL_0, "msr %x msr_content %"PRIx64, ecx, msr_content); switch ( ecx ) @@ -394,7 +394,7 @@ int svm_vmcb_restore(struct vcpu *v, str * If different, make a shadow. Check if the PDBR is valid * first. */ - HVM_DBG_LOG(DBG_LEVEL_VMMU, "CR3 c->cr3 = %"PRIx64"", c->cr3); + HVM_DBG_LOG(DBG_LEVEL_VMMU, "CR3 c->cr3 = %"PRIx64, c->cr3); mfn = gmfn_to_mfn(v->domain, c->cr3 >> PAGE_SHIFT); if( !mfn_valid(mfn) || !get_page(mfn_to_page(mfn), v->domain) ) goto bad_cr3; @@ -1532,7 +1532,7 @@ static int svm_set_cr0(unsigned long val struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; unsigned long old_base_mfn; - HVM_DBG_LOG(DBG_LEVEL_VMMU, "Update CR0 value = %lx\n", value); + HVM_DBG_LOG(DBG_LEVEL_VMMU, "Update CR0 value = %lx", value); /* ET is reserved and should be always be 1. */ value |= X86_CR0_ET; @@ -1557,11 +1557,11 @@ static int svm_set_cr0(unsigned long val { if ( !svm_cr4_pae_is_set(v) ) { - HVM_DBG_LOG(DBG_LEVEL_1, "Enable paging before PAE enable\n"); + HVM_DBG_LOG(DBG_LEVEL_1, "Enable paging before PAE enable"); svm_inject_exception(v, TRAP_gp_fault, 1, 0); return 0; } - HVM_DBG_LOG(DBG_LEVEL_1, "Enable the Long mode\n"); + HVM_DBG_LOG(DBG_LEVEL_1, "Enable the Long mode"); v->arch.hvm_svm.cpu_shadow_efer |= EFER_LMA; vmcb->efer |= EFER_LMA | EFER_LME; } @@ -1654,7 +1654,7 @@ static void mov_from_cr(int cr, int gp, set_reg(gp, value, regs, vmcb); - HVM_DBG_LOG(DBG_LEVEL_VMMU, "mov_from_cr: CR%d, value = %lx,", cr, value); + HVM_DBG_LOG(DBG_LEVEL_VMMU, "mov_from_cr: CR%d, value = %lx", cr, value); } @@ -1672,8 +1672,8 @@ static int mov_to_cr(int gpreg, int cr, HVMTRACE_2D(CR_WRITE, v, cr, value); - HVM_DBG_LOG(DBG_LEVEL_1, "mov_to_cr: CR%d, value = %lx,", cr, value); - HVM_DBG_LOG(DBG_LEVEL_1, "current = %lx,", (unsigned long) current); + HVM_DBG_LOG(DBG_LEVEL_1, "mov_to_cr: CR%d, value = %lx, current = %p", + cr, value, v); switch ( cr ) { Index: 2007-05-14/xen/arch/x86/hvm/vioapic.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/hvm/vioapic.c 2007-04-23 10:01:41.000000000 +0200 +++ 2007-05-14/xen/arch/x86/hvm/vioapic.c 2007-05-14 14:33:28.000000000 +0200 @@ -99,7 +99,7 @@ static unsigned long vioapic_read(struct struct hvm_hw_vioapic *vioapic = domain_vioapic(v->domain); uint32_t result; - HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "vioapic_read addr %lx\n", addr); + HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "addr %lx", addr); addr &= 0xff; @@ -183,8 +183,7 @@ static void vioapic_write_indirect( { uint32_t redir_index = (vioapic->ioregsel - 0x10) >> 1; - HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "vioapic_write_indirect " - "change redir index %x val %lx\n", + HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "change redir index %x val %lx", redir_index, val); if ( redir_index >= VIOAPIC_NUM_PINS ) @@ -252,8 +251,7 @@ static void ioapic_inj_irq( uint8_t trig_mode, uint8_t delivery_mode) { - HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "ioapic_inj_irq " - "irq %d trig %d delive mode %d\n", + HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "irq %d trig %d deliv %d", vector, trig_mode, delivery_mode); switch ( delivery_mode ) @@ -275,8 +273,8 @@ static uint32_t ioapic_get_delivery_bitm uint32_t mask = 0; struct vcpu *v; - HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "ioapic_get_delivery_bitmask " - "dest %d dest_mode %d\n", dest, dest_mode); + HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "dest %d dest_mode %d", + dest, dest_mode); if ( dest_mode == 0 ) /* Physical mode. */ { @@ -304,7 +302,7 @@ static uint32_t ioapic_get_delivery_bitm } out: - HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "ioapic_get_delivery_bitmask mask %x\n", + HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "mask %x", mask); return mask; } @@ -331,14 +329,13 @@ static void vioapic_deliver(struct hvm_h HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "dest=%x dest_mode=%x delivery_mode=%x " - "vector=%x trig_mode=%x\n", + "vector=%x trig_mode=%x", dest, dest_mode, delivery_mode, vector, trig_mode); deliver_bitmask = ioapic_get_delivery_bitmask(vioapic, dest, dest_mode); if ( !deliver_bitmask ) { - HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "ioapic deliver " - "no target on destination\n"); + HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "no target on destination"); return; } @@ -364,7 +361,7 @@ static void vioapic_deliver(struct hvm_h else { HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "null round robin: " - "mask=%x vector=%x delivery_mode=%x\n", + "mask=%x vector=%x delivery_mode=%x", deliver_bitmask, vector, dest_LowestPrio); } break; @@ -412,7 +409,7 @@ void vioapic_irq_positive_edge(struct do struct hvm_hw_vioapic *vioapic = domain_vioapic(d); union vioapic_redir_entry *ent; - HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "ioapic_irq_positive_edge irq %x", irq); + HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "irq %x", irq); ASSERT(irq < VIOAPIC_NUM_PINS); ASSERT(spin_is_locked(&d->arch.hvm_domain.irq_lock)); Index: 2007-05-14/xen/arch/x86/hvm/vlapic.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/hvm/vlapic.c 2007-04-23 10:01:41.000000000 +0200 +++ 2007-05-14/xen/arch/x86/hvm/vlapic.c 2007-05-14 14:33:28.000000000 +0200 @@ -171,7 +171,7 @@ uint32_t vlapic_get_ppr(struct vlapic *v ppr = isrv & 0xf0; HVM_DBG_LOG(DBG_LEVEL_VLAPIC_INTERRUPT, - "vlapic %p, ppr 0x%x, isr 0x%x, isrv 0x%x.", + "vlapic %p, ppr 0x%x, isr 0x%x, isrv 0x%x", vlapic, ppr, isr, isrv); return ppr; @@ -211,7 +211,7 @@ static int vlapic_match_dest(struct vcpu struct vlapic *target = vcpu_vlapic(v); HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "target %p, source %p, dest 0x%x, " - "dest_mode 0x%x, short_hand 0x%x\n", + "dest_mode 0x%x, short_hand 0x%x", target, source, dest, dest_mode, short_hand); switch ( short_hand ) @@ -270,14 +270,14 @@ static int vlapic_accept_irq(struct vcpu if ( vlapic_test_and_set_irr(vector, vlapic) && trig_mode ) { HVM_DBG_LOG(DBG_LEVEL_VLAPIC, - "level trig mode repeatedly for vector %d\n", vector); + "level trig mode repeatedly for vector %d", vector); break; } if ( trig_mode ) { HVM_DBG_LOG(DBG_LEVEL_VLAPIC, - "level trig mode for vector %d\n", vector); + "level trig mode for vector %d", vector); vlapic_set_vector(vector, &vlapic->regs->data[APIC_TMR]); } @@ -399,7 +399,7 @@ static void vlapic_ipi(struct vlapic *vl HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "icr_high 0x%x, icr_low 0x%x, " "short_hand 0x%x, dest 0x%x, trig_mode 0x%x, level 0x%x, " - "dest_mode 0x%x, delivery_mode 0x%x, vector 0x%x.", + "dest_mode 0x%x, delivery_mode 0x%x, vector 0x%x", icr_high, icr_low, short_hand, dest, trig_mode, level, dest_mode, delivery_mode, vector); @@ -437,7 +437,7 @@ static uint32_t vlapic_get_tmcct(struct HVM_DBG_LOG(DBG_LEVEL_VLAPIC_TIMER, "timer initial count %d, timer current count %d, " - "offset %"PRId64".", + "offset %"PRId64, tmict, tmcct, counter_passed); return tmcct; @@ -454,7 +454,7 @@ static void vlapic_set_tdcr(struct vlapi vlapic->hw.timer_divisor = 1 << (val & 7); HVM_DBG_LOG(DBG_LEVEL_VLAPIC_TIMER, - "vlapic_set_tdcr timer_divisor: %d.", vlapic->hw.timer_divisor); + "timer_divisor: %d", vlapic->hw.timer_divisor); } static void vlapic_read_aligned(struct vlapic *vlapic, unsigned int offset, @@ -493,7 +493,7 @@ static unsigned long vlapic_read(struct /* some bugs on kernel cause read this with byte*/ if ( len != 4 ) HVM_DBG_LOG(DBG_LEVEL_VLAPIC, - "read with len=0x%lx, should be 4 instead.\n", + "read with len=0x%lx, should be 4 instead", len); alignment = offset & 0x3; @@ -522,7 +522,7 @@ static unsigned long vlapic_read(struct } HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "offset 0x%x with length 0x%lx, " - "and the result is 0x%lx.", offset, len, result); + "and the result is 0x%lx", offset, len, result); return result; @@ -539,7 +539,7 @@ static void vlapic_write(struct vcpu *v, if ( offset != 0xb0 ) HVM_DBG_LOG(DBG_LEVEL_VLAPIC, - "offset 0x%x with length 0x%lx, and value is 0x%lx.", + "offset 0x%x with length 0x%lx, and value is 0x%lx", offset, len, val); /* @@ -713,7 +713,7 @@ void vlapic_msr_set(struct vlapic *vlapi vlapic->hw.apic_base_msr = value; HVM_DBG_LOG(DBG_LEVEL_VLAPIC, - "apic base msr is 0x%016"PRIx64".", vlapic->hw.apic_base_msr); + "apic base msr is 0x%016"PRIx64, vlapic->hw.apic_base_msr); } int vlapic_accept_pic_intr(struct vcpu *v) @@ -913,7 +913,7 @@ int vlapic_init(struct vcpu *v) { struct vlapic *vlapic = vcpu_vlapic(v); - HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "vlapic_init %d", v->vcpu_id); + HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "%d", v->vcpu_id); vlapic->regs_page = alloc_domheap_page(NULL); if ( vlapic->regs_page == NULL ) Index: 2007-05-14/xen/arch/x86/hvm/vmx/vmx.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/hvm/vmx/vmx.c 2007-05-14 14:33:24.000000000 +0200 +++ 2007-05-14/xen/arch/x86/hvm/vmx/vmx.c 2007-05-14 14:33:28.000000000 +0200 @@ -111,10 +111,11 @@ static void vmx_save_host_msrs(void) static inline int long_mode_do_msr_read(struct cpu_user_regs *regs) { u64 msr_content = 0; + u32 ecx = regs->ecx; struct vcpu *v = current; struct vmx_msr_state *guest_msr_state = &v->arch.hvm_vmx.msr_state; - switch ( (u32)regs->ecx ) { + switch ( ecx ) { case MSR_EFER: msr_content = v->arch.hvm_vmx.efer; break; @@ -157,7 +158,7 @@ static inline int long_mode_do_msr_read( return 0; } - HVM_DBG_LOG(DBG_LEVEL_2, "msr_content: 0x%"PRIx64, msr_content); + HVM_DBG_LOG(DBG_LEVEL_0, "msr 0x%x content 0x%"PRIx64, ecx, msr_content); regs->eax = (u32)(msr_content >> 0); regs->edx = (u32)(msr_content >> 32); @@ -173,8 +174,7 @@ static inline int long_mode_do_msr_write struct vmx_msr_state *guest_msr_state = &v->arch.hvm_vmx.msr_state; struct vmx_msr_state *host_msr_state = &this_cpu(host_msr_state); - HVM_DBG_LOG(DBG_LEVEL_1, "msr 0x%x msr_content 0x%"PRIx64"\n", - ecx, msr_content); + HVM_DBG_LOG(DBG_LEVEL_0, "msr 0x%x content 0x%"PRIx64, ecx, msr_content); switch ( ecx ) { @@ -262,7 +262,7 @@ static inline int long_mode_do_msr_write return 1; uncanonical_address: - HVM_DBG_LOG(DBG_LEVEL_1, "Not cano address of msr write %x\n", ecx); + HVM_DBG_LOG(DBG_LEVEL_0, "Not cano address of msr write %x", ecx); gp_fault: vmx_inject_hw_exception(v, TRAP_gp_fault, 0); return 0; @@ -577,7 +577,7 @@ int vmx_vmcs_restore(struct vcpu *v, str * If different, make a shadow. Check if the PDBR is valid * first. */ - HVM_DBG_LOG(DBG_LEVEL_VMMU, "CR3 c->cr3 = %"PRIx64"", c->cr3); + HVM_DBG_LOG(DBG_LEVEL_VMMU, "CR3 c->cr3 = %"PRIx64, c->cr3); /* current!=vcpu as not called by arch_vmx_do_launch */ mfn = gmfn_to_mfn(v->domain, c->cr3 >> PAGE_SHIFT); if( !mfn_valid(mfn) || !get_page(mfn_to_page(mfn), v->domain)) { @@ -2024,7 +2024,7 @@ static int vmx_set_cr0(unsigned long val unsigned long old_cr0; unsigned long old_base_mfn; - HVM_DBG_LOG(DBG_LEVEL_VMMU, "Update CR0 value = %lx\n", value); + HVM_DBG_LOG(DBG_LEVEL_VMMU, "Update CR0 value = %lx", value); /* ET is reserved and should be always be 1. */ value |= X86_CR0_ET; @@ -2073,12 +2073,12 @@ static int vmx_set_cr0(unsigned long val if ( !(v->arch.hvm_vmx.cpu_shadow_cr4 & X86_CR4_PAE) ) { HVM_DBG_LOG(DBG_LEVEL_1, "Guest enabled paging " - "with EFER.LME set but not CR4.PAE\n"); + "with EFER.LME set but not CR4.PAE"); vmx_inject_hw_exception(v, TRAP_gp_fault, 0); } else { - HVM_DBG_LOG(DBG_LEVEL_1, "Enabling long mode\n"); + HVM_DBG_LOG(DBG_LEVEL_1, "Enabling long mode"); v->arch.hvm_vmx.efer |= EFER_LMA; vm_entry_value = __vmread(VM_ENTRY_CONTROLS); vm_entry_value |= VM_ENTRY_IA32E_MODE; @@ -2139,7 +2139,7 @@ static int vmx_set_cr0(unsigned long val { eip = __vmread(GUEST_RIP); HVM_DBG_LOG(DBG_LEVEL_1, - "Transfering control to vmxassist %%eip 0x%lx\n", eip); + "Transfering control to vmxassist %%eip 0x%lx", eip); return 0; /* do not update eip! */ } } @@ -2147,12 +2147,12 @@ static int vmx_set_cr0(unsigned long val { eip = __vmread(GUEST_RIP); HVM_DBG_LOG(DBG_LEVEL_1, - "Enabling CR0.PE at %%eip 0x%lx\n", eip); + "Enabling CR0.PE at %%eip 0x%lx", eip); if ( vmx_assist(v, VMX_ASSIST_RESTORE) ) { eip = __vmread(GUEST_RIP); HVM_DBG_LOG(DBG_LEVEL_1, - "Restoring to %%eip 0x%lx\n", eip); + "Restoring to %%eip 0x%lx", eip); return 0; /* do not update eip! */ } } @@ -2310,7 +2310,7 @@ static int mov_to_cr(int gp, int cr, str if ( unlikely(vmx_long_mode_enabled(v)) ) { HVM_DBG_LOG(DBG_LEVEL_1, "Guest cleared CR4.PAE while " - "EFER.LMA is set\n"); + "EFER.LMA is set"); vmx_inject_hw_exception(v, TRAP_gp_fault, 0); } } @@ -2440,8 +2440,7 @@ static inline int vmx_do_msr_read(struct u32 ecx = regs->ecx, eax, edx; struct vcpu *v = current; - HVM_DBG_LOG(DBG_LEVEL_1, "ecx=%x, eax=%x, edx=%x", - ecx, (u32)regs->eax, (u32)regs->edx); + HVM_DBG_LOG(DBG_LEVEL_1, "ecx=%x", ecx); switch (ecx) { case MSR_IA32_TIME_STAMP_COUNTER: ++++++ hvm-efer.patch ++++++ ++++ 670 lines (skipped) ++++++ hvm-hypercall-context.patch ++++++ Index: 2007-05-14/xen/arch/x86/domain.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/domain.c 2007-05-14 13:43:44.000000000 +0200 +++ 2007-05-14/xen/arch/x86/domain.c 2007-05-14 14:27:23.000000000 +0200 @@ -38,6 +38,7 @@ #include <asm/mpspec.h> #include <asm/ldt.h> #include <asm/paging.h> +#include <asm/hypercall.h> #include <asm/hvm/hvm.h> #include <asm/hvm/support.h> #include <asm/msr.h> @@ -1234,6 +1235,8 @@ void sync_vcpu_execstate(struct vcpu *v) __arg; \ }) +DEFINE_PER_CPU(char, hc_preempted); + unsigned long hypercall_create_continuation( unsigned int op, const char *format, ...) { @@ -1265,7 +1268,9 @@ unsigned long hypercall_create_continuat regs->eip -= 2; /* re-execute 'syscall' / 'int 0x82' */ #ifdef __x86_64__ - if ( !is_pv_32on64_domain(current->domain) ) + if ( !is_hvm_vcpu(current) ? + !is_pv_32on64_vcpu(current) : + hvm_guest_x86_mode(current) == 8 ) { for ( i = 0; *p != '\0'; i++ ) { @@ -1301,6 +1306,8 @@ unsigned long hypercall_create_continuat } } } + + this_cpu(hc_preempted) = 1; } va_end(args); Index: 2007-05-14/xen/arch/x86/hvm/hvm.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/hvm/hvm.c 2007-05-14 13:47:02.000000000 +0200 +++ 2007-05-14/xen/arch/x86/hvm/hvm.c 2007-05-14 14:21:26.000000000 +0200 @@ -663,7 +663,7 @@ typedef unsigned long hvm_hypercall_t( #if defined(__i386__) -static hvm_hypercall_t *hvm_hypercall_table[NR_hypercalls] = { +static hvm_hypercall_t *hvm_hypercall32_table[NR_hypercalls] = { HYPERCALL(memory_op), HYPERCALL(multicall), HYPERCALL(xen_version), @@ -672,21 +672,6 @@ static hvm_hypercall_t *hvm_hypercall_ta HYPERCALL(hvm_op) }; -static void __hvm_do_hypercall(struct cpu_user_regs *pregs) -{ - if ( (pregs->eax >= NR_hypercalls) || !hvm_hypercall_table[pregs->eax] ) - { - if ( pregs->eax != __HYPERVISOR_grant_table_op ) - gdprintk(XENLOG_WARNING, "HVM vcpu %d:%d bad hypercall %d.\n", - current->domain->domain_id, current->vcpu_id, pregs->eax); - pregs->eax = -ENOSYS; - return; - } - - pregs->eax = hvm_hypercall_table[pregs->eax]( - pregs->ebx, pregs->ecx, pregs->edx, pregs->esi, pregs->edi); -} - #else /* defined(__x86_64__) */ static long do_memory_op_compat32(int cmd, XEN_GUEST_HANDLE(void) arg) @@ -746,49 +731,38 @@ static hvm_hypercall_t *hvm_hypercall32_ HYPERCALL(hvm_op) }; -static void __hvm_do_hypercall(struct cpu_user_regs *pregs) -{ - pregs->rax = (uint32_t)pregs->eax; /* mask in case compat32 caller */ - if ( (pregs->rax >= NR_hypercalls) || !hvm_hypercall64_table[pregs->rax] ) - { - if ( pregs->rax != __HYPERVISOR_grant_table_op ) - gdprintk(XENLOG_WARNING, "HVM vcpu %d:%d bad hypercall %ld.\n", - current->domain->domain_id, current->vcpu_id, pregs->rax); - pregs->rax = -ENOSYS; - return; - } - - if ( current->arch.paging.mode->guest_levels == 4 ) - { - pregs->rax = hvm_hypercall64_table[pregs->rax](pregs->rdi, - pregs->rsi, - pregs->rdx, - pregs->r10, - pregs->r8); - } - else - { - pregs->eax = hvm_hypercall32_table[pregs->eax]((uint32_t)pregs->ebx, - (uint32_t)pregs->ecx, - (uint32_t)pregs->edx, - (uint32_t)pregs->esi, - (uint32_t)pregs->edi); - } -} - #endif /* defined(__x86_64__) */ int hvm_do_hypercall(struct cpu_user_regs *regs) { - int flush, preempted; - unsigned long old_eip; + int flush, mode = hvm_guest_x86_mode(current); + uint32_t eax = regs->eax; - hvm_store_cpu_guest_regs(current, regs, NULL); + switch ( mode ) + { +#ifdef __x86_64__ + case 8: +#endif + case 4: + case 2: + hvm_store_cpu_guest_regs(current, regs, NULL); + if ( unlikely(ring_3(regs)) ) + { + default: + regs->eax = -EPERM; + return HVM_HCALL_completed; + } + case 0: + break; + } - if ( unlikely(ring_3(regs)) ) + if ( (eax >= NR_hypercalls) || !hvm_hypercall32_table[eax] ) { - regs->eax = -EPERM; - return 0; + if ( eax != __HYPERVISOR_grant_table_op ) + gdprintk(XENLOG_WARNING, "HVM vcpu %d:%d bad hypercall %u.\n", + current->domain->domain_id, current->vcpu_id, eax); + regs->eax = -ENOSYS; + return HVM_HCALL_completed; } /* @@ -796,20 +770,29 @@ int hvm_do_hypercall(struct cpu_user_reg * For now we also need to flush when pages are added, as qemu-dm is not * yet capable of faulting pages into an existing valid mapcache bucket. */ - flush = ((uint32_t)regs->eax == __HYPERVISOR_memory_op); - - /* Check for preemption: RIP will be modified from this dummy value. */ - old_eip = regs->eip; - regs->eip = 0xF0F0F0FF; - - __hvm_do_hypercall(regs); + flush = (eax == __HYPERVISOR_memory_op); + this_cpu(hc_preempted) = 0; - preempted = (regs->eip != 0xF0F0F0FF); - regs->eip = old_eip; - - hvm_load_cpu_guest_regs(current, regs); +#ifdef __x86_64__ + if ( mode == 8 ) + { + regs->rax = hvm_hypercall64_table[eax](regs->rdi, + regs->rsi, + regs->rdx, + regs->r10, + regs->r8); + } + else +#endif + { + regs->eax = hvm_hypercall32_table[eax]((uint32_t)regs->ebx, + (uint32_t)regs->ecx, + (uint32_t)regs->edx, + (uint32_t)regs->esi, + (uint32_t)regs->edi); + } - return (preempted ? HVM_HCALL_preempted : + return (this_cpu(hc_preempted) ? HVM_HCALL_preempted : flush ? HVM_HCALL_invalidate : HVM_HCALL_completed); } Index: 2007-05-14/xen/arch/x86/hvm/platform.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/hvm/platform.c 2007-04-23 10:01:41.000000000 +0200 +++ 2007-05-14/xen/arch/x86/hvm/platform.c 2007-05-14 13:47:25.000000000 +0200 @@ -1037,6 +1037,9 @@ void handle_mmio(unsigned long gpa) df = regs->eflags & X86_EFLAGS_DF ? 1 : 0; address_bytes = hvm_guest_x86_mode(v); + if (address_bytes < 2) + /* real or vm86 modes */ + address_bytes = 2; inst_addr = hvm_get_segment_base(v, x86_seg_cs) + regs->eip; inst_len = hvm_instruction_length(inst_addr, address_bytes); if ( inst_len <= 0 ) Index: 2007-05-14/xen/arch/x86/hvm/svm/svm.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/hvm/svm/svm.c 2007-05-03 09:45:09.000000000 +0200 +++ 2007-05-14/xen/arch/x86/hvm/svm/svm.c 2007-05-14 13:47:25.000000000 +0200 @@ -563,14 +563,6 @@ static inline void svm_restore_dr(struct } -static int svm_realmode(struct vcpu *v) -{ - unsigned long cr0 = v->arch.hvm_svm.cpu_shadow_cr0; - unsigned long eflags = v->arch.hvm_svm.vmcb->rflags; - - return (eflags & X86_EFLAGS_VM) || !(cr0 & X86_CR0_PE); -} - static int svm_interrupts_enabled(struct vcpu *v) { unsigned long eflags = v->arch.hvm_svm.vmcb->rflags; @@ -581,13 +573,13 @@ static int svm_guest_x86_mode(struct vcp { struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; - if ( svm_long_mode_enabled(v) && vmcb->cs.attr.fields.l ) + if ( unlikely(!(v->arch.hvm_svm.cpu_shadow_cr0 & X86_CR0_PE)) ) + return 0; + if ( unlikely(vmcb->rflags & X86_EFLAGS_VM) ) + return 1; + if ( svm_long_mode_enabled(v) && likely(vmcb->cs.attr.fields.l) ) return 8; - - if ( svm_realmode(v) ) - return 2; - - return (vmcb->cs.attr.fields.db ? 4 : 2); + return (likely(vmcb->cs.attr.fields.db) ? 4 : 2); } void svm_update_host_cr3(struct vcpu *v) Index: 2007-05-14/xen/arch/x86/hvm/vmx/vmx.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/hvm/vmx/vmx.c 2007-05-03 09:45:09.000000000 +0200 +++ 2007-05-14/xen/arch/x86/hvm/vmx/vmx.c 2007-05-14 13:47:25.000000000 +0200 @@ -995,31 +995,20 @@ static void vmx_init_hypercall_page(stru *(u16 *)(hypercall_page + (__HYPERVISOR_iret * 32)) = 0x0b0f; /* ud2 */ } -static int vmx_realmode(struct vcpu *v) -{ - unsigned long rflags; - - ASSERT(v == current); - - rflags = __vmread(GUEST_RFLAGS); - return rflags & X86_EFLAGS_VM; -} - static int vmx_guest_x86_mode(struct vcpu *v) { - unsigned long cs_ar_bytes; + unsigned int cs_ar_bytes; ASSERT(v == current); + if ( unlikely(!(v->arch.hvm_vmx.cpu_shadow_cr0 & X86_CR0_PE)) ) + return 0; + if ( unlikely(__vmread(GUEST_RFLAGS) & X86_EFLAGS_VM) ) + return 1; cs_ar_bytes = __vmread(GUEST_CS_AR_BYTES); - - if ( vmx_long_mode_enabled(v) && (cs_ar_bytes & (1u<<13)) ) + if ( vmx_long_mode_enabled(v) && likely(cs_ar_bytes & (1u<<13)) ) return 8; - - if ( vmx_realmode(v) ) - return 2; - - return ((cs_ar_bytes & (1u<<14)) ? 4 : 2); + return (likely(cs_ar_bytes & (1u<<14)) ? 4 : 2); } static int vmx_pae_enabled(struct vcpu *v) Index: 2007-05-14/xen/include/asm-x86/hypercall.h =================================================================== --- 2007-05-14.orig/xen/include/asm-x86/hypercall.h 2007-04-23 10:01:46.000000000 +0200 +++ 2007-05-14/xen/include/asm-x86/hypercall.h 2007-05-14 14:26:36.000000000 +0200 @@ -15,6 +15,15 @@ */ #define MMU_UPDATE_PREEMPTED (~(~0U>>1)) +/* + * This gets set to a non-zero value whenever hypercall_create_continuation() + * is used (outside of multicall context; in multicall context the second call + * from do_multicall() itself will have this effect). Internal callers of + * hypercall handlers interested in this condition must clear the flag prior + * to invoking the respective handler(s). + */ +DECLARE_PER_CPU(char, hc_preempted); + extern long do_event_channel_op_compat( XEN_GUEST_HANDLE(evtchn_op_t) uop); ++++++ hvm-hypercall-debug.patch ++++++ Index: 2007-05-14/xen/arch/x86/hvm/hvm.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/hvm/hvm.c 2007-05-14 14:21:26.000000000 +0200 +++ 2007-05-14/xen/arch/x86/hvm/hvm.c 2007-05-14 14:32:48.000000000 +0200 @@ -776,6 +776,9 @@ int hvm_do_hypercall(struct cpu_user_reg #ifdef __x86_64__ if ( mode == 8 ) { + HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%u(%lx, %lx, %lx, %lx, %lx)", eax, + regs->rdi, regs->rsi, regs->rdx, regs->r10, regs->r8); + regs->rax = hvm_hypercall64_table[eax](regs->rdi, regs->rsi, regs->rdx, @@ -785,6 +788,11 @@ int hvm_do_hypercall(struct cpu_user_reg else #endif { + HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%u(%x, %x, %x, %x, %x)", eax, + (uint32_t)regs->ebx, (uint32_t)regs->ecx, + (uint32_t)regs->edx, (uint32_t)regs->esi, + (uint32_t)regs->edi); + regs->eax = hvm_hypercall32_table[eax]((uint32_t)regs->ebx, (uint32_t)regs->ecx, (uint32_t)regs->edx, @@ -792,6 +800,8 @@ int hvm_do_hypercall(struct cpu_user_reg (uint32_t)regs->edi); } + HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%u -> %lx", eax, (unsigned long)regs->eax); + return (this_cpu(hc_preempted) ? HVM_HCALL_preempted : flush ? HVM_HCALL_invalidate : HVM_HCALL_completed); } @@ -1056,6 +1066,10 @@ long do_hvm_op(unsigned long op, XEN_GUE rc = copy_to_guest(arg, &a, 1) ? -EFAULT : 0; } + HVM_DBG_LOG(DBG_LEVEL_HCALL, "%s param %u = %"PRIx64, + op == HVMOP_set_param ? "set" : "get", + a.index, a.value); + param_fail: rcu_unlock_domain(d); break; Index: 2007-05-14/xen/include/asm-x86/hvm/support.h =================================================================== --- 2007-05-14.orig/xen/include/asm-x86/hvm/support.h 2007-04-23 10:01:46.000000000 +0200 +++ 2007-05-14/xen/include/asm-x86/hvm/support.h 2007-05-14 14:31:44.000000000 +0200 @@ -62,6 +62,7 @@ static inline vcpu_iodata_t *get_ioreq(s #define DBG_LEVEL_VLAPIC_TIMER (1 << 7) #define DBG_LEVEL_VLAPIC_INTERRUPT (1 << 8) #define DBG_LEVEL_IOAPIC (1 << 9) +#define DBG_LEVEL_HCALL (1 << 10) extern unsigned int opt_hvm_debug_level; #define HVM_DBG_LOG(level, _f, _a...) \ ++++++ hvm-pio-read.patch ++++++ Index: 2007-04-27/xen/arch/x86/hvm/io.c =================================================================== --- 2007-04-27.orig/xen/arch/x86/hvm/io.c 2007-04-16 09:26:34.000000000 +0200 +++ 2007-04-27/xen/arch/x86/hvm/io.c 2007-05-09 18:00:08.000000000 +0200 @@ -418,11 +418,10 @@ static inline void set_eflags_PF(int siz static void hvm_pio_assist(struct cpu_user_regs *regs, ioreq_t *p, struct hvm_io_op *pio_opp) { - unsigned long old_eax; - int sign = p->df ? -1 : 1; - if ( p->data_is_ptr || (pio_opp->flags & OVERLAP) ) { + int sign = p->df ? -1 : 1; + if ( pio_opp->flags & REPZ ) regs->ecx -= p->count; @@ -459,14 +458,15 @@ static void hvm_pio_assist(struct cpu_us } else if ( p->dir == IOREQ_READ ) { - old_eax = regs->eax; + unsigned long old_eax = regs->eax; + switch ( p->size ) { case 1: - regs->eax = (old_eax & 0xffffff00) | (p->data & 0xff); + regs->eax = (old_eax & ~0xff) | (p->data & 0xff); break; case 2: - regs->eax = (old_eax & 0xffff0000) | (p->data & 0xffff); + regs->eax = (old_eax & ~0xffff) | (p->data & 0xffff); break; case 4: regs->eax = (p->data & 0xffffffff); ++++++ hvm-shared-info-size.patch ++++++ Index: 2007-05-14/xen/arch/x86/hvm/hvm.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/hvm/hvm.c 2007-05-14 08:28:38.000000000 +0200 +++ 2007-05-14/xen/arch/x86/hvm/hvm.c 2007-05-14 13:47:02.000000000 +0200 @@ -824,6 +824,15 @@ void hvm_update_guest_cr3(struct vcpu *v void hvm_hypercall_page_initialise(struct domain *d, void *hypercall_page) { +#ifdef __x86_64__ + /* + * Since this operation is one of the very first executed by PV drivers + * on initialisation or after save/restore, it is a sensible point at + * which to sample the execution mode of the guest and latch 32- or 64- + * bit format for shared state. + */ + d->arch.has_32bit_shinfo = (hvm_guest_x86_mode(current) != 8); +#endif hvm_funcs.init_hypercall_page(d, hypercall_page); } @@ -1053,13 +1062,6 @@ long do_hvm_op(unsigned long op, XEN_GUE break; case HVM_PARAM_CALLBACK_IRQ: hvm_set_callback_via(d, a.value); - /* - * Since this operation is one of the very first executed - * by PV drivers on initialisation or after save/restore, it - * is a sensible point at which to sample the execution mode of - * the guest and latch 32- or 64-bit format for shared state. - */ - d->arch.has_32bit_shinfo = (hvm_guest_x86_mode(current) != 8); break; } d->arch.hvm_domain.params[a.index] = a.value; ++++++ intpte_t-cast.patch ++++++ Index: 2007-05-14/xen/arch/x86/mm.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/mm.c 2007-05-14 08:40:14.000000000 +0200 +++ 2007-05-14/xen/arch/x86/mm.c 2007-05-14 08:40:20.000000000 +0200 @@ -1017,7 +1017,7 @@ static void pae_flush_pgd( l3tab_ptr = &cache->table[cache->inuse_idx][idx]; _ol3e = l3e_get_intpte(*l3tab_ptr); _nl3e = l3e_get_intpte(nl3e); - _pl3e = cmpxchg((intpte_t *)l3tab_ptr, _ol3e, _nl3e); + _pl3e = cmpxchg(&l3e_get_intpte(*l3tab_ptr), _ol3e, _nl3e); BUG_ON(_pl3e != _ol3e); } @@ -1316,7 +1316,7 @@ static inline int update_intpte(intpte_t /* Macro that wraps the appropriate type-changes around update_intpte(). * Arguments are: type, ptr, old, new, mfn, vcpu */ #define UPDATE_ENTRY(_t,_p,_o,_n,_m,_v) \ - update_intpte((intpte_t *)(_p), \ + update_intpte(&_t ## e_get_intpte(*(_p)), \ _t ## e_get_intpte(_o), _t ## e_get_intpte(_n), \ (_m), (_v)) @@ -2498,7 +2498,7 @@ static int create_grant_pte_mapping( } ol1e = *(l1_pgentry_t *)va; - if ( !UPDATE_ENTRY(l1, va, ol1e, nl1e, mfn, v) ) + if ( !UPDATE_ENTRY(l1, (l1_pgentry_t *)va, ol1e, nl1e, mfn, v) ) { put_page_type(page); rc = GNTST_general_error; @@ -3278,7 +3278,7 @@ static int ptwr_emulated_update( intpte_t t = old; ol1e = l1e_from_intpte(old); - okay = paging_cmpxchg_guest_entry(v, (intpte_t *) pl1e, + okay = paging_cmpxchg_guest_entry(v, &l1e_get_intpte(*pl1e), &t, val, _mfn(mfn)); okay = (okay && t == old); ++++++ inval-sh-ldt.patch ++++++ Index: 2007-04-27/xen/arch/x86/mm.c =================================================================== --- 2007-04-27.orig/xen/arch/x86/mm.c 2007-04-27 08:27:18.000000000 +0200 +++ 2007-04-27/xen/arch/x86/mm.c 2007-04-27 09:30:37.000000000 +0200 @@ -410,7 +410,7 @@ void update_cr3(struct vcpu *v) } -void invalidate_shadow_ldt(struct vcpu *v) +static void invalidate_shadow_ldt(struct vcpu *v) { int i; unsigned long pfn; Index: 2007-04-27/xen/include/asm-x86/mm.h =================================================================== --- 2007-04-27.orig/xen/include/asm-x86/mm.h 2007-04-02 12:16:27.000000000 +0200 +++ 2007-04-27/xen/include/asm-x86/mm.h 2007-04-27 09:30:37.000000000 +0200 @@ -143,7 +143,6 @@ void init_frametable(void); int alloc_page_type(struct page_info *page, unsigned long type); void free_page_type(struct page_info *page, unsigned long type); -void invalidate_shadow_ldt(struct vcpu *d); int _shadow_mode_refcounts(struct domain *d); static inline void put_page(struct page_info *page) ++++++ kill-sh_mapcache.patch ++++++ Index: 2007-05-14/xen/arch/x86/mm.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/mm.c 2007-05-14 08:39:16.000000000 +0200 +++ 2007-05-14/xen/arch/x86/mm.c 2007-05-14 08:40:14.000000000 +0200 @@ -2261,7 +2261,7 @@ int do_mmu_update( struct vcpu *v = current; struct domain *d = v->domain; unsigned long type_info; - struct domain_mmap_cache mapcache, sh_mapcache; + struct domain_mmap_cache mapcache; if ( unlikely(count & MMU_UPDATE_PREEMPTED) ) { @@ -2285,7 +2285,6 @@ int do_mmu_update( } domain_mmap_cache_init(&mapcache); - domain_mmap_cache_init(&sh_mapcache); LOCK_BIGLOCK(d); @@ -2447,7 +2446,6 @@ int do_mmu_update( UNLOCK_BIGLOCK(d); domain_mmap_cache_destroy(&mapcache); - domain_mmap_cache_destroy(&sh_mapcache); perfc_add(num_page_updates, i); ++++++ page-cacheability.patch ++++++ Index: 2007-05-14/xen/arch/x86/mm.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/mm.c 2007-05-14 14:33:33.000000000 +0200 +++ 2007-05-14/xen/arch/x86/mm.c 2007-05-14 14:35:02.000000000 +0200 @@ -147,6 +147,14 @@ struct page_info *frame_table; unsigned long max_page; unsigned long total_pages; +#define PAGE_CACHE_ATTRS (_PAGE_PAT|_PAGE_PCD|_PAGE_PWT) + +#define l1_disallow_mask(d) (!(d)->iomem_caps || \ + !rangeset_is_empty((d)->iomem_caps) || \ + !rangeset_is_empty((d)->arch.ioport_caps) ? \ + L1_DISALLOW_MASK : \ + L1_DISALLOW_MASK|PAGE_CACHE_ATTRS) + #ifdef CONFIG_COMPAT l2_pgentry_t *compat_idle_pg_table_l2 = NULL; #define l3_disallow_mask(d) (!is_pv_32on64_domain(d) ? \ @@ -265,9 +273,10 @@ void share_xen_page_with_guest( spin_lock(&d->page_alloc_lock); - /* The incremented type count pins as writable or read-only. */ page->u.inuse.type_info = (readonly ? PGT_none : PGT_writable_page); - page->u.inuse.type_info |= PGT_validated | 1; + if ( readonly || d != dom_io ) + /* The incremented type count pins as writable or read-only. */ + page->u.inuse.type_info |= PGT_validated | 1; page_set_owner(page, d); wmb(); /* install valid domain ptr before updating refcnt. */ @@ -526,6 +535,74 @@ static int get_page_and_type_from_pagenr return 1; } +static unsigned long get_writable_type(unsigned int flags) +{ + unsigned long type = PGT_none; + + if ( flags & _PAGE_RW ) + type = PGT_writable_page; + if ( flags & _PAGE_PWT ) + type |= PGT_pwt_mask | PGT_writable_page; + if ( flags & _PAGE_PCD ) + type |= PGT_pcd_mask | PGT_writable_page; +#ifdef CONFIG_PAT + if ( flags & _PAGE_PAT ) + type |= PGT_pat_mask | PGT_writable_page; +#endif + BUG_ON(!(type & PGT_writable_page)); + + return type; +} + +static int alloc_writable_page(struct page_info *page, unsigned long type) +{ + unsigned long mfn = page_to_mfn(page); + unsigned int flags = 0; + int ret; + + if ( page_get_owner(page) == dom_io ) + return 1; +#ifdef __i386__ + if ( mfn >= ((DIRECTMAP_VIRT_END - DIRECTMAP_VIRT_START) >> PAGE_SHIFT) ) + return 1; +#endif + + if ( type & PGT_pwt_mask ) + flags |= _PAGE_PWT; + if ( type & PGT_pcd_mask ) + flags |= _PAGE_PCD; +#ifdef CONFIG_PAT + if ( type & PGT_pat_mask ) + flags |= _PAGE_PAT; +#endif + ret = map_pages_to_xen((unsigned long)mfn_to_virt(mfn), mfn, 1, + PAGE_HYPERVISOR | flags); + if ( ret == 0 ) + return 1; + + MEM_LOG("Error %d changing cacheability of mfn %lx", ret, mfn); + return 0; +} + +static void free_writable_page(struct page_info *page) +{ + unsigned long mfn = page_to_mfn(page); + + if ( page_get_owner(page) == dom_io ) + return; +#ifdef __i386__ + if ( mfn >= ((DIRECTMAP_VIRT_END - DIRECTMAP_VIRT_START) >> PAGE_SHIFT) ) + return; +#endif + + if ( map_pages_to_xen((unsigned long)mfn_to_virt(mfn), mfn, 1, + PAGE_HYPERVISOR) ) + { + printk("Reverting cacheability for %lx failed\n", mfn); + BUG(); + } +} + /* * We allow root tables to map each other (a.k.a. linear page tables). It * needs some special care with reference counts and access permissions: @@ -586,15 +663,16 @@ get_page_from_l1e( l1_pgentry_t l1e, struct domain *d) { unsigned long mfn = l1e_get_pfn(l1e); + unsigned int flags = l1e_get_flags(l1e); struct page_info *page = mfn_to_page(mfn); int okay; - if ( !(l1e_get_flags(l1e) & _PAGE_PRESENT) ) + if ( !(flags & _PAGE_PRESENT) ) return 1; - if ( unlikely(l1e_get_flags(l1e) & L1_DISALLOW_MASK) ) + if ( unlikely(flags & l1_disallow_mask(d)) ) { - MEM_LOG("Bad L1 flags %x", l1e_get_flags(l1e) & L1_DISALLOW_MASK); + MEM_LOG("Bad L1 flags %x", flags & l1_disallow_mask(d)); return 0; } @@ -624,9 +702,9 @@ get_page_from_l1e( * contribute to writeable mapping refcounts. (This allows the * qemu-dm helper process in dom0 to map the domain's memory without * messing up the count of "real" writable mappings.) */ - okay = (((l1e_get_flags(l1e) & _PAGE_RW) && + okay = (((flags & (_PAGE_RW|PAGE_CACHE_ATTRS)) && !(unlikely(paging_mode_external(d) && (d != current->domain)))) - ? get_page_and_type(page, d, PGT_writable_page) + ? get_page_and_type(page, d, get_writable_type(flags)) : get_page(page, d)); if ( !okay ) { @@ -819,7 +897,7 @@ void put_page_from_l1e(l1_pgentry_t l1e, /* Remember we didn't take a type-count of foreign writable mappings * to paging-external domains */ - if ( (l1e_get_flags(l1e) & _PAGE_RW) && + if ( (l1e_get_flags(l1e) & (_PAGE_RW|PAGE_CACHE_ATTRS)) && !(unlikely((e != d) && paging_mode_external(e))) ) { put_page_and_type(page); @@ -1320,6 +1398,60 @@ static inline int update_intpte(intpte_t _t ## e_get_intpte(_o), _t ## e_get_intpte(_n), \ (_m), (_v)) +/* + * Present->present transitions referencing the same page with old and new + * attributes resulting in (different) PGT_writable_page types and with the + * type use count being 1 must be special cased, as the transition would + * otherwise fail. + */ +static int transition_writable_page(l1_pgentry_t *pl1e, l1_pgentry_t ol1e, + l1_pgentry_t nl1e, unsigned long gl1mfn, + int do_cmpxchg) +{ + struct page_info *page = l1e_get_page(nl1e); + unsigned long type = get_writable_type(l1e_get_flags(ol1e)); + unsigned long nx = type | 2; + unsigned long x = type | PGT_validated | 1; + + if ( cmpxchg(&page->u.inuse.type_info, x, nx) == x ) + { + /* + * The adjustment is now safe because the refcnt is 2 and validated + * bit is clear => non-free ops will spin or fail, and a racing free + * is illegal (will crash domain below). + */ + type = get_writable_type(l1e_get_flags(nl1e)); + if ( alloc_writable_page(page, type) ) + { + x = nx; + nx = type | PGT_validated | 1; + if ( cmpxchg(&page->u.inuse.type_info, x, nx) == x ) + { + if ( do_cmpxchg ) + { + intpte_t t = l1e_get_intpte(ol1e); + + if ( paging_cmpxchg_guest_entry(current, + &l1e_get_intpte(*pl1e), + &t, + l1e_get_intpte(nl1e), + _mfn(gl1mfn)) ) + return t == l1e_get_intpte(ol1e); + } + else if ( UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, gl1mfn, current) ) + return 1; + } + domain_crash(current->domain); + return 0; + } + page->u.inuse.type_info |= PGT_validated; + /* Drop the extra reference. */ + put_page_type(page); + } + + return -1; +} + /* Update the L1 entry at pl1e to new value nl1e. */ static int mod_l1_entry(l1_pgentry_t *pl1e, l1_pgentry_t nl1e, unsigned long gl1mfn) @@ -1339,19 +1471,31 @@ static int mod_l1_entry(l1_pgentry_t *pl nl1e = l1e_from_pfn(gmfn_to_mfn(FOREIGNDOM, l1e_get_pfn(nl1e)), l1e_get_flags(nl1e)); - if ( unlikely(l1e_get_flags(nl1e) & L1_DISALLOW_MASK) ) + if ( unlikely(l1e_get_flags(nl1e) & l1_disallow_mask(d)) ) { MEM_LOG("Bad L1 flags %x", - l1e_get_flags(nl1e) & L1_DISALLOW_MASK); + l1e_get_flags(nl1e) & l1_disallow_mask(d)); return 0; } adjust_guest_l1e(nl1e, d); - /* Fast path for identical mapping, r/w and presence. */ - if ( !l1e_has_changed(ol1e, nl1e, _PAGE_RW | _PAGE_PRESENT) ) + /* Fast path for identical mapping, r/w, cacheability, and presence. */ + if ( !l1e_has_changed(ol1e, nl1e, + _PAGE_RW | _PAGE_PRESENT | PAGE_CACHE_ATTRS) ) return UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, gl1mfn, current); + if ( !l1e_has_changed(ol1e, nl1e, _PAGE_PRESENT) && + (l1e_get_flags(ol1e) & (_PAGE_RW | PAGE_CACHE_ATTRS)) && + (l1e_get_flags(nl1e) & (_PAGE_RW | PAGE_CACHE_ATTRS)) && + mfn_valid(l1e_get_pfn(nl1e)) ) + { + int ret = transition_writable_page(pl1e, ol1e, nl1e, gl1mfn, 0); + + if ( ret >= 0 ) + return ret; + } + if ( unlikely(!get_page_from_l1e(nl1e, FOREIGNDOM)) ) return 0; @@ -1546,10 +1690,13 @@ static int mod_l4_entry(struct domain *d #endif -int alloc_page_type(struct page_info *page, unsigned long type) +static int alloc_page_type(struct page_info *page, unsigned long type) { struct domain *owner = page_get_owner(page); + if ( type & PGT_writable_page ) + return alloc_writable_page(page, type); + /* A page table is dirtied when its type count becomes non-zero. */ if ( likely(owner != NULL) ) mark_dirty(owner, page_to_mfn(page)); @@ -1583,6 +1730,12 @@ void free_page_type(struct page_info *pa struct domain *owner = page_get_owner(page); unsigned long gmfn; + if ( type & PGT_writable_page ) + { + free_writable_page(page); + return; + } + if ( likely(owner != NULL) ) { /* @@ -1652,11 +1805,13 @@ void put_page_type(struct page_info *pag if ( unlikely((nx & PGT_count_mask) == 0) ) { - if ( unlikely((nx & PGT_type_mask) <= PGT_l4_page_table) && + if ( (unlikely((nx & PGT_type_mask) <= PGT_l4_page_table) || + unlikely((nx & PGT_type_mask) > PGT_writable_page)) && likely(nx & PGT_validated) ) { /* - * Page-table pages must be unvalidated when count is zero. The + * Page-table pages and writable pages with non-default + * cacheability must be unvalidated when count is zero. The * 'free' is safe because the refcnt is non-zero and validated * bit is clear => other ops will spin or fail. */ @@ -1725,7 +1880,7 @@ int get_page_type(struct page_info *page if ( unlikely(!cpus_empty(mask)) && /* Shadow mode: track only writable pages. */ (!shadow_mode_enabled(page_get_owner(page)) || - ((nx & PGT_type_mask) == PGT_writable_page)) ) + (nx & PGT_writable_page)) ) { perfc_incr(need_flush_tlb_flush); flush_tlb_mask(mask); @@ -3243,8 +3398,30 @@ static int ptwr_emulated_update( ASSERT((page->u.inuse.type_info & PGT_count_mask) != 0); ASSERT(page_get_owner(page) == d); + pl1e = (l1_pgentry_t *)((unsigned long)map_domain_page(mfn) + + (addr & ~PAGE_MASK)); + ol1e = do_cmpxchg ? l1e_from_intpte(old) : *pl1e; + /* Check the new PTE. */ nl1e = l1e_from_intpte(val); + adjust_guest_l1e(nl1e, d); + + if ( (l1e_get_flags(nl1e) & _PAGE_PRESENT) && + !l1e_has_changed(ol1e, nl1e, _PAGE_PRESENT) && + l1e_has_changed(ol1e, nl1e, _PAGE_RW | PAGE_CACHE_ATTRS) && + (l1e_get_flags(ol1e) & (_PAGE_RW | PAGE_CACHE_ATTRS)) && + (l1e_get_flags(nl1e) & (_PAGE_RW | PAGE_CACHE_ATTRS)) && + mfn_valid(l1e_get_pfn(nl1e)) ) + { + int ret = transition_writable_page(pl1e, ol1e, nl1e, mfn, do_cmpxchg); + + if ( ret >= 0 ) + { + unmap_domain_page(pl1e); + return ret ? X86EMUL_OKAY : X86EMUL_RETRY; + } + } + if ( unlikely(!get_page_from_l1e(nl1e, d)) ) { if ( (CONFIG_PAGING_LEVELS >= 3) && is_pv_32bit_domain(d) && @@ -3263,21 +3440,17 @@ static int ptwr_emulated_update( } else { + unmap_domain_page(pl1e); MEM_LOG("ptwr_emulate: could not get_page_from_l1e()"); return X86EMUL_UNHANDLEABLE; } } - adjust_guest_l1e(nl1e, d); - /* Checked successfully: do the update (write or cmpxchg). */ - pl1e = map_domain_page(mfn); - pl1e = (l1_pgentry_t *)((unsigned long)pl1e + (addr & ~PAGE_MASK)); if ( do_cmpxchg ) { int okay; intpte_t t = old; - ol1e = l1e_from_intpte(old); okay = paging_cmpxchg_guest_entry(v, &l1e_get_intpte(*pl1e), &t, val, _mfn(mfn)); @@ -3290,12 +3463,8 @@ static int ptwr_emulated_update( return X86EMUL_CMPXCHG_FAILED; } } - else - { - ol1e = *pl1e; - if ( !UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, mfn, v) ) - BUG(); - } + else if ( !UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, mfn, v) ) + BUG(); unmap_domain_page(pl1e); @@ -3439,6 +3608,8 @@ int map_pages_to_xen( if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) { pl1e = alloc_xen_pagetable(); + if ( pl1e == NULL ) + return -ENOMEM; clear_page(pl1e); l2e_write(pl2e, l2e_from_pfn(virt_to_mfn(pl1e), __PAGE_HYPERVISOR)); @@ -3446,6 +3617,8 @@ int map_pages_to_xen( else if ( l2e_get_flags(*pl2e) & _PAGE_PSE ) { pl1e = alloc_xen_pagetable(); + if ( pl1e == NULL ) + return -ENOMEM; for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++ ) l1e_write(&pl1e[i], l1e_from_pfn(l2e_get_pfn(*pl2e) + i, @@ -3464,6 +3637,28 @@ int map_pages_to_xen( virt += 1UL << L1_PAGETABLE_SHIFT; mfn += 1UL; nr_mfns -= 1UL; + + if ( !map_small_pages && + flags == PAGE_HYPERVISOR && + ( nr_mfns == 0 || + ((((virt>>PAGE_SHIFT) | mfn) & ((1<<PAGETABLE_ORDER)-1)) == 0)) ) + { + unsigned long base_mfn; + + pl1e = l2e_to_l1e(*pl2e); + base_mfn = l1e_get_pfn(*pl1e); + for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++, pl1e++ ) + if ( l1e_get_pfn(*pl1e) != base_mfn + i || + l1e_get_flags(*pl1e) != flags ) + break; + if ( i == L1_PAGETABLE_ENTRIES ) + { + ol2e = *pl2e; + l2e_write(pl2e, l2e_from_pfn(base_mfn, flags|_PAGE_PSE)); + local_flush_tlb_pge(); + free_xen_pagetable(mfn_to_virt(l2e_get_pfn(ol2e))); + } + } } } Index: 2007-05-14/xen/arch/x86/mm/shadow/common.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/mm/shadow/common.c 2007-05-14 08:28:38.000000000 +0200 +++ 2007-05-14/xen/arch/x86/mm/shadow/common.c 2007-05-14 14:35:02.000000000 +0200 @@ -1320,7 +1320,7 @@ static void sh_hash_audit_bucket(struct /* Bad shadow flags on guest page? */ BUG_ON( !(gpg->shadow_flags & (1<<sp->type)) ); /* Bad type count on guest page? */ - if ( (gpg->u.inuse.type_info & PGT_type_mask) == PGT_writable_page + if ( (gpg->u.inuse.type_info & PGT_writable_page) && (gpg->u.inuse.type_info & PGT_count_mask) != 0 ) { SHADOW_ERROR("MFN %#lx shadowed (by %#"PRI_mfn")" Index: 2007-05-14/xen/arch/x86/mm/shadow/multi.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/mm/shadow/multi.c 2007-05-14 14:28:19.000000000 +0200 +++ 2007-05-14/xen/arch/x86/mm/shadow/multi.c 2007-05-14 14:35:02.000000000 +0200 @@ -4128,8 +4128,7 @@ audit_gfn_to_mfn(struct vcpu *v, gfn_t g if ( !shadow_mode_translate(v->domain) ) return _mfn(gfn_x(gfn)); - if ( (mfn_to_page(gmfn)->u.inuse.type_info & PGT_type_mask) - != PGT_writable_page ) + if ( !(mfn_to_page(gmfn)->u.inuse.type_info & PGT_writable_page) ) return _mfn(gfn_x(gfn)); /* This is a paging-disabled shadow */ else return gfn_to_mfn(v->domain, gfn_x(gfn)); Index: 2007-05-14/xen/include/asm-x86/mm.h =================================================================== --- 2007-05-14.orig/xen/include/asm-x86/mm.h 2007-05-14 13:43:35.000000000 +0200 +++ 2007-05-14/xen/include/asm-x86/mm.h 2007-05-14 14:35:02.000000000 +0200 @@ -64,24 +64,35 @@ struct page_info }; /* The following page types are MUTUALLY EXCLUSIVE. */ -#define PGT_none (0U<<29) /* no special uses of this page */ -#define PGT_l1_page_table (1U<<29) /* using this page as an L1 page table? */ -#define PGT_l2_page_table (2U<<29) /* using this page as an L2 page table? */ -#define PGT_l3_page_table (3U<<29) /* using this page as an L3 page table? */ -#define PGT_l4_page_table (4U<<29) /* using this page as an L4 page table? */ -#define PGT_gdt_page (5U<<29) /* using this page in a GDT? */ -#define PGT_ldt_page (6U<<29) /* using this page in an LDT? */ -#define PGT_writable_page (7U<<29) /* has writable mappings of this page? */ -#define PGT_type_mask (7U<<29) /* Bits 29-31. */ +#define PGT_none (0U<<28) /* no special uses of this page */ +#define PGT_l1_page_table (1U<<28) /* using this page as an L1 page table? */ +#define PGT_l2_page_table (2U<<28) /* using this page as an L2 page table? */ +#define PGT_l3_page_table (3U<<28) /* using this page as an L3 page table? */ +#define PGT_l4_page_table (4U<<28) /* using this page as an L4 page table? */ +#define PGT_gdt_page (5U<<28) /* using this page in a GDT? */ +#define PGT_ldt_page (6U<<28) /* using this page in an LDT? */ +#define PGT_writable_page (0x8U<<28) /* has writable mappings of this page? */ +#define PGT_pwt_mask (0x1U<<28) /* (l1e & _PAGE_PWT) mirror */ +#define PGT_pcd_mask (0x2U<<28) /* (l1e & _PAGE_PCD) mirror */ +#define PGT_wb_page (0x8U<<28) /* WB cached writable page? */ +#define PGT_wt_page (0x9U<<28) /* WT cached writable page? */ +#define PGT_ucm_page (0xAU<<28) /* UC- cached writable page? */ +#define PGT_uc_page (0xBU<<28) /* UC cached writable page? */ +#ifdef CONFIG_PAT +#define PGT_pat_mask (0x4U<<28) /* (l1e & _PAGE_PAT) mirror */ +#define PGT_wc_page (0xCU<<28) /* WC cached writable page? */ +#define PGT_wp_page (0xDU<<28) /* WP cached writable page? */ +#endif +#define PGT_type_mask (0xFU<<28) /* Bits 28-31. */ /* Owning guest has pinned this page to its current type? */ -#define _PGT_pinned 28 +#define _PGT_pinned 22 #define PGT_pinned (1U<<_PGT_pinned) /* Has this page been validated for use as its current type? */ -#define _PGT_validated 27 +#define _PGT_validated 21 #define PGT_validated (1U<<_PGT_validated) /* PAE only: is this an L2 page directory containing Xen-private mappings? */ -#define _PGT_pae_xen_l2 26 +#define _PGT_pae_xen_l2 20 #define PGT_pae_xen_l2 (1U<<_PGT_pae_xen_l2) /* 16-bit count of uses of this frame as its current type. */ @@ -141,7 +152,6 @@ extern unsigned long max_page; extern unsigned long total_pages; void init_frametable(void); -int alloc_page_type(struct page_info *page, unsigned long type); void free_page_type(struct page_info *page, unsigned long type); int _shadow_mode_refcounts(struct domain *d); Index: 2007-05-14/xen/include/asm-x86/x86_32/page-3level.h =================================================================== --- 2007-05-14.orig/xen/include/asm-x86/x86_32/page-3level.h 2007-04-23 10:01:46.000000000 +0200 +++ 2007-05-14/xen/include/asm-x86/x86_32/page-3level.h 2007-05-14 14:35:02.000000000 +0200 @@ -85,6 +85,6 @@ typedef l3_pgentry_t root_pgentry_t; #define get_pte_flags(x) (((int)((x) >> 32) & ~0xFFF) | ((int)(x) & 0xFFF)) #define put_pte_flags(x) (((intpte_t)((x) & ~0xFFF) << 32) | ((x) & 0xFFF)) -#define L3_DISALLOW_MASK 0xFFFFF1E6U /* must-be-zero */ +#define L3_DISALLOW_MASK 0xFFFFF1FEU /* must-be-zero */ #endif /* __X86_32_PAGE_3LEVEL_H__ */ Index: 2007-05-14/xen/include/asm-x86/x86_32/page.h =================================================================== --- 2007-05-14.orig/xen/include/asm-x86/x86_32/page.h 2007-04-23 10:01:46.000000000 +0200 +++ 2007-05-14/xen/include/asm-x86/x86_32/page.h 2007-05-14 14:35:02.000000000 +0200 @@ -29,13 +29,13 @@ extern unsigned int PAGE_HYPERVISOR_NOCA (_PAGE_PRESENT|_PAGE_ACCESSED|_PAGE_DIRTY|_PAGE_GNTTAB) /* - * Disallow unused flag bits plus PAT, PSE and GLOBAL. + * Disallow unused flag bits plus PAT/PSE and GLOBAL. * Permit the NX bit if the hardware supports it. */ #define BASE_DISALLOW_MASK (0xFFFFF180U & ~_PAGE_NX) #define L1_DISALLOW_MASK (BASE_DISALLOW_MASK | _PAGE_GNTTAB) -#define L2_DISALLOW_MASK (BASE_DISALLOW_MASK) +#define L2_DISALLOW_MASK (BASE_DISALLOW_MASK | _PAGE_PCD | _PAGE_PWT) #endif /* __X86_32_PAGE_H__ */ Index: 2007-05-14/xen/include/asm-x86/x86_64/page.h =================================================================== --- 2007-05-14.orig/xen/include/asm-x86/x86_64/page.h 2007-05-03 09:45:09.000000000 +0200 +++ 2007-05-14/xen/include/asm-x86/x86_64/page.h 2007-05-14 14:35:02.000000000 +0200 @@ -87,18 +87,18 @@ typedef l4_pgentry_t root_pgentry_t; #define _PAGE_NX (cpu_has_nx ? _PAGE_NX_BIT : 0U) /* - * Disallow unused flag bits plus PAT, PSE and GLOBAL. + * Disallow unused flag bits plus PAT/PSE and GLOBAL. * Permit the NX bit if the hardware supports it. * Note that range [62:52] is available for software use on x86/64. */ #define BASE_DISALLOW_MASK (0xFF800180U & ~_PAGE_NX) #define L1_DISALLOW_MASK (BASE_DISALLOW_MASK | _PAGE_GNTTAB) -#define L2_DISALLOW_MASK (BASE_DISALLOW_MASK) -#define L3_DISALLOW_MASK (BASE_DISALLOW_MASK) -#define L4_DISALLOW_MASK (BASE_DISALLOW_MASK) +#define L2_DISALLOW_MASK (BASE_DISALLOW_MASK | _PAGE_PCD | _PAGE_PWT) +#define L3_DISALLOW_MASK (BASE_DISALLOW_MASK | _PAGE_PCD | _PAGE_PWT) +#define L4_DISALLOW_MASK (BASE_DISALLOW_MASK | _PAGE_PCD | _PAGE_PWT) -#define COMPAT_L3_DISALLOW_MASK 0xFFFFF1E6U +#define COMPAT_L3_DISALLOW_MASK 0xFFFFF1FEU #define PAGE_HYPERVISOR (__PAGE_HYPERVISOR | _PAGE_GLOBAL) #define PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR_NOCACHE | _PAGE_GLOBAL) ++++++ ptwr-sanity.patch ++++++ Index: 2007-05-14/xen/arch/x86/mm.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/mm.c 2007-05-14 13:43:50.000000000 +0200 +++ 2007-05-14/xen/arch/x86/mm.c 2007-05-14 13:44:25.000000000 +0200 @@ -3238,13 +3238,14 @@ static int ptwr_emulated_update( /* We are looking only for read-only mappings of p.t. pages. */ ASSERT((l1e_get_flags(pte) & (_PAGE_RW|_PAGE_PRESENT)) == _PAGE_PRESENT); + ASSERT(mfn_valid(mfn)); ASSERT((page->u.inuse.type_info & PGT_type_mask) == PGT_l1_page_table); ASSERT((page->u.inuse.type_info & PGT_count_mask) != 0); ASSERT(page_get_owner(page) == d); /* Check the new PTE. */ nl1e = l1e_from_intpte(val); - if ( unlikely(!get_page_from_l1e(gl1e_to_ml1e(d, nl1e), d)) ) + if ( unlikely(!get_page_from_l1e(nl1e, d)) ) { if ( (CONFIG_PAGING_LEVELS >= 3) && is_pv_32bit_domain(d) && (bytes == 4) && (addr & 4) && !do_cmpxchg && @@ -3270,7 +3271,7 @@ static int ptwr_emulated_update( adjust_guest_l1e(nl1e, d); /* Checked successfully: do the update (write or cmpxchg). */ - pl1e = map_domain_page(page_to_mfn(page)); + pl1e = map_domain_page(mfn); pl1e = (l1_pgentry_t *)((unsigned long)pl1e + (addr & ~PAGE_MASK)); if ( do_cmpxchg ) { @@ -3285,21 +3286,21 @@ static int ptwr_emulated_update( if ( !okay ) { unmap_domain_page(pl1e); - put_page_from_l1e(gl1e_to_ml1e(d, nl1e), d); + put_page_from_l1e(nl1e, d); return X86EMUL_CMPXCHG_FAILED; } } else { ol1e = *pl1e; - if ( !UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, page_to_mfn(page), v) ) + if ( !UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, mfn, v) ) BUG(); } unmap_domain_page(pl1e); /* Finally, drop the old PTE. */ - put_page_from_l1e(gl1e_to_ml1e(d, ol1e), d); + put_page_from_l1e(ol1e, d); return X86EMUL_OKAY; } @@ -3365,17 +3366,13 @@ int ptwr_do_page_fault(struct vcpu *v, u LOCK_BIGLOCK(d); - /* - * Attempt to read the PTE that maps the VA being accessed. By checking for - * PDE validity in the L2 we avoid many expensive fixups in __get_user(). - */ + /* Attempt to read the PTE that maps the VA being accessed. */ guest_get_eff_l1e(v, addr, &pte); - if ( !(l1e_get_flags(pte) & _PAGE_PRESENT) ) - goto bail; page = l1e_get_page(pte); /* We are looking only for read-only mappings of p.t. pages. */ if ( ((l1e_get_flags(pte) & (_PAGE_PRESENT|_PAGE_RW)) != _PAGE_PRESENT) || + !mfn_valid(l1e_get_pfn(pte)) || ((page->u.inuse.type_info & PGT_type_mask) != PGT_l1_page_table) || ((page->u.inuse.type_info & PGT_count_mask) == 0) || (page_get_owner(page) != d) ) ++++++ realmode.patch ++++++ Index: 2007-04-27/xen/arch/x86/Makefile =================================================================== --- 2007-04-27.orig/xen/arch/x86/Makefile 2006-12-01 10:44:36.000000000 +0100 +++ 2007-04-27/xen/arch/x86/Makefile 2007-04-27 09:31:25.000000000 +0200 @@ -78,6 +78,8 @@ xen.lds: $(TARGET_SUBARCH)/xen.lds.S $(H boot/mkelf32: boot/mkelf32.c $(HOSTCC) $(HOSTCFLAGS) -o $@ $< +boot/$(TARGET_SUBARCH).o: boot/realmode.S + .PHONY: clean clean:: rm -f asm-offsets.s xen.lds boot/*.o boot/*~ boot/core boot/mkelf32 Index: 2007-04-27/xen/arch/x86/boot/realmode.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ 2007-04-27/xen/arch/x86/boot/realmode.S 2007-04-27 09:31:25.000000000 +0200 @@ -0,0 +1,122 @@ +#define REALMODE_SEG 0x1000 +#define REALMODE_BASE (REALMODE_SEG << 4) + + .section .init.data, "aw" + .align 8 +gdt16_table: + .quad 0 + .quad 0x00cf9a000000ffff /* 0xe008 ring 0 4.00GB code at 0x0 */ + .quad 0x00cf92000000ffff /* 0xe010 ring 0 4.00GB data at 0x0 */ + /* 0xe018 ring 0 64kB 16-bit code at REALMODE_BASE */ +#define __HYPERVISOR_CS16 (__HYPERVISOR_CS + 0x10) + .long 0x0000ffff + ((REALMODE_BASE & 0xffff) << 16) + .long 0x00009a00 + (REALMODE_BASE >> 16) + /* 0xe020 ring 0 64kB 16-bit data at REALMODE_BASE */ +#define __HYPERVISOR_DS16 (__HYPERVISOR_DS32 + 0x10) + .long 0x0000ffff + ((REALMODE_BASE & 0xffff) << 16) + .long 0x00009200 + (REALMODE_BASE >> 16) +#if __HYPERVISOR_CS32 != __HYPERVISOR_CS +/* This doesn't work properly with gas up to at least 2.17.50 as of Feb 2007. + Using .skip or .fill also doesn't work up to 2.15 or 2.16. Use as' -K + option to be pointed at the problematic construct (.word with its operand + being the difference of two symbols) below. + .org gdt16_table + (__HYPERVISOR_CS32 - FIRST_RESERVED_GDT_BYTE) */ + .rept (__HYPERVISOR_CS32 - __HYPERVISOR_DS16) / 8 - 1 + .quad 0 + .endr + .quad 0x00cf9a000000ffff /* 0xe038 ring 0 4.00GB code at 0x0 */ +#endif +.Lgdt16_end: + + .word 0 +gdt16: .word FIRST_RESERVED_GDT_BYTE + .Lgdt16_end - gdt16_table - 1 + .long SYM_PHYS(gdt16_table) - FIRST_RESERVED_GDT_BYTE + +#define SYM_REAL(x) ((x) - .L__realtext) + + .section .init.text, "ax" + .code32 +realmode: + pushal + movl %esp, %ebp + sgdt SYM_PHYS(.Lgdt) + sidt SYM_PHYS(.Lidt) + testl $MBI_CMDLINE, MBI_flags(%ebx) + movl MBI_cmdline(%ebx), %esi + jz 1f + testl %esi, %esi + jz 1f + movl $REALMODE_BASE + 0x10000, %edi + movl %edi, SYM_PHYS(cmd_line_ptr) +0: + lodsb + stosb + testb %al, %al + jnz 0b +1: + movl $SYM_PHYS(.L__realtext), %esi + movl $REALMODE_BASE, %edi + movl $SYM_PHYS(__end_realmode), %ecx + subl %esi, %ecx + rep movsb + movl 9*4(%ebp), %edi + subl $SYM_PHYS(.L__realtext), %edi + lgdt SYM_PHYS(gdt16) + movl $__HYPERVISOR_DS16, %ecx + mov %ecx, %ss + xorl %esp, %esp + mov %ecx, %ds + mov %ecx, %es + ljmpl $__HYPERVISOR_CS16, $SYM_REAL(.Ltext16) + +protmode: + movl $__HYPERVISOR_DS32, %ecx + mov %ecx, %ss + movl %ebp, %esp + mov %ecx, %ds + mov %ecx, %es + movl $REALMODE_BASE + SYM_PHYS(.L__realdata), %esi + subl $SYM_PHYS(.L__realtext), %esi + movl $SYM_PHYS(.L__realdata), %edi + movl $SYM_PHYS(__end_realmode), %ecx + subl %edi, %ecx + rep movsb + mov %ecx, %fs + mov %ecx, %gs + popal + ret $4 + + .section .real.text, "ax" +.L__realtext: + .code16 +.Ltext16: + mov %cr0, %eax + andb $~1, %al + mov %eax, %cr0 + ljmpw $REALMODE_SEG, $SYM_REAL(.Lrealmode) +.Lrealmode: + mov %cs, %cx + mov %cx, %ss + mov %cx, %ds + mov %cx, %es + + pushal + callw *%di + popal + + pushw $0 + popfw + lgdtl %cs:SYM_REAL(.Lgdt) + lidtl %cs:SYM_REAL(.Lidt) + mov %cr0, %eax + orb $1, %al + mov %eax, %cr0 + ljmpl $__HYPERVISOR_CS32, $SYM_PHYS(protmode) + + .section .real.data, "aw" +.L__realdata: + .align 4 +cmd_line_ptr: .long 0 +.Lgdt: .skip 2+4 +.Lidt: .skip 2+4 + .previous Index: 2007-04-27/xen/arch/x86/boot/x86_32.S =================================================================== --- 2007-04-27.orig/xen/arch/x86/boot/x86_32.S 2007-01-05 10:09:13.000000000 +0100 +++ 2007-04-27/xen/arch/x86/boot/x86_32.S 2007-04-27 09:31:25.000000000 +0200 @@ -10,6 +10,8 @@ .text +#define SYM_PHYS(sym) (sym - __PAGE_OFFSET) + ENTRY(start) jmp __start @@ -28,7 +30,7 @@ ENTRY(start) not_multiboot_msg: .asciz "ERR: Not a Multiboot bootloader!" not_multiboot: - mov $not_multiboot_msg-__PAGE_OFFSET,%esi + mov $SYM_PHYS(not_multiboot_msg),%esi mov $0xB8000,%edi # VGA framebuffer 1: mov (%esi),%bl test %bl,%bl # Terminate on '\0' sentinel @@ -47,14 +49,14 @@ not_multiboot: __start: /* Set up a few descriptors: on entry only CS is guaranteed good. */ - lgdt %cs:nopaging_gdt_descr-__PAGE_OFFSET + lgdt %cs:SYM_PHYS(nopaging_gdt_descr) mov $(__HYPERVISOR_DS),%ecx mov %ecx,%ds mov %ecx,%es mov %ecx,%fs mov %ecx,%gs - ljmp $(__HYPERVISOR_CS),$(1f)-__PAGE_OFFSET -1: lss stack_start-__PAGE_OFFSET,%esp + ljmp $(__HYPERVISOR_CS),$SYM_PHYS(1f) +1: lss SYM_PHYS(stack_start),%esp add $(STACK_SIZE-CPUINFO_sizeof-__PAGE_OFFSET),%esp /* Reset EFLAGS (subsumes CLI and CLD). */ @@ -66,7 +68,7 @@ __start: /* Set up CR4, except global flag which Intel requires should be */ /* left until after paging is enabled (IA32 Manual Vol. 3, Sec. 2.5) */ - mov mmu_cr4_features-__PAGE_OFFSET,%ecx + mov SYM_PHYS(mmu_cr4_features),%ecx and $0x7f,%cl # CR4.PGE (global enable) mov %ecx,%cr4 @@ -78,19 +80,19 @@ __start: jne not_multiboot /* Initialize BSS (no nasty surprises!) */ - mov $__bss_start-__PAGE_OFFSET,%edi - mov $_end-__PAGE_OFFSET,%ecx + mov $SYM_PHYS(__bss_start),%edi + mov $SYM_PHYS(_end),%ecx sub %edi,%ecx xor %eax,%eax rep stosb /* Save the Multiboot info structure for later use. */ - add $__PAGE_OFFSET,%ebx - push %ebx + lea __PAGE_OFFSET(%ebx),%eax + push %eax #ifdef CONFIG_X86_PAE /* Initialize low and high mappings of all memory with 2MB pages */ - mov $idle_pg_table_l2-__PAGE_OFFSET,%edi + mov $SYM_PHYS(idle_pg_table_l2),%edi mov $0xe3,%eax /* PRESENT+RW+A+D+2MB */ 1: mov %eax,__PAGE_OFFSET>>18(%edi) /* high mapping */ stosl /* low mapping */ @@ -105,7 +107,7 @@ __start: jne 1b #else /* Initialize low and high mappings of all memory with 4MB pages */ - mov $idle_pg_table-__PAGE_OFFSET,%edi + mov $SYM_PHYS(idle_pg_table),%edi mov $0xe3,%eax /* PRESENT+RW+A+D+4MB */ 1: mov %eax,__PAGE_OFFSET>>20(%edi) /* high mapping */ stosl /* low mapping */ @@ -123,7 +125,7 @@ __start: mov $(__HYPERVISOR_CS << 16),%eax mov %dx,%ax /* selector = 0x0010 = cs */ mov $0x8E00,%dx /* interrupt gate - dpl=0, present */ - lea idt_table-__PAGE_OFFSET,%edi + lea SYM_PHYS(idt_table),%edi mov $256,%ecx 1: mov %eax,(%edi) mov %edx,4(%edi) @@ -149,7 +151,7 @@ start_paging: no_execute_disable: pop %ebx #endif - mov $idle_pg_table-__PAGE_OFFSET,%eax + mov $SYM_PHYS(idle_pg_table),%eax mov %eax,%cr3 mov $0x80050033,%eax /* hi-to-lo: PG,AM,WP,NE,ET,MP,PE */ mov %eax,%cr0 @@ -212,7 +214,7 @@ gdt_descr: .word 0 nopaging_gdt_descr: .word LAST_RESERVED_GDT_BYTE - .long gdt_table - FIRST_RESERVED_GDT_BYTE - __PAGE_OFFSET + .long SYM_PHYS(gdt_table) - FIRST_RESERVED_GDT_BYTE .align PAGE_SIZE, 0 /* NB. Rings != 0 get access up to MACH2PHYS_VIRT_END. This allows access to */ @@ -236,10 +238,10 @@ ENTRY(gdt_table) #ifdef CONFIG_X86_PAE ENTRY(idle_pg_table) ENTRY(idle_pg_table_l3) - .long idle_pg_table_l2 + 0*PAGE_SIZE + 0x01 - __PAGE_OFFSET, 0 - .long idle_pg_table_l2 + 1*PAGE_SIZE + 0x01 - __PAGE_OFFSET, 0 - .long idle_pg_table_l2 + 2*PAGE_SIZE + 0x01 - __PAGE_OFFSET, 0 - .long idle_pg_table_l2 + 3*PAGE_SIZE + 0x01 - __PAGE_OFFSET, 0 + .long SYM_PHYS(idle_pg_table_l2) + 0*PAGE_SIZE + 0x01, 0 + .long SYM_PHYS(idle_pg_table_l2) + 1*PAGE_SIZE + 0x01, 0 + .long SYM_PHYS(idle_pg_table_l2) + 2*PAGE_SIZE + 0x01, 0 + .long SYM_PHYS(idle_pg_table_l2) + 3*PAGE_SIZE + 0x01, 0 .section ".bss.page_aligned","w" ENTRY(idle_pg_table_l2) .fill 4*PAGE_SIZE,1,0 @@ -253,3 +255,8 @@ ENTRY(idle_pg_table_l2) .section ".bss.stack_aligned","w" ENTRY(cpu0_stack) .fill STACK_SIZE,1,0 + +#define __HYPERVISOR_CS32 __HYPERVISOR_CS +#define __HYPERVISOR_DS32 __HYPERVISOR_DS + +#include "realmode.S" Index: 2007-04-27/xen/arch/x86/boot/x86_64.S =================================================================== --- 2007-04-27.orig/xen/arch/x86/boot/x86_64.S 2007-01-08 14:15:31.000000000 +0100 +++ 2007-04-27/xen/arch/x86/boot/x86_64.S 2007-04-27 09:31:25.000000000 +0200 @@ -72,6 +72,8 @@ __start: /* Save the Multiboot info structure for later use. */ mov %ebx,SYM_PHYS(multiboot_ptr) + lss SYM_PHYS(.Lstack_start),%esp + /* We begin by interrogating the CPU for the presence of long mode. */ mov $0x80000000,%eax cpuid @@ -200,7 +202,7 @@ multiboot_ptr: .word 0 nopaging_gdt_descr: .word LAST_RESERVED_GDT_BYTE - .quad gdt_table - FIRST_RESERVED_GDT_BYTE - __PAGE_OFFSET + .quad SYM_PHYS(gdt_table) - FIRST_RESERVED_GDT_BYTE cpuid_ext_features: .long 0 @@ -217,6 +219,9 @@ idt_descr: ENTRY(stack_start) .quad cpu0_stack +.Lstack_start: + .long SYM_PHYS(cpu0_stack) + STACK_SIZE - CPUINFO_sizeof + .word __HYPERVISOR_DS32 high_start: .quad __high_start @@ -256,14 +261,14 @@ ENTRY(compat_gdt_table) .align PAGE_SIZE, 0 ENTRY(idle_pg_table) ENTRY(idle_pg_table_4) - .quad idle_pg_table_l3 - __PAGE_OFFSET + 7 # PML4[0] + .quad SYM_PHYS(idle_pg_table_l3) + 7 # PML4[0] .fill 261,8,0 - .quad idle_pg_table_l3 - __PAGE_OFFSET + 7 # PML4[262] + .quad SYM_PHYS(idle_pg_table_l3) + 7 # PML4[262] /* Initial PDP -- level-3 page table. */ .align PAGE_SIZE, 0 ENTRY(idle_pg_table_l3) - .quad idle_pg_table_l2 - __PAGE_OFFSET + 7 + .quad SYM_PHYS(idle_pg_table_l2) + 7 /* Initial PDE -- level-2 page table. Maps first 1GB physical memory. */ .align PAGE_SIZE, 0 @@ -283,3 +288,5 @@ ENTRY(idle_pg_table_l2) .section ".bss.stack_aligned","w" ENTRY(cpu0_stack) .fill STACK_SIZE,1,0 + +#include "realmode.S" Index: 2007-04-27/xen/arch/x86/x86_32/asm-offsets.c =================================================================== --- 2007-04-27.orig/xen/arch/x86/x86_32/asm-offsets.c 2007-04-02 12:16:26.000000000 +0200 +++ 2007-04-27/xen/arch/x86/x86_32/asm-offsets.c 2007-04-27 09:31:25.000000000 +0200 @@ -7,6 +7,7 @@ #include <xen/config.h> #include <xen/perfc.h> #include <xen/sched.h> +#include <xen/multiboot.h> #include <asm/fixmap.h> #include <asm/hardirq.h> @@ -99,6 +100,10 @@ void __dummy__(void) DEFINE(CPUINFO_sizeof, sizeof(struct cpu_info)); BLANK(); + OFFSET(MBI_flags, multiboot_info_t, flags); + OFFSET(MBI_cmdline, multiboot_info_t, cmdline); + BLANK(); + OFFSET(TRAPBOUNCE_error_code, struct trap_bounce, error_code); OFFSET(TRAPBOUNCE_flags, struct trap_bounce, flags); OFFSET(TRAPBOUNCE_cs, struct trap_bounce, cs); Index: 2007-04-27/xen/arch/x86/x86_32/xen.lds.S =================================================================== --- 2007-04-27.orig/xen/arch/x86/x86_32/xen.lds.S 2007-01-05 10:09:13.000000000 +0100 +++ 2007-04-27/xen/arch/x86/x86_32/xen.lds.S 2007-04-27 09:31:25.000000000 +0200 @@ -63,6 +63,10 @@ SECTIONS __initcall_start = .; .initcall.init : { *(.initcall1.init) } :text __initcall_end = .; + . = ALIGN(16); + .real.text : { *(.real.text) } :text + .real.data : { *(.real.data) } :text + __end_realmode = .; . = ALIGN(PAGE_SIZE); __init_end = .; Index: 2007-04-27/xen/arch/x86/x86_64/asm-offsets.c =================================================================== --- 2007-04-27.orig/xen/arch/x86/x86_64/asm-offsets.c 2007-04-02 12:16:26.000000000 +0200 +++ 2007-04-27/xen/arch/x86/x86_64/asm-offsets.c 2007-04-27 09:31:25.000000000 +0200 @@ -7,6 +7,7 @@ #include <xen/config.h> #include <xen/perfc.h> #include <xen/sched.h> +#include <xen/multiboot.h> #ifdef CONFIG_COMPAT #include <compat/xen.h> #endif @@ -112,6 +113,10 @@ void __dummy__(void) DEFINE(CPUINFO_sizeof, sizeof(struct cpu_info)); BLANK(); + OFFSET(MBI_flags, multiboot_info_t, flags); + OFFSET(MBI_cmdline, multiboot_info_t, cmdline); + BLANK(); + OFFSET(TRAPBOUNCE_error_code, struct trap_bounce, error_code); OFFSET(TRAPBOUNCE_flags, struct trap_bounce, flags); OFFSET(TRAPBOUNCE_cs, struct trap_bounce, cs); Index: 2007-04-27/xen/arch/x86/x86_64/xen.lds.S =================================================================== --- 2007-04-27.orig/xen/arch/x86/x86_64/xen.lds.S 2007-01-05 10:09:13.000000000 +0100 +++ 2007-04-27/xen/arch/x86/x86_64/xen.lds.S 2007-04-27 09:31:25.000000000 +0200 @@ -61,6 +61,10 @@ SECTIONS __initcall_start = .; .initcall.init : { *(.initcall1.init) } :text __initcall_end = .; + . = ALIGN(16); + .real.text : { *(.real.text) } :text + .real.data : { *(.real.data) } :text + __end_realmode = .; . = ALIGN(PAGE_SIZE); __init_end = .; ++++++ svm-reg-save.patch ++++++ Index: 2007-05-14/xen/arch/x86/hvm/svm/svm.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/hvm/svm/svm.c 2007-05-14 14:28:19.000000000 +0200 +++ 2007-05-14/xen/arch/x86/hvm/svm/svm.c 2007-05-14 14:33:08.000000000 +0200 @@ -747,28 +747,10 @@ static void svm_init_hypercall_page(stru *(u16 *)(hypercall_page + (__HYPERVISOR_iret * 32)) = 0x0b0f; /* ud2 */ } -static void save_svm_cpu_user_regs(struct vcpu *v, struct cpu_user_regs *ctxt) -{ - struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; - - ctxt->eax = vmcb->rax; - ctxt->ss = vmcb->ss.sel; - ctxt->esp = vmcb->rsp; - ctxt->eflags = vmcb->rflags; - ctxt->cs = vmcb->cs.sel; - ctxt->eip = vmcb->rip; - - ctxt->gs = vmcb->gs.sel; - ctxt->fs = vmcb->fs.sel; - ctxt->es = vmcb->es.sel; - ctxt->ds = vmcb->ds.sel; -} - static void svm_load_cpu_guest_regs(struct vcpu *v, struct cpu_user_regs *regs) { struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; - vmcb->rax = regs->eax; vmcb->ss.sel = regs->ss; vmcb->rsp = regs->esp; vmcb->rflags = regs->eflags | 2UL; @@ -1408,7 +1390,7 @@ static void svm_io_instruction(struct vc /* Copy current guest state into io instruction state structure. */ memcpy(regs, guest_cpu_user_regs(), HVM_CONTEXT_STACK_BYTES); - hvm_store_cpu_guest_regs(v, regs, NULL); + svm_store_cpu_guest_regs(v, regs, NULL); info.bytes = vmcb->exitinfo1; @@ -2236,7 +2218,6 @@ asmlinkage void svm_vmexit_handler(struc int inst_len, rc; exit_reason = vmcb->exitcode; - save_svm_cpu_user_regs(v, regs); HVMTRACE_2D(VMEXIT, v, vmcb->rip, exit_reason); Index: 2007-05-14/xen/arch/x86/hvm/svm/x86_32/exits.S =================================================================== --- 2007-05-14.orig/xen/arch/x86/hvm/svm/x86_32/exits.S 2007-04-23 10:01:41.000000000 +0200 +++ 2007-05-14/xen/arch/x86/hvm/svm/x86_32/exits.S 2007-05-14 14:33:08.000000000 +0200 @@ -61,8 +61,11 @@ #define HVM_SAVE_ALL_NOSEGREGS \ pushl $HVM_MONITOR_EFLAGS; \ popf; \ - subl $(NR_SKIPPED_REGS*4), %esp; \ - pushl %eax; \ + /* \ + * Skip %eax, we need have vmcb address in there. \ + * Don't worry, EAX is saved during #VMEXIT. \ + */ \ + subl $4+(NR_SKIPPED_REGS*4), %esp; \ pushl %ebp; \ pushl %edi; \ pushl %esi; \ @@ -77,8 +80,11 @@ popl %esi; \ popl %edi; \ popl %ebp; \ - popl %eax; \ - addl $(NR_SKIPPED_REGS*4), %esp + /* \ + * Skip %eax, we need to have vmcb address in there. \ + * Don't worry, EAX is restored through the VMRUN instruction. \ + */ \ + addl $4+(NR_SKIPPED_REGS*4), %esp #define VMRUN .byte 0x0F,0x01,0xD8 #define VMLOAD .byte 0x0F,0x01,0xDA @@ -88,63 +94,53 @@ ENTRY(svm_asm_do_resume) GET_CURRENT(%ebx) - xorl %ecx,%ecx - notl %ecx +.Lresume: cli # tests must not race interrupts movl VCPU_processor(%ebx),%eax shl $IRQSTAT_shift,%eax - test %ecx,irq_stat(%eax,1) - jnz svm_process_softirqs + cmpl $0,irq_stat(%eax) + jne svm_process_softirqs call svm_intr_assist call svm_load_cr2 CLGI sti - GET_CURRENT(%ebx) movl VCPU_svm_vmcb(%ebx), %ecx - movl 24(%esp), %eax + movl UREGS_eax(%esp), %eax + movl VCPU_processor(%ebx), %edx movl %eax, VMCB_rax(%ecx) - movl VCPU_processor(%ebx), %eax - movl root_vmcb_pa(,%eax,8), %eax + movl root_vmcb_pa(,%edx,8), %eax VMSAVE movl VCPU_svm_vmcb_pa(%ebx), %eax - popl %ebx - popl %ecx - popl %edx - popl %esi - popl %edi - popl %ebp - - /* - * Skip %eax, we need to have vmcb address in there. - * Don't worry, EAX is restored through the VMRUN instruction. - */ - addl $4, %esp - addl $(NR_SKIPPED_REGS*4), %esp + HVM_RESTORE_ALL_NOSEGREGS + VMLOAD VMRUN VMSAVE - /* eax is the only register we're allowed to touch here... */ - GET_CURRENT(%eax) + HVM_SAVE_ALL_NOSEGREGS - movl VCPU_processor(%eax), %eax - movl root_vmcb_pa(,%eax,8), %eax + GET_CURRENT(%ebx) + movl VCPU_processor(%ebx), %ecx + movl VCPU_svm_vmcb(%ebx), %edx + movl root_vmcb_pa(,%ecx,8), %eax VMLOAD + movl VMCB_rax(%edx), %eax - HVM_SAVE_ALL_NOSEGREGS STGI .globl svm_stgi_label; svm_stgi_label: + + movl %eax, UREGS_eax(%esp) movl %esp,%eax push %eax call svm_vmexit_handler addl $4,%esp - jmp svm_asm_do_resume + jmp .Lresume ALIGN svm_process_softirqs: sti call do_softirq - jmp svm_asm_do_resume + jmp .Lresume Index: 2007-05-14/xen/arch/x86/hvm/svm/x86_64/exits.S =================================================================== --- 2007-05-14.orig/xen/arch/x86/hvm/svm/x86_64/exits.S 2007-04-23 10:01:41.000000000 +0200 +++ 2007-05-14/xen/arch/x86/hvm/svm/x86_64/exits.S 2007-05-14 14:33:08.000000000 +0200 @@ -85,7 +85,11 @@ popq %r10; \ popq %r9; \ popq %r8; \ - popq %rax; \ + /* \ + * Discard %rax, we need to have vmcb address in there. \ + * Don't worry, RAX is restored through the VMRUN instruction. \ + */ \ + addq $8, %rsp; \ popq %rcx; \ popq %rdx; \ popq %rsi; \ @@ -100,68 +104,54 @@ ENTRY(svm_asm_do_resume) GET_CURRENT(%rbx) +.Lresume: cli # tests must not race interrupts movl VCPU_processor(%rbx),%eax shl $IRQSTAT_shift, %rax leaq irq_stat(%rip), %rdx - testl $~0, (%rdx, %rax, 1) - jnz svm_process_softirqs + cmpl $0, (%rdx, %rax) + jne svm_process_softirqs call svm_intr_assist call svm_load_cr2 CLGI sti - GET_CURRENT(%rbx) movq VCPU_svm_vmcb(%rbx), %rcx movq UREGS_rax(%rsp), %rax + movl VCPU_processor(%rbx), %edx movq %rax, VMCB_rax(%rcx) leaq root_vmcb_pa(%rip), %rax - movl VCPU_processor(%rbx), %ecx - movq (%rax,%rcx,8), %rax + movq (%rax,%rdx,8), %rax VMSAVE movq VCPU_svm_vmcb_pa(%rbx), %rax - popq %r15 - popq %r14 - popq %r13 - popq %r12 - popq %rbp - popq %rbx - popq %r11 - popq %r10 - popq %r9 - popq %r8 - /* - * Skip %rax, we need to have vmcb address in there. - * Don't worry, RAX is restored through the VMRUN instruction. - */ - addq $8, %rsp - popq %rcx - popq %rdx - popq %rsi - popq %rdi - addq $(NR_SKIPPED_REGS*8), %rsp + HVM_RESTORE_ALL_NOSEGREGS VMLOAD VMRUN VMSAVE + HVM_SAVE_ALL_NOSEGREGS GET_CURRENT(%rbx) - leaq root_vmcb_pa(%rip), %rax movl VCPU_processor(%rbx), %ecx + leaq root_vmcb_pa(%rip), %rax + movq VCPU_svm_vmcb(%rbx), %rdx movq (%rax,%rcx,8), %rax VMLOAD + movq VMCB_rax(%rdx), %rax STGI .globl svm_stgi_label; svm_stgi_label: + + movq %rax, UREGS_rax(%rsp) movq %rsp,%rdi call svm_vmexit_handler - jmp svm_asm_do_resume + jmp .Lresume ALIGN svm_process_softirqs: sti call do_softirq - jmp svm_asm_do_resume + jmp .Lresume ++++++ vgacon-50-lines.patch ++++++ --- /var/tmp/diff_new_pack.y15063/_old 2007-05-21 22:27:54.000000000 +0200 +++ /var/tmp/diff_new_pack.y15063/_new 2007-05-21 22:27:54.000000000 +0200 @@ -1,9 +1,9 @@ -Index: xen-unstable/xen/drivers/video/vga.c +Index: xen-3.1-testing/xen/drivers/video/vga.c =================================================================== ---- xen-unstable.orig/xen/drivers/video/vga.c -+++ xen-unstable/xen/drivers/video/vga.c -@@ -585,6 +585,8 @@ void vga_init(void) - vgacon_keep = 1; +--- xen-3.1-testing.orig/xen/drivers/video/vga.c ++++ xen-3.1-testing/xen/drivers/video/vga.c +@@ -587,6 +587,8 @@ void vga_init(void) + keep = -1; else if ( strncmp(p, "text-80x", 8) == 0 ) vgacon_lines = simple_strtoul(p + 8, NULL, 10); + else if ( strncmp(p, "text", 4) == 0 && p[4] != '-' ) ++++++ vgacon-keep.patch ++++++ --- /var/tmp/diff_new_pack.y15063/_old 2007-05-21 22:27:54.000000000 +0200 +++ /var/tmp/diff_new_pack.y15063/_new 2007-05-21 22:27:54.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-unstable/xen/drivers/video/vga.c +Index: 2007-02-07/xen/drivers/video/vga.c =================================================================== ---- xen-unstable.orig/xen/drivers/video/vga.c -+++ xen-unstable/xen/drivers/video/vga.c +--- 2007-02-07.orig/xen/drivers/video/vga.c 2007-01-15 09:10:11.000000000 +0100 ++++ 2007-02-07/xen/drivers/video/vga.c 2007-02-07 16:31:41.000000000 +0100 @@ -556,7 +556,6 @@ static int vga_load_font(const struct fo */ @@ -27,8 +27,8 @@ + keep = -1; else if ( strncmp(p, "text-80x", 8) == 0 ) vgacon_lines = simple_strtoul(p + 8, NULL, 10); - else if ( strncmp(p, "text", 4) == 0 && p[4] != '-' ) -@@ -623,21 +625,48 @@ void vga_init(void) + } +@@ -621,21 +623,48 @@ void vga_init(void) /* Disable cursor. */ vga_wcrt(vgabase, VGA_CRTC_CURSOR_START, 0x20); @@ -82,7 +82,7 @@ static void put_newline(void) { -@@ -655,14 +684,25 @@ static void put_newline(void) +@@ -653,14 +682,25 @@ static void put_newline(void) void vga_putchar(int c) { ++++++ vmx-no-cstar.patch ++++++ Index: 2007-05-14/xen/arch/x86/hvm/vmx/vmx.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/hvm/vmx/vmx.c 2007-05-14 14:28:19.000000000 +0200 +++ 2007-05-14/xen/arch/x86/hvm/vmx/vmx.c 2007-05-14 14:33:24.000000000 +0200 @@ -88,8 +88,7 @@ static DEFINE_PER_CPU(struct vmx_msr_sta static u32 msr_index[VMX_MSR_COUNT] = { - MSR_LSTAR, MSR_STAR, MSR_CSTAR, - MSR_SYSCALL_MASK + MSR_LSTAR, MSR_STAR, MSR_SYSCALL_MASK }; static void vmx_save_host_msrs(void) @@ -147,7 +146,7 @@ static inline int long_mode_do_msr_read( break; case MSR_CSTAR: - msr_content = guest_msr_state->msrs[VMX_INDEX_MSR_CSTAR]; + msr_content = v->arch.hvm_vmx.cstar; break; case MSR_SYSCALL_MASK: @@ -250,7 +249,8 @@ static inline int long_mode_do_msr_write case MSR_CSTAR: if ( !is_canonical_address(msr_content) ) goto uncanonical_address; - WRITE_MSR(CSTAR); + v->arch.hvm_vmx.cstar = msr_content; + break; case MSR_SYSCALL_MASK: WRITE_MSR(SYSCALL_MASK); @@ -730,12 +730,12 @@ static void vmx_save_cpu_state(struct vc unsigned long guest_flags = guest_state->flags; data->shadow_gs = v->arch.hvm_vmx.shadow_gs; + data->msr_cstar = v->arch.hvm_vmx.cstar; /* save msrs */ data->msr_flags = guest_flags; data->msr_lstar = guest_state->msrs[VMX_INDEX_MSR_LSTAR]; data->msr_star = guest_state->msrs[VMX_INDEX_MSR_STAR]; - data->msr_cstar = guest_state->msrs[VMX_INDEX_MSR_CSTAR]; data->msr_syscall_mask = guest_state->msrs[VMX_INDEX_MSR_SYSCALL_MASK]; #endif @@ -755,9 +755,9 @@ static void vmx_load_cpu_state(struct vc guest_state->flags = data->msr_flags; guest_state->msrs[VMX_INDEX_MSR_LSTAR] = data->msr_lstar; guest_state->msrs[VMX_INDEX_MSR_STAR] = data->msr_star; - guest_state->msrs[VMX_INDEX_MSR_CSTAR] = data->msr_cstar; guest_state->msrs[VMX_INDEX_MSR_SYSCALL_MASK] = data->msr_syscall_mask; + v->arch.hvm_vmx.cstar = data->msr_cstar; v->arch.hvm_vmx.shadow_gs = data->shadow_gs; #endif Index: 2007-05-14/xen/include/asm-x86/hvm/vmx/vmcs.h =================================================================== --- 2007-05-14.orig/xen/include/asm-x86/hvm/vmx/vmcs.h 2007-05-14 14:28:19.000000000 +0200 +++ 2007-05-14/xen/include/asm-x86/hvm/vmx/vmcs.h 2007-05-14 14:33:24.000000000 +0200 @@ -37,7 +37,6 @@ struct vmcs_struct { enum { VMX_INDEX_MSR_LSTAR = 0, VMX_INDEX_MSR_STAR, - VMX_INDEX_MSR_CSTAR, VMX_INDEX_MSR_SYSCALL_MASK, VMX_MSR_COUNT @@ -77,6 +76,7 @@ struct arch_vmx_struct { #ifdef __x86_64__ struct vmx_msr_state msr_state; unsigned long shadow_gs; + unsigned long cstar; #endif unsigned long efer; unsigned long vmxassist_enabled:1; ++++++ vnc-i18n-keys.diff ++++++ Index: xen-3.1-testing/tools/ioemu/sdl_keysym.h =================================================================== --- xen-3.1-testing.orig/tools/ioemu/sdl_keysym.h +++ xen-3.1-testing/tools/ioemu/sdl_keysym.h @@ -274,5 +274,27 @@ static name2keysym_t name2keysym[]={ {"Pause", SDLK_PAUSE}, {"Escape", SDLK_ESCAPE}, + /* dead keys */ +{"dead_grave", 0xfe50}, +{"dead_acute", 0xfe51}, +{"dead_circumflex", 0xfe52}, +{"dead_tilde", 0xfe53}, +{"dead_macron", 0xfe54}, +{"dead_brev", 0xfe55}, +{"dead_abovedot", 0xfe56}, +{"dead_diaeresis", 0xfe57}, +{"dead_abovering", 0xfe58}, +{"dead_doubleacute", 0xfe59}, +{"dead_caron", 0xfe5a}, +{"dead_cedilla", 0xfe5b}, +{"dead_ogonek", 0xfe5c}, +{"dead_iota", 0xfe5d}, +{"dead_voiced_sound", 0xfe5e}, +{"dead_semivoiced_sound", 0xfe5f}, +{"dead_belowdot", 0xfe60}, +{"dead_hook", 0xfe61}, +{"dead_horn", 0xfe62}, + {0,0}, }; + Index: xen-3.1-testing/tools/ioemu/vnc_keysym.h =================================================================== --- xen-3.1-testing.orig/tools/ioemu/vnc_keysym.h +++ xen-3.1-testing/tools/ioemu/vnc_keysym.h @@ -291,10 +291,34 @@ static name2keysym_t name2keysym[]={ {"BackApostrophe", 0xff21}, {"Muhenkan", 0xff22}, {"Katakana", 0xff25}, -{"Zenkaku_Hankaku", 0xff29}, +{"Hankaku", 0xff29}, +{"Zenkaku_Hankaku", 0xff2a}, {"Henkan_Mode_Real", 0xff23}, {"Henkan_Mode_Ultra", 0xff3e}, {"backslash_ja", 0xffa5}, + /* dead keys */ +{"dead_grave", 0xfe50}, +{"dead_acute", 0xfe51}, +{"dead_circumflex", 0xfe52}, +{"dead_tilde", 0xfe53}, +{"dead_macron", 0xfe54}, +{"dead_brev", 0xfe55}, +{"dead_abovedot", 0xfe56}, +{"dead_diaeresis", 0xfe57}, +{"dead_abovering", 0xfe58}, +{"dead_doubleacute", 0xfe59}, +{"dead_caron", 0xfe5a}, +{"dead_cedilla", 0xfe5b}, +{"dead_ogonek", 0xfe5c}, +{"dead_iota", 0xfe5d}, +{"dead_voiced_sound", 0xfe5e}, +{"dead_semivoiced_sound", 0xfe5f}, +{"dead_belowdot", 0xfe60}, +{"dead_hook", 0xfe61}, +{"dead_horn", 0xfe62}, + + {0,0}, }; + Index: xen-3.1-testing/tools/python/xen/xend/XendOptions.py =================================================================== --- xen-3.1-testing.orig/tools/python/xen/xend/XendOptions.py +++ xen-3.1-testing/tools/python/xen/xend/XendOptions.py @@ -278,6 +278,9 @@ class XendOptions: return self.get_config_string('vncpasswd', self.vncpasswd_default) + def get_keymap(self): + return self.get_config_value('keymap', None) + class XendOptionsFile(XendOptions): """Default path to the config file.""" Index: xen-3.1-testing/tools/python/xen/xend/XendConfig.py =================================================================== --- xen-3.1-testing.orig/tools/python/xen/xend/XendConfig.py +++ xen-3.1-testing/tools/python/xen/xend/XendConfig.py @@ -27,6 +27,7 @@ from xen.xend.XendError import VmError from xen.xend.XendDevices import XendDevices from xen.xend.PrettyPrint import prettyprintstring from xen.xend.XendConstants import DOM_STATE_HALTED +from xen.xend import XendOptions log = logging.getLogger("xend.XendConfig") log.setLevel(logging.WARN) @@ -389,6 +390,8 @@ class XendConfig(dict): self['name_label'] = 'Domain-' + self['uuid'] def _platform_sanity_check(self): + if 'keymap' not in self['platform'] and XendOptions.instance().get_keymap(): + self['platform']['keymap'] = XendOptions.instance().get_keymap() if self.is_hvm(): if 'device_model' not in self['platform']: self['platform']['device_model'] = DEFAULT_DM Index: xen-3.1-testing/tools/examples/xend-config.sxp =================================================================== --- xen-3.1-testing.orig/tools/examples/xend-config.sxp +++ xen-3.1-testing/tools/examples/xend-config.sxp @@ -197,3 +197,7 @@ # The default password for VNC console on HVM domain. # Empty string is no authentication. (vncpasswd '') + +# The default keymap to use for the VM's virtual keyboard. +#(keymap 'en-us') + Index: xen-3.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== --- xen-3.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py +++ xen-3.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -1336,6 +1336,9 @@ class XendDomainInfo: if devclass in XendDevices.valid_devices(): log.info("createDevice: %s : %s" % (devclass, scrub_password(config))) dev_uuid = config.get('uuid') + if 'keymap' not in config: + if 'keymap' in self.info['platform']: + config['keymap'] = self.info['platform']['keymap'] devid = self._createDevice(devclass, config) # store devid in XendConfig for caching reasons ++++++ x86_emulate.patch ++++++ ++++ 609 lines (skipped) ++++ between arch/i386/xen/x86_emulate.patch ++++ and xen/x86_emulate.patch ++++++ x86-extra-trap-info.patch ++++++ --- /var/tmp/diff_new_pack.y15063/_old 2007-05-21 22:27:54.000000000 +0200 +++ /var/tmp/diff_new_pack.y15063/_new 2007-05-21 22:27:54.000000000 +0200 @@ -1,8 +1,8 @@ -Index: xen-3.0.5-testing/xen/arch/x86/x86_32/entry.S +Index: 2007-04-27/xen/arch/x86/x86_32/entry.S =================================================================== ---- xen-3.0.5-testing.orig/xen/arch/x86/x86_32/entry.S -+++ xen-3.0.5-testing/xen/arch/x86/x86_32/entry.S -@@ -386,21 +386,33 @@ ring1: /* obtain ss/esp from oldss/olde +--- 2007-04-27.orig/xen/arch/x86/x86_32/entry.S 2007-04-27 09:50:12.000000000 +0200 ++++ 2007-04-27/xen/arch/x86/x86_32/entry.S 2007-04-27 09:57:47.000000000 +0200 +@@ -387,21 +387,33 @@ ring1: /* obtain ss/esp from oldss/olde movl %eax,UREGS_eip+4(%esp) ret .section __ex_table,"a" @@ -46,10 +46,10 @@ domain_crash_synchronous: pushl $domain_crash_synchronous_string call printk -Index: xen-3.0.5-testing/xen/arch/x86/x86_64/entry.S +Index: 2007-04-27/xen/arch/x86/x86_64/entry.S =================================================================== ---- xen-3.0.5-testing.orig/xen/arch/x86/x86_64/entry.S -+++ xen-3.0.5-testing/xen/arch/x86/x86_64/entry.S +--- 2007-04-27.orig/xen/arch/x86/x86_64/entry.S 2007-04-27 09:31:40.000000000 +0200 ++++ 2007-04-27/xen/arch/x86/x86_64/entry.S 2007-04-27 09:57:47.000000000 +0200 @@ -338,17 +338,30 @@ create_bounce_frame: movq %rax,UREGS_rip+8(%rsp) ret ++++++ x86-nmi-inject.patch ++++++ Index: 2007-05-14/xen/arch/x86/physdev.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/physdev.c 2007-04-23 10:01:42.000000000 +0200 +++ 2007-05-14/xen/arch/x86/physdev.c 2007-05-14 14:40:35.000000000 +0200 @@ -143,6 +143,56 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_H break; } + case PHYSDEVOP_send_nmi: { + struct physdev_send_nmi send_nmi; + struct domain *d; + + ret = -EFAULT; + if ( copy_from_guest(&send_nmi, arg, 1) != 0 ) + break; + + ret = -EPERM; + if ( send_nmi.domain == DOMID_SELF ) + d = rcu_lock_current_domain(); + else if ( IS_PRIV(current->domain) ) + d = rcu_lock_domain_by_id(send_nmi.domain); + else + break; + ret = -ESRCH; + if ( d == NULL ) + break; + + switch ( send_nmi.vcpu ) + { + struct vcpu *v; + + case XEN_SEND_NMI_ALL: + case XEN_SEND_NMI_ALL_BUT_SELF: + for_each_vcpu(d, v) + { + if ( (send_nmi.vcpu == XEN_SEND_NMI_ALL || v != current) && + !xchg(&v->nmi_pending, 1) ) + vcpu_kick(v); + } + ret = 0; + break; + case 0 ... MAX_VIRT_CPUS - 1: + if ( (v = d->vcpu[send_nmi.vcpu]) != NULL ) + { + if ( !xchg(&v->nmi_pending, 1) ) + vcpu_kick(v); + ret = 0; + } + break; + default: + ret = EINVAL; + break; + } + + rcu_unlock_domain(d); + break; + } + default: ret = -ENOSYS; break; Index: 2007-05-14/xen/arch/x86/traps.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/traps.c 2007-05-14 14:40:32.000000000 +0200 +++ 2007-05-14/xen/arch/x86/traps.c 2007-05-14 14:40:35.000000000 +0200 @@ -2517,6 +2517,12 @@ long do_set_trap_table(XEN_GUEST_HANDLE( if ( cur.address == 0 ) break; + if ( cur.vector == 2 && !TI_GET_IF(&cur) ) + { + rc = -EINVAL; + break; + } + fixup_guest_code_selector(current->domain, cur.cs); memcpy(&dst[cur.vector], &cur, sizeof(cur)); Index: 2007-05-14/xen/arch/x86/x86_32/asm-offsets.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/x86_32/asm-offsets.c 2007-05-14 14:40:29.000000000 +0200 +++ 2007-05-14/xen/arch/x86/x86_32/asm-offsets.c 2007-05-14 14:40:35.000000000 +0200 @@ -68,6 +68,7 @@ void __dummy__(void) OFFSET(VCPU_guest_context_flags, struct vcpu, arch.guest_context.flags); OFFSET(VCPU_arch_guest_fpu_ctxt, struct vcpu, arch.guest_context.fpu_ctxt); OFFSET(VCPU_nmi_addr, struct vcpu, nmi_addr); + OFFSET(VCPU_nmi_cs, struct vcpu, arch.guest_context.trap_ctxt[2].cs); OFFSET(VCPU_nmi_pending, struct vcpu, nmi_pending); OFFSET(VCPU_nmi_masked, struct vcpu, nmi_masked); DEFINE(_VGCF_failsafe_disables_events, _VGCF_failsafe_disables_events); Index: 2007-05-14/xen/arch/x86/x86_32/entry.S =================================================================== --- 2007-05-14.orig/xen/arch/x86/x86_32/entry.S 2007-05-03 09:45:09.000000000 +0200 +++ 2007-05-14/xen/arch/x86/x86_32/entry.S 2007-05-14 14:40:35.000000000 +0200 @@ -263,14 +263,15 @@ process_nmi: testb $1,VCPU_nmi_masked(%ebx) jnz test_guest_events movb $0,VCPU_nmi_pending(%ebx) - movl VCPU_nmi_addr(%ebx),%eax + movzwl VCPU_nmi_cs(%ebx),%eax + movl VCPU_nmi_addr(%ebx),%ecx test %eax,%eax jz test_guest_events movb $1,VCPU_nmi_masked(%ebx) sti leal VCPU_trap_bounce(%ebx),%edx - movl %eax,TRAPBOUNCE_eip(%edx) - movw $FLAT_KERNEL_CS,TRAPBOUNCE_cs(%edx) + movl %ecx,TRAPBOUNCE_eip(%edx) + movw %ax,TRAPBOUNCE_cs(%edx) movb $TBF_INTERRUPT,TRAPBOUNCE_flags(%edx) call create_bounce_frame jmp test_all_events Index: 2007-05-14/xen/arch/x86/x86_64/asm-offsets.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/x86_64/asm-offsets.c 2007-05-14 14:40:29.000000000 +0200 +++ 2007-05-14/xen/arch/x86/x86_64/asm-offsets.c 2007-05-14 14:40:35.000000000 +0200 @@ -77,6 +77,7 @@ void __dummy__(void) OFFSET(VCPU_guest_context_flags, struct vcpu, arch.guest_context.flags); OFFSET(VCPU_arch_guest_fpu_ctxt, struct vcpu, arch.guest_context.fpu_ctxt); OFFSET(VCPU_nmi_addr, struct vcpu, nmi_addr); + OFFSET(VCPU_nmi_cs, struct vcpu, arch.guest_context.trap_ctxt[2].cs); OFFSET(VCPU_nmi_pending, struct vcpu, nmi_pending); OFFSET(VCPU_nmi_masked, struct vcpu, nmi_masked); DEFINE(_VGCF_failsafe_disables_events, _VGCF_failsafe_disables_events); Index: 2007-05-14/xen/arch/x86/x86_64/compat/entry.S =================================================================== --- 2007-05-14.orig/xen/arch/x86/x86_64/compat/entry.S 2007-05-03 09:45:09.000000000 +0200 +++ 2007-05-14/xen/arch/x86/x86_64/compat/entry.S 2007-05-14 14:40:35.000000000 +0200 @@ -119,14 +119,15 @@ compat_process_nmi: testb $1,VCPU_nmi_masked(%rbx) jnz compat_test_guest_events movb $0,VCPU_nmi_pending(%rbx) - movl VCPU_nmi_addr(%rbx),%eax + movzwl VCPU_nmi_cs(%rbx),%eax + movl VCPU_nmi_addr(%rbx),%ecx testl %eax,%eax jz compat_test_guest_events movb $1,VCPU_nmi_masked(%rbx) sti leaq VCPU_trap_bounce(%rbx),%rdx - movl %eax,TRAPBOUNCE_eip(%rdx) - movw $FLAT_COMPAT_KERNEL_CS,TRAPBOUNCE_cs(%rdx) + movl %ecx,TRAPBOUNCE_eip(%rdx) + movw %ax,TRAPBOUNCE_cs(%rdx) movb $TBF_INTERRUPT,TRAPBOUNCE_flags(%rdx) call compat_create_bounce_frame jmp compat_test_all_events Index: 2007-05-14/xen/arch/x86/x86_64/compat/traps.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/x86_64/compat/traps.c 2007-04-23 10:01:42.000000000 +0200 +++ 2007-05-14/xen/arch/x86/x86_64/compat/traps.c 2007-05-14 14:40:35.000000000 +0200 @@ -288,6 +288,12 @@ int compat_set_trap_table(XEN_GUEST_HAND if ( cur.address == 0 ) break; + if ( cur.vector == 2 && !TI_GET_IF(&cur) ) + { + rc = -EINVAL; + break; + } + fixup_guest_code_selector(current->domain, cur.cs); XLAT_trap_info(dst + cur.vector, &cur); Index: 2007-05-14/xen/arch/x86/x86_64/physdev.c =================================================================== --- 2007-05-14.orig/xen/arch/x86/x86_64/physdev.c 2007-04-23 10:01:43.000000000 +0200 +++ 2007-05-14/xen/arch/x86/x86_64/physdev.c 2007-05-14 14:40:35.000000000 +0200 @@ -30,6 +30,10 @@ #define physdev_irq_status_query compat_physdev_irq_status_query #define physdev_irq_status_query_t physdev_irq_status_query_compat_t +#define xen_physdev_send_nmi physdev_send_nmi +CHECK_physdev_send_nmi; +#undef xen_physdev_send_nmi + #define COMPAT #undef guest_handle_okay #define guest_handle_okay compat_handle_okay Index: 2007-05-14/xen/common/kernel.c =================================================================== --- 2007-05-14.orig/xen/common/kernel.c 2007-05-14 14:40:27.000000000 +0200 +++ 2007-05-14/xen/common/kernel.c 2007-05-14 14:40:35.000000000 +0200 @@ -246,16 +246,20 @@ long register_guest_nmi_callback(unsigne struct vcpu *v = current; struct domain *d = current->domain; - if ( (d->domain_id != 0) || (v->vcpu_id != 0) ) - return -EINVAL; - v->nmi_addr = address; #ifdef CONFIG_X86 + v->arch.guest_context.trap_ctxt[2].vector = 2; + v->arch.guest_context.trap_ctxt[2].flags = 0; + TI_SET_IF(v->arch.guest_context.trap_ctxt + 2, 1); + v->arch.guest_context.trap_ctxt[2].cs = + !is_pv_32on64_domain(d) ? FLAT_KERNEL_CS : FLAT_COMPAT_KERNEL_CS; + /* * If no handler was registered we can 'lose the NMI edge'. Re-assert it * now. */ - if ( arch_get_nmi_reason(d) != 0 ) + if ( d->domain_id == 0 && v->vcpu_id == 0 && + arch_get_nmi_reason(d) != 0 ) v->nmi_pending = 1; #endif @@ -266,6 +270,11 @@ long unregister_guest_nmi_callback(void) { struct vcpu *v = current; +#ifdef CONFIG_X86 + v->arch.guest_context.trap_ctxt[2].cs = 0; + v->arch.guest_context.trap_ctxt[2].vector = 0; + v->arch.guest_context.trap_ctxt[2].flags = 0; +#endif v->nmi_addr = 0; return 0; Index: 2007-05-14/xen/include/public/physdev.h =================================================================== --- 2007-05-14.orig/xen/include/public/physdev.h 2007-04-23 10:01:47.000000000 +0200 +++ 2007-05-14/xen/include/public/physdev.h 2007-05-14 14:40:35.000000000 +0200 @@ -119,6 +119,22 @@ typedef struct physdev_irq physdev_irq_t DEFINE_XEN_GUEST_HANDLE(physdev_irq_t); /* + * Allocate or free a physical upcall vector for the specified IRQ line. + * @arg == pointer to physdev_irq structure. + */ +#define PHYSDEVOP_send_nmi 13 +struct physdev_send_nmi { + /* IN */ + domid_t domain; + uint32_t vcpu; +}; +typedef struct physdev_send_nmi physdev_send_nmi_t; +DEFINE_XEN_GUEST_HANDLE(physdev_send_nmi_t); + +#define XEN_SEND_NMI_ALL (~(uint32_t)0) +#define XEN_SEND_NMI_ALL_BUT_SELF (~(uint32_t)1) + +/* * Argument to physdev_op_compat() hypercall. Superceded by new physdev_op() * hypercall since 0x00030202. */ Index: 2007-05-14/xen/include/xen/sched.h =================================================================== --- 2007-05-14.orig/xen/include/xen/sched.h 2007-05-03 09:45:09.000000000 +0200 +++ 2007-05-14/xen/include/xen/sched.h 2007-05-14 14:40:35.000000000 +0200 @@ -128,7 +128,11 @@ struct vcpu /* Bitmask of CPUs on which this VCPU may run. */ cpumask_t cpu_affinity; +#ifndef CONFIG_X86 unsigned long nmi_addr; /* NMI callback address. */ +#else +# define nmi_addr arch.guest_context.trap_ctxt[2].address +#endif /* Bitmask of CPUs which are holding onto this VCPU's state. */ cpumask_t vcpu_dirty_cpumask; Index: 2007-05-14/xen/include/xlat.lst =================================================================== --- 2007-05-14.orig/xen/include/xlat.lst 2007-05-03 09:45:09.000000000 +0200 +++ 2007-05-14/xen/include/xlat.lst 2007-05-14 14:40:35.000000000 +0200 @@ -35,6 +35,7 @@ ! memory_map memory.h ! memory_reservation memory.h ! translate_gpfn_list memory.h +? physdev_send_nmi physdev.h ! sched_poll sched.h ? sched_remote_shutdown sched.h ? sched_shutdown sched.h ++++++ xen-enable-hvm-debug.diff ++++++ --- /var/tmp/diff_new_pack.y15063/_old 2007-05-21 22:27:55.000000000 +0200 +++ /var/tmp/diff_new_pack.y15063/_new 2007-05-21 22:27:55.000000000 +0200 @@ -1,9 +1,9 @@ -Index: xen-unstable/tools/firmware/vmxassist/vm86.c +Index: xen-3.1-testing/tools/firmware/vmxassist/vm86.c =================================================================== ---- xen-unstable.orig/tools/firmware/vmxassist/vm86.c -+++ xen-unstable/tools/firmware/vmxassist/vm86.c -@@ -38,7 +38,7 @@ unsigned prev_eip = 0; - enum vm86_mode mode; +--- xen-3.1-testing.orig/tools/firmware/vmxassist/vm86.c ++++ xen-3.1-testing/tools/firmware/vmxassist/vm86.c +@@ -40,7 +40,7 @@ enum vm86_mode mode = 0; + static struct regs saved_rm_regs; #ifdef DEBUG -int traceset = 0; @@ -11,8 +11,8 @@ char *states[] = { "<VM86_REAL>", -@@ -72,6 +72,35 @@ address(struct regs *regs, unsigned seg, - return addr; +@@ -164,6 +164,35 @@ address(struct regs *regs, unsigned seg, + return 0; } +void @@ -47,7 +47,7 @@ #ifdef DEBUG void trace(struct regs *regs, int adjust, char *fmt, ...) -@@ -1037,7 +1066,7 @@ emulate(struct regs *regs) +@@ -1636,7 +1665,7 @@ emulate(struct regs *regs) /* detect the case where we are not making progress */ if (nemul == 0 && prev_eip == regs->eip) { flteip = address(regs, MASK16(regs->cs), regs->eip); @@ -56,16 +56,16 @@ MASK16(regs->cs), regs->eip, flteip); } else prev_eip = regs->eip; -@@ -1061,7 +1090,7 @@ trap(int trapno, int errno, struct regs - if (regs->eflags & EFLAGS_VM) { - /* emulate any 8086 instructions */ +@@ -1662,7 +1691,7 @@ trap(int trapno, int errno, struct regs + if (mode == VM86_REAL) + return; if (mode != VM86_REAL_TO_PROTECTED) - panic("not in real-to-protected mode"); + panic_eip(regs, "not in real-to-protected mode"); emulate(regs); return; } -@@ -1071,7 +1100,7 @@ trap(int trapno, int errno, struct regs +@@ -1672,7 +1701,7 @@ trap(int trapno, int errno, struct regs if (regs->eflags & EFLAGS_VM) { /* emulate any 8086 instructions */ if (mode == VM86_PROTECTED) @@ -74,11 +74,11 @@ emulate(regs); return; } -Index: xen-unstable/tools/firmware/rombios/rombios.c +Index: xen-3.1-testing/tools/firmware/rombios/rombios.c =================================================================== ---- xen-unstable.orig/tools/firmware/rombios/rombios.c -+++ xen-unstable/tools/firmware/rombios/rombios.c -@@ -129,18 +129,18 @@ +--- xen-3.1-testing.orig/tools/firmware/rombios/rombios.c ++++ xen-3.1-testing/tools/firmware/rombios/rombios.c +@@ -131,18 +131,18 @@ // // BCC Bug: find a generic way to handle the bug of #asm after an "if" (fixed in 0.16.7) ++++++ xen-rpmoptflags.diff ++++++ --- /var/tmp/diff_new_pack.y15063/_old 2007-05-21 22:27:55.000000000 +0200 +++ /var/tmp/diff_new_pack.y15063/_new 2007-05-21 22:27:55.000000000 +0200 @@ -1,28 +1,3 @@ -Index: xen-unstable/tools/blktap/drivers/Makefile -=================================================================== ---- xen-unstable.orig/tools/blktap/drivers/Makefile -+++ xen-unstable/tools/blktap/drivers/Makefile -@@ -8,7 +8,6 @@ QCOW_UTIL = img2qcow qcow2raw qcow-cr - INST_DIR = /usr/sbin - LIBAIO_DIR = ../../libaio/src - --CFLAGS += -Werror - CFLAGS += -Wno-unused - CFLAGS += -fno-strict-aliasing - CFLAGS += -I $(XEN_LIBXC) -I $(LIBAIO_DIR) -Index: xen-unstable/tools/ioemu/Makefile -=================================================================== ---- xen-unstable.orig/tools/ioemu/Makefile -+++ xen-unstable/tools/ioemu/Makefile -@@ -8,7 +8,7 @@ include $(XEN_ROOT)/tools/Rules.mk - .PHONY: all clean distclean dvi info install install-doc tar tarbin \ - speed test test2 html dvi info - --CFLAGS+=-Wall -O2 -g -fno-strict-aliasing -I. -+CFLAGS+=-Wall -fno-strict-aliasing -I. - ifdef CONFIG_DARWIN - CFLAGS+= -mdynamic-no-pic - endif Index: xen-unstable/Config.mk =================================================================== --- xen-unstable.orig/Config.mk ++++++ xen-vm-install.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/glade/xen-vm-install.glade new/xen-vm-install/glade/xen-vm-install.glade --- old/xen-vm-install/glade/xen-vm-install.glade 2007-04-06 01:22:11.000000000 +0200 +++ new/xen-vm-install/glade/xen-vm-install.glade 2007-05-18 20:42:57.000000000 +0200 @@ -6580,7 +6580,7 @@ <widget class="GtkHBox" id="hbox71"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="spacing">10</property> <child> <widget class="GtkComboBoxEntry" id="disk-location"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/src/disks.py new/xen-vm-install/src/disks.py --- old/xen-vm-install/src/disks.py 2007-03-15 22:18:14.000000000 +0100 +++ new/xen-vm-install/src/disks.py 2007-05-18 22:55:15.000000000 +0200 @@ -89,13 +89,13 @@ vdevType = self.DEVICE_DISK # Must specify at least one of vdev or options - + self._created = False self.options = options self.disk_group = disk_group self._pdevDriver = pdevDriver self._mb = mb - + self.set_pdev(pdev) self.set_vdev(vdev) self.set_vdevtype(vdevType) @@ -109,13 +109,13 @@ def set_disk_group(self, disk_group): self._disk_group = disk_group disk_group = property(get_disk_group, set_disk_group) - + def update(self, options): self.options = options - + def copy(self): disk = XenDisk(pdev=self._pdev, vdev=self._vdev, vdevType=self._vdevType, ro=self._ro, - mb=self._mb, sparse=self._sparse, pdevDriver=self._pdevDriver, + mb=self._mb, sparse=self._sparse, pdevDriver=self._pdevDriver, options=self.options) disk._pdev_auto = self._pdev_auto return disk @@ -123,7 +123,16 @@ def exists(self): return self._exists - def setup(self): + def setup_time(self): + """Returns a unit-less number, which attempts to describe the relative + amount of time it will take to set up the disk.""" + if self._exists: + return 0.1 + if self._sparse: + return 1.0 + return self._mb / 20.0 + + def setup(self, progress=lambda f:None): if self._pdev: self._pdev = os.path.abspath(self._pdev) self.validate() @@ -133,10 +142,11 @@ if not os.path.exists(dpath): os.makedirs(dpath) log.info("Creating disk %s" % self.pdev) - util.createEmptyImage(self.pdev, long(self._mb * 1024L * 1024L), sparse=self._sparse) + util.createEmptyImage(self.pdev, long(self._mb * 1024L * 1024L), sparse=self._sparse, progress=progress) self._exists = True self._created = True self.is_block = False + progress(1.0) def reset(self): """If the disk was created, destroys the disk image and allows the disk @@ -259,30 +269,34 @@ def set_pdev(self, pdev): self._pdev_auto = None self.is_block = None - self._mb = None if pdev: self._pdev = pdev self._exists = os.path.exists(self._pdev) if self._exists: stats = os.stat(self._pdev) - mode = stats[stat.ST_MODE] + mode = stats.st_mode if stat.S_ISBLK(mode): self.is_block = True - self._mb = stats[stat.ST_SIZE] / (1024*1024.0) # FIXME - get size of block dev + try: + f = open(self._pdev) + f.seek(0, 2) # seek to end + self._mb = f.tell() / (1024*1024.0) + except: + self._mb = 1 elif stat.S_ISREG(mode): self.is_block = False # 0 byte file is a special case, for temp disks - if stats[stat.ST_SIZE] == 0: + if stats.st_size == 0: self._exists = False - if self._mb is None: - self._mb = 1 + self._mb = 1 else: - self._mb = stats[stat.ST_SIZE] / (1024*1024.0) + self._mb = stats.st_size / (1024*1024.0) else: # This is an invalid state (is_block is None and exists) # but will be caught later in validate(). pass else: + self._mb = None self._pdev = None self._exists = False self.set_driver(self._pdevDriver) @@ -294,9 +308,7 @@ if self._vdevType == self.DEVICE_CDROM: ro = True elif self._exists: - stats = os.stat(self.pdev) - mode = stats[stat.ST_MODE] - if (mode & stat.S_IWRITE) == 0: + if (os.stat(self.pdev).st_mode & stat.S_IWRITE) == 0: ro = True self._ro = ro ro = property(get_ro, set_ro) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/src/gui/gjob.py new/xen-vm-install/src/gui/gjob.py --- old/xen-vm-install/src/gui/gjob.py 2007-05-09 00:32:45.000000000 +0200 +++ new/xen-vm-install/src/gui/gjob.py 2007-05-18 18:18:16.000000000 +0200 @@ -36,7 +36,9 @@ self.errors.insert(0, text) self.emit('install-show-error') def _stateChangeCB(job, state): - self.emit('install-progress-change', state[2], (state[0]+1) / float(state[1])) + self.emit('install-progress-change', state[2], -1.0) + def _progressChangeCB(job, fraction): + self.emit('install-progress-change', '', fraction) def _consoleCB(job): return self.emit('install-show-console', job.guest.uuid) def _finish_worker(): @@ -45,7 +47,8 @@ self.job.run(GetSettingsCB=_getSettingsCB, StateChangeCB=_stateChangeCB, ConsoleCB=_consoleCB, - ErrorCB=_errorCB) + ErrorCB=_errorCB, + ProgressCB=_progressChangeCB) except Exception, e: xen.install.log.error("VM creation job failed: %s" % str(e)) self.emit('install-progress-close') diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/src/gui/gui.py new/xen-vm-install/src/gui/gui.py --- old/xen-vm-install/src/gui/gui.py 2007-05-09 03:39:04.000000000 +0200 +++ new/xen-vm-install/src/gui/gui.py 2007-05-18 23:16:28.000000000 +0200 @@ -65,7 +65,7 @@ return str(name) def set_combo_from_list(combo, items): - """Setup a ComboBox or ComboBoxEntry based on a list of strings.""" + """Setup a ComboBox or ComboBoxEntry based on a list of strings.""" model = gtk.ListStore(gobject.TYPE_STRING) for item in items: model.append([item]) @@ -118,13 +118,11 @@ pass if info: self.xen_info = info - + def __init__(self, job=None, options=None, defaults=None, virtman=False, key=0): self.__gobject_init__() - if job is None: - job = xen.install.Job(background=False) - self.job = job + self.job = job or xen.install.Job(background=False) if options is None: options = xen.install.Options() defaults = xen.install.Options() @@ -135,7 +133,7 @@ self.xen_info = None self.refresh_xen_info() - + self.virtman = virtman self.key = key @@ -414,12 +412,12 @@ self.disk_caller_page = 'pv_install' self.disks_widget.set_disks(self.defaults.disks) self.do_new_cdrom(button) - + def do_new_fv_cdrom(self, button): self.disk_caller_page = 'fv_install' self.disks_widget.set_disks(self.defaults.disks) self.do_new_cdrom(button) - + def do_new_cdrom(self, button): # mb is specified to pacify the constructor in case the default # cdrom does not exist; disk.validate will ensure it does exist. @@ -849,11 +847,13 @@ pbar = pbar_glade.get_widget("pbar") label = pbar_glade.get_widget("status") errors = [] + def do_progress_change(src, text, fraction): gtk.gdk.threads_enter() if text: label.set_text(text) - pbar.set_fraction(fraction) + if fraction >= 0.0 and fraction <= 1.0: + pbar.set_fraction(fraction) gtk.gdk.threads_leave() def do_progress_close(src): if pbar_win is None: @@ -875,9 +875,11 @@ signal = 'action-show-console' xen.install.log.info("%s of %s via virt-manager" % (signal, uuid)) def poke_virt_man(): + gtk.gdk.threads_enter() self.emit(signal, 'xen', uuid) pbar_win.hide() self.topwin.hide() + gtk.gdk.threads_leave() return False # Do not call me again # virt-manager (and libvirt) poll. Asking virt-manager to open # the console too soon after the VM has started will fail. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/src/job.py new/xen-vm-install/src/job.py --- old/xen-vm-install/src/job.py 2007-05-09 01:06:50.000000000 +0200 +++ new/xen-vm-install/src/job.py 2007-05-18 23:15:57.000000000 +0200 @@ -50,15 +50,14 @@ def __init__(self, background, debug=False): """Creates a job.""" self._states = ( - (Job.SETTINGS, msg.job_settings, 'settings'), - (Job.PREP_INSTALL, msg.job_prep_install, 'prep_install'), - (Job.INSTALL, msg.job_install, 'install'), - (Job.POST_INSTALL, msg.job_post_install, 'post_install'), - (Job.RUNTIME_CONF, msg.job_runtime_conf, 'runtime_conf'), - (Job.RUNTIME, msg.job_runtime, 'runtime'), - (Job.FINISHED, msg.job_finished, 'finish'), + (Job.SETTINGS, msg.job_settings, 'settings', 0.02), + (Job.PREP_INSTALL, msg.job_prep_install, 'prep_install', 0.80), + (Job.INSTALL, msg.job_install, 'install', 0.02), + (Job.POST_INSTALL, msg.job_post_install, 'post_install', 0.10), + (Job.RUNTIME_CONF, msg.job_runtime_conf, 'runtime_conf', 0.02), + (Job.RUNTIME, msg.job_runtime, 'runtime', 0.02), + (Job.FINISHED, msg.job_finished, 'finish', 0.02), ) - self._StateChangeCB = self._GetSettingsCB = self._ConsoleCB = self._ErrorCB = None self._guest = None self._state_num = Job.SETTINGS self._options = None @@ -118,7 +117,7 @@ self.jobfd = os.open(self.jobfn, os.O_WRONLY | os.O_TRUNC) os.write(self.jobfd, s) os.close(self.jobfd) - self.jobfd = None + self.jobfd = None def _cleanup_conf(self): if self._state_num == Job.FINISHED: @@ -174,15 +173,13 @@ except NotImplementedError: try_text = True except RuntimeError, e: - if self._ErrorCB: - self._ErrorCB(self, str(e)) + self._ErrorCB(self, str(e)) if try_text or self._options.graphics_viewer == 'none': log.debug('Viewer is text') try: child = console.text_console(self.guest, detach=detached) except NotImplementedError: - if self._ErrorCB: - self._ErrorCB(self, msg.display_failed) + self._ErrorCB(self, msg.display_failed) if child is None: if not detached: log.debug('Not detached but no child; wait for VM to exit') @@ -193,7 +190,8 @@ (pid, status) = os.waitpid(child, 0) log.debug('Not detached; done waiting') - def run(self, GetSettingsCB, StateChangeCB=None, ConsoleCB=None, ErrorCB=None): + def run(self, GetSettingsCB, StateChangeCB=lambda job,state:None, ConsoleCB=None, \ + ErrorCB=lambda job,msg:None, ProgressCB=lambda job,f:None): """Starts the VM creation job. GetSettingsCB: Called with job to get user's VM settings. Return XenGuest. @@ -203,18 +201,26 @@ self._GetSettingsCB = GetSettingsCB self._ConsoleCB = ConsoleCB self._ErrorCB = ErrorCB + self._ProgressCB = ProgressCB self._cancel = False + progress = util.filtered_progress(lambda f:self._ProgressCB(self, f)) + try: - for state in self._states: - self._state_num = state[0] - self._update_job_file() - if self._StateChangeCB: + try: + done = 0.0 + for state in self._states: + self._state_num = state[0] + self._update_job_file() self._StateChangeCB(self, self.state) - eval('self._state_%s()' % state[2]) - if self._cancel: - log.debug("Job's cancel flag was set") - raise JobError(JobError.E_CANCELED) + func = eval('self._state_%s' % state[2]) + func(lambda f:progress(done+f*state[3])) + done += state[3] + if self._cancel: + log.debug("Job's cancel flag was set") + raise JobError(JobError.E_CANCELED) + except KeyboardInterrupt: + raise JobError(JobError.E_CANCELED) except Error, e: log.info("xen.install.Error caught in job.run: %s" % str(e)) if self._guest: @@ -256,7 +262,7 @@ if uuid: log.debug("Destroying VM %s" % uuid) xend.connection.destroy(uuid) - + def get_guest(self): return self._guest guest = property(get_guest) @@ -265,24 +271,26 @@ return (self._state_num, len(self._states), self._states[self._state_num][1]) state = property(get_state) - def _state_settings(self): + def _state_settings(self, progress): if not caps.is_dom0(): raise XenError(XenError.E_NO_XEN) if os.geteuid() != 0: raise XenError(XenError.E_ROOT) self._options = self._GetSettingsCB(self) + progress(0.5) if self._options.full_virt: self._guest = FullVirtGuest(self._options) else: self._guest = ParaVirtGuest(self._options) + progress(1.0) - def _state_prep_install(self): + def _state_prep_install(self, progress): if not self._options.install: return - self.guest.PreInstall() + self.guest.PreInstall(lambda f:progress(f*0.98)) conf = self.guest.GetConfigXml() self._xml_conf = os.path.join(paths.configdir, self.guest.options.name + '.xml') @@ -294,38 +302,47 @@ f = open(self._xen_conf, "w+") f.write(conf) f.close() + progress(1.0) - def _state_install(self): + def _state_install(self, progress): if not self._options.install: return self.guest.Start() if not self._cancel: + progress(0.5) self.show_console() + progress(0.9) self.guest.Stop() + progress(1.0) - def _state_post_install(self): + def _state_post_install(self, progress): log.info("Post install check...") self.guest.PostInstallCheck() + progress(1.0) - def _state_runtime_conf(self): + def _state_runtime_conf(self, progress): log.info("Post install configuration...") self.guest.PostInstallConf() + progress(0.9) log.info("Writing runtime configuration file...") conf = self.guest.GetConfigXen() cf = os.path.join(paths.configdir, self.guest.options.name) f = open(cf, 'w+') f.write(conf) f.close() + progress(1.0) - def _state_runtime(self): + def _state_runtime(self, progress): if self._options.norestart: return self.guest.start_from_disk() + progress(0.5) self.show_console() + progress(1.0) - def _state_finish(self): + def _state_finish(self, progress): self.job_exit = 0 - pass + progress(1.0) def _get_job_filename(job_id): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/src/nics.py new/xen-vm-install/src/nics.py --- old/xen-vm-install/src/nics.py 2007-03-29 22:13:19.000000000 +0200 +++ new/xen-vm-install/src/nics.py 2007-05-10 19:40:59.000000000 +0200 @@ -108,9 +108,10 @@ def copy(self): return XenNic(number=self.number, mac=self.mac, bridge=self.bridge, model=self._model, full_virt=self.full_virt) - def setup(self): + def setup(self, progress=lambda f:None): if self.mac is None: self.mac = randomMAC() + progress(1.0) def update(self, full_virt): if self._model is not None and self._model != 'para' and not full_virt: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/src/ParaVirtGuest.py new/xen-vm-install/src/ParaVirtGuest.py --- old/xen-vm-install/src/ParaVirtGuest.py 2007-03-29 19:47:04.000000000 +0200 +++ new/xen-vm-install/src/ParaVirtGuest.py 2007-05-10 23:50:50.000000000 +0200 @@ -53,7 +53,7 @@ XenGuest.__init__(self, options) self.runtime = {} - def _get_paravirt_images(self, disk, partitions, copy): + def _get_paravirt_images(self, disk, partitions, copy, progress=lambda f:None): def traildigits(strg): "Return the trailing digits, used to split the partition number off" idx = len(strg)-1 @@ -91,9 +91,11 @@ return (vpart, kernel, initrd) finally: vdisk.unmount() + progress(1.0) + progress(1.0) return (None, None, None) - def _get_paravirt_install_images(self): + def _get_paravirt_install_images(self, progress=lambda f:None): """Retrieves the kernel and initrd from the installation source. Potentially a heavy-weight operation.""" actions = VMDefaults[self.options.os_type].actions() @@ -110,12 +112,12 @@ mountpoint = mounted_disk.mount() except Exception, e: raise InstSrcError(InstSrcError.E_BAD, details=e.args[0]) - (kfn, ifn) = actions.getInstallImagesFromPath(mountpoint) + (kfn, ifn) = actions.getInstallImagesFromPath(mountpoint, progress) mounted_disk.unmount() else: - (_, kfn, ifn) = self._get_paravirt_images(source, partitions, copy=True) + (_, kfn, ifn) = self._get_paravirt_images(source, partitions, copy=True, progress=progress) else: - (kfn, ifn) = actions.getInstallImagesFromUrl(source) + (kfn, ifn) = actions.getInstallImagesFromUrl(source, progress) if kfn is None: raise InstSrcError(InstSrcError.E_BAD, details=str(source)) return (kfn, ifn) @@ -196,10 +198,10 @@ %(graphics)s """ % { 'common': self.getCommonXen(), 'osblob': osblob, 'disks': self._get_disk_xen(), 'networks': self._get_network_xen(), 'graphics': self._get_graphics_xen() } - def PreInstall(self): - XenGuest.PreInstall(self) + def PreInstall(self, progress=lambda f:None): + XenGuest.PreInstall(self, lambda f:progress(f*0.5)) self._cleanup_kernel() # In case the install was retried - (self.kernel, self.initrd) = self._get_paravirt_install_images() + (self.kernel, self.initrd) = self._get_paravirt_install_images(lambda f:progress(0.5+f*0.5)) def PostInstallCheck(self): self._cleanup_kernel() # Regardless of success or failure, no longer needed diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/src/util.py new/xen-vm-install/src/util.py --- old/xen-vm-install/src/util.py 2007-03-29 19:46:12.000000000 +0200 +++ new/xen-vm-install/src/util.py 2007-05-18 22:34:19.000000000 +0200 @@ -64,7 +64,7 @@ # See http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/148061 rx=re.compile(u"([\u2e80-\uffff])", re.UNICODE) def wrap(text, width=79, encoding="utf8"): - return reduce(lambda line, word, width=width: '%s%s%s' % + return reduce(lambda line, word, width=width: '%s%s%s' % (line, [' ','\n', ''][(len(line)-line.rfind('\n')-1 + len(word.split('\n',1)[0] ) >= width) or @@ -80,19 +80,40 @@ backitems.sort() return [ backitems[i][1] for i in xrange(0, len(backitems))] -def copy_to_temp(fileobj, prefix): +def filtered_progress(fn, step=0.01): + """Returns a function which takes a fraction (0.0 .. 1.0) describing + progress. When the progress advances beyond a specified step size, + the function calls 'fn' with the current progress.""" + def p(f): + if f < p.f + step: + return + p.f = f + fn(p.f) + p.f = 0.0 + fn(p.f) + return p + +def copy_to_temp(fileobj, prefix, progress=lambda f:None): (fd, fn) = tempfile.mkstemp(prefix=prefix) log.debug("Copying to temporary file '%s'" % fn) - block_size = 16384 + read = size = 0 + try: + size = os.fstat(fileobj.fileno()).st_size + except: + pass + block_size = 65536 while 1: buff = fileobj.read(block_size) if not buff: break + read += len(buff) os.write(fd, buff) + if read <= size: # Some file objects can't accurately report size + progress(float(read) / float(size)) os.close(fd) return fn -def createEmptyImage(filename, size, sparse=True): +def createEmptyImage(filename, size, sparse=True, progress=lambda f:None): s = '' if sparse: s = 'sparse ' @@ -106,23 +127,28 @@ else: block_size = 65536 data = '\x00' * block_size - blocks = size / block_size + blocks = remaining = size / block_size block = 0 - while blocks: + while remaining: os.write(fd, data) - blocks -= 1 + remaining -= 1 block += 1 + if (block & 1023) == 0: + progress(float(block) / float(blocks)) os.close(fd) + progress(1.0) -def mke2fsImage(filename): - args = ['/sbin/mkfs.ext2', '-F', '-m', '0', '--', filename] +def mke2fsImage(filename, progress=lambda f:None): + args = ['/sbin/mkfs.ext2', '-F', '-m', '0', '-q', '--', filename] log.debug("Creating filesystem: %s" % str(args)) run(args) + progress(1.0) -def mkdosfsImage(filename): +def mkdosfsImage(filename, progress=lambda f:None): args = ['/sbin/mkdosfs', '--', filename] log.debug("Creating filesystem: %s" % str(args)) run(args) + progress(1.0) # the following three functions are from xend/uuid.py and are thus # available under the LGPL, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/src/VMActions.py new/xen-vm-install/src/VMActions.py --- old/xen-vm-install/src/VMActions.py 2007-03-15 19:33:08.000000000 +0100 +++ new/xen-vm-install/src/VMActions.py 2007-05-10 22:38:14.000000000 +0200 @@ -15,11 +15,12 @@ class VMActions: """Actions that are specific to a particular OS type within a VM.""" - def getInstallImagesFromPath(self, root): + def getInstallImagesFromPath(self, root, progress=lambda f:None): """Locates or creates a Xen-enabled kernel and initrd under 'root' to bootstrap install.""" + progress(1.0) return (None, None) - def getInstallImagesFromUrl(self, url): + def getInstallImagesFromUrl(self, url, progress=lambda f:None): """Locates or creates a Xen-enabled kernel and initrd from 'url' to bootstrap install.""" raise InstSrcError(err=InstSrcError.E_UNSUPPORTED) @@ -42,12 +43,12 @@ MUST BE IDEMPOTENT!""" pass - def setupOsSettings(self, guest): + def setupOsSettings(self, guest, progress=lambda f:None): """Prepares the guest to use the guest.os_settings file or URL. For example, this may create a temporary disk image to contain guest.os_settings, and add the disk to guest.tmpdisks.""" - pass + progress(1.0) def postInstall(self, guest): """Give the guest a chance to massage options, after first stage diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/src/VMDefaults.py new/xen-vm-install/src/VMDefaults.py --- old/xen-vm-install/src/VMDefaults.py 2007-05-09 03:53:39.000000000 +0200 +++ new/xen-vm-install/src/VMDefaults.py 2007-05-04 20:58:59.000000000 +0200 @@ -114,8 +114,6 @@ def prefers_full(self): # RHEL4 doesn't support para, but RHEL4 update 8 does. return True - def apic(self): - return True def min_memory(self): return 256 def max_memory(self): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/src/VMNetWare.py new/xen-vm-install/src/VMNetWare.py --- old/xen-vm-install/src/VMNetWare.py 2007-03-15 16:21:53.000000000 +0100 +++ new/xen-vm-install/src/VMNetWare.py 2007-05-18 22:35:44.000000000 +0200 @@ -25,13 +25,13 @@ def _kernel(self, base): return '%s/STARTUP/XNLOADER.SYS' % (base,) - def getInstallImagesFromPath(self, path): + def getInstallImagesFromPath(self, path, progress=lambda f:None): """Retrieves a Xen-enabled NetWare kernel and initrd. Retrieves a Xen-enabled NetWare kernel from the base path, and copies it to a temporary file. Returns the (kernel, None) tuple of filenames.""" - kfn = util.copy_to_temp(open(self._kernel(path), 'r'), prefix='netware.') + kfn = util.copy_to_temp(open(self._kernel(path), 'r'), prefix='netware.', progress=progress) return (kfn, None) def getRuntimeImagesFromPath(self, root): @@ -42,14 +42,16 @@ return (kernel, None) return (None, None) - def setupOsSettings(self, guest): + def setupOsSettings(self, guest, progress=lambda f:None): """Creates a temporary disk image, in which to pass the NetWare response file.""" if not guest.options.os_settings: + progress(1.0) return if guest.options.full_virt: # FIXME: Need to support qemu's floppies... + progress(1.0) return (fd, tmpdisk) = tempfile.mkstemp(prefix='netware-rsp.') @@ -57,14 +59,14 @@ # Nominal "1.44 MB floppy" == 1440 KB == 1406.25 KiB == 1.40625 MiB disk = XenDisk(pdev=tmpdisk, ro=True, mb=1.40625, options=guest.options, disk_group=guest.options.disks) - disk.setup() - util.mkdosfsImage(disk.pdev) + disk.setup(lambda f:progress(f*0.5)) + util.mkdosfsImage(disk.pdev, lambda f:progress(0.5+f*0.25)) mounted_disk = mount.TemporaryLoopMount(disk.pdev) mountpoint = mounted_disk.mount(options='loop') + progress(0.8) rf = False try: - stats = os.stat(guest.options.os_settings) - mode = stats[stat.ST_MODE] + mode = os.stat(guest.options.os_settings).st_mode if stat.S_ISREG(mode): shutil.copyfile(guest.options.os_settings, mountpoint + '/netware.rsp') rf = True @@ -73,7 +75,7 @@ nlf = re.compile('.*\.nlf$', re.IGNORECASE) nodes = os.listdir(guest.options.os_settings) for node in nodes: - mode = os.stat('%s/%s' % (guest.options.os_settings, node))[stat.ST_MODE] + mode = os.stat('%s/%s' % (guest.options.os_settings, node)).st_mode if not stat.S_ISREG(mode): continue if not rf and rsp.match(node): @@ -88,10 +90,12 @@ '%s/%s' % (mountpoint, dst)) else: raise ParamError(err=ParamError.E_INVALID, desc='os-settings') + progress(0.9) finally: mounted_disk.unmount() + progress(1.0) if rf: - guest.options._install_args = " [INST: rf=a:netware.rsp]" + guest.options._install_args = ' [INST: rf=a:netware.rsp]' except: os.unlink(tmpdisk) raise diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/src/VMRedHat.py new/xen-vm-install/src/VMRedHat.py --- old/xen-vm-install/src/VMRedHat.py 2007-03-15 19:35:29.000000000 +0100 +++ new/xen-vm-install/src/VMRedHat.py 2007-05-10 22:52:42.000000000 +0200 @@ -24,35 +24,42 @@ def _initrd(self, base): return '%s/images/xen/initrd.img' % (base,) - def getInstallImagesFromUrl(self, url): +# def _getHostAndPathFromNFS(self, url): + # RedHat NFS URLs are of the form: + # nfs:host:/path/to/install/source + # SUSE's are of the form: + # nfs://host/path/to/install/source + + def getInstallImagesFromUrl(self, url, progress=lambda f:None): """Retrieves a Xen-enabled RedHat kernel and initrd from the URL, and copies them to temporary files. Returns the (kernel, initrd) tuple of filenames.""" try: if url.startswith('http://') or url.startswith('ftp://'): - kfd = grabber.urlopen(self._kernel(url)) - ifd = grabber.urlopen(self._initrd(url)) + kfd = grabber.urlopen(self._kernel(url), lambda f:progress(f*0.4)) + ifd = grabber.urlopen(self._initrd(url), lambda f:progress(0.4+f*0.4)) elif url.startswith('nfs:'): mnt = mount.TemporaryMount(url[4:]) mountpoint = mnt.mount(mnt) kfd = open(self._kernel(mountpoint), 'r') ifd = open(self._initrd(mountpoint), 'r') + progress(0.8) else: raise InstSrcError(err=InstSrcError.E_UNSUPPORTED, details=url) except IOError, e: raise RuntimeError(msg.invalid_url + ': ' + str(e)) - kfn = util.copy_to_temp(kfd, prefix='vmlinuz.') - ifn = util.copy_to_temp(ifd, prefix='initrd.') + kfn = util.copy_to_temp(kfd, prefix='vmlinuz.', progress=lambda f:progress(0.8+f*0.1)) + ifn = util.copy_to_temp(ifd, prefix='initrd.', progress=lambda f:progress(0.9+f*0.1)) return (kfn, ifn) - def getInstallImagesFromPath(self, path): + def getInstallImagesFromPath(self, path, progress=lambda f:None): """Retrieves a Xen-enabled RedHat kernel and initrd from the base path, and copies them to temporary files. Returns the (kernel, initrd) tuple of filenames.""" kfd = open(self._kernel(path), 'r') ifd = open(self._initrd(path), 'r') - kfn = util.copy_to_temp(kfd, prefix='vmlinuz.') - ifn = util.copy_to_temp(ifd, prefix='initrd.') + kfn = util.copy_to_temp(kfd, prefix='vmlinuz.', progress=lambda f:progress(f*0.5)) + ifn = util.copy_to_temp(ifd, prefix='initrd.', progress=lambda f:progress(0.5+f*0.5)) return (kfn, ifn) def getInstallArgs(self, options): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/src/VMSUSE.py new/xen-vm-install/src/VMSUSE.py --- old/xen-vm-install/src/VMSUSE.py 2007-04-05 22:52:26.000000000 +0200 +++ new/xen-vm-install/src/VMSUSE.py 2007-05-18 22:37:17.000000000 +0200 @@ -16,7 +16,6 @@ import os import re import shutil -import stat import tempfile import urlgrabber.grabber as grabber @@ -33,8 +32,7 @@ def die_zero(fn): try: - stats = os.stat(fn) - if not stats[stat.ST_SIZE]: + if not os.stat(fn).st_size: raise RuntimeError except: try: @@ -61,7 +59,7 @@ def _getPackageNamesByArch(self, base, lines, arch, ext): kernel = 'kernel-' + ext log.debug("Searching for %s %s" % (arch, kernel)) - + kernel_rpm = initrd_rpm = None kernel_disc = initrd_disc = None # The packages may or may not have a version. @@ -94,27 +92,31 @@ details=base) return [kernel_disc, kernel_rpm, initrd_disc, initrd_rpm] - def _buildInitrd(self, krpm, irpm): + def _buildInitrd(self, krpm, irpm, progress=lambda f:None): (fd, ifn) = tempfile.mkstemp(prefix='inst-initrd.') tmpdir = tempfile.mkdtemp() log.info("Building inst-initrd...") try: os.system("cd -- '%s' && /usr/bin/rpm2cpio '%s' | /usr/bin/cpio -idum 2>/dev/null" % \ (tmpdir, irpm)) + progress(0.2) os.system("%s/usr/sbin/mkinstallinitrd --kernel-rpm '%s' --libdir '%s' '%s'" % \ (tmpdir, krpm, tmpdir + '/usr/lib/install-initrd', ifn)) + progress(0.9) finally: os.system("/bin/rm -rf -- '%s'" % (tmpdir,)) os.unlink(irpm) + progress(1.0) return ifn - def _extractKernel(self, krpm, ext): + def _extractKernel(self, krpm, ext, progress=lambda f:None): (fd, kfn) = tempfile.mkstemp(prefix='vmlinuz-%s.' % ext) tmpdir = tempfile.mkdtemp() log.info("Extracting kernel from '%s' to '%s'" % (krpm, kfn)) try: os.system("cd -- '%s' && /usr/bin/rpm2cpio '%s' | /usr/bin/cpio -idum -- '%s' 2>/dev/null" % \ (tmpdir, krpm, './boot/vmlinuz-*-' + ext)) + progress(0.8) kernels = glob.glob('%s/boot/vmlinuz-*-%s' % (tmpdir, ext)) for kernel in kernels: if not os.path.islink(kernel): @@ -124,10 +126,10 @@ finally: os.system("/bin/rm -rf -- '%s'" % (tmpdir,)) os.unlink(krpm) - pass + progress(1.0) return kfn - def getInstallImagesFromPath(self, root): + def getInstallImagesFromPath(self, root, progress=lambda f:None): """Retrieves a Xen-enabled SUSE kernel and initrd from the base path, and copies them to temporary files. Returns the (kernel, initrd) tuple of filenames.""" @@ -142,8 +144,8 @@ log.debug("Unpacked kernel/initrd found: %s %s" % (kfn, ifn)) kfd = open(kfn, 'r') ifd = open(ifn, 'r') - self.kfn = util.copy_to_temp(kfd, prefix='kernel.') - self.ifn = util.copy_to_temp(ifd, prefix='install-initrd.') + self.kfn = util.copy_to_temp(kfd, prefix='kernel.', progress=lambda f:progress(f*0.5)) + self.ifn = util.copy_to_temp(ifd, prefix='install-initrd.', progress=lambda f:progress(0.5+f*0.5)) return (self.kfn, self.ifn) log.debug("No unpacked kernel/initrd found") index_path = root + '/INDEX.gz' @@ -156,18 +158,18 @@ (arch, ext, kernel_disc, kernel_rpm, initrd_disc, initrd_rpm) = self._getPackageNames(root, fobj) # FIXME: may have to prompt to swap CDs... - + kfd = open('%s/suse/%s/%s' % (root, arch, kernel_rpm), 'r') - krpm = util.copy_to_temp(kfd, prefix='kernel.') - + krpm = util.copy_to_temp(kfd, prefix='kernel.', progress=lambda f:progress(f*0.1)) + ifd = open('%s/suse/%s/%s' % (root, arch, initrd_rpm), 'r') - irpm = util.copy_to_temp(ifd, prefix='install-initrd.') - self.ifn = self._buildInitrd(krpm, irpm) - self.kfn = self._extractKernel(krpm, ext) + irpm = util.copy_to_temp(ifd, prefix='install-initrd.', progress=lambda f:progress(0.1+f*0.1)) + self.ifn = self._buildInitrd(krpm, irpm, lambda f:progress(0.2+f*0.4)) + self.kfn = self._extractKernel(krpm, ext, lambda f:progress(0.6+f*0.4)) log.debug("Extracted installation kernel/initrd: %s %s" % (self.kfn, self.ifn)) return (self.kfn, self.ifn) - def getInstallImagesFromUrl(self, url): + def getInstallImagesFromUrl(self, url, progress=lambda f:None): """Retrieves a Xen-enabled SUSE kernel and initrd from the URL, and copies them to temporary files. Returns the (kernel, initrd) tuple of filenames.""" @@ -194,6 +196,7 @@ else: # This should never happen (unless VMDefaults are out of sync?) raise InstSrcError(err=InstSrcError.E_UNSUPPORTED, details=url) + progress(0.1) arches = caps.compatible_arches() for a in arches: @@ -201,11 +204,11 @@ kfn = '/boot/%s/vmlinuz-%s' % (a[0], a[1]) ifn = '/boot/%s/initrd-%s' % (a[0], a[1]) kfd = urlopen(base + kfn) - self.kfn = util.copy_to_temp(kfd, prefix='kernel.') + self.kfn = util.copy_to_temp(kfd, prefix='kernel.', progress=lambda f:progress(0.1+f*0.45)) kfd.close() die_zero(self.kfn) ifd = urlopen(base + ifn) - self.ifn = util.copy_to_temp(ifd, prefix='install-initrd.') + self.ifn = util.copy_to_temp(ifd, prefix='install-initrd.', progress=lambda f:progress(0.55+f*0.45)) ifd.close() die_zero(self.kfn) log.debug("Unpacked kernel/initrd found: %s %s" % (kfn, ifn)) @@ -227,7 +230,7 @@ # NOTE: I can't back up above the NFS/SMB mount point, so (for # now) no rewriting in those cases. if ((not nfs and not smb) and kernel_disc and initrd_disc and - (not kernel_disc.endswith('1') or not initrd_disc.endswith('1'))): + (not kernel_disc.endswith('1') or not initrd_disc.endswith('1'))): diskless = base.strip('/').split('/')[:-1] kbase = '/'.join(diskless + [kernel_disc]) ibase = '/'.join(diskless + [initrd_disc]) @@ -239,6 +242,7 @@ url = kbase + kurl kfd = urlopen(url) krpm = util.copy_to_temp(kfd, prefix='kernel.') + progress(0.15) iurl = '/suse/%s/%s' % (arch, initrd_rpm) log.debug("URL of initrd is %s" % iurl) @@ -251,8 +255,9 @@ raise except Exception, e: raise InstSrcError(err=InstSrcError.E_BAD, desc=str(e), details=url) - self.ifn = self._buildInitrd(krpm, irpm) - self.kfn = self._extractKernel(krpm, ext) + progress(0.2) + self.ifn = self._buildInitrd(krpm, irpm, lambda f:progress(0.2+f*0.4)) + self.kfn = self._extractKernel(krpm, ext, lambda f:progress(0.6+f*0.4)) log.debug("Extracted installation kernel/initrd: %s %s" % (self.kfn, self.ifn)) return (self.kfn, self.ifn) @@ -267,8 +272,13 @@ else: src = options.source args += ' install=%s' % src - if options.os_settings: - args += ' autoyast=device://%s/autoinst.xml' % (autoyast_vdev,) + ay = options.os_settings + if ay: + if ay.startswith('ftp://') or ay.startswith('tftp://') or \ + ay.startswith('http://') or ay.startswith('nfs://'): + args += ' autoyast=%s' % (ay,) + else: + args += ' autoyast=device://%s/autoinst.xml' % (autoyast_vdev,) return args def preprocessOptions(self, options): @@ -292,23 +302,29 @@ extra_args += arg + ' ' options.extra_args = extra_args - def setupOsSettings(self, guest): + def setupOsSettings(self, guest, progress=lambda f:None): """Creates a temporary disk image, in which to pass the autoyast XML file.""" - if not guest.options.os_settings: - return - (fd, tmpdisk) = tempfile.mkstemp(prefix='autoyast.') - disk = XenDisk(pdev=tmpdisk, vdev=autoyast_vdev, ro=True, mb=1, options=guest.options) - try: - disk.setup() - util.mke2fsImage(disk.pdev) - mounted_disk = mount.TemporaryLoopMount(disk.pdev) - mountpoint = mounted_disk.mount(options='loop') + ay = guest.options.os_settings + if not ay or ay.startswith('ftp://') or ay.startswith('tftp://') or \ + ay.startswith('http://') or ay.startswith('nfs://'): + pass + else: + (fd, tmpdisk) = tempfile.mkstemp(prefix='autoyast.') + disk = XenDisk(pdev=tmpdisk, vdev=autoyast_vdev, ro=True, mb=1, options=guest.options) try: - shutil.copyfile(guest.options.os_settings, mountpoint + '/autoinst.xml') - finally: - mounted_disk.unmount() - except: - os.unlink(tmpdisk) - raise - guest.tmpdisks.append(disk) + disk.setup(progress=lambda f:progress(f*0.5)) + util.mke2fsImage(disk.pdev, progress=lambda f:progress(0.5+f*0.25)) + mounted_disk = mount.TemporaryLoopMount(disk.pdev) + mountpoint = mounted_disk.mount(options='loop') + progress(0.8) + try: + shutil.copyfile(ay, mountpoint + '/autoinst.xml') + finally: + progress(0.9) + mounted_disk.unmount() + except: + os.unlink(tmpdisk) + raise + guest.tmpdisks.append(disk) + progress(1.0) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/src/xend.py new/xen-vm-install/src/xend.py --- old/xen-vm-install/src/xend.py 2007-05-12 00:04:01.000000000 +0200 +++ new/xen-vm-install/src/xend.py 2007-05-18 17:59:28.000000000 +0200 @@ -12,7 +12,12 @@ import time -from xen.util.xmlrpcclient import ServerProxy +try: + # Xen 3.1+ + from xen.util.xmlrpcclient import ServerProxy +except: + # Xen 3.0.4 and older + from xen.util.xmlrpclib2 import ServerProxy # Some Xen limits: max_nics = 3 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/src/XenGuest.py new/xen-vm-install/src/XenGuest.py --- old/xen-vm-install/src/XenGuest.py 2007-04-12 17:42:21.000000000 +0200 +++ new/xen-vm-install/src/XenGuest.py 2007-05-18 19:06:38.000000000 +0200 @@ -80,7 +80,7 @@ return ' <ostype>%s</ostype>' % self.options.os_type def _get_ostype_xen(self): return 'ostype="%s"\n' % self.options.os_type - + def getCommonXen(self): s = '' s += self._get_ostype_xen() @@ -111,7 +111,7 @@ return ret def _get_disk_xen(self): - """Get the disk config in the xend python format""" + """Get the disk config in the xend python format""" ret = 'disk=[ ' for disk in self.options.disks + self.tmpdisks: ret += disk.get_xen_config() @@ -196,20 +196,18 @@ lines += options return '\n'.join(lines) - + def GetConfigXml(self): raise RuntimeError('pure virtual') def GetConfigXen(self): raise RuntimeError('pure virtual') - def PreInstall(self): + def PreInstall(self, progress=lambda f:None): if xen.install.xend.connection.domain_running(self.options.name): raise VmError(VmError.E_VM_EXISTS) - if self.options.os_settings: - VMDefaults[self.options.os_type].actions().setupOsSettings(self) - - self.create_devices() + VMDefaults[self.options.os_type].actions().setupOsSettings(self, lambda f:progress(f*0.05)) + self.create_devices(lambda f:progress(0.05 + f*0.95)) def Start(self): if (xen.install.xend.connection.domain_running(self.options.name) or @@ -286,9 +284,15 @@ raise VmError(VmError.E_NO_START) self.uuid = self.options.uuid - def create_devices(self): - for disk in self.options.disks + self.tmpdisks: - disk.setup() + def create_devices(self, progress=lambda f:None): + disks = self.options.disks + self.tmpdisks + times = map(lambda d: d.setup_time(), disks) + cum_times = [0.0] + for i in range(len(times)): + cum_times.append(cum_times[-1]+times[i]) + for i in range(len(disks)): + disks[i].setup(lambda f: progress(cum_times[i]/cum_times[-1] + f*cum_times[i+1]/cum_times[-1])) + for nic in self.options.nics: nic.setup() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/TODO new/xen-vm-install/TODO --- old/xen-vm-install/TODO 2007-04-20 23:06:26.000000000 +0200 +++ new/xen-vm-install/TODO 2007-05-18 23:16:46.000000000 +0200 @@ -1,89 +1,7 @@ - + /etc/xen/ -> /etc/xen/vm/ - + validate domain name - + If interactive, prompt if RH, SUSE, NetWare, ... - + OS defines what the "location" is - + support multiple disks - + support non-interactive - + improve XenDisk class - + kill pygrub - + RedHat grabs kernel via URL; we need to do tricks :-( - + probe disk after install; define "bootentry" - + standard header on files - + finish turning Options.py into a class, to remove lower dependencies on optparse - + support autoinst.xml - + os-specific hook to parse config file - + restarting VM hangs (while reading XML?) - + clean up tmp dir usage - + well defined return codes - + implemented job - + kill "isinstall" junk - + -x raises - + abstract better between frontend (CLI/GUI) and backend - + Create better exception class, derived from RuntimeError, for non-CLI users - + better status messages / progress (callbacks?) - + loopbacks not cleared - + --debug is being ignored - + fix finding kernel-xen on 64 bit - + finish pv.install_disk/install_url --> pv.source - + define network CLI format - + finish cleaning up options vs. XenGuest - + clean up "guest" crap in gui - + add vif support to GUI, for network install - + get notebook pages by name, not number - + kill libvirt - + conflict detection in cli - + finish defining exceptions - + check if a vm by that name is already running - + conflict detection: OS doesn't support PV; hardware doesn't support FV - + support netware response file - + check disks for duplication - + change PV iso/cd/network radio buttons to disk/network - + default timezone based on OS - + make summary screen scrollable - + be able to specify CDROM vs. DISK - + change FV install source to use defined disks - + disk must always remain abstract, to change hda<=>xvda when switching FV<->PV - + xen-manager (aka virt-manager) calls xen-vm-install - + iterate, find an unused VM name - + graphics (sdl, vnc, pvfb...) - + change --sdl, --vnc, --vnc-port, etc to be --graphics-viewer (or some such) - + support pvfb (test NW) - + default to installing from CDROMs instead of disks - + netware iso loopbacks not being cleared: domUloader bug (kpartx -d is failing) - + remove CD for NW before reboot - + default to vnc for netware - + always use vnc, because of virt-manager - + submit strings for translation - + using physical cdrom asserts - + allow os-settings to be a directory (*.rsp, *.nlf) - + Support installing 32 bit SUSE domU on 64 bit dom0 - + xm new / xm start instead of xm create - + CDROM/DVD should always be mode 'r' - + hand cursor - + finalize NIC model after user views it, so it doesn't change - + On summary screen, flag items user must fill out before continuing - + fix open port - + # physical processors - + amount physical memory - + X memory free; OS requires Y; X < Y - + properly use "vncunused" flag, to avoid displaying Xvnc - + Can now install 32pae SLES 10 on x86_64 hypervisor (#237370) - + Be able to use an existing disk, bypassing the OS installation (#237396) - + Honor extra-args setting from UI - + Clean up handling of user's "extra_args" versus implicit args necessary for OS - + #234331, #239007: CD/DVDs should always be marked read-only - + validate nic MAC - + #239196: support SLED - + increase SLES's recommended memory size to 512 - + Fix naming and re-ordering of disks and nics - + Allow PV to install bootloader on any disk - + single connection to xend - + Check for conflicting VM names in filesystem, disks, and xend - + clean up dot files + #238458: Work-around qemu slowness bug + #240064: clean up the vm on failure + #241197: Job support -===beta 3=== +===SLES 10 SP1 beta 3=== + Allow specifing disk (and disk size) vs. cdrom from CLI to match GUI + Add missing -M/--max-memory parameter to CLI to match GUI + #241528: Display error if user selects FV OS but hardware lacks VT @@ -105,13 +23,13 @@ + #240984: properly detach vncviewer + #240387: default to absolute coordinate mouse for Windows + Re-fix: Honor ordering of arguments (as claimed in man page) -===beta 4 try #1=== +===SLES 10 SP1 beta 4 try #1=== + #248047: Fix inability to use already-extracted SUSE kernel/initrds + Fix accumulation of 0-byte tmp files + #237063: close fds before running vncviewer because it is long-running + deleting a job whose (truncated) jobfile is lacking 'id' causes exception + default apic=0 for Windows, due to performance -===beta 4 respin=== +===SLES 10 SP1 beta 4 respin=== + #244772: display error message in GUI if xen isn't running + #246049: better error message when OS==SUSE but ISO looks wrong + Fix printing of jobid when run with --background @@ -128,26 +46,26 @@ + Updated 2 help strings, to help users add disks. + #240001: virt-manager keys: f10 + #228133: default apic=0 for sles 8 & 9 -===beta 5=== +===SLES 10 SP1 beta 5=== + Better description on "Virtual Disk" drop-down (not "xvda") + Proper separation of recording options versus calculating defaults; fixes corner cases + #247849, #253013, 253009: Multiple fixes related to how disks are defined, centered around bug #247849 (handle partitioned PV installation disk) + #252437: Allow virtual CDROM to be added (via ISO) even if physical CDROM doesn't exist + #241251: Support installs from NFS & SMB -===beta 6=== +===SLES 10 SP1 beta 6=== + #253743: vm-install-job was failing to query job status + #247849: Further fixes for NetWare factory install/configure mode + #241251: Fix bug in path concatenation for NFS/SMB + Updated translations - + "xm delete" before "xm new" to avoid failed bootloader - + #247980: Display more details on failure + + "xm delete" before "xm new" to avoid failed bootloader + + #247980: Display more details on failure + #254655: Cap VM's starting memory to available memory -===RC1=== +===SLES 10 SP1 RC1=== + update icon name (yast-network -> yast-create-new-vm) + #258376: pass args to child process as an array, not string + do not run "brctl show" just because of "import nics" + #259207: write out maxmem parameter -===RC2=== +===SLES 10 SP1 RC2=== + #259420: refresh available memory more often + #259972: cannot enter autoyast url + #259917: cannot do simultaneous installs via virt-manager @@ -158,40 +76,52 @@ + do not complain about existing /etc/xen/vm/ conf file + properly tear down failed VMs + #260983: support booting PV RHEL4,5 -===RC3=== - +===SLES 10 SP1 RC3=== +===SLES 10 SP1 RC4=== +===SLES 10 SP1=== + + #211342: better progress bar + + #259994: disk size would reset when editing path + + #247073: handle autoyast URLs + + #254311: physical disks were showing as 0.0 GB + + - hard to exit with ctrl-c -- gui + - block drivers: + - iscsi + - nbd + - #239173: default to blktap + - try to avoid sparse files + blktap, because it is slow + - specify driver on command line + - add gui + - add physical cdrom to VM, but don't use. Install. Reboot. Fails: "no medium found for /dev/cdrom" + - disallow incompatible architectures + - disable 64 bit OSs if not possible + - How to know what architecture the install source is (in general)? + - VMDefaults sees 64-bit capable machine, and defaults to 64 bit memory size, when OS is 32 bit + - catch backtrace when exception happens + - libvirt vs xenapi + - add password option to vnc, and expose in command line + - offer unsupported OSs: generic PV, *BSD, ... + - Live CDs + - require dosfstools? - RHEL4/SLES9 isn't defaulting to FV in GUI (but is in CLI) - - finish virt-manager & disks - "Virtual Disk" field too wide - - hide left-hand pane of Open dialog - - #211342: make progress bar more meaningful for non-sparse file - support --install / --no-install from the command line - - add password to vnc - Usability: - list physical block devices - - Change "Disks" title to "Virtual Disks" (?) - "CD-Rom" on gtk-cdrom button should be "CD-ROM" to match rest of UI - "CD-Rom" and "Harddisk" buttons should have a "+" icon - - if job exits due to other reason (e.g., bad installation source) job.py assumes it was canceled + - if job exits due to other reason (e.g., bad installation source) job.py assumes it was canceled - cryptic error message if out of loopback devs - domUloader: test tap:qcow - - hard to exit with ctrl-c - memory reservation (to avoid races) - touch new config file to avoid races - windowing: - pop to top if error (since it can block virt-manager) - alt-tab to xen-vm-install window while installing; progress window should get focus - - blktap: - - #239173: use blktap - - try to avoid sparse files + blktap, because it is slow - - sparse, blktap, ... flags on command line - don't allow/default "Network URL" if OS doesn't support it - prompt for physical media before starting the installation - - How to know what architecture the install source is (in general)? - + VMDefaults sees 64-bit capable machine, and defaults to 64 bit memory size, when OS is 32 bit - -M 0 ==> no max - clean up rhpl - - icons - tidy up support for floppy (only for FV?) - disk FV only allows 1 CDROM @@ -200,11 +130,8 @@ - fix dbus timeout - support RH kickstart - sort OS names with 10 > 9 - - "other OS" doesn't support para (at very least because user can't manually input kernel) - windows 2003 immediately writes a bootsector, so I can't tell if install was canceled - read disk/NIC xml - - pull notebook pages out as separate glade objects - - dynamically insert notebook pages from glade - can't consistently use "=" with --long-args - clean up imports - good py doc strings @@ -212,19 +139,3 @@ virt-manager: - re-use xen-vm-install GUI widgets when editing running VMs - Patch for virt-manager-launch is incorrect (lib vs. libexec) - - Heed packaging doc's warning about gconf schema (?) - - -Try to enter conflicting options. The re-calculation of options is now transactional, so things should never get into an inconsistent state. For example, pick an OS that can only be fully virtualized (Windows XP), and add a fully virtualized NIC, then back up and change your OS type to SLES 10. - -Set your installation source to be a disk/CD/DVD/ISO/whatever. Add, remove, re-order disks. The installation source should "follow" the previously set disk, even as it changes xvdX names. Also change the VM's name. Unless you've explicitly selected where the virtual disk is stored, the disk image name should change to match the VM's name. - -Test bootstrapping an installation from CD/DVD/ISO. This code has changed to support NetWare. - -Try doing an installation from an existing disk (check that it bootstraps the VM, even if it's not a true installation source). NetWare needs this sort of functionality for "Factory Configure". - -Check that the above changes haven't broken finding the kernel/initrd on a disk after the installation finishes. - -Start vm-install from the command line, pre-populating several disks. Don't specify the file that will hold the disk image; the tool should generate that for you. For example, this should start you off with 2 disks: -vm-install --debug --disk ,xvda,disk,w,5120 --disk ,xvdb,disk,w,10240 - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/xen-vm-install.desktop new/xen-vm-install/xen-vm-install.desktop --- old/xen-vm-install/xen-vm-install.desktop 2007-03-28 19:25:07.000000000 +0200 +++ new/xen-vm-install/xen-vm-install.desktop 2007-05-21 17:47:19.000000000 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] X-SuSE-DocTeamID=ycc_xen Type=Application -Categories=Qt;X-SuSE-YaST; +Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization; X-KDE-ModuleType=Library X-KDE-RootOnly=true @@ -21,5 +21,3 @@ Name=Create Virtual Machines GenericName=Create Virtual Machines X-KDE-SubstituteUID=true - -X-SuSE-translate=true ++++++ xen-warnings.diff ++++++ --- /var/tmp/diff_new_pack.y15063/_old 2007-05-21 22:27:55.000000000 +0200 +++ /var/tmp/diff_new_pack.y15063/_new 2007-05-21 22:27:55.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-3.0.5-testing/tools/ioemu/hw/piix4acpi.c +Index: xen-3.1-testing/tools/ioemu/hw/piix4acpi.c =================================================================== ---- xen-3.0.5-testing.orig/tools/ioemu/hw/piix4acpi.c -+++ xen-3.0.5-testing/tools/ioemu/hw/piix4acpi.c +--- xen-3.1-testing.orig/tools/ioemu/hw/piix4acpi.c ++++ xen-3.1-testing/tools/ioemu/hw/piix4acpi.c @@ -69,6 +69,8 @@ static int piix4acpi_load(QEMUFile *f, v if (version_id > 1) return -EINVAL; @@ -11,10 +11,10 @@ } static void acpiPm1Control_writeb(void *opaque, uint32_t addr, uint32_t val) -Index: xen-3.0.5-testing/tools/ioemu/hw/usb-hid.c +Index: xen-3.1-testing/tools/ioemu/hw/usb-hid.c =================================================================== ---- xen-3.0.5-testing.orig/tools/ioemu/hw/usb-hid.c -+++ xen-3.0.5-testing/tools/ioemu/hw/usb-hid.c +--- xen-3.1-testing.orig/tools/ioemu/hw/usb-hid.c ++++ xen-3.1-testing/tools/ioemu/hw/usb-hid.c @@ -557,6 +557,7 @@ int usb_mouse_load(QEMUFile *f, void *op fprintf(logfile, "usb_mouse_load:add usb_mouse_event.\n"); qemu_add_mouse_event_handler(usb_mouse_event, s, 0); @@ -23,10 +23,10 @@ } -Index: xen-3.0.5-testing/tools/misc/miniterm/miniterm.c +Index: xen-3.1-testing/tools/misc/miniterm/miniterm.c =================================================================== ---- xen-3.0.5-testing.orig/tools/misc/miniterm/miniterm.c -+++ xen-3.0.5-testing/tools/misc/miniterm/miniterm.c +--- xen-3.1-testing.orig/tools/misc/miniterm/miniterm.c ++++ xen-3.1-testing/tools/misc/miniterm/miniterm.c @@ -157,7 +157,7 @@ int main(int argc, char **argv) case 0: close(1); /* stdout not needed */ @@ -60,10 +60,10 @@ break; } -Index: xen-3.0.5-testing/xen/tools/symbols.c +Index: xen-3.1-testing/xen/tools/symbols.c =================================================================== ---- xen-3.0.5-testing.orig/xen/tools/symbols.c -+++ xen-3.0.5-testing/xen/tools/symbols.c +--- xen-3.1-testing.orig/xen/tools/symbols.c ++++ xen-3.1-testing/xen/tools/symbols.c @@ -80,7 +80,8 @@ static int read_symbol(FILE *in, struct if (rc != 3) { if (rc != EOF) { @@ -74,3 +74,71 @@ } return -1; } +Index: xen-3.1-testing/tools/blktap/drivers/blktapctrl.c +=================================================================== +--- xen-3.1-testing.orig/tools/blktap/drivers/blktapctrl.c ++++ xen-3.1-testing/tools/blktap/drivers/blktapctrl.c +@@ -678,7 +678,10 @@ int main(int argc, char *argv[]) + __init_blkif(); + snprintf(buf, sizeof(buf), "BLKTAPCTRL[%d]", getpid()); + openlog(buf, LOG_CONS|LOG_ODELAY, LOG_DAEMON); +- daemon(0,0); ++ if (daemon(0,0)) { ++ DPRINTF("daemon failed (%d)\n", errno); ++ goto open_failed; ++ } + + print_drivers(); + init_driver_list(); +Index: xen-3.1-testing/tools/blktap/drivers/block-vmdk.c +=================================================================== +--- xen-3.1-testing.orig/tools/blktap/drivers/block-vmdk.c ++++ xen-3.1-testing/tools/blktap/drivers/block-vmdk.c +@@ -283,8 +283,9 @@ static uint64_t get_cluster_offset(struc + if (!allocate) + return 0; + cluster_offset = lseek(prv->fd, 0, SEEK_END); +- ftruncate(prv->fd, cluster_offset + +- (prv->cluster_sectors << 9)); ++ if (ftruncate(prv->fd, cluster_offset + ++ (prv->cluster_sectors << 9))) ++ return 0; + cluster_offset >>= 9; + /* update L2 table */ + tmp = cpu_to_le32(cluster_offset); +Index: xen-3.1-testing/tools/blktap/drivers/block-qcow.c +=================================================================== +--- xen-3.1-testing.orig/tools/blktap/drivers/block-qcow.c ++++ xen-3.1-testing/tools/blktap/drivers/block-qcow.c +@@ -745,7 +745,10 @@ found: + } + memcpy(tmp_ptr2, l2_ptr, 4096); + lseek(s->fd, l2_offset + (l2_sector << 12), SEEK_SET); +- write(s->fd, tmp_ptr2, 4096); ++ if (write(s->fd, tmp_ptr2, 4096) != 4096) { ++ free(tmp_ptr2); ++ return -1; ++ } + free(tmp_ptr2); + } + return cluster_offset; +@@ -1162,7 +1165,7 @@ int tdqcow_close(struct disk_driver *dd) + offset = sizeof(QCowHeader) + sizeof(uint32_t); + lseek(fd, offset, SEEK_SET); + out = cpu_to_be32(cksum); +- write(fd, &out, sizeof(uint32_t)); ++ if (write(fd, &out, sizeof(uint32_t))) ; + close(fd); + } + +@@ -1252,8 +1255,8 @@ int qcow_create(const char *filename, ui + strncpy(backing_filename, backing_file, + sizeof(backing_filename)); + } else { +- realpath(backing_file, backing_filename); +- if (stat(backing_filename, &st) != 0) { ++ if (realpath(backing_file, backing_filename) == NULL || ++ stat(backing_filename, &st) != 0) { + return -1; + } + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-vm
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package yast2-vm checked in at Mon May 21 22:27:42 CEST 2007. -------- --- arch/i386/yast2-vm/yast2-vm.changes 2007-03-12 17:22:27.000000000 +0100 +++ yast2-vm/yast2-vm.changes 2007-05-21 21:26:56.556256000 +0200 @@ -1,0 +2,7 @@ +Mon May 21 08:29:37 MDT 2007 - carnold(a)novell.com + +- The 'Virtualization' category is missing and the virtualization + icons are in the other category. (#258600) +- Update icon name in yast2-vm (#258519) + +------------------------------------------------------------------- Old: ---- yast2-vm-2.15.3.tar.bz2 New: ---- yast2-vm-2.15.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-vm.spec ++++++ --- /var/tmp/diff_new_pack.m12892/_old 2007-05-21 22:27:35.000000000 +0200 +++ /var/tmp/diff_new_pack.m12892/_new 2007-05-21 22:27:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-vm (Version 2.15.3) +# spec file for package yast2-vm (Version 2.15.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-vm -Version: 2.15.3 +Version: 2.15.4 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-vm-2.15.3.tar.bz2 +Source0: yast2-vm-2.15.4.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 @@ -33,7 +33,7 @@ Michael G. Fritch <mgfritch(a)novell.com> %prep -%setup -n yast2-vm-2.15.3 +%setup -n yast2-vm-2.15.4 %build %{prefix}/bin/y2tool y2autoconf @@ -52,10 +52,6 @@ d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done -for f in `find $RPM_BUILD_ROOT/usr/share/applications/YaST2/groups/*.desktop` ; do - d=${f##*/} - %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} -done %clean rm -rf "$RPM_BUILD_ROOT" @@ -70,6 +66,10 @@ %doc %{prefix}/share/doc/packages/yast2-vm %changelog +* Mon May 21 2007 - carnold(a)novell.com +- The 'Virtualization' category is missing and the virtualization + icons are in the other category. (#258600) +- Update icon name in yast2-vm (#258519) * Mon Mar 12 2007 - carnold(a)novell.com - Change the check for xenbr0 to xenbr+. (#233934) - Remove requires rule on yast2-installation. (#252932) ++++++ yast2-vm-2.15.3.tar.bz2 -> yast2-vm-2.15.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.15.3/configure new/yast2-vm-2.15.4/configure --- old/yast2-vm-2.15.3/configure 2007-02-22 00:38:38.000000000 +0100 +++ new/yast2-vm-2.15.4/configure 2007-05-21 16:27:52.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-vm 2.15.1. +# Generated by GNU Autoconf 2.59 for yast2-vm 2.15.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-vm' PACKAGE_TARNAME='yast2-vm' -PACKAGE_VERSION='2.15.1' -PACKAGE_STRING='yast2-vm 2.15.1' +PACKAGE_VERSION='2.15.4' +PACKAGE_STRING='yast2-vm 2.15.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-vm 2.15.1 to adapt to many kinds of systems. +\`configure' configures yast2-vm 2.15.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-vm 2.15.1:";; + short | recursive ) echo "Configuration of yast2-vm 2.15.4:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-vm configure 2.15.1 +yast2-vm configure 2.15.4 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-vm $as_me 2.15.1, which was +It was created by yast2-vm $as_me 2.15.4, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-vm' - VERSION='2.15.1' + VERSION='2.15.4' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.15.1" +VERSION="2.15.4" RPMNAME="yast2-vm" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -2700,7 +2700,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-vm $as_me 2.15.1, which was +This file was extended by yast2-vm $as_me 2.15.4, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2755,7 +2755,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-vm config.status 2.15.1 +yast2-vm config.status 2.15.4 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.15.3/configure.in new/yast2-vm-2.15.4/configure.in --- old/yast2-vm-2.15.3/configure.in 2007-02-22 00:38:34.000000000 +0100 +++ new/yast2-vm-2.15.4/configure.in 2007-05-21 16:27:47.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-vm, 2.15.1, http://bugs.opensuse.org/, yast2-vm) +AC_INIT(yast2-vm, 2.15.4, http://bugs.opensuse.org/, yast2-vm) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.1" +VERSION="2.15.4" RPMNAME="yast2-vm" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.15.3/src/virtualization.desktop new/yast2-vm-2.15.4/src/virtualization.desktop --- old/yast2-vm-2.15.3/src/virtualization.desktop 2007-02-22 00:38:28.000000000 +0100 +++ new/yast2-vm-2.15.4/src/virtualization.desktop 2007-05-21 19:41:22.000000000 +0200 @@ -1,5 +1,4 @@ [Desktop Entry] -# X-SuSE-DocTeamID=ycc_Virtualization Type=Application Categories=Qt;X-SuSE-YaST-Virtualization; @@ -15,5 +14,3 @@ Icon=yast-host Name=Virtualization - -X-SuSE-translate=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.15.3/src/xen.desktop new/yast2-vm-2.15.4/src/xen.desktop --- old/yast2-vm-2.15.3/src/xen.desktop 2007-02-22 00:38:28.000000000 +0100 +++ new/yast2-vm-2.15.4/src/xen.desktop 2007-05-21 19:41:31.000000000 +0200 @@ -1,5 +1,4 @@ [Desktop Entry] -X-SuSE-DocTeamID=ycc_xen Type=Application Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization; @@ -16,11 +15,9 @@ X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoinstResource= -Icon=yast-uml +Icon=yast-vm-install Exec=/sbin/yast2 xen Name=Install Hypervisor and Tools GenericName=Install Hypervisor and Tools X-KDE-SubstituteUID=true - -X-SuSE-translate=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.15.3/VERSION new/yast2-vm-2.15.4/VERSION --- old/yast2-vm-2.15.3/VERSION 2007-03-12 17:17:13.000000000 +0100 +++ new/yast2-vm-2.15.4/VERSION 2007-05-21 16:24:20.000000000 +0200 @@ -1 +1 @@ -2.15.3 +2.15.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package OpenOffice_org checked in at Mon May 21 22:21:22 CEST 2007. -------- --- arch/i386/OpenOffice_org/OpenOffice_org.changes 2007-05-17 20:39:30.000000000 +0200 +++ OpenOffice_org/OpenOffice_org.changes 2007-05-21 17:47:26.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 21 17:44:35 CEST 2007 - pmladek(a)suse.cz + +- removed duplicate X-SuSE-translate from base.desktop + +------------------------------------------------------------------- Old: ---- minmem New: ---- ooo-build-2.2.0.1-base-desktop.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org.spec ++++++ --- /var/tmp/diff_new_pack.D28834/_old 2007-05-21 22:19:57.000000000 +0200 +++ /var/tmp/diff_new_pack.D28834/_new 2007-05-21 22:19:57.000000000 +0200 @@ -112,7 +112,7 @@ License: Artistic License, BSD License and BSD-like Group: Productivity/Office/Suite Version: 2.2 -Release: 5 +Release: 6 Autoreqprov: on PreReq: coreutils /usr/bin/update-mime-database Prereq: %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq} @@ -205,6 +205,7 @@ # obsolete wrapper, removed in openSUSE 10.2 Source600: OOo-wrapper %endif +Patch: ooo-build-2.2.0.1-base-desktop.diff Patch100: extra_localizations_sources-about.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1165,6 +1166,7 @@ %setup -D -T -q -n ooo-build-%ooo_build_version %else %setup -q -n ooo-build-%ooo_build_version +%patch install -m 644 %{S:1} %{S:2} %{S:3} %{S:6} %{S:7} %{S:8} %{S:9} %{S:10} %{S:11} %{S:12} %{S:13} %{S:14} %{S:15} %{S:16} %{S:17} %{S:18} %{S:19} src/ %if %suse_version <= 930 # some more libraries for older distributions where the system versions are @@ -2131,6 +2133,8 @@ %endif %changelog +* Mon May 21 2007 - pmladek(a)suse.cz +- removed duplicate X-SuSE-translate from base.desktop * Thu May 17 2007 - pmladek(a)suse.cz - updated to milestone oof680-m16 (2.2.1rc1) - updated ooo-build to 2.2.0.1: ++++++ ooo-build-2.2.0.1-base-desktop.diff ++++++ --- desktop/base.desktop.in.in +++ desktop/base.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -X-SuSE-translate=true Version=1.0 Encoding=UTF-8 Terminal=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 systemtap
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package systemtap checked in at Mon May 21 18:48:08 CEST 2007. -------- --- systemtap/systemtap.changes 2007-04-24 18:40:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/systemtap/systemtap.changes 2007-05-21 12:24:53.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 21 12:24:15 CEST 2007 - tiwai(a)suse.de + +- use the external elfutils packages. + +------------------------------------------------------------------- Old: ---- elfutils-0.127-build-fix.diff elfutils-0.127-no-osl.tar.bz2 elfutils-portability.patch systap-elf-install.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemtap.spec ++++++ --- /var/tmp/diff_new_pack.YC7786/_old 2007-05-21 18:47:56.000000000 +0200 +++ /var/tmp/diff_new_pack.YC7786/_new 2007-05-21 18:47:56.000000000 +0200 @@ -11,23 +11,19 @@ # norootforbuild Name: systemtap -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ libebl-devel %define package_version 20070421 %define elfutils_version 0.127 License: GNU General Public License (GPL) Version: 0.5.14 -Release: 1 +Release: 7 Summary: Instrumentation System Group: Development/Tools/Debuggers URL: http://sourceware.org/systemtap/ # Requires: kernel-source gcc make # Suggest: kernel-smp-debuginfo Source: systemtap-%{package_version}.tar.bz2 -Source1: elfutils-%{elfutils_version}-no-osl.tar.bz2 -Patch: systap-elf-install.patch -Patch1: elfutils-portability.patch -Patch2: elfutils-0.127-build-fix.diff -Patch3: systemtap-compile-warning-fixes.diff +Patch: systemtap-compile-warning-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,22 +42,15 @@ %prep # %setup -n %{name}-%{package_version} -q -a1 -%setup -n src -q -a1 +%setup -n src -q %patch -%patch3 -autoreconf -fi -cd elfutils-%{elfutils_version} -%patch1 -p1 -%patch2 -autoreconf -fi -cd .. %build -%configure --with-elfutils=elfutils-%{elfutils_version} +%configure make %install -make DESTDIR=$RPM_BUILD_ROOT install install-elfutils +make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/var/cache/systemtap %clean @@ -77,6 +66,8 @@ %dir %attr(0755,root,root) /var/cache/systemtap %changelog +* Mon May 21 2007 - tiwai(a)suse.de +- use the external elfutils packages. * Tue Apr 24 2007 - tiwai(a)suse.de - updated to snapshot 20070421 and elfutils-0.127: * minor compile warning fixes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xkeyboard-config
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package xkeyboard-config checked in at Mon May 21 18:47:40 CEST 2007. -------- --- xkeyboard-config/xkeyboard-config.changes 2007-05-13 21:26:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/xkeyboard-config/xkeyboard-config.changes 2007-05-21 18:09:57.463500000 +0200 @@ -1,0 +2,6 @@ +Mon May 21 18:09:12 CEST 2007 - sndirsch(a)suse.de + +- xkeyboard-config.mainline-cvs.us-backslash.patch: + * backslash needs to be explicitely set in us (Bug #275561) + +------------------------------------------------------------------- New: ---- xkeyboard-config.mainline-cvs.us-backslash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkeyboard-config.spec ++++++ --- /var/tmp/diff_new_pack.wA5992/_old 2007-05-21 18:47:24.000000000 +0200 +++ /var/tmp/diff_new_pack.wA5992/_new 2007-05-21 18:47:24.000000000 +0200 @@ -20,7 +20,7 @@ PreReq: /bin/ln /bin/rm Autoreqprov: on Version: 0.9 -Release: 53 +Release: 58 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 Patch0: xkeyboard-config.mainline-cvs.group.patch @@ -31,6 +31,7 @@ Patch5: xkeyboard-config.mainline-cvs.mac-euro.patch Patch6: xkeyboard-config.mainline-cvs.trans.patch Patch7: xkeyboard-config.mainline-cvs.il.patch +Patch8: xkeyboard-config.mainline-cvs.us-backslash.patch Patch40: xkeyboard-config.macintosh.patch Patch100: p_suse.diff Patch101: ibm_space_saver.diff @@ -64,6 +65,7 @@ %patch5 %patch6 %patch7 +%patch8 %patch40 %patch100 %patch101 @@ -95,6 +97,9 @@ /usr/share/X11/xkb/ %changelog +* Mon May 21 2007 - sndirsch(a)suse.de +- xkeyboard-config.mainline-cvs.us-backslash.patch: + * backslash needs to be explicitely set in us (Bug #275561) * Sun May 13 2007 - sndirsch(a)suse.de - xkeyboard-config.mainline-cvs.il.patch: * fixed mapping for "|" symbol in hebrew layout (Bug #273712) ++++++ xkeyboard-config.mainline-cvs.us-backslash.patch ++++++ Index: symbols/us =================================================================== RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/us,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- symbols/us 6 Mar 2007 22:58:42 -0000 1.27 +++ symbols/us 29 Apr 2007 16:28:26 -0000 1.28 @@ -61,6 +61,7 @@ key <AB09> { [ period, greater ] }; key <AB10> { [ slash, question ] }; + key <BKSL> { [ backslash, bar ] }; // End alphanumeric section }; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 netcdf
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package netcdf checked in at Mon May 21 18:47:18 CEST 2007. -------- --- netcdf/netcdf.changes 2006-10-20 02:30:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/netcdf/netcdf.changes 2007-05-21 18:35:43.197431000 +0200 @@ -1,0 +2,6 @@ +Mon May 21 18:34:56 CEST 2007 - ro(a)suse.de + +- removed cfortran.doc from tarball due to "non-commercial" status +- check in specfile to make sure the file does not reappear + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcdf.spec ++++++ --- /var/tmp/diff_new_pack.Bq4055/_old 2007-05-21 18:47:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Bq4055/_new 2007-05-21 18:47:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package netcdf (Version 3.6.1) # -# Copyright (c) 2006 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. # @@ -14,9 +14,9 @@ BuildRequires: f2c gcc-c++ gcc-fortran Summary: Library for Array Oriented Data Access Version: 3.6.1 -Release: 2 +Release: 31 Group: System/Libraries -License: BSD License and BSD-like, Other License(s), see package +License: BSD License and BSD-like URL: http://www.unidata.ucar.edu/software/netcdf/ Source: netcdf-%{version}.tar.bz2 Patch: netcdf-%{version}.dif @@ -48,6 +48,7 @@ %patch1 %patch2 %patch3 +test -f src/fortran/cfortran.doc && exit 1 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" @@ -87,7 +88,10 @@ /usr/include/* %{_libdir}/lib* -%changelog -n netcdf +%changelog +* Mon May 21 2007 - ro(a)suse.de +- removed cfortran.doc from tarball due to "non-commercial" status +- check in specfile to make sure the file does not reappear * Thu Oct 19 2006 - zpetrova(a)suse.cz - update to version 3.6.1 - updated installation manual ++++++ netcdf-3.6.1.tar.bz2 ++++++ ++++ 2053 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 kasumi
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package kasumi checked in at Mon May 21 18:47:03 CEST 2007. -------- --- kasumi/kasumi.changes 2007-03-14 12:52:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/kasumi/kasumi.changes 2007-05-21 18:11:52.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 21 18:11:11 CEST 2007 - mfabian(a)suse.de + +- fix build on STABLE (remove X-SuSE-translate=true from .desktop + file). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kasumi.spec ++++++ --- /var/tmp/diff_new_pack.sO3415/_old 2007-05-21 18:46:58.000000000 +0200 +++ /var/tmp/diff_new_pack.sO3415/_new 2007-05-21 18:46:58.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Provides: locale(anthy:ja) Version: 2.2 -Release: 1 +Release: 17 URL: http://kasumi.sourceforge.jp/ Source0: http://osdn.dl.sourceforge.jp/kasumi/22902/kasumi-2.2.tar.bz2 Patch0: 64bit.patch @@ -76,6 +76,9 @@ %{_mandir}/man1/* %changelog +* Mon May 21 2007 - mfabian(a)suse.de +- fix build on STABLE (remove X-SuSE-translate=true from .desktop + file). * Wed Mar 14 2007 - mfabian(a)suse.de - enable 64bit patch again. * Tue Mar 13 2007 - mfabian(a)suse.de ++++++ desktop.patch ++++++ --- /var/tmp/diff_new_pack.sO3415/_old 2007-05-21 18:46:59.000000000 +0200 +++ /var/tmp/diff_new_pack.sO3415/_new 2007-05-21 18:46:59.000000000 +0200 @@ -1,12 +1,6 @@ diff -ru kasumi-2.2.orig/kasumi.desktop.in kasumi-2.2/kasumi.desktop.in --- kasumi-2.2.orig/kasumi.desktop.in 2006-06-03 16:30:07.000000000 +0200 +++ kasumi-2.2/kasumi.desktop.in 2007-03-13 17:50:20.000000000 +0100 -@@ -1,4 +1,5 @@ - [Desktop Entry] -+X-SuSE-translate=true - Version=1.0 - Encoding=UTF-8 - Name=Anthy Dictionary editor @@ -8,7 +9,7 @@ Comment=Edit Anthy dictionary. Comment[ja]=Anthy の個人辞書に単語を登録、削除、編集するツールです。 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 openldap2
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package openldap2 checked in at Mon May 21 18:10:56 CEST 2007. -------- --- openldap2/openldap2.changes 2007-05-15 15:50:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/openldap2/openldap2.changes 2007-05-21 12:20:06.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 21 12:19:45 CEST 2007 - dmueller(a)suse.de + +- reduce duplicated buildrequires against db42 and db45 + +------------------------------------------------------------------- openldap2-client.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.jB5316/_old 2007-05-21 18:10:39.000000000 +0200 +++ /var/tmp/diff_new_pack.jB5316/_new 2007-05-21 18:10:39.000000000 +0200 @@ -11,7 +11,7 @@ # norootforbuild Name: openldap2-client -BuildRequires: cyrus-sasl-devel db-devel db42-devel openslp-devel openssl-devel tcpd-devel +BuildRequires: cyrus-sasl-devel db-devel openslp-devel openssl-devel tcpd-devel URL: http://www.openldap.org License: BSD License and BSD-like %if "%{name}" == "openldap2" @@ -28,7 +28,7 @@ %endif Autoreqprov: on Version: 2.3.35 -Release: 5 +Release: 7 Source: openldap-%{version}.tar.bz2 Source1: openldap-rc.tgz Source2: openldap-admin-guide.tar.bz2 @@ -351,6 +351,8 @@ %endif %changelog +* Mon May 21 2007 - dmueller(a)suse.de +- reduce duplicated buildrequires against db42 and db45 * Tue May 15 2007 - rhafer(a)suse.de - imported apparmor profile from apparmor (this profile is not enabled by default) openldap2.spec: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rcs
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package rcs checked in at Mon May 21 18:10:44 CEST 2007. -------- --- rcs/rcs.changes 2006-09-04 15:18:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/rcs/rcs.changes 2007-05-21 16:28:47.158830000 +0200 @@ -1,0 +2,5 @@ +Mon May 21 16:28:27 CEST 2007 - sndirsch(a)suse.de + +- fixed sendmail path (Bug #275541) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rcs.spec ++++++ --- /var/tmp/diff_new_pack.QA4677/_old 2007-05-21 18:10:31.000000000 +0200 +++ /var/tmp/diff_new_pack.QA4677/_new 2007-05-21 18:10:31.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rcs (Version 5.7) # -# Copyright (c) 2006 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. # @@ -11,11 +11,11 @@ # norootforbuild Name: rcs -License: GPL +License: GNU General Public License (GPL) Group: Development/Tools/Version Control Autoreqprov: on Version: 5.7 -Release: 881 +Release: 916 Summary: Revision Control System Source: rcs-5.7.tar.gz Source1: rcs.html @@ -45,7 +45,7 @@ %patch -P 1 -p 0 -b .tmpfile %build -ac_cv_path_SENDMAIL=/sbin/sendmail \ +ac_cv_path_SENDMAIL=/usr/sbin/sendmail \ ./configure --prefix=/usr --with-diff-utils make CFLAGS="$RPM_OPT_FLAGS" @@ -60,7 +60,9 @@ /usr/bin/* %{_mandir}/man?/*.gz -%changelog -n rcs +%changelog +* Mon May 21 2007 - sndirsch(a)suse.de +- fixed sendmail path (Bug #275541) * Mon Sep 04 2006 - rguenther(a)suse.de - Get rid of postfix build dependency, use /sbin/sendmail. * Wed Jan 25 2006 - mls(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 multipath-tools
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package multipath-tools checked in at Mon May 21 18:10:24 CEST 2007. -------- --- multipath-tools/multipath-tools.changes 2007-05-14 16:21:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/multipath-tools/multipath-tools.changes 2007-05-21 16:00:53.397751000 +0200 @@ -1,0 +2,6 @@ +Mon May 21 15:34:07 CEST 2007 - hare(a)suse.de + +- Rework udev handling +- Split off kpartx package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multipath-tools.spec ++++++ --- /var/tmp/diff_new_pack.hU1296/_old 2007-05-21 18:10:03.000000000 +0200 +++ /var/tmp/diff_new_pack.hU1296/_new 2007-05-21 18:10:03.000000000 +0200 @@ -15,13 +15,13 @@ URL: http://christophe.varoqui.free.fr/ License: BSD License and BSD-like, GNU General Public License (GPL) Group: System/Base -Requires: device-mapper +Requires: device-mapper kpartx %if %suse_version > 800 PreReq: %insserv_prereq %endif Autoreqprov: on Version: 0.4.7 -Release: 48 +Release: 50 Summary: Tools to Manage Multipathed Devices with the device-mapper Source: multipath-tools-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,6 +50,20 @@ -------- Christophe Varoqui <christophe.varoqui(a)free.fr> +%package -n kpartx +Summary: Manages partition tables on device-mapper devices +Group: System/Base + +%description -n kpartx +The kpartx program maps linear devmaps to device partitions, which +makes multipath maps partionable. + + + +Authors: +-------- + Christophe Varoqui <christophe.varoqui(a)free.fr> + %prep %setup -n multipath-tools-%{version} %patch0 -p1 @@ -63,8 +77,6 @@ mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 make DESTDIR=$RPM_BUILD_ROOT install -rm $RPM_BUILD_ROOT/etc/udev/rules.d/multipath.rules -install -m 644 multipathd/71-multipath.rules $RPM_BUILD_ROOT/etc/udev/rules.d mkdir -p $RPM_BUILD_ROOT/etc/init.d install -m 744 multipath/multipath.init.suse $RPM_BUILD_ROOT/etc/init.d/boot.multipath install -m 744 multipathd/multipathd.init.suse $RPM_BUILD_ROOT/etc/init.d/multipathd @@ -84,13 +96,13 @@ %defattr(-,root,root) %doc AUTHOR COPYING README ChangeLog %doc multipath.conf* +%dir /etc/udev +%dir /etc/udev/rules.d %config /etc/init.d/multipathd %config /etc/init.d/boot.multipath -%config /etc/udev +%config /etc/udev/rules.d/71-multipath.rules /sbin/devmap_name /sbin/multipath -/sbin/kpartx -/sbin/kpartx_id /sbin/multipathd /sbin/mpath_prio_netapp /sbin/mpath_prio_balance_units @@ -104,11 +116,22 @@ %{_mandir}/man8/devmap_name.8* %{_mandir}/man8/multipath.8* %{_mandir}/man5/multipath.conf.5* -%{_mandir}/man8/kpartx.8* %{_mandir}/man8/multipathd.8* %{_mandir}/man8/mpath_prio_alua.8* +%files -n kpartx +%defattr(-,root,root) +%dir /etc/udev +%dir /etc/udev/rules.d +%config /etc/udev/rules.d/70-kpartx.rules +/sbin/kpartx +/sbin/kpartx_id +%{_mandir}/man8/kpartx.8* + %changelog +* Mon May 21 2007 - hare(a)suse.de +- Rework udev handling +- Split off kpartx package * Mon May 14 2007 - hare(a)suse.de - Merge in latest fixes from upstream - Add all SuSE specific files to git repository. ++++++ multipath-tools-suse-update ++++++ ++++ 893 lines (skipped) ++++ between multipath-tools-suse-update ++++ and /mounts/work_src_done/STABLE/multipath-tools/multipath-tools-suse-update ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 makedumpfile
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package makedumpfile checked in at Mon May 21 18:10:14 CEST 2007. -------- --- makedumpfile/makedumpfile.changes 2007-04-13 19:02:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/makedumpfile/makedumpfile.changes 2007-05-21 12:25:34.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 21 12:25:28 CEST 2007 - tiwai(a)suse.de + +- use external elfutils packages. + +------------------------------------------------------------------- Old: ---- elfutils-0.124-compile-fix.diff elfutils-0.124-no-osl.tar.bz2 elfutils-portability.patch makedumpfile-static-elfutils.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ makedumpfile.spec ++++++ --- /var/tmp/diff_new_pack.rjX688/_old 2007-05-21 18:09:56.000000000 +0200 +++ /var/tmp/diff_new_pack.rjX688/_new 2007-05-21 18:09:56.000000000 +0200 @@ -11,20 +11,16 @@ # norootforbuild Name: makedumpfile -BuildRequires: gcc-c++ zlib-devel +BuildRequires: gcc-c++ libdw-devel zlib-devel %define elfutils_version 0.124 License: GNU General Public License (GPL) Version: 1.1.3 -Release: 1 +Release: 9 Summary: Partial kernel dump Group: System/Kernel URL: https://sourceforge.net/projects/makedumpfile/ Source: makedumpfile-%{version}.tar.bz2 -Source1: elfutils-%{elfutils_version}-no-osl.tar.bz2 -Patch: makedumpfile-static-elfutils.diff -Patch1: makedumpfile-coptflags.diff -Patch2: elfutils-portability.patch -Patch3: elfutils-0.124-compile-fix.diff +Patch: makedumpfile-coptflags.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -40,31 +36,10 @@ NEC Corporation %prep -%setup -n makedumpfile -q -a1 +%setup -n makedumpfile -q %patch -%patch1 -cd elfutils-%{elfutils_version} -ls -l backends -if [ `wc -l < "backends/sparc_retval.c"` -gt 2 ]; then - echo "backends/sparc_retval.c is not distributable for legal reasons." - echo "Please replace it with a dummy implementation in your elfutils package:" - echo "echo -e '#include <stdlib.h>\nint sparc_return_value_location () { abort(); return 0; }' > backends/sparc_retval.c" - exit 1 -fi -%patch2 -p1 -%patch3 -autoreconf -fi -cd .. %build -MKDUMP_ROOT=`pwd`/installed -cd elfutils-%{elfutils_version} -CFLAGS="$RPM_OPT_FLAGS" \ -./configure --prefix=/usr -make -make install DESTDIR=$MKDUMP_ROOT -rm -f $MKDUMP_ROOT/usr/lib/*.so* -cd .. make COPTFLAGS="$RPM_OPT_FLAGS" %install @@ -84,6 +59,8 @@ /bin/* %changelog +* Mon May 21 2007 - tiwai(a)suse.de +- use external elfutils packages. * Fri Apr 13 2007 - tiwai(a)suse.de - updated to version 1.1.3: * 2.6.21 kernel support ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 update-desktop-files
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package update-desktop-files checked in at Mon May 21 18:10:06 CEST 2007. -------- --- update-desktop-files/update-desktop-files.changes 2007-05-15 10:57:41.000000000 +0200 +++ update-desktop-files/update-desktop-files.changes 2007-05-21 17:48:46.386019000 +0200 @@ -1,0 +2,5 @@ +Mon May 21 17:48:09 CEST 2007 - coolo(a)suse.de + +- update from SVN to fix a lot of bugs ;( + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ update-desktop-files.spec ++++++ --- /var/tmp/diff_new_pack.v29537/_old 2007-05-21 18:07:53.000000000 +0200 +++ /var/tmp/diff_new_pack.v29537/_new 2007-05-21 18:07:53.000000000 +0200 @@ -12,7 +12,7 @@ Name: update-desktop-files Version: 10.3 -Release: 20 +Release: 22 Summary: A Build Tool to Update Desktop Files License: GNU General Public License (GPL) Group: Development/Tools/Building @@ -123,6 +123,8 @@ /usr/share/locale/*/LC_MESSAGES/*mo %changelog +* Mon May 21 2007 - coolo(a)suse.de +- update from SVN to fix a lot of bugs ;( * Tue May 15 2007 - coolo(a)suse.de - remove windows line feeds from desktop files * Mon May 14 2007 - coolo(a)suse.de ++++++ desktop-translations.tar.bz2 ++++++ ++++ 428300 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 mkinitrd
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package mkinitrd checked in at Mon May 21 18:09:56 CEST 2007. -------- --- mkinitrd/mkinitrd.changes 2007-05-21 13:28:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2007-05-21 17:22:31.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 21 17:21:06 CEST 2007 - agraf(a)suse.de + +- Added a warning if fsck was not found +- Fixed to load sysconfig/kernel modules + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.I31862/_old 2007-05-21 18:09:00.000000000 +0200 +++ /var/tmp/diff_new_pack.I31862/_new 2007-05-21 18:09:00.000000000 +0200 @@ -18,7 +18,7 @@ Requires: coreutils modutils util-linux grep gzip sed gawk cpio udev pciutils sysvinit file Autoreqprov: on Version: 2.0 -Release: 4 +Release: 6 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tgz @@ -93,6 +93,9 @@ %changelog * Mon May 21 2007 - agraf(a)suse.de +- Added a warning if fsck was not found +- Fixed to load sysconfig/kernel modules +* Mon May 21 2007 - agraf(a)suse.de - Beautified the initrd boot output - Removed unused modules when using IDE / SCSI - Minor variable escaping fixes ++++++ mkinitrd.tgz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/boot/01-start.sh new/mkinitrd-2.0/lib/mkinitrd/boot/01-start.sh --- old/mkinitrd-2.0/lib/mkinitrd/boot/01-start.sh 2007-04-27 11:52:31.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/boot/01-start.sh 2007-05-21 17:04:36.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash #%programs: bash umount test mount mknod mkdir ln /sbin/blogd date sleep echo cat /bin/sed /sbin/insmod /sbin/modprobe expr kill /sbin/killall5 /sbin/halt /sbin/reboot /sbin/showconsole cp /sbin/pidof mv chmod rm true /bin/grep ls /lib/mkinitrd/bin/* -#%modules: $INITRD_MODULES +#%modules: $modules #%dontshow # ##### Initrd initialization diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/setup/16-mount.sh new/mkinitrd-2.0/lib/mkinitrd/setup/16-mount.sh --- old/mkinitrd-2.0/lib/mkinitrd/setup/16-mount.sh 2007-05-21 11:39:36.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/setup/16-mount.sh 2007-05-21 17:26:06.000000000 +0200 @@ -2,7 +2,18 @@ # don't include a non-existant fsck rootfsck="/sbin/fsck.${rootfstype}" -[ -e "$rootfsck" ] || rootfsck= +if [ ! -x "$rootfsck" ]; then + rootfsck= + if [ "$rootfstype" != "nfs" ]; then + echo "****************************" + echo "* WARNING " + echo "* No fsck for your rootfs " + echo "* could be found. " + echo "* This might be bad! " + echo "* Please install: /sbin/fsck.$rootfstype" + echo "****************************" + fi +fi verbose "[MOUNT] Root:\t$rootdev" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kiwi
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package kiwi checked in at Mon May 21 18:08:53 CEST 2007. -------- --- arch/i386/kiwi/kiwi.changes 2007-05-11 11:54:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-05-21 17:17:52.999803000 +0200 @@ -1,0 +2,30 @@ +Mon May 14 13:57:39 CEST 2007 - ms(a)suse.de + +- v1.34 +- code cleanup: reduce amount of package variables. Move module + variables into this hash, don't allow private data to be exported +- fixed grub virtual disk setup, grub stages were missing +- added plusSuggested for pattern validation +- use aufs || unionfs for read-only mounts in KIWIRoot.pm +- added support for aufs to isoboot live media for suse >= 10.3 + using aufs for live media requires: "flags=unified" to be set +- added cleanInitrd method to remove the boot image data from + main memory before chroot'ing into the system +- added loginfo method and include script output to root log +- fixed set-repo option to use this path for downloading + patterns if specified +- make importFile function easier, fixed KERNEL_LIST content + if system image doesn't provide it but KIWI_INITRD does. + Added options KIWI_KERNEL_OPTIONS and KIWI_BOOT_TIMEOUT. + Thanks to snorp(a)novell.com who created the patch +- added required netboot versions for SLES and SLED + GM and SP1, activate prebuilding for GM versions (#270881) +- allow USB stick device to be selected via --bootstick-device + option. The given device must be one of the devices detected + by the getRemovableUSBStorageDevices() method (#275137) +- fixed possible race condition while searching for the correct + kernel file. kiwi will create a link pointing to the correct + file and thus kiwi can use this link later instead of a glob + search + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.T26835/_old 2007-05-21 18:07:33.000000000 +0200 +++ /var/tmp/diff_new_pack.T26835/_new 2007-05-21 18:07:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 1.33) +# spec file for package kiwi (Version 1.34) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,7 +15,7 @@ BuildRequires: module-init-tools perl perl-XML-LibXML perl-libwww-perl screen smart syslinux Requires: perl perl-XML-LibXML perl-libwww-perl screen Summary: OpenSuSE - KIWI Image System -Version: 1.33 +Version: 1.34 Release: 1 Group: System/Management License: GNU General Public License (GPL) @@ -138,12 +138,12 @@ # %patch %build -export USER=-1 # set value to 0 to build boot images +export K_USER=0 # set value to 0 to build boot images rm -rf $RPM_BUILD_ROOT test -e /.buildenv && . /.buildenv #cat /proc/mounts > /etc/fstab make buildroot=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS" -if [ $UID = $USER ];then +if [ $UID = $K_USER ];then # prepare and create boot images... mkdir -p $RPM_BUILD_ROOT/srv/tftpboot/pxelinux.cfg mkdir -p $RPM_BUILD_ROOT/srv/tftpboot/boot @@ -164,10 +164,7 @@ echo "# ..." >> $pxedefault echo "DEFAULT Local-Boot" >> $pxedefault images=" - netboot/suse-10.1 netboot/suse-10.1-smp - netboot/suse-10.2 netboot/suse-10.2-smp - xennetboot/suse-10.1 - xennetboot/suse-10.2 + netboot/suse-SLES10 netboot/suse-SLED10 " for i in $images;do rootName=`echo $i | tr / -` @@ -181,7 +178,7 @@ ../kiwi.pl --root $RPM_BUILD_ROOT/root-$rootName --prepare ../system/boot/$i ../kiwi.pl --create $RPM_BUILD_ROOT/root-$rootName \ -d $RPM_BUILD_ROOT/srv/tftpboot/boot - rm -rf $RPM_BUILD_ROOT/root-$rootName + rm -rf $RPM_BUILD_ROOT/root-$rootName* echo >> $pxedefault echo "LABEL $rootName" >> $pxedefault ( @@ -222,7 +219,7 @@ man_prefix=$RPM_BUILD_ROOT/%{_mandir} \ install touch kiwi.loader -if [ ! $UID = $USER ];then +if [ ! $UID = $K_USER ];then install -m 755 pxeboot/pxelinux.0.config \ $RPM_BUILD_ROOT/srv/tftpboot/pxelinux.cfg/default fi @@ -288,6 +285,33 @@ %{_datadir}/kiwi/image/xenboot %changelog +* Mon May 14 2007 - ms(a)suse.de +- v1.34 +- code cleanup: reduce amount of package variables. Move module + variables into this hash, don't allow private data to be exported +- fixed grub virtual disk setup, grub stages were missing +- added plusSuggested for pattern validation +- use aufs || unionfs for read-only mounts in KIWIRoot.pm +- added support for aufs to isoboot live media for suse >= 10.3 + using aufs for live media requires: "flags=unified" to be set +- added cleanInitrd method to remove the boot image data from + main memory before chroot'ing into the system +- added loginfo method and include script output to root log +- fixed set-repo option to use this path for downloading + patterns if specified +- make importFile function easier, fixed KERNEL_LIST content + if system image doesn't provide it but KIWI_INITRD does. + Added options KIWI_KERNEL_OPTIONS and KIWI_BOOT_TIMEOUT. + Thanks to snorp(a)novell.com who created the patch +- added required netboot versions for SLES and SLED + GM and SP1, activate prebuilding for GM versions (#270881) +- allow USB stick device to be selected via --bootstick-device + option. The given device must be one of the devices detected + by the getRemovableUSBStorageDevices() method (#275137) +- fixed possible race condition while searching for the correct + kernel file. kiwi will create a link pointing to the correct + file and thus kiwi can use this link later instead of a glob + search * Tue May 08 2007 - ms(a)suse.de - v1.33 - kiwi-pxeboot: install files to /srv/tftpboot (#248008) ++++++ kiwi.tar.bz2 ++++++ ++++ 4859 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 gnome-vfs2
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package gnome-vfs2 checked in at Mon May 21 18:07:25 CEST 2007. -------- --- GNOME/gnome-vfs2/gnome-vfs2.changes 2007-04-19 12:04:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-vfs2/gnome-vfs2.changes 2007-05-21 15:55:53.511127000 +0200 @@ -1,0 +2,6 @@ +Mon May 21 15:17:43 CEST 2007 - sbrabec(a)suse.cz + +- Disable default application for ftp:// URL handler by default - + it's handled internally better (GNOME#426638#c9). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-vfs2.spec ++++++ --- /var/tmp/diff_new_pack.x23827/_old 2007-05-21 18:05:48.000000000 +0200 +++ /var/tmp/diff_new_pack.x23827/_new 2007-05-21 18:05:48.000000000 +0200 @@ -27,7 +27,7 @@ BuildRequires: mDNSResponder-devel %endif Version: 2.18.0.1 -Release: 9 +Release: 25 Summary: The GNOME 2.x Desktop Virtual File System Libraries License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Libraries/GNOME @@ -274,6 +274,9 @@ %{_datadir}/gtk-doc/html/gnome-vfs-2.0 %changelog +* Mon May 21 2007 - sbrabec(a)suse.cz +- Disable default application for ftp:// URL handler by default - + it's handled internally better (GNOME#426638#c9). * Thu Apr 19 2007 - sbrabec(a)suse.cz - Correctly initialize XDG_DATA_DIRS in SuSEconfig (#240603). * Mon Apr 02 2007 - sbrabec(a)suse.cz ++++++ gnome-vfs-url_handler_ftp.patch ++++++ --- /var/tmp/diff_new_pack.x23827/_old 2007-05-21 18:05:48.000000000 +0200 +++ /var/tmp/diff_new_pack.x23827/_new 2007-05-21 18:05:48.000000000 +0200 @@ -10,7 +10,7 @@ + <applyto>/desktop/gnome/url-handlers/ftp/enabled</applyto> + <owner>gnome</owner> + <type>bool</type> -+ <default>true</default> ++ <default>false</default> + <locale name="C"> + <short>Whether the specified command should handle "ftp" URLs</short> + <long>True if the command specified in the "command" key should handle "ftp" URLs.</long> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bluez-utils
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package bluez-utils checked in at Mon May 21 18:04:21 CEST 2007. -------- --- bluez-utils/bluez-utils.changes 2007-05-10 18:41:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/bluez-utils/bluez-utils.changes 2007-05-21 16:29:50.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 21 16:29:34 CEST 2007 - seife(a)suse.de + +- handle the update case for the no longer present sdpd + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-utils.spec ++++++ --- /var/tmp/diff_new_pack.T17880/_old 2007-05-21 18:04:04.000000000 +0200 +++ /var/tmp/diff_new_pack.T17880/_new 2007-05-21 18:04:04.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: alsa-devel bluez-libs cups dbus-1-devel fuse-devel libusb openobex-devel pkgconfig resmgr xorg-x11-devel URL: http://bluez.sourceforge.net Version: 3.10 -Release: 1 +Release: 4 Summary: Bluetooth Daemons and Utilities License: GNU General Public License (GPL) PreReq: %fillup_prereq %insserv_prereq @@ -182,6 +182,19 @@ rm -rf $RPM_BUILD_ROOT %post -n bluez-utils +if [ -e /etc/sysconfig/bluetooth ]; then + . /etc/sysconfig/bluetooth + if [ x"$SDP_START" = "xyes" ]; then + ARGS="-s" + for i in $HCI_DAEMON_ARGS; do + case $i in + -s) continue ;; + *) ARGS="$ARGS $i" ;; + esac + done + sed -i -e "s@^HCI_DAEMON_ARGS.*\$@HCI_DAEMON_ARGS=\"$ARGS\"@;" /etc/sysconfig/bluetooth + fi +fi %{fillup_only -n bluetooth} %postun -n bluez-utils @@ -268,6 +281,8 @@ %doc %{_defaultdocdir}/bluez-test %changelog +* Mon May 21 2007 - seife(a)suse.de +- handle the update case for the no longer present sdpd * Thu May 10 2007 - dgollub(a)suse.de - Added encryption_key fix for input service * Thu May 10 2007 - dgollub(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 lkcdutils
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package lkcdutils checked in at Mon May 21 15:46:45 CEST 2007. -------- --- lkcdutils/lkcdutils.changes 2007-04-16 17:10:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/lkcdutils/lkcdutils.changes 2007-05-21 15:26:21.403043000 +0200 @@ -1,0 +2,5 @@ +Mon May 21 15:07:57 CEST 2007 - bwalle(a)suse.de + +- add patch from ptesarik(a)suse.cz to fix composite types + +------------------------------------------------------------------- New: ---- lkcdutils-composite-types.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lkcdutils.spec ++++++ --- /var/tmp/diff_new_pack.RA5101/_old 2007-05-21 15:46:26.000000000 +0200 +++ /var/tmp/diff_new_pack.RA5101/_new 2007-05-21 15:46:26.000000000 +0200 @@ -16,7 +16,7 @@ BuildRequires: bison flex module-init-tools ncurses-devel Summary: Linux Kernel Crash Dump (LKCD) Utilities Version: 7.0.1 -Release: 69 +Release: 78 License: GNU General Public License (GPL) Group: System/Kernel # Original source is from Sourceforge SVN @@ -52,6 +52,7 @@ Patch26: lkcdutils-fix-missing-filenames.diff Patch27: lkcdutils-fix-wrong-default-cpu-initialisation.diff Patch28: lkcdutils-add-cflags.diff +Patch29: lkcdutils-composite-types.patch Patch71: lkcdutils-netdump-secure_mode.patch Patch75: lkcdutils-netdump-doc.patch Patch76: lkcdutils-savedump.patch @@ -111,6 +112,7 @@ %patch26 -p1 %patch27 -p1 %patch28 -p1 +%patch29 -p2 %patch77 -p1 %patch80 -p1 cp %{S:4} PATCHES @@ -204,6 +206,8 @@ #/usr/sbin/netdump-login-client %changelog +* Mon May 21 2007 - bwalle(a)suse.de +- add patch from ptesarik(a)suse.cz to fix composite types * Mon Apr 16 2007 - bwalle(a)suse.de - fix failure of first 'rd' call (#264857) - honor RPM_OPT_FLAGS when building lcrash ++++++ lkcdutils-composite-types.patch ++++++ Index: trunk/lkcdutils/lib/libklib/kl_stabs.c =================================================================== --- trunk/lkcdutils/lib/libklib/kl_stabs.c (revision 1376) +++ trunk/lkcdutils/lib/libklib/kl_stabs.c (working copy) @@ -1851,8 +1851,8 @@ strcpy(typestr, KL_TYPESTR_UNION); break; } + strcat(typestr, " "); if (sp->st_name) { - strcat(typestr, " "); strcat(typestr, sp->st_name); strcat(typestr, " "); } @@ -2062,10 +2062,9 @@ sprintf(typestr, "<type=%d>", rsp->st_type); break; } - if (rsp->st_name) { - strcat(typestr, " "); + strcat(typestr, " "); + if (rsp->st_name) strcat(typestr, rsp->st_name); - } got_typedef: if (ptrcnt) { strcat(typestr, " "); Index: trunk/lkcdutils/lib/libklib/kl_dwarf.c =================================================================== --- trunk/lkcdutils/lib/libklib/kl_dwarf.c (revision 1376) +++ trunk/lkcdutils/lib/libklib/kl_dwarf.c (working copy) @@ -1028,9 +1028,7 @@ /* First, check to see if this is an anonymous union or struct... */ - if (!strcmp(source->kl_typestr, KL_TYPESTR_STRUCT) || - !strcmp(source->kl_typestr, KL_TYPESTR_STRUCT" ") || - !strcmp(source->kl_typestr, KL_TYPESTR_UNION) || + if (!strcmp(source->kl_typestr, KL_TYPESTR_STRUCT" ") || !strcmp(source->kl_typestr, KL_TYPESTR_UNION" ")) { source->kl_flags |= TYP_ANONYMOUS_FLG; } Index: trunk/lkcdutils/lib/libklib/kl_symbol.c =================================================================== --- trunk/lkcdutils/lib/libklib/kl_symbol.c (revision 1376) +++ trunk/lkcdutils/lib/libklib/kl_symbol.c (working copy) @@ -1066,12 +1066,10 @@ } else { fprintf(kl_stdout, " []\n"); } - } else if((strcmp(kltp->kl_typestr, - KL_TYPESTR_STRUCT) == 0) || - (strcmp(kltp->kl_typestr, - KL_TYPESTR_STRUCT" ") == 0) || - (strcmp(kltp->kl_typestr, - KL_TYPESTR_UNION) == 0)){ + } else if(strcmp(kltp->kl_typestr, + KL_TYPESTR_STRUCT" ") == 0 || + strcmp(kltp->kl_typestr, + KL_TYPESTR_UNION" ") == 0){ /* anonymous struct or union */ fprintf(kl_stdout, " {...}\n"); } else { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 installation-images
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package installation-images checked in at Mon May 21 15:46:16 CEST 2007. -------- --- installation-images/installation-images.changes 2007-05-08 17:29:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2007-05-21 15:32:22.000000000 +0200 @@ -1,0 +2,10 @@ +Mon May 21 15:32:18 CEST 2007 - snwint(a)suse.de + +- add ahci, sata_sil24, sata_sil on ppc +- added ps3_storage +- various package changes +- removed evms +- fix perl file list +- fixed module list parser (cbc.ko now really added) + +------------------------------------------------------------------- Old: ---- installation-images-9.68.tar.bz2 New: ---- installation-images-9.70.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.uV3371/_old 2007-05-21 15:46:05.000000000 +0200 +++ /var/tmp/diff_new_pack.uV3371/_new 2007-05-21 15:46:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 9.68) +# spec file for package installation-images (Version 9.70) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -66,9 +66,9 @@ Obsoletes: y2image Autoreqprov: off Summary: Installation Image Files -Version: 9.68 +Version: 9.70 Release: 1 -Source: installation-images-9.68.tar.bz2 +Source: installation-images-9.70.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -322,6 +322,13 @@ /CD1 %changelog +* Mon May 21 2007 - snwint(a)suse.de +- add ahci, sata_sil24, sata_sil on ppc +- added ps3_storage +- various package changes +- removed evms +- fix perl file list +- fixed module list parser (cbc.ko now really added) * Tue May 08 2007 - snwint(a)suse.de - added otheros.bld for ps3 - move pre-generated ssh keys out of /etc ++++++ installation-images-9.68.tar.bz2 -> installation-images-9.70.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.68/bin/mlist1 new/installation-images-9.70/bin/mlist1 --- old/installation-images-9.68/bin/mlist1 2005-02-03 11:53:12.000000000 +0100 +++ new/installation-images-9.70/bin/mlist1 2007-05-21 15:29:07.000000000 +0200 @@ -44,7 +44,7 @@ die "$0: $ex: $!\n" unless open(F, "$ex.$arch") || open(F, $ex); while(<F>) { - chomp; + s/\s*$//; next if /^\s*(#|$)/; if(s/^\-//) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.68/Changelog new/installation-images-9.70/Changelog --- old/installation-images-9.68/Changelog 2007-05-08 17:28:22.000000000 +0200 +++ new/installation-images-9.70/Changelog 2007-05-21 15:31:23.000000000 +0200 @@ -1,3 +1,13 @@ +21/5/2007: v9.70 + - fix perl file list + - fixed module list parser (cbc.ko now really added) + +21/5/2007: v9.69 + - add ahci, sata_sil24, sata_sil on ppc + - added ps3_storage + - various package changes + - removed evms + 8/5/2007: v9.68 - added otheros.bld for ps3 - move pre-generated ssh keys out of /etc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.68/data/base/base.file_list new/installation-images-9.70/data/base/base.file_list --- old/installation-images-9.68/data/base/base.file_list 2007-05-07 15:12:00.000000000 +0200 +++ new/installation-images-9.70/data/base/base.file_list 2007-05-21 12:27:07.000000000 +0200 @@ -194,14 +194,17 @@ r /var/adm/fillup-templates t /etc/fstab +perl-base: + /usr/{bin,lib} + perl: /usr/{bin,lib} perl-HTML-Parser: /usr/lib -db: - /usr/lib*/libdb-4*.so +libdb-4_5: + /usr/lib*/libdb*.so gdbm: /usr/lib*/libgdbm.so.* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.68/data/rescue/rescue.file_list new/installation-images-9.70/data/rescue/rescue.file_list --- old/installation-images-9.68/data/rescue/rescue.file_list 2007-05-07 15:16:34.000000000 +0200 +++ new/installation-images-9.70/data/rescue/rescue.file_list 2007-05-21 12:30:37.000000000 +0200 @@ -438,8 +438,8 @@ cyrus-sasl: /usr/lib*/libsasl2.so.* -db: - /usr/lib*/libdb-4*.so +libdb-4_5: + /usr/lib*/libdb*.so krb5: /etc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.68/data/root/root.file_list new/installation-images-9.70/data/root/root.file_list --- old/installation-images-9.68/data/root/root.file_list 2007-05-07 15:21:12.000000000 +0200 +++ new/installation-images-9.70/data/root/root.file_list 2007-05-21 14:54:23.000000000 +0200 @@ -388,8 +388,10 @@ / yast2-storage: / +if 0 yast2-storage-evms: / +endif yast2-storage-lib: / yast2-transfer: @@ -585,8 +587,8 @@ cyrus-sasl: /usr/lib*/libsasl2.so.* -db: - /usr/lib*/libdb-4*.so +libdb-4_5: + /usr/lib*/libdb*.so pam: /etc/pam.d @@ -682,10 +684,12 @@ /usr/sbin/ntfsresize /usr/lib*/libntfs.so* +if 0 evms: /etc/evms.conf /lib* /sbin +endif sysconfig: /sbin/getcfg* @@ -711,47 +715,51 @@ checkmedia: /usr/bin -perl: +perl-base: /usr/bin/perl - /usr/lib/perl*/*/*/CORE/libperl.so + /usr/lib/perl*/*/AutoLoader.pm + /usr/lib/perl*/*/Carp{,.pm} + /usr/lib/perl*/*/Class/Struct.pm + /usr/lib/perl*/*/Exporter{,.pm} + /usr/lib/perl*/*/IPC/Open3.pm + /usr/lib/perl*/*/List/Util.pm + /usr/lib/perl*/*/Scalar/Util.pm + /usr/lib/perl*/*/SelectSaver.pm + /usr/lib/perl*/*/Symbol.pm + /usr/lib/perl*/*/bytes.pm + /usr/lib/perl*/*/constant.pm + /usr/lib/perl*/*/overload.pm + /usr/lib/perl*/*/strict.pm + /usr/lib/perl*/*/vars.pm + /usr/lib/perl*/*/warnings.pm + /usr/lib/perl*/*/warnings/register.pm /usr/lib/perl*/*/*/Config.pm /usr/lib/perl*/*/*/Data/Dumper.pm /usr/lib/perl*/*/*/DynaLoader.pm /usr/lib/perl*/*/*/Errno.pm + /usr/lib/perl*/*/*/Errno.pm /usr/lib/perl*/*/*/Fcntl.pm /usr/lib/perl*/*/*/IO.pm /usr/lib/perl*/*/*/IO/Handle.pm /usr/lib/perl*/*/*/POSIX.pm - /usr/lib/perl*/*/*/Sys/Hostname.pm /usr/lib/perl*/*/*/XSLoader.pm /usr/lib/perl*/*/*/auto/Data/Dumper /usr/lib/perl*/*/*/auto/DynaLoader /usr/lib/perl*/*/*/auto/Fcntl /usr/lib/perl*/*/*/auto/IO /usr/lib/perl*/*/*/auto/POSIX - /usr/lib/perl*/*/*/auto/Sys/Hostname /usr/lib/perl*/*/*/lib.pm - /usr/lib/perl*/*/AutoLoader.pm - /usr/lib/perl*/*/Carp{,.pm} - /usr/lib/perl*/*/Class/Struct.pm - /usr/lib/perl*/*/*/Errno.pm - /usr/lib/perl*/*/Exporter{,.pm} - /usr/lib/perl*/*/IPC/Open3.pm - /usr/lib/perl*/*/SelectSaver.pm - /usr/lib/perl*/*/Symbol.pm + +perl: /usr/lib/perl*/*/Time/localtime.pm /usr/lib/perl*/*/Time/tm.pm - /usr/lib/perl*/*/bytes.pm - /usr/lib/perl*/*/constant.pm /usr/lib/perl*/*/diagnostics.pm - /usr/lib/perl*/*/overload.pm /usr/lib/perl*/*/pod/perldiag.pod - /usr/lib/perl*/*/strict.pm - /usr/lib/perl*/*/vars.pm - /usr/lib/perl*/*/warnings.pm - /usr/lib/perl*/*/warnings/register.pm - /usr/lib/perl*/*/Scalar/Util.pm - /usr/lib/perl*/*/List/Util.pm + /usr/lib/perl*/*/*/CORE/libperl.so + /usr/lib/perl*/*/*/Config.pm + /usr/lib/perl*/*/*/Sys/Hostname.pm + /usr/lib/perl*/*/*/auto/POSIX + /usr/lib/perl*/*/*/auto/Sys/Hostname perl-Bootloader: /usr/lib @@ -796,7 +804,6 @@ /etc/udev /sbin/devmap_name /sbin/kpartx* - /sbin/mpath_id util-linux-crypto: /sbin/cryptsetup diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.68/etc/module.config new/installation-images-9.70/etc/module.config --- old/installation-images-9.68/etc/module.config 2007-04-23 16:43:01.000000000 +0200 +++ new/installation-images-9.70/etc/module.config 2007-05-21 12:30:15.000000000 +0200 @@ -186,7 +186,6 @@ xenblk,"Xen Block Driver",,,,1 xennet,"Xen Net Driver",,,,1 - [IDE/RAID/SCSI] MoreModules=scsi-modules @@ -317,6 +316,7 @@ sata_sx4,"Promise SATA SX4 Driver",,,,1 sx8,"Promise SATA SX8 Driver",,,,1 stex,"Promise SuperTrak EX",,,,1 +ps3_storage,"PS3 storage",,,,1 sata_nv,"NVIDIA nForce SATA Driver",,,,1 psi240i,"PSI-240i",,,,1 qlogicfas,"QLogic FAS",,,,1 @@ -694,6 +694,9 @@ pata_pdc2027x,"Promise PDC20268 to PDC20277",,,,1 pata_sil680,SI680 PATA QS20,,,,1 pata_sl82c105,"W82C105 PATA IDE",,,,1 +ahci,"AHCI SATA driver",,,,1 +sata_sil,"Silicon Image SATA",,,,1 +sata_sil24,"Silicon Image 3124/3132 SATA",,,,1 pata_via,VIA PATA,,,,1 siimage,"SiI IDE",,,,1 sl82c105,"W82C105 IDE",,,,1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.68/etc/module.list new/installation-images-9.70/etc/module.list --- old/installation-images-9.68/etc/module.list 2007-04-16 16:51:46.000000000 +0200 +++ new/installation-images-9.70/etc/module.list 2007-05-21 15:28:47.000000000 +0200 @@ -108,8 +108,8 @@ kernel/lib/crc-ccitt.ko kernel/lib/libcrc32c.ko -kernel/crypto/cbc.ko -kernel/crypto/blkcipher.ko +kernel/crypto/cbc.ko +kernel/crypto/blkcipher.ko kernel/crypto/crc32c.ko kernel/crypto/twofish.ko kernel/crypto/twofish_common.ko diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.68/VERSION new/installation-images-9.70/VERSION --- old/installation-images-9.68/VERSION 2007-05-04 15:47:51.000000000 +0200 +++ new/installation-images-9.70/VERSION 2007-05-21 15:30:41.000000000 +0200 @@ -1 +1 @@ -9.68 +9.70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yum-metadata-parser
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package yum-metadata-parser checked in at Mon May 21 15:12:20 CEST 2007. -------- --- yum-metadata-parser/yum-metadata-parser.changes 2007-05-03 13:42:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/yum-metadata-parser/yum-metadata-parser.changes 2007-05-21 13:27:41.190546000 +0200 @@ -1,0 +2,6 @@ +Mon May 21 13:26:28 CEST 2007 - cthiel(a)suse.de + +- update to version 1.1.1 + * Expose DBVERSION + +------------------------------------------------------------------- Old: ---- yum-metadata-parser-1.1.0.tar.bz2 New: ---- yum-metadata-parser-1.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yum-metadata-parser.spec ++++++ --- /var/tmp/diff_new_pack.G28416/_old 2007-05-21 15:12:10.000000000 +0200 +++ /var/tmp/diff_new_pack.G28416/_new 2007-05-21 15:12:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yum-metadata-parser (Version 1.1.0) +# spec file for package yum-metadata-parser (Version 1.1.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ Name: yum-metadata-parser BuildRequires: glib2-devel libxml2-devel pkgconfig python-devel sqlite-devel Summary: A fast metadata parser for yum -Version: 1.1.0 +Version: 1.1.1 Release: 1 Source: %{name}-%{version}.tar.bz2 Patch: %{name}-1.0-quiet.patch @@ -56,6 +56,9 @@ %{py_sitedir}/* %changelog +* Mon May 21 2007 - cthiel(a)suse.de +- update to version 1.1.1 + * Expose DBVERSION * Thu May 03 2007 - cthiel(a)suse.de - update to version 1.1.0 * setup.py, yum-metadata-parser.spec: bump version to 1.1.0 b/c of the ++++++ yum-metadata-parser-1.1.0.tar.bz2 -> yum-metadata-parser-1.1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.1.0/AUTHORS new/yum-metadata-parser-1.1.1/AUTHORS --- old/yum-metadata-parser-1.1.0/AUTHORS 2006-05-24 14:59:46.000000000 +0200 +++ new/yum-metadata-parser-1.1.1/AUTHORS 2007-05-16 10:21:58.000000000 +0200 @@ -1,2 +1,6 @@ +James Bowes +Florian Festi Tambet Ingo <tambet(a)ximian.com> - +Jeremy Katz +Paul Nasrat +Seth Vidal diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.1.0/ChangeLog new/yum-metadata-parser-1.1.1/ChangeLog --- old/yum-metadata-parser-1.1.0/ChangeLog 2007-04-27 15:42:16.000000000 +0200 +++ new/yum-metadata-parser-1.1.1/ChangeLog 2007-05-16 10:24:24.000000000 +0200 @@ -1,225 +1,242 @@ -2007-04-27 09:30 skvidal +2007-05-16 09:24 pnasrat - * setup.py, yum-metadata-parser.spec: - bump version to 1.1.0 b/c of the dbversion change + * AUTHORS, ChangeLog, setup.py, yum-metadata-parser.spec: Bump to + version 1.1.1 to allow multiple dbversions -2007-04-10 18:30 jbowes +2007-05-16 09:15 pnasrat + + * sqlitecache.c, sqlitecachec.py: Add DBVERSION attribute Jeremy + Katzj <katzj(a)redhat.com> + +2007-04-27 14:30 skvidal + + * setup.py, yum-metadata-parser.spec: + bump version to 1.1.0 b/c of the dbversion change + +2007-04-10 23:30 jbowes * db.c, db.h, package.h, xml-parser.c: Bump database version to 10 - - build_* and time_* values are stored as ints, rather than text, and - checksum_value has been dropped, as this is the same value as - pkgId. -2007-04-07 19:52 jbowes + build_* and time_* values are stored as ints, rather than text, + and checksum_value has been dropped, as this is the same value as + pkgId. + +2007-04-08 00:52 jbowes * xml-parser.c: Reduce some code duplication in xml-parser -2007-04-04 00:07 skvidal +2007-04-04 05:07 skvidal * ChangeLog: merge changelog -2007-04-04 00:07 skvidal +2007-04-04 05:07 skvidal - * setup.py, yum-metadata-parser.spec: - mark as 1.0.4 + * setup.py, yum-metadata-parser.spec: + mark as 1.0.4 -2007-04-03 10:02 jbowes +2007-04-03 15:02 jbowes * db.c: Create a pkgKey index for provides, requires, conflicts, - and obsoletes. - - Originally suggested by Florian Festi on yum-devel. + and obsoletes. + + Originally suggested by Florian Festi on yum-devel. -2007-02-17 22:38 jbowes +2007-02-18 03:38 jbowes * db.c, db.h, package.h, sqlitecache.c, xml-parser.c: Apply patch - from Florian Festi to include Prereqs. + from Florian Festi to include Prereqs. -2007-01-07 15:31 skvidal +2007-01-07 20:31 skvidal - * ChangeLog: - check in changelog + * ChangeLog: + check in changelog -2007-01-07 15:31 skvidal +2007-01-07 20:31 skvidal - * setup.py, yum-metadata-parser.spec: - mark as 1.0.3 + * setup.py, yum-metadata-parser.spec: + mark as 1.0.3 -2007-01-04 13:20 jbowes +2007-01-04 18:20 jbowes * ChangeLog, sqlitecache.c: 2007-12-04 13:10 jbowes - - * sqlitecache.c: Never use the default glib log handler. - This way, when - -d0 is passed, we won't output to the glib log handler - (since nothing - should be displayed at all). -2006-12-05 15:50 katzj + * sqlitecache.c: Never use the default glib log handler. + This way, when + -d0 is passed, we won't output to the glib log handler + (since nothing + should be displayed at all). + +2006-12-05 20:50 katzj * sqlitecachec.py: support newer pysqlite as included in python 2.5 -2006-11-22 20:28 jbowes +2006-11-23 01:28 jbowes * ChangeLog, sqlitecache.c: Use structs and function pointers to - reduce code duplication. + reduce code duplication. -2006-11-22 20:22 jbowes +2006-11-23 01:22 jbowes * ChangeLog, sqlitecache.c, sqlitecachec.py: Display repoid while - populating the cache. + populating the cache. -2006-07-12 01:40 skvidal +2006-07-12 06:40 skvidal - * ChangeLog, setup.py, yum-metadata-parser.spec: - version bump check in changelog + * ChangeLog, setup.py, yum-metadata-parser.spec: + version bump check in changelog -2006-07-10 12:54 pnasrat +2006-07-10 17:54 pnasrat * db.c, db.h: Move to dbversion 9 - add pre for requires -2006-06-19 00:37 skvidal +2006-06-19 05:37 skvidal - * yum-metadata-parser.spec: - update specfile + * yum-metadata-parser.spec: + update specfile -2006-06-18 21:54 skvidal +2006-06-19 02:54 skvidal - * setup.py: - bump second minor version number + * setup.py: + bump second minor version number -2006-06-15 13:36 pnasrat +2006-06-15 18:36 pnasrat * xml-parser.c: Actually populate location_base attribute - used - for cd installs + for cd installs -2006-06-14 16:03 pnasrat +2006-06-14 21:03 pnasrat * db.c: Fix the order to correspond with the schema -2006-06-06 09:41 skvidal +2006-06-06 14:41 skvidal * MANIFEST.in: add spec file in MANIFEST.in as Terje mentioned -2006-06-06 00:00 katzj +2006-06-06 05:00 katzj * yum-metadata-parser.spec: add pkgconfig as a BR -2006-06-06 00:00 katzj +2006-06-06 05:00 katzj * sqlitecachec.py: doesn't actually have anything to run -2006-06-05 13:58 katzj +2006-06-05 18:58 katzj * yum-metadata-parser.spec: glib2, not glib -2006-06-05 09:02 tambet +2006-06-05 14:02 tambet + + * ChangeLog, yum-metadata-parser.spec: 2006-06-05 Tambet Ingo + <tambet(a)ximian.com> - * ChangeLog, yum-metadata-parser.spec: 2006-06-05 Tambet Ingo - <tambet(a)ximian.com> - - * yum-metadata-parser.spec: Relax the required yum version - a bit, the - next release from the 2.6 branch works with this as well. + * yum-metadata-parser.spec: Relax the required yum + version a bit, the + next release from the 2.6 branch works with this as well. -2006-06-05 08:58 tambet +2006-06-05 13:58 tambet * ChangeLog, MANIFEST.in, setup.py, yum-metadata-parser.spec: - 2006-06-05 Tambet Ingo <tambet(a)ximian.com> - - Patch from Terje Rosten <terje.rosten(a)ntnu.no> - - * setup.py: Set the name of the module correctly. - - * yum-metadata-parser.spec: Implement. - - * MANIFEST.in: New file. + 2006-06-05 Tambet Ingo <tambet(a)ximian.com> -2006-05-24 16:03 tambet + Patch from Terje Rosten <terje.rosten(a)ntnu.no> + + * setup.py: Set the name of the module correctly. + + * yum-metadata-parser.spec: Implement. + + * MANIFEST.in: New file. + +2006-05-24 21:03 tambet * ChangeLog, db.c, debug.c, debug.h, setup.py, sqlitecache.c, - xml-parser.c: 2006-05-24 Tambet Ingo <tambet(a)ximian.com> - - * debug.[ch]: Remove. No need for our own logging - framework, glib - already has one. - - *.[ch]: Use glib messaging/logging functions instead of - debug_*. - - * sqlitecache.c: A small cleanup to get rid of some awfully - similar - looking code. - -2006-05-24 10:20 tambet - - * ChangeLog, db.c, sqlitecache.c: 2006-05-24 Tambet Ingo - <tambet(a)ximian.com> - - * ChangeLog: Start keeping change log. - - * sqlitecache.c (update_primary): Nullify the update info - structure, - so we don't find garbage from it on freeing. - (update_filelist): Ditto. - (update_other): Ditto. - - * db.c (yum_db_open): Delete the cache file if the - dbversion - does not match. + xml-parser.c: 2006-05-24 Tambet Ingo <tambet(a)ximian.com> + + * debug.[ch]: Remove. No need for our own logging + framework, glib + already has one. + + *.[ch]: Use glib messaging/logging functions instead of + debug_*. + + * sqlitecache.c: A small cleanup to get rid of some + awfully similar + looking code. + +2006-05-24 15:20 tambet -2006-05-24 08:59 tambet + * ChangeLog, db.c, sqlitecache.c: 2006-05-24 Tambet Ingo + <tambet(a)ximian.com> + + * ChangeLog: Start keeping change log. + + * sqlitecache.c (update_primary): Nullify the update info + structure, + so we don't find garbage from it on freeing. + (update_filelist): Ditto. + (update_other): Ditto. + + * db.c (yum_db_open): Delete the cache file if the + dbversion + does not match. + +2006-05-24 13:59 tambet * AUTHORS, README: 2006-05-24 Tambet Ingo <tambet(a)ximian.com> - - * AUTHORS: Add. - - * README: Add. -2006-05-24 08:51 tambet + * AUTHORS: Add. + + * README: Add. + +2006-05-24 13:51 tambet * .cvsignore: 2006-05-24 Tambet Ingo <tambet(a)ximian.com> - - * .cvsignore: Add. -2006-05-24 08:49 tambet + * .cvsignore: Add. + +2006-05-24 13:49 tambet * db.c, db.h, setup.py, sqlitecache.c, sqlitecache.py, - sqlitecachec.py, xml-parser.c, xml-parser.h: 2006-05-24 Tambet - Ingo <tambet(a)ximian.com> - - * Implement the database opening correctly, just like yum - does. - - * Implement raising the correct exception if something goes - wrong. - - * Some small performance optimizations: Don't copy - uninteresting XML - characters to the local buffer, use typed python object - initialization - functions instead of BuildValue(), and add a dedicated - string chunk to - package ids collection instead of doing one malloc per id. - - * Rename sqlitecache.py to sqlitecachec.py + sqlitecachec.py, xml-parser.c, xml-parser.h: 2006-05-24 Tambet + Ingo <tambet(a)ximian.com> + + * Implement the database opening correctly, just like yum + does. -2006-05-15 23:53 skvidal + * Implement raising the correct exception if something + goes wrong. + + * Some small performance optimizations: Don't copy + uninteresting XML + characters to the local buffer, use typed python object + initialization + functions instead of BuildValue(), and add a dedicated + string chunk to + package ids collection instead of doing one malloc per + id. + + * Rename sqlitecache.py to sqlitecachec.py + +2006-05-16 04:53 skvidal * debug.c, debug.h, sqlitecache.c, sqlitecache.py, xml-parser.c, - xml-parser.h: - committing Tambet's patch: - - "Here's a patch to fix the logging output and to implement the - progress bar callback. The previous patch that implemented logging - always added a log callback, so it worked correctly for the first - time, but every other time the output callback was added and a - duplicate log line was printed. " + xml-parser.h: + committing Tambet's patch: + + "Here's a patch to fix the logging output and to implement the + progress bar callback. The previous patch that implemented + logging always added a log callback, so it worked correctly for + the first time, but every other time the output callback was + added and a duplicate log line was printed. " + +2006-05-11 18:33 skvidal + + * db.c, db.h, debug.c, debug.h, package.c, package.h, setup.py, + sqlitecache.c, sqlitecache.py, xml-parser.c, xml-parser.h: + Initial revision -2006-05-11 13:33 skvidal +2006-05-11 18:33 skvidal * db.c, db.h, debug.c, debug.h, package.c, package.h, setup.py, - sqlitecache.c, sqlitecache.py, xml-parser.c, xml-parser.h: Initial - revision + sqlitecache.c, sqlitecache.py, xml-parser.c, xml-parser.h: yum + metdata parser diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.1.0/PKG-INFO new/yum-metadata-parser-1.1.1/PKG-INFO --- old/yum-metadata-parser-1.1.0/PKG-INFO 2007-04-27 15:42:42.000000000 +0200 +++ new/yum-metadata-parser-1.1.1/PKG-INFO 2007-05-16 10:24:43.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: yum-metadata-parser -Version: 1.1.0 +Version: 1.1.1 Summary: A fast YUM meta-data parser Home-page: UNKNOWN Author: UNKNOWN diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.1.0/setup.py new/yum-metadata-parser-1.1.1/setup.py --- old/yum-metadata-parser-1.1.0/setup.py 2007-04-27 15:31:36.000000000 +0200 +++ new/yum-metadata-parser-1.1.1/setup.py 2007-05-16 10:17:00.000000000 +0200 @@ -23,7 +23,7 @@ 'sqlitecache.c']) setup (name = 'yum-metadata-parser', - version = '1.1.0', + version = '1.1.1', description = 'A fast YUM meta-data parser', py_modules = ['sqlitecachec'], ext_modules = [module]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.1.0/sqlitecache.c new/yum-metadata-parser-1.1.1/sqlitecache.c --- old/yum-metadata-parser-1.1.0/sqlitecache.c 2007-03-13 15:43:57.000000000 +0100 +++ new/yum-metadata-parser-1.1.1/sqlitecache.c 2007-05-16 10:10:33.000000000 +0200 @@ -609,5 +609,10 @@ PyMODINIT_FUNC init_sqlitecache (void) { - Py_InitModule ("_sqlitecache", SqliteMethods); + PyObject * m, * d; + + m = Py_InitModule ("_sqlitecache", SqliteMethods); + + d = PyModule_GetDict(m); + PyDict_SetItemString(d, "DBVERSION", PyInt_FromLong(YUM_SQLITE_CACHE_DBVERSION)); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.1.0/sqlitecachec.py new/yum-metadata-parser-1.1.1/sqlitecachec.py --- old/yum-metadata-parser-1.1.0/sqlitecachec.py 2007-01-07 21:28:20.000000000 +0100 +++ new/yum-metadata-parser-1.1.1/sqlitecachec.py 2007-05-16 10:10:33.000000000 +0200 @@ -18,6 +18,8 @@ import sqlite import _sqlitecache +DBVERSION = _sqlitecache.DBVERSION + class RepodataParserSqlite: def __init__(self, storedir, repoid, callback=None): self.callback = callback diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.1.0/yum-metadata-parser.spec new/yum-metadata-parser-1.1.1/yum-metadata-parser.spec --- old/yum-metadata-parser-1.1.0/yum-metadata-parser.spec 2007-04-27 15:31:22.000000000 +0200 +++ new/yum-metadata-parser-1.1.1/yum-metadata-parser.spec 2007-05-16 10:16:51.000000000 +0200 @@ -2,7 +2,7 @@ Summary: A fast metadata parser for yum Name: yum-metadata-parser -Version: 1.1.0 +Version: 1.1.1 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL @@ -40,6 +40,9 @@ %{python_sitelib_platform}/sqlitecachec.pyo %changelog +* Wed May 16 2007 Paul Nasrat <pnasrat at redhat.com> +- Expose DBVERSION + * Fri Apr 27 2007 Seth Vidal <skvidal at linux.duke.edu> - split out 1.1.0 for dbversion 10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yum
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package yum checked in at Mon May 21 15:12:05 CEST 2007. -------- --- yum/yum.changes 2007-05-03 13:50:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/yum/yum.changes 2007-05-21 13:24:04.749027000 +0200 @@ -1,0 +2,7 @@ +Mon May 21 13:22:10 CEST 2007 - cthiel(a)suse.de + +- update to version 3.2.0 + * latests stable release +- drop yum-install.patch, included in 3.2.0 + +------------------------------------------------------------------- Old: ---- yum-3.1.7.tar.bz2 yum-install.patch New: ---- yum-3.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yum.spec ++++++ --- /var/tmp/diff_new_pack.C27303/_old 2007-05-21 15:12:00.000000000 +0200 +++ /var/tmp/diff_new_pack.C27303/_new 2007-05-21 15:12:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yum (Version 3.1.7) +# spec file for package yum (Version 3.2.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: yum BuildRequires: python-devel -Version: 3.1.7 +Version: 3.2.0 Release: 1 Summary: RPM installer/updater Group: System/Packages @@ -22,7 +22,6 @@ Source1: %{name}.conf Source2: repos.tar.bz2 Patch: %{name}-no_updatesd.patch -Patch1: %{name}-install.patch Patch2: %{name}-3.1.7.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: rpm >= 4.4.0 @@ -51,7 +50,6 @@ %prep %setup -q -b 2 %patch -%patch1 %patch2 %ifnarch %{ix86} for i in rpmUtils yum @@ -99,6 +97,10 @@ %{py_sitedir}/* %changelog +* Mon May 21 2007 - cthiel(a)suse.de +- update to version 3.2.0 + * latests stable release +- drop yum-install.patch, included in 3.2.0 * Thu May 03 2007 - cthiel(a)suse.de - added yum-3.1.7.patch to workaround bug #255914 * Thu May 03 2007 - cthiel(a)suse.de ++++++ yum-3.1.7.tar.bz2 -> yum-3.2.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/bin/yum-updatesd.py new/yum-3.2.0/bin/yum-updatesd.py --- old/yum-3.1.7/bin/yum-updatesd.py 2006-12-05 09:33:35.000000000 +0100 +++ new/yum-3.2.0/bin/yum-updatesd.py 2007-05-15 14:18:07.000000000 +0200 @@ -1,32 +1,25 @@ #!/usr/bin/python -import sys -try: - import yum -except ImportError: - print >> sys.stderr, """\ -There was a problem importing one of the Python modules -required to run yum. The error leading to this problem was: - - %s +import sys, os +import optparse -Please install a package which provides this module, or -verify that the module is installed correctly. +parser = optparse.OptionParser() +parser.add_option("-f", "--no-fork", action="store_true", default=False, dest="nofork") +parser.add_option("-r", "--remote-shutdown", action="store_true", default=False, dest="remoteshutdown") +(options, args) = parser.parse_args() -It's possible that the above module doesn't match the -current version of Python, which is: -%s - -If you cannot solve this problem yourself, please go to -the yum faq at: - http://wiki.linux.duke.edu/YumFaq - -""" % (sys.exc_value, sys.version) - sys.exit(1) +if not options.nofork: + if os.fork(): + sys.exit() + fd = os.open("/dev/null", os.O_RDWR) + os.dup2(fd, 0) + os.dup2(fd, 1) + os.dup2(fd, 2) + os.close(fd) sys.path.insert(0, '/usr/share/yum-cli') try: import yumupd - yumupd.main() + yumupd.main(options) except KeyboardInterrupt, e: print >> sys.stderr, "\n\nExiting on user cancel." sys.exit(1) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/ChangeLog new/yum-3.2.0/ChangeLog --- old/yum-3.1.7/ChangeLog 2007-04-27 15:40:35.000000000 +0200 +++ new/yum-3.2.0/ChangeLog 2007-05-16 23:03:32.000000000 +0200 @@ -1,3 +1,57 @@ +2007-05-16 17:02 skvidal + + * yum.spec, yum/__init__.py: mark as 3.2.0 + +2007-05-16 09:21 skvidal + + * yum/Makefile, rpmUtils/Makefile: fix from Christoph Thiel and Jan + Matejek "The problem is that when precompiling python files, the + compiler needs to know their "base path" which will be used in + debug outputs (such as the backtrace). Without this patch, makefile + sets $(PYDIR) as the base path, but $(PYDIR) isn't defined and the + base path stays empty. (some of our python builds apparently can't + deal with it and use PIL's base path instead) The patch replaces + $(PYDIR) with correct value, $(PKGDIR)." + +2007-05-14 14:39 katzj + + * yum/__init__.py: don't cause repos to be set up unnecessarily + (rh#238940) + +2007-05-06 00:12 lmacken + + * yum/update_md.py: - Add title and release to metadata - Clean up + UpdateNotice.__str__ - Remove pushcount, as it does not seem very + useful at the moment - inline DTD updates - s/summary/title/ for + Bugzilla and CVE's + +2007-05-02 21:24 katzj + + * yum-updatesd.py, bin/yum-updatesd.py: move option parsing around + a little so that yum-updatesd will start faster (rh#220614) + +2007-05-02 19:19 jbowes + + * cli.py, shell.py, yumcommands.py, docs/yum.8: Add repolist + command. + + This is just the 'repo list' yum shell command. 'repo list' now + calls the repolist command instead. + +2007-05-02 17:58 katzj + + * yum-updatesd.py: fix name error (#238685) + +2007-04-29 09:51 skvidal + + * yum/yumRepo.py: + make sure we can set and del repoobj.urls for fastestmirrors, etc + rh bugs: 238305 and 238276 + +2007-04-27 09:37 skvidal + + * ChangeLog: changelog merge - 3.1.7 + 2007-04-27 09:29 skvidal * yum.spec: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/cli.py new/yum-3.2.0/cli.py --- old/yum-3.1.7/cli.py 2007-04-27 15:16:12.000000000 +0200 +++ new/yum-3.2.0/cli.py 2007-05-15 14:18:07.000000000 +0200 @@ -80,6 +80,7 @@ self.registerCommand(yumcommands.ResolveDepCommand()) self.registerCommand(yumcommands.ShellCommand()) self.registerCommand(yumcommands.DepListCommand()) + self.registerCommand(yumcommands.RepoListCommand()) def registerCommand(self, command): for name in command.getNames(): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/docs/yum.8 new/yum-3.2.0/docs/yum.8 --- old/yum-3.1.7/docs/yum.8 2007-04-27 15:16:12.000000000 +0200 +++ new/yum-3.2.0/docs/yum.8 2007-05-15 14:18:08.000000000 +0200 @@ -50,9 +50,10 @@ .br .I \fR * localupdate rpmfile1 [rpmfile2] [\&.\&.\&.] .br -.br .I \fR * deplist package1 [package2] [\&.\&.\&.] .br +.I \fR * repolist [all|enabled|disabled] +.br .PP Unless the \-\-help or \-h option is given, one of the above commands must be present\&. @@ -140,6 +141,10 @@ Produces a list of all dependencies and what packages provide those dependencies for the given packages. .IP +.IP "\fBrepolist\fP" +Produces a list of configured repositories. The default is to list all +enabled repositories. +.IP .PP .SH "GENERAL OPTIONS" Most command line options can be set using the configuration file as diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/rpmUtils/Makefile new/yum-3.2.0/rpmUtils/Makefile --- old/yum-3.1.7/rpmUtils/Makefile 2005-02-25 08:49:38.000000000 +0100 +++ new/yum-3.2.0/rpmUtils/Makefile 2007-05-16 15:15:09.000000000 +0200 @@ -17,4 +17,4 @@ for p in $(PYFILES) ; do \ install -m 644 $$p $(DESTDIR)/$(PKGDIR)/$$p; \ done - $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(PKGDIR)', 1, '$(PYDIR)', 1)" + $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(PKGDIR)', 1, '$(PKGDIR)', 1)" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/shell.py new/yum-3.2.0/shell.py --- old/yum-3.1.7/shell.py 2007-03-16 21:27:51.000000000 +0100 +++ new/yum-3.2.0/shell.py 2007-05-15 14:18:07.000000000 +0200 @@ -241,20 +241,20 @@ def do_repo(self, line): (cmd, args, line) = self.parseline(line) if cmd in ['list', None]: - format_string = "%-20.20s %-40.40s %s" - if self.base.repos.repos.values(): - self.verbose_logger.log(logginglevels.INFO_2, format_string, - 'repo id', 'repo name', 'status') - repos = self.base.repos.repos.values() - repos.sort() - for repo in repos: - if repo in self.base.repos.listEnabled() and args in ('', 'enabled'): - self.verbose_logger.log(logginglevels.INFO_2, format_string, - repo, repo.name, 'enabled') - elif args in ('', 'disabled'): - self.verbose_logger.log(logginglevels.INFO_2, format_string, - repo, repo.name, 'disabled') - + # Munge things to run the repolist command + cmds = self._shlex_split(args) + if not cmds: + cmds = ['all'] + cmds.insert(0, 'repolist') + self.base.cmds = cmds + + try: + self.base.parseCommands() + except Errors.YumBaseError: + pass + else: + self.base.doCommands() + elif cmd == 'enable': repos = self._shlex_split(args) for repo in repos: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/yum/__init__.py new/yum-3.2.0/yum/__init__.py --- old/yum-3.1.7/yum/__init__.py 2007-04-26 15:33:52.000000000 +0200 +++ new/yum-3.2.0/yum/__init__.py 2007-05-16 22:57:12.000000000 +0200 @@ -53,7 +53,7 @@ from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage from constants import * -__version__ = '3.1.7' +__version__ = '3.2.0' class YumBase(depsolve.Depsolve): """This is a primary structure and base class. It houses the objects and @@ -439,8 +439,9 @@ if val is None: # if we unset the comps object, we need to undo which repos have # been added to the group file as well - for repo in self.repos.listGroupsEnabled(): - repo.groups_added = False + if self._repos: + for repo in self._repos.listGroupsEnabled(): + repo.groups_added = False self._comps = val def _getGroups(self): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/yum/Makefile new/yum-3.2.0/yum/Makefile --- old/yum-3.1.7/yum/Makefile 2005-02-25 08:49:38.000000000 +0100 +++ new/yum-3.2.0/yum/Makefile 2007-05-16 15:15:22.000000000 +0200 @@ -17,4 +17,4 @@ for p in $(PYFILES) ; do \ install -m 644 $$p $(DESTDIR)/$(PKGDIR)/$$p; \ done - $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(PKGDIR)', 1, '$(PYDIR)', 1)" + $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(PKGDIR)', 1, '$(PKGDIR)', 1)" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/yum/update_md.py new/yum-3.2.0/yum/update_md.py --- old/yum-3.1.7/yum/update_md.py 2007-04-25 20:55:36.000000000 +0200 +++ new/yum-3.2.0/yum/update_md.py 2007-05-15 14:18:08.000000000 +0200 @@ -21,6 +21,7 @@ import gzip import exceptions +from textwrap import wrap from yum.yumRepo import YumRepository try: @@ -39,6 +40,8 @@ self._md = { 'from' : '', 'type' : '', + 'title' : '', + 'release' : '', 'status' : '', 'version' : '', 'pushcount' : '', @@ -60,36 +63,47 @@ def __str__(self): head = """ -ID : %(update_id)s -Type : %(type)s -Status : %(status)s -Issued : %(issued)s -Updated : %(updated)s -Description : -%(description)s - """ % self._md - - refs = '\n== References ==\n' - for ref in self._md['references']: - type = ref['type'] - if type == 'cve': - refs += '\n%s : %s\n%s\n' % (ref['id'], ref['href'], - ref.has_key('summary') and - ref['summary'] or '') - elif type == 'bugzilla': - refs += '\nBug #%s : %s\n%s\n' % (ref['id'], ref['href'], - ref.has_key('summary') and - ref['summary'] or '') +=============================================================================== + %(title)s +=============================================================================== + Update ID : %(update_id)s + Release : %(release)s + Type : %(type)s + Status : %(status)s + Issued : %(issued)s +""" % self._md + + if self._md['updated'] and self._md['updated'] != self._md['issued']: + head += " Updated : %(updated)s" % self_md + + # Add our bugzilla references + bzs = filter(lambda r: r['type'] == 'bugzilla', self._md['references']) + if len(bzs): + buglist = " Bugs :" + for bz in bzs: + buglist += " %s%s\n\t :" % (bz['id'], bz.has_key('title') + and ' - %s' % bz['title'] or '') + head += buglist[:-1].rstrip() + '\n' + + # Add our CVE references + cves = filter(lambda r: r['type'] == 'cve', self._md['references']) + if len(cves): + cvelist = " CVEs :" + for cve in cves: + cvelist += " %s\n\t :" % cve['id'] + head += cvelist[:-1].rstrip() + '\n' + + desc = wrap(self._md['description'], width=64, + subsequent_indent=' ' * 12 + ': ') + head += "Description : %s\n" % '\n'.join(desc) - pkglist = '\n== Updated Packages ==\n' + filelist = " Files :" for pkg in self._md['pkglist']: - pkglist += '\n%s\n' % pkg['name'] for file in pkg['packages']: - pkglist += ' %s %s\n' % (file['sum'][1], file['filename']) + filelist += " %s\n\t :" % file['filename'] + head += filelist[:-1].rstrip() - msg = head + refs + pkglist - - return msg + return head def get_metadata(self): """ Return the metadata dict. """ @@ -98,7 +112,7 @@ def _parse(self, elem): """ Parse an update element. - <!ELEMENT update (id, pushcount, synopsis?, issued, updated, + <!ELEMENT update (id, synopsis?, issued, updated, references, description, pkglist)> <!ATTLIST update type (errata|security) "errata"> <!ATTLIST update status (final|testing) "final"> @@ -125,6 +139,10 @@ self._md['description'] = child.text elif child.tag == 'pkglist': self._parse_pkglist(child) + elif child.tag == 'title': + self._md['title'] = child.text + elif child.tag == 'release': + self._md['release'] = child.text else: raise UpdateNoticeException('No update element found') @@ -132,23 +150,17 @@ """ Parse the update references. <!ELEMENT references (reference*)> - <!ELEMENT reference (summary*)> + <!ELEMENT reference> <!ATTLIST reference href CDATA #REQUIRED> <!ATTLIST reference type (self|cve|bugzilla) "self"> <!ATTLIST reference id CDATA #IMPLIED> - <!ELEMENT cve (#PCDATA)> - <!ELEMENT bugzilla (#PCDATA)> - <!ELEMENT summary (#PCDATA)> - <!ELEMENT description (#PCDATA)> + <!ATTLIST reference title CDATA #IMPLIED> """ for reference in elem: if reference.tag == 'reference': data = {} - for refattrib in ('id', 'href', 'type'): + for refattrib in ('id', 'href', 'type', 'title'): data[refattrib] = reference.attrib.get(refattrib) - for child in reference: - if child.tag == 'summary': - data['summary'] = child.text self._md['references'].append(data) else: raise UpdateNoticeException('No reference element found') diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/yum/yumRepo.py new/yum-3.2.0/yum/yumRepo.py --- old/yum-3.1.7/yum/yumRepo.py 2007-04-26 00:25:52.000000000 +0200 +++ new/yum-3.2.0/yum/yumRepo.py 2007-04-29 15:52:43.000000000 +0200 @@ -35,6 +35,9 @@ import logging import logginglevels +import warnings +warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning) + logger = logging.getLogger("yum.Repos") verbose_logger = logging.getLogger("yum.verbose.Repos") @@ -468,7 +471,10 @@ self._baseurlSetup() return self._urls - urls = property(lambda self: self._geturls()) + urls = property(fget=lambda self: self._geturls(), + fset=lambda self, value: setattr(self, "_urls", value), + fdel=lambda self: setattr(self, "_urls", None)) + def _getFile(self, url=None, relative=None, local=None, start=None, end=None, copy_local=0, checkfunc=None, text=None, reget='simple', cache=True): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/yumcommands.py new/yum-3.2.0/yumcommands.py --- old/yum-3.1.7/yumcommands.py 2007-01-22 05:31:30.000000000 +0100 +++ new/yum-3.2.0/yumcommands.py 2007-05-15 14:18:07.000000000 +0200 @@ -414,3 +414,40 @@ return 1, [str(e)] +class RepoListCommand: + usage = 'repolist [all|enabled|disabled]' + + def getNames(self): + return ('repolist',) + + def getUsage(self): + return usage + + def doCheck(self, base, basecmd, extcmds): + if len(extcmds) == 0: + return + elif len(extcmds) > 1 or extcmds[0] not in ('all', 'disabled', + 'enabled'): + raise cli.CliError + + def doCommand(self, base, basecmd, extcmds): + if len(extcmds) == 1: + arg = extcmds[0] + else: + arg = 'enabled' + + format_string = "%-20.20s %-40.40s %s" + if base.repos.repos.values(): + base.verbose_logger.log(logginglevels.INFO_2, format_string, + 'repo id', 'repo name', 'status') + repos = base.repos.repos.values() + repos.sort() + for repo in repos: + if repo in base.repos.listEnabled() and arg in ('all', 'enabled'): + base.verbose_logger.log(logginglevels.INFO_2, format_string, + repo, repo.name, 'enabled') + elif arg in ('all', 'disabled'): + base.verbose_logger.log(logginglevels.INFO_2, format_string, + repo, repo.name, 'disabled') + + return 0, [] diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/yum.spec new/yum-3.2.0/yum.spec --- old/yum-3.1.7/yum.spec 2007-04-27 15:32:09.000000000 +0200 +++ new/yum-3.2.0/yum.spec 2007-05-16 22:57:49.000000000 +0200 @@ -1,6 +1,6 @@ Summary: RPM installer/updater Name: yum -Version: 3.1.7 +Version: 3.2.0 Release: 1 License: GPL Group: System Environment/Base @@ -91,6 +91,9 @@ %{_mandir}/man*/yum-updatesd* %changelog +* Wed May 16 2007 Seth Vidal <skvidal at fedoraproject.org> +- 3.2.0 + * Thu Apr 26 2007 Seth Vidal <skvidal at linux.duke.edu> - 3.1.7 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-3.1.7/yum-updatesd.py new/yum-3.2.0/yum-updatesd.py --- old/yum-3.1.7/yum-updatesd.py 2007-04-26 00:19:28.000000000 +0200 +++ new/yum-3.2.0/yum-updatesd.py 2007-05-15 14:18:07.000000000 +0200 @@ -479,11 +479,11 @@ self.populateUpdates() if self.opts.do_update: - uit = UpdateInstallThread(self, dlpkgs) + uit = UpdateInstallThread(self) uit.start() elif self.opts.do_download: self.emitDownloading() - dl = UpdateDownloadThread(self, dlpkgs) + dl = UpdateDownloadThread(self) dl.start() else: # just notify about things being available @@ -602,25 +602,25 @@ os.chdir(initial_directory) os.execve(sys.argv[0], sys.argv, os.environ) -def main(): +def main(options = None): # we'll be threading for downloads/updates gobject.threads_init() dbus.glib.threads_init() - - parser = OptionParser() - parser.add_option("-f", "--no-fork", action="store_true", default=False, dest="nofork") - parser.add_option("-r", "--remote-shutdown", action="store_true", default=False, dest="remoteshutdown") - (options, args) = parser.parse_args() - - if not options.nofork: - if os.fork(): - sys.exit() - fd = os.open("/dev/null", os.O_RDWR) - os.dup2(fd, 0) - os.dup2(fd, 1) - os.dup2(fd, 2) - os.close(fd) + if options is None: + parser = OptionParser() + parser.add_option("-f", "--no-fork", action="store_true", default=False, dest="nofork") + parser.add_option("-r", "--remote-shutdown", action="store_true", default=False, dest="remoteshutdown") + (options, args) = parser.parse_args() + + if not options.nofork: + if os.fork(): + sys.exit() + fd = os.open("/dev/null", os.O_RDWR) + os.dup2(fd, 0) + os.dup2(fd, 1) + os.dup2(fd, 2) + os.close(fd) confparser = ConfigParser() opts = UDConfig() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 smart
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package smart checked in at Mon May 21 15:11:52 CEST 2007. -------- --- smart/smart.changes 2007-05-19 09:56:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/smart/smart.changes 2007-05-21 12:28:43.133427000 +0200 @@ -1,0 +2,14 @@ +Mon May 21 12:25:42 CEST 2007 - cthiel(a)suse.de + +- update to version 0.51 + * Fixed a few minor leaks in the C cache implementation. + * Added Hungarian translation, by Kalman Kemenczy. + * Adding Swedish translation, by Daniel Nylander. + * New smart.deinit() function. + * Fixed deb backend when using package files with Python 2.5. + * Fixing problem with "+auto.master" style of lines in automount media + discovering, as reported in bug #269 (and by Jeff Johnson ten years + ago). + * Allow deb backend to run inside a thread. + +------------------------------------------------------------------- Old: ---- smart-0.50.tar.bz2 smart-trunk.patch New: ---- smart-0.51.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smart.spec ++++++ --- /var/tmp/diff_new_pack.J25576/_old 2007-05-21 15:11:42.000000000 +0200 +++ /var/tmp/diff_new_pack.J25576/_new 2007-05-21 15:11:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package smart (Version 0.50) +# spec file for package smart (Version 0.51) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,8 +19,8 @@ BuildRequires: python-elementtree %endif Summary: Smart Package Manager -Version: 0.50 -Release: 27 +Version: 0.51 +Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: distro.py Source2: %{name}.desktop @@ -33,7 +33,6 @@ Patch4: %{name}-ksmarttray.patch Patch5: %{name}-yast-media.patch Patch6: %{name}-show-changelog.patch -Patch99: %{name}-trunk.patch Patch100: %{name}-fix-archscore-add-disable-biarch-option.patch Patch101: %{name}-better-x86_64-support.patch Patch102: %{name}-broken-repo-without-summary-or-description-workaround.diff @@ -103,7 +102,6 @@ %if %{suse_version} < 1010 echo ' sysconf.set("no-rpm-readHeaderFromFD", 3)' >> %{SOURCE1} %endif -%patch99 %patch100 %patch101 %patch102 @@ -214,6 +212,17 @@ /opt/kde3/share/apps/konqueror %changelog +* Mon May 21 2007 - cthiel(a)suse.de +- update to version 0.51 + * Fixed a few minor leaks in the C cache implementation. + * Added Hungarian translation, by Kalman Kemenczy. + * Adding Swedish translation, by Daniel Nylander. + * New smart.deinit() function. + * Fixed deb backend when using package files with Python 2.5. + * Fixing problem with "+auto.master" style of lines in automount media + discovering, as reported in bug #269 (and by Jeff Johnson ten years + ago). + * Allow deb backend to run inside a thread. * Sat May 19 2007 - coolo(a)suse.de - remove X-SuSE-translate from desktop file * Wed Mar 07 2007 - cthiel(a)suse.de ++++++ smart-0.50.tar.bz2 -> smart-0.51.tar.bz2 ++++++ ++++ 57441 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 mkinitrd
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package mkinitrd checked in at Mon May 21 15:11:13 CEST 2007. -------- --- mkinitrd/mkinitrd.changes 2007-05-21 11:41:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2007-05-21 13:28:55.000000000 +0200 @@ -1,0 +2,7 @@ +Mon May 21 13:27:39 CEST 2007 - agraf(a)suse.de + +- Beautified the initrd boot output +- Removed unused modules when using IDE / SCSI +- Minor variable escaping fixes + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.q23351/_old 2007-05-21 15:11:07.000000000 +0200 +++ /var/tmp/diff_new_pack.q23351/_new 2007-05-21 15:11:07.000000000 +0200 @@ -18,7 +18,7 @@ Requires: coreutils modutils util-linux grep gzip sed gawk cpio udev pciutils sysvinit file Autoreqprov: on Version: 2.0 -Release: 3 +Release: 4 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tgz @@ -93,6 +93,10 @@ %changelog * Mon May 21 2007 - agraf(a)suse.de +- Beautified the initrd boot output +- Removed unused modules when using IDE / SCSI +- Minor variable escaping fixes +* Mon May 21 2007 - agraf(a)suse.de - added missing shebang entries * Fri May 11 2007 - agraf(a)suse.de - Modularize mkinitrd (FATE #302106) ++++++ mkinitrd.tgz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/boot/03-block.sh new/mkinitrd-2.0/lib/mkinitrd/boot/03-block.sh --- old/mkinitrd-2.0/lib/mkinitrd/boot/03-block.sh 2007-05-11 16:38:12.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/boot/03-block.sh 2007-05-21 13:09:59.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash #%requires: devfunctions -#%udevmodules: $idescsi_modules $block_modules +#%udevmodules: $block_modules #%if: "$block_modules" # ##### Block device initialization @@ -27,10 +27,7 @@ ## default_dev_flags ?? ## -# TODO: rewrite for udev usage? - [ "$(get_param ide)" ] && add_module_param ide_core "options=\"$(get_param ide)\"" -[ "$(get_param hd?)" ] && add_module_param ide_core "options=\"$(get_param hd?)\"" function scsi_mod_check_compat() { p="$(get_param $1)" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/boot/19-mount.sh new/mkinitrd-2.0/lib/mkinitrd/boot/19-mount.sh --- old/mkinitrd-2.0/lib/mkinitrd/boot/19-mount.sh 2007-05-07 11:32:46.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/boot/19-mount.sh 2007-05-21 13:16:12.000000000 +0200 @@ -18,8 +18,8 @@ ## ro mount the root device read-only ## -[ "$(set -u; $rw && echo 1)" = "1" ] && read_write=off -[ "$(set -u; $ro && echo 1)" = "1" ] && read_only=off +[ "$( ( set -u; echo $rw >/dev/null; echo 1 ) 2>/dev/null )" = "1" ] && read_write=1 +[ "$( ( set -u; echo $ro >/dev/null; echo 1 ) 2>/dev/null )" = "1" ] && read_write= # And now for the real thing if ! udev_discover_root ; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/linuxrc new/mkinitrd-2.0/lib/mkinitrd/linuxrc --- old/mkinitrd-2.0/lib/mkinitrd/linuxrc 2007-04-27 11:45:18.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/linuxrc 2007-05-21 12:58:03.000000000 +0200 @@ -43,7 +43,7 @@ # => /dev/hda1 ################################################## get_param() { - echo $(eval echo \${cmd_${1/-/_}}) + echo $(eval echo \${cmd_${1/-/_}}) 2>/dev/null } for file in boot/*; do diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/setup/070-storage.sh new/mkinitrd-2.0/lib/mkinitrd/setup/070-storage.sh --- old/mkinitrd-2.0/lib/mkinitrd/setup/070-storage.sh 2007-05-21 11:39:27.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/setup/070-storage.sh 2007-05-21 12:55:04.000000000 +0200 @@ -85,7 +85,7 @@ # resolve dependencies for bd in $bds ; do update_blockdev $bd >&2 - if [ $blockdriver = device-mapper ]; then + if [ "$blockdriver" = device-mapper ]; then root_dm=1 dm_deps=$(dmsetup deps -j $blockmajor -m $blockminor) dm_deps=${dm_deps#*: } @@ -108,10 +108,10 @@ if [ -e "$root_dir/${curblockdev#/}" ]; then blockdevn="$(devnumber $root_dir/${curblockdev#/})" - if [ ! "$blockdevn" ]; then + blockmajor="$(devmajor $blockdevn)" + if [ ! "$blockmajor" ]; then error 1 "Fatal storage error. Device $curblockdev could not be analyzed." fi - blockmajor="$(devmajor $blockdevn)" blockminor="$(devminor $blockdevn)" blockdriver="$(block_driver $blockmajor)" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/setup/079-block.sh new/mkinitrd-2.0/lib/mkinitrd/setup/079-block.sh --- old/mkinitrd-2.0/lib/mkinitrd/setup/079-block.sh 2007-05-11 16:38:54.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/setup/079-block.sh 2007-05-21 13:20:20.000000000 +0200 @@ -13,17 +13,6 @@ cat /sys/class/scsi_host/host$hostnum/proc_name } -is_ide_or_scsi() { - case "$1" in - sd*) - echo 1 - ;; - hd*) - echo 1 - ;; - esac -} - get_devmodule() { # fix cciss local blkdev=$(echo $1 | sed 's./.!.g') @@ -32,20 +21,19 @@ blkpart=$blkdev blkdev=${blkpart#[0-9]} if [ ! -d /sys/block/$blkdev/$blkpart ] ; then - echo "Device $blkdev not found in sysfs" >&2 - exit 1 + error 1 "Device $blkdev not found in sysfs" fi fi case "$blkdev" in sd*) handle_scsi $blkdev - use_idescsi=1 + echo sd_mod ;; hd*) devpath=$(cd -P "/sys/block/$blkdev/device"; cd ../..; echo $PWD) cat $devpath/modalias - use_idescsi=1 + echo ide-disk ;; cciss* | dasd*) devpath=$(cd -P "/sys/block/$blkdev/device"; echo $PWD) @@ -59,6 +47,20 @@ return 0 } +update_blockmodules() { + local newmodule="$1" + + echo -n "$block_modules" + + for bm in $block_modules; do + if [ "$newmodule" = "$bm" ]; then + return + fi + done + + echo -n "$newmodule " +} + if [ "$create_monster_initrd" ]; then for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/{ide,scsi} -name "*.ko"); do i=${i%*.ko} @@ -70,12 +72,15 @@ /dev*) update_blockdev $bd curmodule="$(get_devmodule ${bd##*/})" - [ "$use_idescsi" ] || use_idescsi="$(is_ide_or_scsi ${bd##*/})" - verbose "[BLOCK] $bd -> $curmodule" + for curmodule_i in $curmodule; do + verbose "[BLOCK] $bd -> $curmodule_i" + done if [ -z "$curmodule" ]; then - echo "[BLOCK] WARNING: could not find block module for $bd" + echo "[BLOCK] WARNING: could not find block module for $bd" fi - block_modules="$block_modules $curmodule" + for blockmodule in $curmodule; do + block_modules=$(update_blockmodules "$blockmodule") + done ;; *) verbose "[BLOCK] ignoring $bd" @@ -83,9 +88,4 @@ done fi -[ "$use_idescsi" ] && idescsi_modules="ide-scsi ide_core ide-disk sd_mod sd_mod osst st sr_mod sg ide-disk ide-cd ide-tape ide-floppy cdrom" -tmp_block_modules="$( ( for i in $block_modules; do echo $i; done ) | sort | uniq )" -block_modules="$( for i in $tmp_block_modules; do echo -n "$i "; done )" - save_var block_modules -save_var idescsi_modules ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yum-utils
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package yum-utils checked in at Mon May 21 15:09:03 CEST 2007. -------- --- yum-utils/yum-utils.changes 2007-05-03 23:17:28.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yum-utils/yum-utils.changes 2007-05-21 13:32:11.334751000 +0200 @@ -1,0 +2,15 @@ +Mon May 21 13:29:30 CEST 2007 - cthiel(a)suse.de + +- update to version 1.1.4 + * plugins/security/security.py: Added patch by James Antill: It seems that + on RHEL5 there are update metadata entries with references == None (in + my FC6 testing they were always == []). This gives a traceback with the + current code. + * yumdownloader.py: removed crap from comment + * yumdownloader.py: make the '--source' work and make it a little smarter + so the 'reponame-source' are enabled automaticly for all enabled repos, + when '--source' is used. (rhbz #239528) + * plugins/security/security.py: Added patch to security plugin by Luke + Macken + +------------------------------------------------------------------- Old: ---- yum-utils-1.1.3.tar.bz2 New: ---- yum-utils-1.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yum-utils.spec ++++++ --- /var/tmp/diff_new_pack.D16900/_old 2007-05-21 15:08:59.000000000 +0200 +++ /var/tmp/diff_new_pack.D16900/_new 2007-05-21 15:08:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yum-utils (Version 1.1.3) +# spec file for package yum-utils (Version 1.1.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: yum-utils BuildRequires: python-devel -Version: 1.1.3 +Version: 1.1.4 Release: 1 License: GNU General Public License (GPL) Group: System/Packages @@ -55,6 +55,18 @@ %{_mandir}/*/* %changelog +* Mon May 21 2007 - cthiel(a)suse.de +- update to version 1.1.4 + * plugins/security/security.py: Added patch by James Antill: It seems that + on RHEL5 there are update metadata entries with references == None (in + my FC6 testing they were always == []). This gives a traceback with the + current code. + * yumdownloader.py: removed crap from comment + * yumdownloader.py: make the '--source' work and make it a little smarter + so the 'reponame-source' are enabled automaticly for all enabled repos, + when '--source' is used. (rhbz #239528) + * plugins/security/security.py: Added patch to security plugin by Luke + Macken * Thu May 03 2007 - cthiel(a)suse.de - update to version 1.1.3 * New yum-security plugin by James Antill. ++++++ yum-utils-1.1.3.tar.bz2 -> yum-utils-1.1.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.3/ChangeLog new/yum-utils-1.1.4/ChangeLog --- old/yum-utils-1.1.3/ChangeLog 2007-05-01 19:18:11.000000000 +0200 +++ new/yum-utils-1.1.4/ChangeLog 2007-05-16 09:48:04.000000000 +0200 @@ -1,3 +1,38 @@ +2007-05-16 07:47 timlau + + * yum-utils.spec: bumped yum-utils version to 1.1.4 + +2007-05-16 07:41 timlau + + * plugins/security/security.py: Added patch by James Antill: + + It seems that on RHEL5 there are update metadata entries with + references == None (in my FC6 testing they were always == []). + This gives a traceback with the current code. + +2007-05-09 10:11 timlau + + * yumdownloader.py: removed crap from comment . + +2007-05-09 10:01 timlau + + * yumdownloader.py: make the '--source' work and make it a little + smarter so the 'reponame-source' are enabled automaticly for all + enabled repos, when '--source' is used. (rhbz #239528) + +2007-05-08 07:54 timlau + + * plugins/security/security.py: Added patch to security plugin by + Luke Macken + +2007-05-08 07:52 timlau + + * plugins/security/security.py: Added patch by James Antill. + +2007-05-01 17:19 timlau + + * ChangeLog: updated ChangeLog + 2007-05-01 17:19 timlau * yum-utils.spec: bumped yum-utils version to 1.1.3 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.3/ChangeLog.bak new/yum-utils-1.1.4/ChangeLog.bak --- old/yum-utils-1.1.3/ChangeLog.bak 2007-04-12 15:45:44.000000000 +0200 +++ new/yum-utils-1.1.4/ChangeLog.bak 2007-05-01 19:19:21.000000000 +0200 @@ -1,3 +1,74 @@ +2007-05-01 17:19 timlau + + * yum-utils.spec: bumped yum-utils version to 1.1.3 + +2007-05-01 16:42 skvidal + + * Makefile, yum-util-cli-template, yum-utils.spec: + - finish added debuginfo-install to makefile - add + yum-util-cli-template to repo and add it to %doc in spec file + - this is a template for folks to easily add more cli-based + yum-utils + +2007-05-01 16:35 skvidal + + * yum-utils.spec: + add debuginfo-install to spec file + +2007-05-01 16:33 skvidal + + * debuginfo-install.py: + add debuginfo-install to yum-utils + +2007-04-30 13:27 timlau + + * docs/: Makefile, reposync.1: Added reposync man page by Daniel de + Kok (#717) + +2007-04-30 10:31 timlau + + * reposync.py: Added gpgcheck option to reposync by Daniel de Kok + (#715) adding a "-g/--gpgcheck" option that removes a newly + downloaded package if the signature is not correct. + +2007-04-29 13:46 skvidal + + * docs/Makefile: + make sure man8 is made before installing the man page for + yum-security + +2007-04-24 05:25 timlau + + * updateonboot/yum-updateonboot.init: + Changed yum-updateonboot priorities to 25/75 -> 30/70 + + rhbz #235509 + +2007-04-21 12:01 timlau + + * plugins/downloadonly/downloadonly.py: fixed traceback when using + --downloaddir rhbz #237367 + +2007-04-20 10:25 timlau + + * yum-utils.spec, docs/Makefile, docs/yum-security.8, + plugins/security/security.conf, plugins/security/security.py: + Added security plugin written by James Antill <james(a)and.org> + +2007-04-19 06:13 lmacken + + * plugins/fastestmirror/: ChangeLog, fastestmirror.py: * Apr 19 + 2007 Luke Macken <lmacken(a)redhat.com> - 0.2.7 - Remove + TYPE_{INTERFACE,INTERACTIVE} + +2007-04-13 13:07 timlau + + * yumdownloader.py: create destdir if it not exists + +2007-04-12 13:46 timlau + + * ChangeLog: updated ChangeLog + 2007-04-12 13:45 timlau * ChangeLog: bumped yum-utils version to 1.1.2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.3/plugins/security/security.py new/yum-utils-1.1.4/plugins/security/security.py --- old/yum-utils-1.1.3/plugins/security/security.py 2007-04-13 07:27:04.000000000 +0200 +++ new/yum-utils-1.1.4/plugins/security/security.py 2007-05-16 09:38:07.000000000 +0200 @@ -60,59 +60,88 @@ continue # No metadata found for this repo return md_info -def ysp_should_show_pkg(pkg, md, rname=None): - """ Do we want to show this package in sec-list. """ +def ysp__safe_refs(refs): + """ Sometimes refs == None, if so return the empty list here. + So we don't have to check everywhere. """ + if refs == None: + return [] + return refs + +def ysp_should_filter_pkg(opts, pkg, md, used_map): + """ Do the package filtering for should_show and should_keep. """ - md = md.get_notice((pkg.name, pkg.ver, pkg.rel)) - if not md: + def has_id(refs, ref_type, ref_ids): + ''' Check if the given ID is a match. ''' + for ref in ysp__safe_refs(refs): + if ref['type'] != ref_type: + continue + if ref['id'] not in ref_ids: + continue + used_map[ref_type][ref['id']] = True + return ref return None - md = md.get_metadata() - if not rname: + if opts.advisory and md['update_id'] in opts.advisory: + used_map['id'][md['update_id']] = True return md - if rname: - if rname == "security": - return md['type'] == 'security' - for ref in md['references']: - if ref['type'] != rname: - continue + elif opts.cve and has_id(md['references'], "cve", opts.cve): + return md + elif opts.bz and has_id(md['references'], "bugzilla", opts.bz): + return md + elif opts.security: + if md['type'] == 'security': return md - + elif not (opts.advisory or opts.cve or opts.bz or opts.security): + return md # This is only possible from should_show_pkg return None -def ysp_show_pkg_md_info(pkg, md, msg): - msg(pkg) - msg(' ID ' + md['update_id']) - msg(' Type ' + md['type']) - msg(' Issued ' + md['issued']) - if md['issued'] != md['updated']: - msg(' Updated ' + md['updated']) - if md['references']: - msg(' References') - for ref in md['references']: - if ref['type'] == 'cve': - txt = " CVE " + ref['id']; - elif ref['type'] == 'bugzilla': - txt = " BZ " + ref['id']; - else: - msg(" *" + ref['type']) - if 'summary' in ref: - if (len(txt) + len(ref['summary'])) <= 76: - msg("%s: %s" % (txt, ref['summary'])) - else: - msg("%s: %.*s..." % (txt, 73 -len(txt), ref['summary'])) - elif 'href' in ref and \ - (len(txt) + len(ref['href'])) <= 76: - msg("%s - %s" % (txt, ref['href'])) - else: - msg(txt) +def ysp_has_info_md(rname, md): + if rname == "security": + if md['type'] == 'security': + return md + for ref in ysp__safe_refs(md['references']): + if ref['type'] != rname: + continue + return md + +def ysp_should_show_pkg(opts, pkg, md, used_map, rname=None): + """ Do we want to show this package in list-security. """ + + md = md.get_notice((pkg.name, pkg.ver, pkg.rel)) + if not md: + return None + + if rname and not ysp_has_info_md(rname, md): + return None + return ysp_should_filter_pkg(opts, pkg, md, used_map) + +def ysp_gen_used_map(opts): + used_map = {'bugzilla' : {}, 'cve' : {}, 'id' : {}} + for i in opts.advisory: + used_map['id'][i] = False + for i in opts.bz: + used_map['bugzilla'][i] = False + for i in opts.cve: + used_map['cve'][i] = False + return used_map + +def ysp_chk_used_map(used_map, msg): + for i in used_map['id']: + if not used_map['id'][i]: + msg('Advisory \"%s\" not found applicable for this system' % i) + for i in used_map['bugzilla']: + if not used_map['bugzilla'][i]: + msg('BZ \"%s\" not found applicable for this system' % i) + for i in used_map['cve']: + if not used_map['cve'][i]: + msg('CVE \"%s\" not found applicable for this system' % i) class SecurityListCommands: def getNames(self): - return ['list-sec', 'list-security'] + return ['list-security', 'list-sec'] def getUsage(self): - return 'list-sec' + return self.getNames()[0] def doCheck(self, base, basecmd, extcmds): pass @@ -120,9 +149,16 @@ def getRepos(self): # so we can act as a "conduit" return self.repos - def show_pkg(self, msg, pkg, md): - ysp_show_pkg_md_info(pkg, md, msg) - msg('') + def show_pkg(self, msg, pkg, md, disp=None): + # Make the list view much smaller + # ysp_show_pkg_md_info(pkg, md, msg) + if disp and ysp_has_info_md(disp, md): + for ref in ysp__safe_refs(md['references']): + if ref['type'] != disp: + continue + msg(" %s %-8s %s" % (str(ref['id']), md['type'], pkg)) + else: + msg("%s %-8s %s" % (md['update_id'], md['type'], pkg)) def doCommand(self, base, basecmd, extcmds): ygh = base.doPackageLists('updates') @@ -135,79 +171,52 @@ def msg_warn(x): logger.warn(x) + opts,cmdline = base.plugins.cmdline ygh.updates.sort(key=lambda x: x.name) - if not extcmds: - for pkg in ygh.updates: - md = ysp_should_show_pkg(pkg, md_info) - if not md: - continue - self.show_pkg(msg, pkg, md) + used_map = ysp_gen_used_map(opts) + if False: + pass elif len(extcmds) == 1 and (extcmds[0] == "bugzillas" or \ extcmds[0] == "bzs"): - done = False for pkg in ygh.updates: - md = ysp_should_show_pkg(pkg, md_info, "bugzilla") + md = ysp_should_show_pkg(opts, pkg, md_info, used_map, + "bugzilla") if not md: continue - if not done: - msg(" ---- Bugzillas ----") - done = True - self.show_pkg(msg, pkg, md) + self.show_pkg(msg, pkg, md, "bugzilla") elif len(extcmds) == 1 and extcmds[0] == "cves": - done = False for pkg in ygh.updates: - md = ysp_should_show_pkg(pkg, md_info, "cve") + md = ysp_should_show_pkg(opts, pkg, md_info, used_map, "cve") if not md: continue - if not done: - msg(" ---- CVEs ----") - done = True - self.show_pkg(msg, pkg, md) + self.show_pkg(msg, pkg, md, "cve") elif len(extcmds) == 1 and (extcmds[0] == "security" or \ extcmds[0] == "sec"): - done = False for pkg in ygh.updates: - md = ysp_should_show_pkg(pkg, md_info, "security") + md = ysp_should_show_pkg(opts, pkg, md_info, used_map, + "security") if not md: continue - if not done: - msg(" ---- Security ----") - done = True self.show_pkg(msg, pkg, md) else: - uids_done = {} - for uid in extcmds: - uids_done[uid] = False + opts.advisory += extcmds + used_map = ysp_gen_used_map(opts) for pkg in ygh.updates: - md = ysp_should_show_pkg(pkg, md_info) + md = ysp_should_show_pkg(opts, pkg, md_info, used_map) if not md: - continue - - if md['update_id'] in extcmds: - uids_done[md['update_id']] = True - self.show_pkg(msg, pkg, md) - for uid in extcmds: - if not uids_done[uid]: - msg_warn('Advisory \"%s\" not found applicable' - ' for this system' % uid) + continue + self.show_pkg(msg, pkg, md) + ysp_chk_used_map(used_map, msg) # else: # return 1, [str(PluginYumExit('Bad %s commands' % basecmd))] return 0, [basecmd + ' done'] class SecurityInfoCommands(SecurityListCommands): def getNames(self): - return ['info-sec', 'info-security'] - - def getUsage(self): - return 'info-sec' + return ['info-security', 'info-sec'] - def show_pkg(self, msg, pkg, md): - ysp_show_pkg_md_info(pkg, md, msg) - if md['description'] != None: - msg(' Description') - msg(textwrap.fill(md['description'], - width=75, expand_tabs=False, - initial_indent=" ", subsequent_indent=" ")) + def show_pkg(self, msg, pkg, md, disp=None): + msg(md) msg('') def config_hook(conduit): @@ -267,33 +276,11 @@ def ysp_should_keep_pkg(opts, pkg, md, used_map): """ Do we want to keep this package to satisfy the security limits. """ - def has_id(refs, ref_type, ref_ids): - ''' Check if the given ID is a match. ''' - for ref in refs: - if ref['type'] != ref_type: - continue - if ref['id'] not in ref_ids: - continue - used_map[ref_type][ref['id']] = True - return ref - return None - md = md.get_notice((pkg.name, pkg.ver, pkg.rel)) if not md: return False - md = md.get_metadata() - if opts.advisory and md['update_id'] in opts.advisory: - used_map['id'][md['update_id']] = True - return True - elif opts.cve and has_id(md['references'], "cve", opts.cve): - return True - elif opts.bz and has_id(md['references'], "bugzilla", opts.bz): - return True - elif opts.security: - return md['type'] == 'security' - else: - return False + return ysp_should_filter_pkg(opts, pkg, md, used_map) def ysp_check_func_enter(conduit): """ Stuff we need to do in both list and update modes. """ @@ -314,12 +301,8 @@ if (args[0] == "update"): ret = {"skip": ndata, "list_cmd": False} if (args[0] == "list-sec") or (args[0] == "list-security"): - if not ndata: - conduit.error(2, 'Skipping security plugin arguments') return (opts, {"skip": True, "list_cmd": True}) if (args[0] == "info-sec") or (args[0] == "info-security"): - if not ndata: - conduit.error(2, 'Skipping security plugin arguments') return (opts, {"skip": True, "list_cmd": True}) if ret: @@ -331,30 +314,6 @@ conduit.error(2, 'Skipping security plugin, other command') return (opts, {"skip": True, "list_cmd": False, "msg": True}) -def ysp_gen_used_map(opts): - used_map = {'bugzilla' : {}, 'cve' : {}, 'id' : {}} - for i in opts.advisory: - used_map['id'][i] = False - for i in opts.bz: - used_map['bugzilla'][i] = False - for i in opts.cve: - used_map['cve'][i] = False - return used_map - -def ysp_chk_used_map(conduit, used_map): - for i in used_map['id']: - if not used_map['id'][i]: - conduit.error(2, 'Advisory \"%s\" not found applicable' - ' for this system' % i) - for i in used_map['bugzilla']: - if not used_map['bugzilla'][i]: - conduit.error(2, 'BZ \"%s\" not found applicable' - ' for this system' % i) - for i in used_map['cve']: - if not used_map['cve'][i]: - conduit.error(2, 'CVE \"%s\" not found applicable' - ' for this system' % i) - def exclude_hook(conduit): ''' Yum Plugin Exclude Hook: @@ -382,7 +341,7 @@ for pkg in conduit.getPackages(): if not ysp_should_keep_pkg(opts, pkg, md_info, used_map): ysp_del_pkg(pkg) - ysp_chk_used_map(conduit, used_map) + ysp_chk_used_map(used_map, lambda x: conduit.error(2, x)) def preresolve_hook(conduit): ''' @@ -416,13 +375,12 @@ ysp_del_pkg(tspkg) else: cnt += 1 - ysp_chk_used_map(conduit, used_map) + ysp_chk_used_map(used_map, lambda x: conduit.error(2, x)) if cnt: conduit.info(2, 'Needed %d packages, for security' % (cnt)) else: conduit.info(2, 'No packages needed, for security') - sys.exit(0) if __name__ == '__main__': print "This is a plugin that is supposed to run from inside YUM" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.3/yumdownloader.py new/yum-utils-1.1.4/yumdownloader.py --- old/yum-utils-1.1.3/yumdownloader.py 2007-04-13 14:28:17.000000000 +0200 +++ new/yum-utils-1.1.4/yumdownloader.py 2007-05-09 12:11:26.000000000 +0200 @@ -60,20 +60,30 @@ sys.exit(50) self.repos.setCacheDir(cachedir) - # Setup yum (Ts, RPM db, Repo & Sack) self.doUtilYumSetup() + # Setup source repos + if opts.source: + self.setupSourceRepos() # Do the real action self.downloadPackages(opts) + def setupSourceRepos(self): + # enable the -source repos for enabled primary repos + archlist = rpmUtils.arch.getArchList() + ['src'] + for repo in self.repos.listEnabled(): + srcrepo = '%s-source' % repo.id + for r in self.repos.findRepos(srcrepo): + self.logger.info('Enabling %s repository' % r.id) + r.enable() + # Setup the repo + self._getRepos(thisrepo=r.id,doSetup=True) + # Setup pkgSack with 'src' in the archlist + self._getSacks(archlist=archlist,thisrepo=r.id) + + def downloadPackages(self,opts): - archlist = None - if opts.source: - archlist = rpmUtils.arch.getArchList() + ['src'] - - self.doSackSetup(archlist=archlist) - avail = self.pkgSack.returnPackages() toDownload = [] @@ -86,7 +96,6 @@ if len(unmatched) > 0: # if we get back anything in unmatched, it fails self.logger.error('No Match for argument %s' % pkg) continue - for newpkg in installable: # This is to fix Bug 469 # If there are matches to the package argument given but there Files old/yum-utils-1.1.3/yum-utils-1.1.3.tar.gz and new/yum-utils-1.1.4/yum-utils-1.1.3.tar.gz differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.3/yum-utils.spec new/yum-utils-1.1.4/yum-utils.spec --- old/yum-utils-1.1.3/yum-utils.spec 2007-05-01 19:17:39.000000000 +0200 +++ new/yum-utils-1.1.4/yum-utils.spec 2007-05-16 09:46:28.000000000 +0200 @@ -1,6 +1,6 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.1.3 +Version: 1.1.4 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -292,6 +292,9 @@ %changelog * Tue May 1 2007 Tim Lauridsen <tla(a)rasmil.dk> +- mark as 1.1.4 + +* Tue May 1 2007 Tim Lauridsen <tla(a)rasmil.dk> - mark as 1.1.3 * Tue May 1 2007 Seth Vidal <skvidal at linux.duke.edu> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-utils-1.1.3/yum-utils.spec~ new/yum-utils-1.1.4/yum-utils.spec~ --- old/yum-utils-1.1.3/yum-utils.spec~ 1970-01-01 01:00:00.000000000 +0100 +++ new/yum-utils-1.1.4/yum-utils.spec~ 2007-05-01 19:19:11.000000000 +0200 @@ -0,0 +1,406 @@ +Summary: Utilities based around the yum package manager +Name: yum-utils +Version: 1.1.3 +Release: 1%{?dist} +License: GPL +Group: Development/Tools +Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz +URL: http://linux.duke.edu/yum/download/yum-utils/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +Requires: python >= 2.4 , yum >= 3.1.1 + +%description +yum-utils is a collection of utilities and examples for the yum package +manager. It includes utilities by different authors that make yum easier and +more powerful to use. + +%package -n yum-updateonboot +Summary: Run yum update on system boot +Group: System Environment/Base +Requires: python, yum >= 2.4 +Requires(pre): chkconfig +Requires(post): chkconfig + +%description -n yum-updateonboot +Runs yum update on system boot. This allows machines that have been turned +off for an extended amount of time to become secure immediately, instead of +waiting until the next early morning cron job. + +%package -n yum-changelog +Summary: Yum plugin for viewing package changelogs before/after updating +Group: System Environment/Base +Requires: yum >= 3.0 + +%description -n yum-changelog +This plugin adds a command line option to allow viewing package changelog +deltas before or after updating packages. + +%package -n yum-fastestmirror +Summary: Yum plugin which chooses fastest repository from a mirrorlist +Group: System Environment/Base +Requires: yum >= 3.0 + +%description -n yum-fastestmirror +This plugin sorts each repository's mirrorlist by connection speed +prior to downloading packages. + +%package -n yum-fedorakmod +Summary: Yum plugin to handle fedora kernel modules. +Group: System Environment/Base +Requires: yum >= 3.0 + +%description -n yum-fedorakmod +Plugin for Yum to handle installation of kmod-foo type of kernel modules, when new kernel versions +are installed. +kmod-foo kernel modules is described by the Fedora Extras packaging standards. + +%package -n yum-protectbase +Summary: Yum plugin to protect packages from certain repositories. +Group: System Environment/Base +Requires: yum >= 3.0 + +%description -n yum-protectbase +This plugin allows certain repositories to be protected. Packages in the +protected repositories can't be overridden by packages in non-protected +repositories even if the non-protected repo has a later version. + +%package -n yum-versionlock +Summary: Yum plugin to lock specified packages from being updated +Group: System Environment/Base +Requires: yum >= 3.0 + +%description -n yum-versionlock +This plugin allows certain packages specified in a file to be protected from being updated by +newer versions. + +%package -n yum-tsflags +Summary: Yum plugin to add tsflags by a commandline option +Group: System Environment/Base +Requires: yum >= 3.0 + +%description -n yum-tsflags +This plugin allows you to specify optional transaction flags on the yum +command line + +%package -n yum-kernel-module +Summary: Yum plugin to handle kernel-module-foo type of kernel module +Group: System Environment/Base +Requires: yum >= 3.0 + +%description -n yum-kernel-module +This plugin handle installation of kernel-module-foo type of kernel modules when new version of +kernels are installed. + + +%package -n yum-downloadonly +Summary: Yum plugin to add downloadonly command option +Group: System Environment/Base +Requires: yum >= 3.0 + +%description -n yum-downloadonly +This plugin adds a --downloadonly flag to yum so that yum will only download +the packages and not install/update them. + +%package -n yum-allowdowngrade +Summary: Yum plugin to enable manual downgrading of packages +Group: System Environment/Base +Requires: yum >= 3.0 + +%description -n yum-allowdowngrade +This plugin adds a --allow-downgrade flag to yum to make it possible to +manually downgrade packages to specific versions. + +%package -n yum-skip-broken +Summary: Yum plugin to handle skiping packages with dependency problems +Group: System Environment/Base +Requires: yum >= 3.0 + +%description -n yum-skip-broken +This plugin adds a --skip-broken to yum to make it possible to +check packages for dependency problems and skip the one with problems. + +%package -n yum-priorities +Summary: plugin to give priorities to packages from different repos +Group: System Environment/Base +Requires: yum >= 3.0 + +%description -n yum-priorities +This plugin allows repositories to have different priorities. +Packages in a repository with a lower priority can't be overridden by packages +from a repository with a higher priority even if repo has a later version. + +%package -n yum-refresh-updatesd +Summary: Tell yum-updatesd to check for updates when yum exits +Group: System Environment/Base +Requires: yum >= 3.0 + +%description -n yum-refresh-updatesd +yum-refresh-updatesd tells yum-updatesd to check for updates when yum exits. +This way, if you run 'yum list updates' and yum says there's a new version +of (for example) zsh available, puplet will almost instantly update itself +to reflect this. + +%package -n yum-merge-conf +Summary: Yum plugin to merge configuration changes when installing packages +Group: System Environment/Base +Requires: yum >= 3.0 + +%description -n yum-merge-conf +This yum plugin adds the "--merge-conf" command line option. With this option, +Yum will ask you what to do with config files which have changed on updating a +package. + +%package -n yum-security +Summary: Yum plugin to enable security filters +Group: System Environment/Base +Requires: yum >= 3.0.5 + +%description -n yum-security +This plugin adds ther options --security, --cve, --bz and --advisory flags +to yum and the list-security and info-security commands. +The options make it possible to limit list/upgrade of packages to specific +security relevant ones. The commands give you the security information. + + +%prep +%setup -q + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install +make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install + +# Plugins to install +plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf security" +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ + +cd plugins +for plug in $plugins; do + install -m 644 $plug/*.conf $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ + install -m 644 $plug/*.py $RPM_BUILD_ROOT/usr/lib/yum-plugins/ +done + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -n yum-updateonboot +/sbin/chkconfig --add yum-updateonboot >/dev/null 2>&1 || :; + +%preun -n yum-updateonboot +if [ $1 = 0 ]; then + /sbin/service yum-updateonboot stop >/dev/null 2>&1 || :; + /sbin/chkconfig --del yum-updateonboot >/dev/null 2>&1 || :; +fi + +%files +%defattr(-, root, root) +%doc README yum-util-cli-template +%doc COPYING +%doc plugins/README +%{_bindir}/debuginfo-install +%{_bindir}/package-cleanup +%{_bindir}/repoclosure +%{_bindir}/repomanage +%{_bindir}/repoquery +%{_bindir}/repotrack +%{_bindir}/reposync +%{_bindir}/repo-graph +%{_bindir}/repo-rss +%{_bindir}/yumdownloader +%{_bindir}/yum-builddep +%{_mandir}/man1/* + +%files -n yum-updateonboot +%defattr(-, root, root) +%doc updateonboot/README +%config(noreplace) %{_sysconfdir}/sysconfig/yum-updateonboot +%{_initrddir}/yum-updateonboot + +%files -n yum-changelog +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/changelog.conf +/usr/lib/yum-plugins/changelog.* +%{_mandir}/man1/yum-changelog.1.* +%{_mandir}/man5/yum-changelog.conf.5.* + +%files -n yum-fastestmirror +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fastestmirror.conf +/usr/lib/yum-plugins/fastestmirror.* + +%files -n yum-fedorakmod +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fedorakmod.conf +/usr/lib/yum-plugins/fedorakmod.* + +%files -n yum-protectbase +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protectbase.conf +/usr/lib/yum-plugins/protectbase.* + +%files -n yum-versionlock +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.conf +/usr/lib/yum-plugins/versionlock.* + +%files -n yum-tsflags +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tsflags.conf +/usr/lib/yum-plugins/tsflags.* + +%files -n yum-kernel-module +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/kernel-module.conf +/usr/lib/yum-plugins/kernel-module.* + +%files -n yum-downloadonly +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/downloadonly.conf +/usr/lib/yum-plugins/downloadonly.* + +%files -n yum-allowdowngrade +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/allowdowngrade.conf +/usr/lib/yum-plugins/allowdowngrade.* + +%files -n yum-skip-broken +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/skip-broken.conf +/usr/lib/yum-plugins/skip-broken.* + +%files -n yum-priorities +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/priorities.conf +/usr/lib/yum-plugins/priorities.* + +%files -n yum-refresh-updatesd +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-updatesd.conf +/usr/lib/yum-plugins/refresh-updatesd.* + +%files -n yum-merge-conf +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/merge-conf.conf +/usr/lib/yum-plugins/merge-conf.* + +%files -n yum-security +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/security.conf +/usr/lib/yum-plugins/security.* +%{_mandir}/man8/yum-security.8.* + +%changelog +* Tue May 1 2007 Tim Lauridsen <tla(a)rasmil.dk> +- mark as 1.1.3 + +* Tue May 1 2007 Seth Vidal <skvidal at linux.duke.edu> +- added debuginfo-install + +* Fri Apr 20 2007 Tim Lauridsen <tla(a)rasmil.dk> +- Added security plugin written by James Antill <james(a)and.org> + +* Thu Apr 12 2007 Tim Lauridsen <tla(a)rasmil.dk> +- mark as 1.1.2 +- Added merge-conf plugin written by Aurelien Bompard <abompard(a)fedoraproject.org> + +* Mon Feb 19 2007 Tim Lauridsen <tla(a)rasmil.dk> +- mark it as 1.1.1 + +* Mon Feb 19 2007 Tim Lauridsen <tla(a)rasmil.dk> +- mark it as 1.1.0 (again) + +* Thu Feb 15 2007 Tim Lauridsen <tla(a)rasmil.dk> +- removed versionlock.list installation. + +* Wed Feb 14 2007 Tim Lauridsen <tla(a)rasmil.dk> +- Added versionlock.list installation. +- fixed skip-broken description (--ignore-broken -> --skip-broken) + +* Tue Feb 13 2007 James Bowes <jbowes(a)redhat.com> +- Add yum-refresh-updatesd plugin + +* Thu Feb 8 2007 Tim Lauridsen <tla(a)rasmil.dk> +- Added man dirs to yum-changelog files section + +* Wed Feb 7 2007 Tim Lauridsen <tla(a)rasmil.dk> +- mark it as 1.1.0 +- Requires: yum >= 3.1.1 for yum-utils. + +* Tue Feb 6 2007 Tim Lauridsen <tla(a)rasmil.dk> +- Added %%{?dist} tag + +* Sun Dec 31 2006 Tim Lauridsen <tla(a)rasmil.dk> +- mark it as 1.0.2 + +* Tue Oct 31 2006 Tim Lauridsen <tla(a)rasmil.dk> +- mark it as 1.0.1 + +* Fri Oct 27 2006 Tim Lauridsen <tla(a)rasmil.dk> +- Added priorities plugin written by Daniel de Kok <danieldk at pobox.com> + +* Wed Oct 4 2006 Seth Vidal <skvidal at linux.duke.edu> +- mark it as 1.0 +- change requires for the packages to yum 3.0 + +* Wed Sep 27 2006 Tim Lauridsen <tla(a)rasmil.dk> +- added skip-broken plugin + +* Tue Sep 05 2006 Panu Matilainen <pmatilai(a)laiskianen.org> +- added allowdowngrade plugin + +* Sun Aug 13 2006 Seth Vidal <skvidal at linux.duke.edu> +- fix the plugins/ doc issue + +* Sat May 6 2006 Seth Vidal <skvidal at linux.duke.edu> +- bump version number +- added yum-downloadonly plugin +- fix minor item in tsflags description + +* Sat Apr 29 2006 Seth Vidal <skvidal at linux.duke.edu> +- add reposync + +* Fri Apr 28 2006 Tim Lauridsen <tla(a)rasmil.dk> +- added yum-fedorakmod plugin subpackage +- added yum-protectbase plugin subpackage. +- added yum-versionlock plugin subpackage. +- added yum-tsflags plugin subpackage. +- added yum-kernel-module plugin subpackage +- changed .py to .* in files sections for plugin subpackages to build rpms without error. + +* Thu Feb 23 2006 Seth Vidal <skvidal at linux.duke.edu> +- changed some of the yum version dependencies + +* Fri Feb 10 2006 Seth Vidal <skvidal(a)linux.duke.edu> +- added repotrack to utils +- bumped version for 2.5.X-compatible release + +* Tue Jan 10 2006 Brian Long <brilong(a)cisco.com> +- bump version to 0.4 +- add yum-fastestmirror subpackage + +* Mon Oct 17 2005 Panu Matilainen <pmatilai(a)laiskiainen.org> +- add repoquery man page + +* Sat Sep 17 2005 Panu Matilainen <pmatilai(a)laiskiainen.org> +- version 0.3.1 +- various enhancements and fixes to repoquery +- avoid tracebacks in yumex and pup when changelog plugin is enabled + +* Mon Jul 25 2005 Panu Matilainen <pmatilai(a)laiskiainen.org> +- bump version to 0.3 +- add yum-changelog subpackage +- add plugins as documentation to the main package +- require yum >= 2.3.4 (for getCacheDir) + +* Tue Jun 21 2005 Gijs Hollestelle <gijs(a)gewis.nl> +- Added missing GPL COPYING file + +* Wed Jun 1 2005 Seth Vidal <skvidal(a)phy.duke.edu> +- 0.2 + +* Mon May 23 2005 Panu Matilainen <pmatilai(a)laiskiainen.org> +- add yum-updateboot subpackage + +* Mon May 16 2005 Gijs Hollestelle <gijs(a)gewis.nl> +- first version based on the mock spec file ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-add-on-creator
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package yast2-add-on-creator checked in at Mon May 21 15:08:53 CEST 2007. -------- --- yast2-add-on-creator/yast2-add-on-creator.changes 2007-05-17 17:00:55.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-add-on-creator/yast2-add-on-creator.changes 2007-05-21 13:33:36.133287000 +0200 @@ -1,0 +2,7 @@ +Mon May 21 13:21:12 CEST 2007 - jsuchome(a)suse.cz + +- fixed signing content file (#275883) +- fixed exporting gpg key (#275900) +- 2.15.8 + +------------------------------------------------------------------- Old: ---- yast2-add-on-creator-2.15.7.tar.bz2 New: ---- yast2-add-on-creator-2.15.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on-creator.spec ++++++ --- /var/tmp/diff_new_pack.s16174/_old 2007-05-21 15:08:48.000000000 +0200 +++ /var/tmp/diff_new_pack.s16174/_new 2007-05-21 15:08:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-add-on-creator (Version 2.15.7) +# spec file for package yast2-add-on-creator (Version 2.15.8) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-add-on-creator -Version: 2.15.7 +Version: 2.15.8 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-add-on-creator-2.15.7.tar.bz2 +Source0: yast2-add-on-creator-2.15.8.tar.bz2 prefix: /usr Requires: yast2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite @@ -33,7 +33,7 @@ Jiř� Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-add-on-creator-2.15.7 +%setup -n yast2-add-on-creator-2.15.8 %build %{prefix}/bin/y2tool y2autoconf @@ -69,6 +69,10 @@ %doc %{prefix}/share/doc/packages/yast2-add-on-creator %changelog +* Mon May 21 2007 - jsuchome(a)suse.cz +- fixed signing content file (#275883) +- fixed exporting gpg key (#275900) +- 2.15.8 * Thu May 17 2007 - jsuchome(a)suse.cz - clear pattern data map before importing next one (#273528) - 2.15.7 ++++++ yast2-add-on-creator-2.15.7.tar.bz2 -> yast2-add-on-creator-2.15.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.7/src/AddOnCreator.ycp new/yast2-add-on-creator-2.15.8/src/AddOnCreator.ycp --- old/yast2-add-on-creator-2.15.7/src/AddOnCreator.ycp 2007-05-17 16:42:04.000000000 +0200 +++ new/yast2-add-on-creator-2.15.8/src/AddOnCreator.ycp 2007-05-21 10:26:55.000000000 +0200 @@ -1631,28 +1631,12 @@ string pw_path = tmpdir + "/pw"; SCR::Write (.target.string, pw_path, passphrase); - // sign the content file - SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path)); - out = (map) SCR::Execute (.target.bash_output, sformat(" - gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", - local_key, base_path, pw_path) - ); - if (out["exit"]:0 != 0) - { - if (Mode::commandline ()) - Report::Error (out["stderr"]:""); - else - // error message - Popup::ErrorDetails (_("Signing of the product failed."), out["stderr"]:""); - return false; - } - // export the key: command = sformat ("gpg --export -a %1 > '%2/gpg-pubkey-%3-%1.asc'", local_key, base_path, big_key); SCR::Execute (.target.bash, command, $["LANG" : "C"]); - // than, make a sha1 sum of that key (content file is modified last time) + // make a sha1 sum of that key (content file is modified last time) out = (map) SCR::Execute (.target.bash_output, sformat ("cd '%1'; ls -A1 gpg-pubkey*", base_path)); @@ -1666,8 +1650,24 @@ SCR::Execute (.target.bash, command, $["LANG" : "C"]); }); + // sign the content file + SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path)); + out = (map) SCR::Execute (.target.bash_output, sformat(" + gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", + local_key, base_path, pw_path) + ); + if (out["exit"]:0 != 0) + { + if (Mode::commandline ()) + Report::Error (out["stderr"]:""); + else + // error message + Popup::ErrorDetails (_("Signing of the product failed."), out["stderr"]:""); + return false; + } + SCR::Execute (.target.bash, - sformat("gpg --export -a -u %1 > '%2/content.key'",local_key, base_path)); + sformat("gpg --export -a %1 > '%2/content.key'",local_key, base_path)); // sign products file string products_path = full_media_paths[0]:"" + "/products"; @@ -1678,7 +1678,7 @@ sformat("gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2' < %3", local_key, products_path, pw_path)); SCR::Execute (.target.bash, - sformat("gpg --export -a -u %1 > '%2.key'", local_key,products_path)); + sformat("gpg --export -a %1 > '%2.key'", local_key,products_path)); } SCR::Execute (.target.remove, pw_path); return true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.7/VERSION new/yast2-add-on-creator-2.15.8/VERSION --- old/yast2-add-on-creator-2.15.7/VERSION 2007-05-17 16:51:05.000000000 +0200 +++ new/yast2-add-on-creator-2.15.8/VERSION 2007-05-21 13:21:50.000000000 +0200 @@ -1 +1 @@ -2.15.7 +2.15.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 createrepo
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package createrepo checked in at Mon May 21 15:08:41 CEST 2007. -------- --- createrepo/createrepo.changes 2007-05-16 17:16:48.000000000 +0200 +++ /mounts/work_src_done/NOARCH/createrepo/createrepo.changes 2007-05-21 12:49:49.317988000 +0200 @@ -1,0 +2,5 @@ +Mon May 21 12:48:37 CEST 2007 - cthiel(a)suse.de + +- replace rpm.RPMTAG_HDRID with rpm.RPMTAG_SHA1HEADER in createrepo-0.4.8-cachefix.patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ createrepo.spec ++++++ --- /var/tmp/diff_new_pack.Y15124/_old 2007-05-21 15:08:32.000000000 +0200 +++ /var/tmp/diff_new_pack.Y15124/_new 2007-05-21 15:08:32.000000000 +0200 @@ -13,7 +13,7 @@ Name: createrepo BuildRequires: python Version: 0.4.9 -Release: 1 +Release: 3 License: GNU General Public License (GPL) Summary: Creates a Common Metadata Repository Group: System/Packages @@ -81,6 +81,8 @@ %{_datadir}/%{name}/* %changelog +* Mon May 21 2007 - cthiel(a)suse.de +- replace rpm.RPMTAG_HDRID with rpm.RPMTAG_SHA1HEADER in createrepo-0.4.8-cachefix.patch * Wed May 16 2007 - cthiel(a)suse.de - update to version 0.4.9 * includes createrepo-0.4.8-skip-symlinks.patch and createrepo-0.4.8-cachefix.patch (partly) ++++++ createrepo-0.4.9-cachefix.patch ++++++ --- /var/tmp/diff_new_pack.Y15124/_old 2007-05-21 15:08:32.000000000 +0200 +++ /var/tmp/diff_new_pack.Y15124/_new 2007-05-21 15:08:32.000000000 +0200 @@ -11,8 +11,8 @@ + t.append("".join(self.hdr[rpm.RPMTAG_SIGGPG])) + if type(self.hdr[rpm.RPMTAG_SIGPGP]) is not types.NoneType: + t.append("".join(self.hdr[rpm.RPMTAG_SIGPGP])) -+ if type(self.hdr[rpm.RPMTAG_HDRID]) is not types.NoneType: -+ t.append("".join(self.hdr[rpm.RPMTAG_HDRID])) ++ if type(self.hdr[rpm.RPMTAG_SHA1HEADER]) is not types.NoneType: ++ t.append("".join(self.hdr[rpm.RPMTAG_SHA1HEADER])) key = md5.new("".join(t)).hexdigest() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 nagios-nrpe
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package nagios-nrpe checked in at Mon May 21 13:34:02 CEST 2007. -------- --- nagios-nrpe/nagios-nrpe.changes 2007-05-16 14:06:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/nagios-nrpe/nagios-nrpe.changes 2007-05-21 13:29:12.425548000 +0200 @@ -1,0 +2,5 @@ +Mon May 21 12:43:40 CEST 2007 - tsieden(a)suse.de + +- fix build (Requires libopenssl and openssl for 10.3 and beyond) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-nrpe.spec ++++++ --- /var/tmp/diff_new_pack.X14957/_old 2007-05-21 13:33:56.000000000 +0200 +++ /var/tmp/diff_new_pack.X14957/_new 2007-05-21 13:33:56.000000000 +0200 @@ -11,13 +11,18 @@ # norootforbuild Name: nagios-nrpe -BuildRequires: nagios-plugins openssl-devel tcpd-devel +BuildRequires: nagios-plugins tcpd-devel +%if 0%{?suse_version} > 1020 +BuildRequires: libopenssl-devel openssl +%else +BuildRequires: openssl-devel +%endif License: GNU General Public License (GPL) Group: System/Monitoring Requires: nagios-plugins inet-daemon Autoreqprov: on Version: 2.8.1 -Release: 1 +Release: 2 Source0: nrpe-%{version}.tar.bz2 Source1: rcnrpe Patch0: xinet.patch @@ -96,6 +101,8 @@ %config(noreplace) /etc/xinetd.d/nagios-nrpe %changelog +* Mon May 21 2007 - tsieden(a)suse.de +- fix build (Requires libopenssl and openssl for 10.3 and beyond) * Wed May 16 2007 - tsieden(a)suse.de - update to version 2.8.1 * Fixed configure script error with user-specified NRPE group ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-installation
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package yast2-installation checked in at Mon May 21 13:12:39 CEST 2007. -------- --- yast2-installation/yast2-installation.changes 2007-05-18 17:50:03.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-05-21 10:40:39.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 21 10:40:20 CEST 2007 - locilka(a)suse.cz + +- Fixed release-notes desktop file. +- 2.15.25 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.15.24.tar.bz2 New: ---- yast2-installation-2.15.25.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.L12717/_old 2007-05-21 13:12:04.000000000 +0200 +++ /var/tmp/diff_new_pack.L12717/_new 2007-05-21 13:12:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.15.24) +# spec file for package yast2-installation (Version 2.15.25) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-installation -Version: 2.15.24 +Version: 2.15.25 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.15.24.tar.bz2 +Source0: yast2-installation-2.15.25.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-country yast2-devtools yast2-testsuite BuildRequires: yast2 >= 2.15.22 @@ -83,7 +83,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-installation-2.15.24 +%setup -n yast2-installation-2.15.25 %build %{prefix}/bin/y2tool y2autoconf @@ -146,6 +146,9 @@ %endif %changelog +* Mon May 21 2007 - locilka(a)suse.cz +- Fixed release-notes desktop file. +- 2.15.25 * Thu May 17 2007 - locilka(a)suse.cz - Progress dialog for initializing installation sources. - 2.15.24 ++++++ yast2-installation-2.15.24.tar.bz2 -> yast2-installation-2.15.25.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.24/src/config/release_notes.desktop new/yast2-installation-2.15.25/src/config/release_notes.desktop --- old/yast2-installation-2.15.24/src/config/release_notes.desktop 2007-05-18 10:44:04.000000000 +0200 +++ new/yast2-installation-2.15.25/src/config/release_notes.desktop 2007-05-21 10:09:14.000000000 +0200 @@ -1,5 +1,4 @@ [Desktop Entry] -X-SuSE-translate=true Type=Application Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.24/VERSION new/yast2-installation-2.15.25/VERSION --- old/yast2-installation-2.15.24/VERSION 2007-05-18 17:49:47.000000000 +0200 +++ new/yast2-installation-2.15.25/VERSION 2007-05-21 10:40:46.000000000 +0200 @@ -1 +1 @@ -2.15.24 +2.15.25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-driver-video
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Mon May 21 12:59:27 CEST 2007. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-05-17 22:45:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-05-21 10:48:05.252540000 +0200 @@ -1,0 +2,27 @@ +Mon May 21 10:43:39 CEST 2007 - sndirsch(a)suse.de + +- update ati driver to release 6.6.191: + * Fix regular/"xinerama"/zaphod dualhead mode + * radeon: fix up crtc debug dereference problem + * radeon: add support for enabling direct rendering on RS480 + * radeon: fix build since patches for IBM don't actually build + * radeon: fix build on older server + * radeon: add support for DDC on some laptop chipsets + * radeon: another attempt at fixing the mergedfb refresh rate + * 9337: EDID modes do not participate in validation for CRT monitor + * 10205: Radeon driver's own mode validation code does not work properly + * Fixed typo in mode list generation. + * Fix crash if MergedFB and secondary head not found + * Fix inconsistent use of Mode lists. + * Set sync polarity restriction flags even for non-"digital separate" + monitors. + * Disable RMX for IBM Lewis server. + * radeon: Fix typo. + * radeon: Guard some MergedFB specific code with info->MergedFB tests. + * radeon: Don't shrink virtual size based on secondary modes. + * radeon: Always sort modes when adding to list. + * radeon: Link nearest modes by default for clone mode. +- obsoletes bug-263199_radeon-mergedfb-crash.diff, + xf86-video-ati-6.6.191.diff + +------------------------------------------------------------------- Old: ---- bug-263199_radeon-mergedfb-crash.diff xf86-video-ati-6.6.191.diff xf86-video-ati-6.6.191.tar.bz2 New: ---- xf86-video-ati-6.6.192.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.B14473/_old 2007-05-21 12:52:46.000000000 +0200 +++ /var/tmp/diff_new_pack.B14473/_new 2007-05-21 12:52:46.000000000 +0200 @@ -15,7 +15,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 100 +Release: 102 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -25,7 +25,7 @@ Source0: xf86-video-apm-X11R7.1-1.1.1.tar.bz2 Source1: xf86-video-ark-X11R7.1-0.6.0.tar.bz2 Source2: xf86-video-ast-X11R7.1-0.81.0.tar.bz2 -Source3: xf86-video-ati-6.6.191.tar.bz2 +Source3: xf86-video-ati-6.6.192.tar.bz2 Source4: xf86-video-chips-X11R7.1-1.1.1.tar.bz2 Source5: xf86-video-cirrus-X11R7.1-1.1.0.tar.bz2 Source6: xf86-video-cyrix-X11R7.1-1.1.0.tar.bz2 @@ -85,8 +85,6 @@ Patch27: xf86-video-ati-mergedfb-dpi.diff Patch28: xf86-video-ati.randr12.diff Patch30: xf86-video-mga.randr12.diff -Patch31: xf86-video-ati-6.6.191.diff -Patch32: bug-263199_radeon-mergedfb-crash.diff Patch33: bug-263199_radeon-autocrt.diff %description @@ -113,8 +111,6 @@ #%patch2 -p0 %patch18 -p1 %patch27 -p0 -%patch31 -p0 -%patch32 -p2 popd pushd xf86-video-ati-* %patch33 -p1 @@ -263,6 +259,30 @@ %{_mandir}/man4/* %changelog +* Mon May 21 2007 - sndirsch(a)suse.de +- update ati driver to release 6.6.191: + * Fix regular/"xinerama"/zaphod dualhead mode + * radeon: fix up crtc debug dereference problem + * radeon: add support for enabling direct rendering on RS480 + * radeon: fix build since patches for IBM don't actually build + * radeon: fix build on older server + * radeon: add support for DDC on some laptop chipsets + * radeon: another attempt at fixing the mergedfb refresh rate + * 9337: EDID modes do not participate in validation for CRT monitor + * 10205: Radeon driver's own mode validation code does not work properly + * Fixed typo in mode list generation. + * Fix crash if MergedFB and secondary head not found + * Fix inconsistent use of Mode lists. + * Set sync polarity restriction flags even for non-"digital separate" + monitors. + * Disable RMX for IBM Lewis server. + * radeon: Fix typo. + * radeon: Guard some MergedFB specific code with info->MergedFB tests. + * radeon: Don't shrink virtual size based on secondary modes. + * radeon: Always sort modes when adding to list. + * radeon: Link nearest modes by default for clone mode. +- obsoletes bug-263199_radeon-mergedfb-crash.diff, + xf86-video-ati-6.6.191.diff * Thu May 17 2007 - sndirsch(a)suse.de - updated ATI RANDR1.2 driver (git 20070517) * Thu May 17 2007 - sndirsch(a)suse.de ++++++ xf86-video-ati-6.6.191.tar.bz2 -> xf86-video-ati-6.6.192.tar.bz2 ++++++ ++++ 22285 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.6.191/ChangeLog new/xf86-video-ati-6.6.192/ChangeLog --- old/xf86-video-ati-6.6.191/ChangeLog 2007-03-27 08:58:28.000000000 +0200 +++ new/xf86-video-ati-6.6.192/ChangeLog 2007-05-21 00:12:31.000000000 +0200 @@ -1,3 +1,171 @@ +commit 09bfc8ed000f95ede5b73f2bad69edc1a4d9bac6 +Author: Alex Deucher <alex(a)t41p.hsd1.va.comcast.net> +Date: Sun May 20 18:06:22 2007 -0400 + + update to 6.6.192 for rc release + +commit 764cb73e8dec4040cdd418d249fc504399fca3ee +Author: Alex Deucher <alex(a)t41p.hsd1.va.comcast.net> +Date: Sun May 20 17:26:26 2007 -0400 + + Fix regular/"xinerama"/zaphod dualhead mode + + - logic in RADEONUnblank() was wrong + - Calling RADEONSetupConnectors() on second instance screwed up the port info + - still seem to be HW cursor issues with zaphod mode + +commit a3ee42207aab77d93655a82fdcb32be38268b85f +Author: Dave Airlie <airlied(a)linux.ie> +Date: Wed Apr 25 09:52:22 2007 +1000 + + radeon: another attempt at fixing the mergedfb refresh rate + + This attempts to keep it inside the 32-bit limit when multiplying things out + later in the randr tree. + + Let me know if I screwed this up.. + +commit 3828237200fc16d4d32664fb8358950c213d4897 +Author: Dave Airlie <airlied(a)nx6125b.(none)> +Date: Sun Apr 22 11:36:00 2007 +1000 + + radeon: add support for DDC on some laptop chipsets + + I noticed fglrx has DDC for the panel in the rs480 laptop, however radeon + didn't pick it up, so I valgrinded fglrx and spotted 0x1a0/0x1a4 accesses + I actually noticed this before from the BIOS but never figured it out. + + So now I get DDC from the LCD on this laptop. + +commit c81ed9bd7b37c9d02141d10f6c7bad3d0c57032f +Author: Dave Airlie <airlied(a)linux.ie> +Date: Sat Apr 21 18:58:40 2007 +1000 + + radeon: fix build on older server + +commit 406eec71116a58d42288a7f1c809a92d5bda7350 +Author: Dave Airlie <airlied(a)linux.ie> +Date: Sat Apr 21 18:56:28 2007 +1000 + + radeon: fix build since patches for IBM don't actually build + +commit ad119960095b4b64f4c6793f65950c9967ce4989 +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Thu Apr 19 11:54:46 2007 +0200 + + Disable RMX for IBM Lewis server. + + Due to the hardware layout RMX ddc_mode has to be set. + If ddc_mode is set, RADEONValdiateFPModes() shouldn't be called. + Bugzilla #10620 (3). + +commit 16ef77df4ebaf5ea13baa82972aaf98e71ac32ee +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Wed Apr 18 17:36:15 2007 +0200 + + Set sync polarity restriction flags even for non-"digital separate" monitors. + + According to Lisa Wu, this is correct regarding the VESA EEDID standard. + Bugzilla #10620 (2), original patch by Lisa Wu @ATI + +commit 0abce69f0d826a7ca1a41d963cd4730b6e01c145 +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Wed Apr 18 17:32:52 2007 +0200 + + Fix inconsistent use of Mode lists. + + Some scans used to only check every second entry, some stopped at the entry + before the last entry. + Bugzilla #10620 (1), original patch by Lisa Wu @ATI + +commit aea801cf9a5ce519a53d6fffd9a3a2e526ec79ea +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Fri Apr 13 16:16:05 2007 +0200 + + Fix crash if MergedFB and secondary head not found + + If the secondary head isn't found (Monitor unplugged etc.) but MergedFB + is configured, the driver segfaults because it tries to access the mode + list private structures, which are not filled in. + +commit 07ddffb32e6293c77b32c94b87ec468caef3d6f5 +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Wed Apr 11 14:36:51 2007 +0200 + + Fixed typo in mode list generation. + +commit 4effa67ea75736a31b9e78a7b35acf74b067c43e +Author: Dave Airlie <airlied(a)linux.ie> +Date: Mon Apr 9 22:08:31 2007 +1000 + + radeon: add support for enabling direct rendering on RS480 + + Thanks to Matthew Garrett and Ubuntu for the hw loan to get this working. + + Still no 3D driver support but at least you should get CP acceleration for + 2D now. + +commit 6b25a4c48796e022a093f3072574ffe9709ecaf4 +Author: Michel Dänzer <michel(a)tungstengraphics.com> +Date: Wed Apr 4 10:47:29 2007 +0200 + + radeon: Link nearest modes by default for clone mode. + + This makes sure all modes of both CRTCs will be available by default with + MergedFB. + +commit 3c892f163ec1fa9be6e733aab091c9b718f41efc +Author: Michel Dänzer <michel(a)tungstengraphics.com> +Date: Wed Apr 4 09:52:37 2007 +0200 + + radeon: Always sort modes when adding to list. + + This makes sure mode lists will always be sorted from larger to smaller. + +commit 3a8190ccc79969925257e7b980b78d79053d208d +Author: Michel Dänzer <michel(a)tungstengraphics.com> +Date: Wed Apr 4 09:47:07 2007 +0200 + + radeon: Don't shrink virtual size based on secondary modes. + +commit 9b1e97284ce185d358ca756a235d2cee346fa53f +Author: Henry Zhao <henryz(a)localhost.localdomain> +Date: Sat Mar 31 23:01:52 2007 -0800 + + 10205: Radeon driver's own mode validation code does not work properly + +commit 9c2dcd19be8fc2cc29e637d1e9748e66196e3900 +Author: Henry Zhao <henryz(a)localhost.localdomain> +Date: Sat Mar 31 20:10:03 2007 -0800 + + 9337: EDID modes do not participate in validation for CRT monitor + +commit 1acd6d6fa42acec07fb11aeb189f492ddb021cb4 +Author: Michel Dänzer <michel(a)tungstengraphics.com> +Date: Fri Mar 30 11:06:10 2007 +0200 + + radeon: Guard some MergedFB specific code with info->MergedFB tests. + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=10442 . + +commit 1a71106c0e4fe5f650239dc694163fdf52d33663 +Author: Michel Dänzer <michel(a)tungstengraphics.com> +Date: Tue Mar 27 10:13:21 2007 +0200 + + radeon: Fix typo. + +commit f87e57d4d773a019d1cc8a10425c57480430f6a4 +Author: Dave Airlie <airlied(a)linux.ie> +Date: Tue Mar 27 18:08:54 2007 +1000 + + radeon: fix up crtc debug dereference problem + +commit 66b4a571a4e7960da6807d3f30955aa08e89ccc6 +Author: Dave Airlie <airlied(a)linux.ie> +Date: Tue Mar 27 17:00:37 2007 +1000 + + update number to 6.6.191 for rc release + commit fca30a6b581cb6c1466ab1bc316df8fed5d82b60 Author: Alex Deucher <alex(a)botch2.com> Date: Mon Mar 26 23:26:51 2007 -0400 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.6.191/compile new/xf86-video-ati-6.6.192/compile --- old/xf86-video-ati-6.6.191/compile 2006-11-17 08:30:49.000000000 +0100 +++ new/xf86-video-ati-6.6.192/compile 1970-01-01 01:00:00.000000000 +0100 @@ -1,107 +0,0 @@ -#! /bin/sh - -# Wrapper for compilers which do not understand `-c -o'. - -# Copyright 1999, 2000 Free Software Foundation, Inc. -# Written by Tom Tromey <tromey(a)cygnus.com>. -# -# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Usage: -# compile PROGRAM [ARGS]... -# `-o FOO.o' is removed from the args passed to the actual compile. - -# Usage statement added by Billy Biggs <vektor(a)dumbterm.net>. -if [ -z $1 ]; then - echo "Wrapper for compilers which do not understand '-c -o'." - echo "usage: compile PROGRAM [ARGS]..." - echo "'-o FOO.o' is removed from the args passed to the actual compile." - exit 1 -fi - -prog=$1 -shift - -ofile= -cfile= -args= -while test $# -gt 0; do - case "$1" in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we do something ugly here. - ofile=$2 - shift - case "$ofile" in - *.o | *.obj) - ;; - *) - args="$args -o $ofile" - ofile= - ;; - esac - ;; - *.c) - cfile=$1 - args="$args $1" - ;; - *) - args="$args $1" - ;; - esac - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$prog" $args -fi - -# Name of file we expect compiler to create. -cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'` - -# Create the lock directory. -# Note: use `[/.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d -while true; do - if mkdir $lockdir > /dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir $lockdir; exit 1" 1 2 15 - -# Run the compile. -"$prog" $args -status=$? - -if test -f "$cofile"; then - mv "$cofile" "$ofile" -fi - -rmdir $lockdir -exit $status diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.6.191/configure.ac new/xf86-video-ati-6.6.192/configure.ac --- old/xf86-video-ati-6.6.191/configure.ac 2007-03-27 08:58:58.000000000 +0200 +++ new/xf86-video-ati-6.6.192/configure.ac 2007-05-21 00:04:14.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-ati], - 6.6.191, + 6.6.192, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xf86-video-ati) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.6.191/missing new/xf86-video-ati-6.6.192/missing --- old/xf86-video-ati-6.6.191/missing 2006-11-17 08:30:48.000000000 +0100 +++ new/xf86-video-ati-6.6.192/missing 2007-04-27 05:21:26.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2006-05-10.23 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -15,8 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +44,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -74,11 +87,15 @@ lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to <bug-automake(a)gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,14 +104,44 @@ exit 1 ;; - aclocal*) +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case $1 in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $1 in + aclocal*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -102,13 +149,8 @@ ;; autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -116,13 +158,8 @@ ;; autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +177,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -156,20 +188,15 @@ ;; autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -185,74 +212,67 @@ bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -262,32 +282,36 @@ ;; makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +347,8 @@ *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +358,10 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.6.191/src/radeon_bios.c new/xf86-video-ati-6.6.192/src/radeon_bios.c --- old/xf86-video-ati-6.6.191/src/radeon_bios.c 2007-01-04 00:23:18.000000000 +0100 +++ new/xf86-video-ati-6.6.192/src/radeon_bios.c 2007-05-19 05:47:32.000000000 +0200 @@ -181,6 +181,9 @@ case RADEON_GPIO_CRT2_DDC: pRADEONEnt->PortInfo[crtc]->DDCType = DDC_CRT2; break; + case RADEON_LCD_GPIO_MASK: + pRADEONEnt->PortInfo[crtc]->DDCType = DDC_LCD; + break; default: pRADEONEnt->PortInfo[crtc]->DDCType = DDC_NONE_DETECTED; break; @@ -290,7 +293,7 @@ if ((tmp0 = RADEON_BIOS16(tmp + 0x15))) { if ((tmp1 = RADEON_BIOS8(tmp0+2) & 0x07)) { pRADEONEnt->PortInfo[0]->DDCType = tmp1; - if (pRADEONEnt->PortInfo[0]->DDCType > DDC_CRT2) { + if (pRADEONEnt->PortInfo[0]->DDCType > DDC_LCD) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Unknown DDCType %d found\n", pRADEONEnt->PortInfo[0]->DDCType); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.6.191/src/radeon_display.c new/xf86-video-ati-6.6.192/src/radeon_display.c --- old/xf86-video-ati-6.6.191/src/radeon_display.c 2007-03-27 08:55:57.000000000 +0200 +++ new/xf86-video-ati-6.6.192/src/radeon_display.c 2007-05-20 23:20:41.000000000 +0200 @@ -75,12 +75,13 @@ "External" }; -const char *DDCTypeName[5] = { +const char *DDCTypeName[6] = { "NONE", "MONID", "DVI_DDC", "VGA_DDC", - "CRT2_DDC" + "CRT2_DDC", + "LCD_DDC" }; const char *DACTypeName[3] = { @@ -166,10 +167,16 @@ unsigned char *RADEONMMIO = info->MMIO; /* Get the result */ - val = INREG(info->DDCReg); - *Clock = (val & RADEON_GPIO_Y_1) != 0; - *data = (val & RADEON_GPIO_Y_0) != 0; + if (info->DDCReg == RADEON_LCD_GPIO_MASK) { + val = INREG(info->DDCReg+4); + *Clock = (val & (1<<13)) != 0; + *data = (val & (1<<12)) != 0; + } else { + val = INREG(info->DDCReg); + *Clock = (val & RADEON_GPIO_Y_1) != 0; + *data = (val & RADEON_GPIO_Y_0) != 0; + } } static void RADEONI2CPutBits(I2CBusPtr b, int Clock, int data) @@ -179,11 +186,17 @@ unsigned long val; unsigned char *RADEONMMIO = info->MMIO; - val = INREG(info->DDCReg) & (CARD32)~(RADEON_GPIO_EN_0 | RADEON_GPIO_EN_1); - val |= (Clock ? 0:RADEON_GPIO_EN_1); - val |= (data ? 0:RADEON_GPIO_EN_0); - OUTREG(info->DDCReg, val); - + if (info->DDCReg == RADEON_LCD_GPIO_MASK) { + val = INREG(info->DDCReg) & (CARD32)~((1<<12) | (1<<13)); + val |= (Clock ? 0:(1<<13)); + val |= (data ? 0:(1<<12)); + OUTREG(info->DDCReg, val); + } else { + val = INREG(info->DDCReg) & (CARD32)~(RADEON_GPIO_EN_0 | RADEON_GPIO_EN_1); + val |= (Clock ? 0:RADEON_GPIO_EN_1); + val |= (data ? 0:RADEON_GPIO_EN_0); + OUTREG(info->DDCReg, val); + } /* read back to improve reliability on some cards. */ val = INREG(info->DDCReg); } @@ -562,13 +575,16 @@ case DDC_CRT2: info->DDCReg = RADEON_GPIO_CRT2_DDC; break; + case DDC_LCD: + info->DDCReg = RADEON_LCD_GPIO_MASK; + break; default: info->DDCReg = DDCReg; return MT_NONE; } /* Read and output monitor info using DDC2 over I2C bus */ - if (info->pI2CBus && info->ddc2) { + if (info->pI2CBus && info->ddc2 && (info->DDCReg != RADEON_LCD_GPIO_MASK)) { OUTREG(info->DDCReg, INREG(info->DDCReg) & (CARD32)~(RADEON_GPIO_A_0 | RADEON_GPIO_A_1)); @@ -620,15 +636,17 @@ OUTREG(info->DDCReg, INREG(info->DDCReg) | RADEON_GPIO_EN_1); OUTREG(info->DDCReg, INREG(info->DDCReg) | RADEON_GPIO_EN_0); usleep(15000); - if(*MonInfo) break; + if(*MonInfo) break; } + } else if (info->pI2CBus && info->ddc2 && info->DDCReg == RADEON_LCD_GPIO_MASK) { + *MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, info->pI2CBus); } else { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "DDC2/I2C is not properly initialized\n"); MonType = MT_NONE; } OUTREG(info->DDCReg, INREG(info->DDCReg) & - ~(RADEON_GPIO_EN_0 | RADEON_GPIO_EN_1)); + ~(RADEON_GPIO_EN_0 | RADEON_GPIO_EN_1)); if (*MonInfo) { if ((*MonInfo)->rawData[0x14] & 0x80) { @@ -755,13 +773,11 @@ info->VSyncWidth = d_timings->v_sync_width; info->VBlank = d_timings->v_blanking; info->Flags = (d_timings->interlaced ? V_INTERLACE : 0); - if (d_timings->sync == 3) { - switch (d_timings->misc) { - case 0: info->Flags |= V_NHSYNC | V_NVSYNC; break; - case 1: info->Flags |= V_PHSYNC | V_NVSYNC; break; - case 2: info->Flags |= V_NHSYNC | V_PVSYNC; break; - case 3: info->Flags |= V_PHSYNC | V_PVSYNC; break; - } + switch (d_timings->misc) { + case 0: info->Flags |= V_NHSYNC | V_NVSYNC; break; + case 1: info->Flags |= V_PHSYNC | V_NVSYNC; break; + case 2: info->Flags |= V_NHSYNC | V_PVSYNC; break; + case 3: info->Flags |= V_PHSYNC | V_PVSYNC; break; } xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Panel infos found from DDC detailed: %dx%d\n", info->PanelXRes, info->PanelYRes); @@ -776,7 +792,7 @@ for (j = 0; j < 8; j++) { if ((info->PanelXRes < ddc->timings2[j].hsize) && (info->PanelYRes < ddc->timings2[j].vsize)) { - for (p = pScrn->monitor->Modes; p && p->next; p = p->next->next) { + for (p = pScrn->monitor->Modes; p; p = p->next) { if ((ddc->timings2[j].hsize == p->HDisplay) && (ddc->timings2[j].vsize == p->VDisplay)) { float refresh = @@ -2119,7 +2135,9 @@ RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); RADEONConnector *pPort; - if (!pRADEONEnt->HasSecondary || (info->IsSwitching && !info->IsSecondary)) { + if (!pRADEONEnt->HasSecondary || + (pRADEONEnt->HasSecondary && !info->IsSwitching) || + (info->IsSwitching && (!info->IsSecondary))) { pPort = RADEONGetCrtcConnector(pScrn, 1); if (pPort) RADEONUnblankSet(pScrn, pPort); @@ -2142,7 +2160,8 @@ } } - if (info->IsSwitching && info->IsSecondary) { + if ((pRADEONEnt->HasSecondary && !info->IsSwitching) || + (info->IsSwitching && info->IsSecondary)) { pPort = RADEONGetCrtcConnector(pScrn, 2); if (pPort) RADEONUnblankSet(pScrn, pPort); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.6.191/src/radeon_driver.c new/xf86-video-ati-6.6.192/src/radeon_driver.c --- old/xf86-video-ati-6.6.191/src/radeon_driver.c 2007-03-27 08:56:13.000000000 +0200 +++ new/xf86-video-ati-6.6.192/src/radeon_driver.c 2007-05-20 23:20:14.000000000 +0200 @@ -953,7 +953,8 @@ if (ref_div < 2) { CARD32 tmp; tmp = INPLL(pScrn, RADEON_PPLL_REF_DIV); - if (IS_R300_VARIANT || (info->ChipFamily == CHIP_FAMILY_RS300)) + if (IS_R300_VARIANT || (info->ChipFamily == CHIP_FAMILY_RS300) + || (info->ChipFamily == CHIP_FAMILY_RS400)) ref_div = (tmp & R300_PPLL_REF_DIV_ACC_MASK) >> R300_PPLL_REF_DIV_ACC_SHIFT; else @@ -1033,7 +1034,8 @@ CARD32 tmp; tmp = INPLL(pScrn, RADEON_PPLL_REF_DIV); if (IS_R300_VARIANT || - (info->ChipFamily == CHIP_FAMILY_RS300)) { + (info->ChipFamily == CHIP_FAMILY_RS300) || + (info->ChipFamily == CHIP_FAMILY_RS400)) { pll->reference_div = (tmp & R300_PPLL_REF_DIV_ACC_MASK) >> R300_PPLL_REF_DIV_ACC_SHIFT; } else { pll->reference_div = tmp & RADEON_PPLL_REF_DIV_MASK; @@ -1903,10 +1905,15 @@ } } + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%s card detected\n", (info->cardType==CARD_PCI) ? "PCI" : (info->cardType==CARD_PCIE) ? "PCIE" : "AGP"); + /* treat PCIE IGP cards as PCI */ + if (info->cardType == CARD_PCIE && info->IsIGP) + info->cardType = CARD_PCI; + if ((s = xf86GetOptValString(info->Options, OPTION_BUS_TYPE))) { if (strcmp(s, "AGP") == 0) { info->cardType = CARD_AGP; @@ -2022,15 +2029,19 @@ xf86ReturnOptValBool(info->Options, OPTION_DDC_MODE, FALSE); /* don't use RMX if we have a dual-tmds panels */ - if ((connector = RADEONGetCrtcConnector(pScrn, 2))) if (connector->MonType == MT_DFP) info->ddc_mode = TRUE; /* don't use RMX if we are Dell Server */ if (info->IsDellServer) - { info->ddc_mode = TRUE; + /* IBM Lewis server have troubles using the on-chip RMX mode */ + if (info->ChipFamily == CHIP_FAMILY_RV100 && !pRADEONEnt->HasCRTC2 && pRADEONEnt->PortInfo[0]->MonInfo) { + struct vendor *ven = &pRADEONEnt->PortInfo[0]->MonInfo->vendor; + if (ven && ven->prod_id == 0x029a && ven->serial == 0x01010101) + info->ddc_mode = TRUE; } + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Validating modes on %s head ---------\n", info->IsSecondary ? "Secondary" : "Primary"); @@ -2125,7 +2136,7 @@ * 'stretched' from their native mode. */ if (info->DisplayType == MT_CRT && !info->ddc_mode) { - + xf86SetDDCproperties(pScrn, pScrn->monitor->DDC); modesFound = xf86ValidateModes(pScrn, pScrn->monitor->Modes, @@ -2212,7 +2223,7 @@ pScrn->display->virtualY, info->FbMapSize, LOOKUP_BEST_REFRESH); - else if (!info->IsSecondary) + else if (!info->IsSecondary && !info->ddc_mode) modesFound = RADEONValidateFPModes(pScrn, pScrn->display->modes); } } @@ -2247,7 +2258,7 @@ /* If we have 2 screens from the config file, we don't need * to do clone thing, let each screen handles one head. */ - if (!pRADEONEnt->HasSecondary) { + if (info->MergedFB) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Validating CRTC2 modes for MergedFB ------------ \n"); @@ -2273,7 +2284,7 @@ if (pRADEONEnt->HasCRTC2) { - if(pRADEONEnt->Controller[1]->binding == 1) { + if(pRADEONEnt->Controller[1]->binding == 1 && info->MergedFB) { xf86SetCrtcForModes(info->CRT2pScrn, INTERLACE_HALVE_V); @@ -2321,7 +2332,11 @@ } } + else + info->MergedFB = FALSE; } + else + info->MergedFB = FALSE; if (info->MergedFB) { /* If no virtual dimension was given by the user, @@ -2526,18 +2541,6 @@ } } - if (info->Chipset == PCI_CHIP_RS400_5A41 || - info->Chipset == PCI_CHIP_RS400_5A42 || - info->Chipset == PCI_CHIP_RC410_5A61 || - info->Chipset == PCI_CHIP_RC410_5A62 || - info->Chipset == PCI_CHIP_RS480_5954 || - info->Chipset == PCI_CHIP_RS480_5955 || - info->Chipset == PCI_CHIP_RS482_5974 || - info->Chipset == PCI_CHIP_RS482_5975) { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Direct rendering broken on XPRESS 200 and 200M\n"); - return FALSE; - } if (!xf86ReturnOptValBool(info->Options, OPTION_DRI, TRUE)) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, @@ -2564,6 +2567,24 @@ info->pKernelDRMVersion->version_minor, info->pKernelDRMVersion->version_patchlevel); + if (info->Chipset == PCI_CHIP_RS400_5A41 || + info->Chipset == PCI_CHIP_RS400_5A42 || + info->Chipset == PCI_CHIP_RC410_5A61 || + info->Chipset == PCI_CHIP_RC410_5A62 || + info->Chipset == PCI_CHIP_RS480_5954 || + info->Chipset == PCI_CHIP_RS480_5955 || + info->Chipset == PCI_CHIP_RS482_5974 || + info->Chipset == PCI_CHIP_RS482_5975) { + + if (info->pKernelDRMVersion->version_minor < 27) { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Direct rendering broken on XPRESS 200 and 200M with DRI less than 1.27\n"); + return FALSE; + } + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Direct rendering experimental on RS400/Xpress 200 enabled\n"); + } + if (xf86ReturnOptValBool(info->Options, OPTION_CP_PIO, FALSE)) { xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Forcing CP into PIO mode\n"); info->CPMode = RADEON_DEFAULT_CP_PIO_MODE; @@ -2950,7 +2971,9 @@ RADEONGetBIOSInfo(pScrn, pInt10); - RADEONSetupConnectors(pScrn); + if (!info->IsSecondary) { + RADEONSetupConnectors(pScrn); + } RADEONMapControllers(pScrn); RADEONGetClockInfo(pScrn); @@ -4734,7 +4757,8 @@ RADEONPllErrataAfterIndex(info); if (IS_R300_VARIANT || - (info->ChipFamily == CHIP_FAMILY_RS300)) { + (info->ChipFamily == CHIP_FAMILY_RS300) || + (info->ChipFamily == CHIP_FAMILY_RS400)) { if (restore->ppll_ref_div & R300_PPLL_REF_DIV_ACC_MASK) { /* When restoring console mode, use saved PPLL_REF_DIV * setting. @@ -6333,9 +6357,10 @@ ScrnInfoPtr pScrn0 = NULL; #if RADEON_DEBUG - ErrorF("%-12.12s %7.2f %4d %4d %4d %4d %4d %4d %4d %4d (%d,%d)", + if (crtc1 && (crtc_mask & 1)) { + ErrorF("%-12.12s %7.2f %4d %4d %4d %4d %4d %4d %4d %4d (%d,%d)", crtc1->name, - dot_clock, + crtc1->Clock/1000.0, crtc1->HDisplay, crtc1->HSyncStart, @@ -6348,40 +6373,44 @@ crtc1->VTotal, pScrn->depth, pScrn->bitsPerPixel); - if (crtc1->Flags & V_DBLSCAN) ErrorF(" D"); - if (crtc1->Flags & V_CSYNC) ErrorF(" C"); - if (crtc1->Flags & V_INTERLACE) ErrorF(" I"); - if (crtc1->Flags & V_PHSYNC) ErrorF(" +H"); - if (crtc1->Flags & V_NHSYNC) ErrorF(" -H"); - if (crtc1->Flags & V_PVSYNC) ErrorF(" +V"); - if (crtc1->Flags & V_NVSYNC) ErrorF(" -V"); - ErrorF("\n"); - ErrorF("%-12.12s %7.2f %4d %4d %4d %4d %4d %4d %4d %4d (%d,%d)", - crtc1->name, - crtc1->Clock/1000.0, - - crtc1->CrtcHDisplay, - crtc1->CrtcHSyncStart, - crtc1->CrtcHSyncEnd, - crtc1->CrtcHTotal, - - crtc1->CrtcVDisplay, - crtc1->CrtcVSyncStart, - crtc1->CrtcVSyncEnd, - crtc1->CrtcVTotal, + if (crtc1->Flags & V_DBLSCAN) ErrorF(" D"); + if (crtc1->Flags & V_CSYNC) ErrorF(" C"); + if (crtc1->Flags & V_INTERLACE) ErrorF(" I"); + if (crtc1->Flags & V_PHSYNC) ErrorF(" +H"); + if (crtc1->Flags & V_NHSYNC) ErrorF(" -H"); + if (crtc1->Flags & V_PVSYNC) ErrorF(" +V"); + if (crtc1->Flags & V_NVSYNC) ErrorF(" -V"); + ErrorF("\n"); + } + if (crtc2 && (crtc_mask & 2)) { + ErrorF("%-12.12s %7.2f %4d %4d %4d %4d %4d %4d %4d %4d (%d,%d)", + crtc2->name, + crtc2->Clock/1000.0, + + crtc2->CrtcHDisplay, + crtc2->CrtcHSyncStart, + crtc2->CrtcHSyncEnd, + crtc2->CrtcHTotal, + + crtc2->CrtcVDisplay, + crtc2->CrtcVSyncStart, + crtc2->CrtcVSyncEnd, + crtc2->CrtcVTotal, pScrn->depth, pScrn->bitsPerPixel); - if (crtc1->Flags & V_DBLSCAN) ErrorF(" D"); - if (crtc1->Flags & V_CSYNC) ErrorF(" C"); - if (crtc1->Flags & V_INTERLACE) ErrorF(" I"); - if (crtc1->Flags & V_PHSYNC) ErrorF(" +H"); - if (crtc1->Flags & V_NHSYNC) ErrorF(" -H"); - if (crtc1->Flags & V_PVSYNC) ErrorF(" +V"); - if (crtc1->Flags & V_NVSYNC) ErrorF(" -V"); - ErrorF("\n"); + if (crtc2->Flags & V_DBLSCAN) ErrorF(" D"); + if (crtc2->Flags & V_CSYNC) ErrorF(" C"); + if (crtc2->Flags & V_INTERLACE) ErrorF(" I"); + if (crtc2->Flags & V_PHSYNC) ErrorF(" +H"); + if (crtc2->Flags & V_NHSYNC) ErrorF(" -H"); + if (crtc2->Flags & V_PVSYNC) ErrorF(" +V"); + if (crtc2->Flags & V_NVSYNC) ErrorF(" -V"); + ErrorF("\n"); + } #endif - info->Flags = crtc1->Flags; + if (crtc1 && (crtc_mask & 1)) + info->Flags = crtc1->Flags; RADEONInitMemMapRegisters(pScrn, save, info); RADEONInitCommonRegisters(save, info); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.6.191/src/radeon_mergedfb.c new/xf86-video-ati-6.6.192/src/radeon_mergedfb.c --- old/xf86-video-ati-6.6.191/src/radeon_mergedfb.c 2007-01-04 00:23:18.000000000 +0100 +++ new/xf86-video-ati-6.6.192/src/radeon_mergedfb.c 2007-05-19 05:47:32.000000000 +0200 @@ -215,8 +215,13 @@ * extension to allow selecting among a number of modes whose merged result * looks identical but consists of different modes for CRT1 and CRT2 */ - mode->VRefresh = (float)((i->Clock * 1000.0 / i->HTotal / i->VTotal) * 100 + - (j->Clock * 1000.0 / j->HTotal / j->VTotal)); + { + float ref1, ref2; + ref1 = ((float)i->Clock * 100.0 / i->HTotal / i->VTotal) * 50.0; + ref2 = ((float)j->Clock * 100.0 / j->HTotal / j->VTotal) / 2.0; + + mode->VRefresh = (float) ref1 + ref2; + } mode->Clock = (int)(mode->VRefresh * 0.001 * mode->HTotal * mode->VTotal); @@ -389,7 +394,7 @@ if(srel != radeonClone) { if(mode3 && mode4 && !info->NonRect) { mode1 = mode3; - mode2 = mode2; + mode2 = mode4; } } @@ -536,12 +541,33 @@ DisplayModePtr p, q, result = NULL; xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Clone mode, list all common modes\n"); - for (p = i; p->next != i; p = p->next) - for (q = j; q->next != j; q = q->next) - if ((p->HDisplay == q->HDisplay) && - (p->VDisplay == q->VDisplay)) - result = RADEONCopyModeNLink(pScrn, result, p, q, srel); + "Clone mode, linking all nearest modes\n"); + + p = i; + q = j; + + result = RADEONCopyModeNLink(pScrn, result, p, q, srel); + + while (p->next != i || q->next != j) { + DisplayModePtr next_p = p; + + if (q->next == j || (p->next != i && + (p->HDisplay > q->HDisplay || + (p->HDisplay == q->HDisplay && + p->VDisplay >= q->VDisplay)))) + next_p = p->next; + + if (p->next == i || (q->next != j && + (q->HDisplay > p->HDisplay || + (q->HDisplay == p->HDisplay && + q->VDisplay >= p->VDisplay)))) + q = q->next; + + p = next_p; + + result = RADEONCopyModeNLink(pScrn, result, p, q, srel); + } + return result; } else { xf86DrvMsg(pScrn->scrnIndex, X_INFO, @@ -581,8 +607,10 @@ info->CRT1XOffs = info->CRT2XOffs = 0; maxh -= (info->CRT1XOffs + info->CRT2XOffs); } - pScrn->virtualX = maxh; - pScrn->displayWidth = maxh; + if (maxh > pScrn->virtualX) + pScrn->virtualX = maxh; + if (maxh > pScrn->displayWidth) + pScrn->displayWidth = maxh; xf86DrvMsg(pScrn->scrnIndex, X_PROBED, str, "width", maxh); } else { if(maxh < pScrn->display->virtualX) { @@ -592,7 +620,8 @@ } if(!(pScrn->display->virtualY)) { - pScrn->virtualY = maxv; + if (maxv > pScrn->virtualY) + pScrn->virtualY = maxv; xf86DrvMsg(pScrn->scrnIndex, X_PROBED, str, "height", maxv); } else { if(maxv < pScrn->display->virtualY) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.6.191/src/radeon_modes.c new/xf86-video-ati-6.6.192/src/radeon_modes.c --- old/xf86-video-ati-6.6.191/src/radeon_modes.c 2007-03-27 08:55:57.000000000 +0200 +++ new/xf86-video-ati-6.6.192/src/radeon_modes.c 2007-05-19 05:47:32.000000000 +0200 @@ -86,10 +86,16 @@ p = *last; while (p) { - if ((((*new)->HDisplay < p->HDisplay) && + if (((*new)->HDisplay < p->HDisplay) || + (((*new)->HDisplay == p->HDisplay) && ((*new)->VDisplay < p->VDisplay)) || (((*new)->HDisplay == p->HDisplay) && ((*new)->VDisplay == p->VDisplay) && + ((*new)->type < p->type) && + !(((*new)->type == M_T_USERDEF) || (!(*new)->type))) || + (((*new)->HDisplay == p->HDisplay) && + ((*new)->VDisplay == p->VDisplay) && + ((*new)->type == p->type) && ((*new)->Clock < p->Clock))) { if (p->next) p->next->prev = *new; @@ -180,18 +186,17 @@ new->status = MODE_OK; #ifdef M_T_PREFERRED if (PREFERRED_TIMING_MODE(ddc->features.msc)) - new->type = M_T_PREFERRED; - else + new->type |= M_T_PREFERRED; +#endif +#ifdef M_T_DRIVER + new->type |= M_T_DRIVER; #endif - new->type = M_T_DEFAULT; - if (d_timings->sync == 3) { - switch (d_timings->misc) { - case 0: new->Flags |= V_NHSYNC | V_NVSYNC; break; - case 1: new->Flags |= V_PHSYNC | V_NVSYNC; break; - case 2: new->Flags |= V_NHSYNC | V_PVSYNC; break; - case 3: new->Flags |= V_PHSYNC | V_PVSYNC; break; - } + switch (d_timings->misc) { + case 0: new->Flags |= V_NHSYNC | V_NVSYNC; break; + case 1: new->Flags |= V_PHSYNC | V_NVSYNC; break; + case 2: new->Flags |= V_NHSYNC | V_PVSYNC; break; + case 3: new->Flags |= V_PHSYNC | V_PVSYNC; break; } count++; @@ -207,8 +212,10 @@ for (j = 0; j < 8; j++) { if (ddc->timings2[j].hsize == 0 || ddc->timings2[j].vsize == 0) continue; - for (p = pScrn->monitor->Modes; p && p->next; p = p->next->next) { + for (p = pScrn->monitor->Modes; p; p = p->next) { /* Ignore all double scan modes */ + if (p->Flags & V_DBLSCAN) + continue; if ((ddc->timings2[j].hsize == p->HDisplay) && (ddc->timings2[j].vsize == p->VDisplay)) { float refresh = @@ -221,7 +228,8 @@ new->name = xnfalloc(strlen(p->name) + 1); strcpy(new->name, p->name); new->status = MODE_OK; - new->type = M_T_DEFAULT; + if ((new->type != M_T_USERDEF) && (new->type)) + new->type = M_T_DEFAULT; count++; @@ -240,7 +248,10 @@ tmp = (ddc->timings1.t1 << 8) | ddc->timings1.t2; for (j = 0; j < 16; j++) { if (tmp & (1 << j)) { - for (p = pScrn->monitor->Modes; p && p->next; p = p->next->next) { + for (p = pScrn->monitor->Modes; p; p = p->next) { + /* Ignore all double scan modes */ + if (p->Flags & V_DBLSCAN) + continue; if ((est_timings[j].hsize == p->HDisplay) && (est_timings[j].vsize == p->VDisplay)) { float refresh = @@ -253,7 +264,8 @@ new->name = xnfalloc(strlen(p->name) + 1); strcpy(new->name, p->name); new->status = MODE_OK; - new->type = M_T_DEFAULT; + if ((new->type != M_T_USERDEF) && (new->type)) + new->type = M_T_DEFAULT; count++; @@ -361,15 +373,7 @@ if (p == ddcModes) ddcModes = p->next; /* Add to used modes */ - if (last) { - last->next = p; - p->prev = last; - } else { - first = p; - p->prev = NULL; - } - p->next = NULL; - last = p; + RADEONSortModes(&p, &first, &last); break; } @@ -390,15 +394,7 @@ if (p == ddcModes) ddcModes = p->next; /* Add to used modes */ - if (last) { - last->next = p; - p->prev = last; - } else { - first = p; - p->prev = NULL; - } - p->next = NULL; - last = p; + RADEONSortModes(&p, &first, &last); } } @@ -546,12 +542,7 @@ new->type |= M_T_USERDEF; - new->next = NULL; - new->prev = last; - - if (last) last->next = new; - last = new; - if (!first) first = new; + RADEONSortModes(&new, &first, &last); pScrn->display->virtualX = pScrn->virtualX = MAX(pScrn->virtualX, width); @@ -569,7 +560,7 @@ } /* add in all default vesa modes smaller than panel size, used for randr*/ - for (p = pScrn->monitor->Modes; p && p->next; p = p->next->next) { + for (p = pScrn->monitor->Modes; p; p = p->next) { if ((p->HDisplay <= info->PanelXRes) && (p->VDisplay <= info->PanelYRes)) { tmp = first; while (tmp) { @@ -597,12 +588,7 @@ new->type |= M_T_DEFAULT; - new->next = NULL; - new->prev = last; - - if (last) last->next = new; - last = new; - if (!first) first = new; + RADEONSortModes(&new, &first, &last); } } } @@ -675,7 +661,7 @@ * 'stretched' from their native mode. */ if (info->MergeType == MT_CRT && !info->ddc_mode) { - + xf86SetDDCproperties(pScrn, pScrn->monitor->DDC); modesFound = xf86ValidateModes(pScrn, pScrn->monitor->Modes, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.6.191/src/radeon_probe.h new/xf86-video-ati-6.6.192/src/radeon_probe.h --- old/xf86-video-ati-6.6.191/src/radeon_probe.h 2007-03-27 08:56:13.000000000 +0200 +++ new/xf86-video-ati-6.6.192/src/radeon_probe.h 2007-05-19 05:47:32.000000000 +0200 @@ -48,7 +48,8 @@ DDC_MONID, DDC_DVI, DDC_VGA, - DDC_CRT2 + DDC_CRT2, + DDC_LCD, } RADEONDDCType; typedef enum diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.6.191/src/radeon_reg.h new/xf86-video-ati-6.6.192/src/radeon_reg.h --- old/xf86-video-ati-6.6.191/src/radeon_reg.h 2007-03-27 08:56:13.000000000 +0200 +++ new/xf86-video-ati-6.6.192/src/radeon_reg.h 2007-05-08 16:24:25.000000000 +0200 @@ -907,6 +907,8 @@ # define RADEON_IO_MCLK_MAX_DYN_STOP_LAT (1<<13) # define RADEON_MC_MCLK_DYN_ENABLE (1 << 14) # define RADEON_IO_MCLK_DYN_ENABLE (1 << 15) +#define RADEON_LCD_GPIO_MASK 0x01a0 +#define RADEON_LCD_GPIO_Y_REG 0x01a4 #define RADEON_MDGPIO_A_REG 0x01ac #define RADEON_MDGPIO_EN_REG 0x01b0 #define RADEON_MDGPIO_MASK 0x0198 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sax2
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package sax2 checked in at Mon May 21 12:51:28 CEST 2007. -------- --- sax2/sax2.changes 2007-05-16 10:14:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2007-05-21 11:26:41.847445000 +0200 @@ -1,0 +2,11 @@ +Mon May 21 10:43:45 CEST 2007 - ms(a)suse.de + +- update x11 DB for use of intel driver (#214943) +- added Samsung 931C monitor into the CDB (#275595) + +------------------------------------------------------------------- +Thu May 17 12:12:29 CEST 2007 - ms(a)suse.de + +- include hwinfo changes + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sax2.spec ++++++ --- /var/tmp/diff_new_pack.B11309/_old 2007-05-21 12:50:45.000000000 +0200 +++ /var/tmp/diff_new_pack.B11309/_new 2007-05-21 12:50:45.000000000 +0200 @@ -45,7 +45,7 @@ %endif Summary: SuSE advanced X Window System-configuration Version: 8.1 -Release: 152 +Release: 154 Group: System/X11/Utilities License: GNU General Public License (GPL) Source: sax2.tar.bz2 @@ -472,6 +472,11 @@ %endif %changelog +* Mon May 21 2007 - ms(a)suse.de +- update x11 DB for use of intel driver (#214943) +- added Samsung 931C monitor into the CDB (#275595) +* Thu May 17 2007 - ms(a)suse.de +- include hwinfo changes * Wed May 16 2007 - ms(a)suse.de - do not calculate modelines if fbdev driver is used (#265498) * Fri May 11 2007 - ms(a)suse.de ++++++ sax2.tar.bz2 ++++++ sax2/sax2.tar.bz2 /mounts/work_src_done/STABLE/sax2/sax2.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mkinitrd
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package mkinitrd checked in at Mon May 21 12:48:04 CEST 2007. -------- --- mkinitrd/mkinitrd.changes 2007-05-11 17:32:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2007-05-21 11:41:16.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 21 11:40:58 CEST 2007 - agraf(a)suse.de + +- added missing shebang entries + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.BQ2857/_old 2007-05-21 12:47:06.000000000 +0200 +++ /var/tmp/diff_new_pack.BQ2857/_new 2007-05-21 12:47:06.000000000 +0200 @@ -18,7 +18,7 @@ Requires: coreutils modutils util-linux grep gzip sed gawk cpio udev pciutils sysvinit file Autoreqprov: on Version: 2.0 -Release: 1 +Release: 3 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tgz @@ -92,6 +92,8 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog +* Mon May 21 2007 - agraf(a)suse.de +- added missing shebang entries * Fri May 11 2007 - agraf(a)suse.de - Modularize mkinitrd (FATE #302106) - Partly rewrite to create a slick and clean structure ++++++ mkinitrd.tgz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/boot/05-firewire.sh new/mkinitrd-2.0/lib/mkinitrd/boot/05-firewire.sh --- old/mkinitrd-2.0/lib/mkinitrd/boot/05-firewire.sh 2007-05-02 16:09:49.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/boot/05-firewire.sh 2007-05-21 11:39:14.000000000 +0200 @@ -1,3 +1,4 @@ +#!/bin/bash #%requires: blogd #%udevmodules: ohci1394 #%if: "$root_firewire" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/setup/070-storage.sh new/mkinitrd-2.0/lib/mkinitrd/setup/070-storage.sh --- old/mkinitrd-2.0/lib/mkinitrd/setup/070-storage.sh 2007-05-07 17:24:02.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/setup/070-storage.sh 2007-05-21 11:39:27.000000000 +0200 @@ -1,3 +1,4 @@ +#!/bin/bash # usage: block_driver <major id> block_driver() { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/setup/16-mount.sh new/mkinitrd-2.0/lib/mkinitrd/setup/16-mount.sh --- old/mkinitrd-2.0/lib/mkinitrd/setup/16-mount.sh 2007-05-07 11:48:46.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/setup/16-mount.sh 2007-05-21 11:39:36.000000000 +0200 @@ -1,3 +1,4 @@ +#!/bin/bash # don't include a non-existant fsck rootfsck="/sbin/fsck.${rootfstype}" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdepim3
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package kdepim3 checked in at Mon May 21 12:46:21 CEST 2007. -------- --- KDE/kdepim3/kdepim3.changes 2007-05-11 19:54:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepim3/kdepim3.changes 2007-05-21 09:06:41.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 21 09:06:22 CEST 2007 - wstephenson(a)suse.de + +- remove dimap patch pending further work + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim3.spec ++++++ --- /var/tmp/diff_new_pack.r30475/_old 2007-05-21 12:44:55.000000000 +0200 +++ /var/tmp/diff_new_pack.r30475/_new 2007-05-21 12:44:55.000000000 +0200 @@ -29,7 +29,7 @@ Group: System/GUI/KDE Summary: Personal Information Manager Software for KDE Version: 3.5.6 -Release: 33 +Release: 39 URL: http://www.kde.org/ Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) Requires: kdebase3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) @@ -205,7 +205,7 @@ %patch24 %patch25 %patch28 -%patch29 +#%patch29 %patch30 . /etc/opt/kde3/common_options update_admin @@ -682,6 +682,8 @@ /opt/kde3/%_lib/kde3/plugins/designer/kpartsdesignerplugin.* %changelog +* Mon May 21 2007 - wstephenson(a)suse.de +- remove dimap patch pending further work * Fri May 11 2007 - dmueller(a)suse.de - reduce size * Tue May 08 2007 - dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase3-SuSE
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package kdebase3-SuSE checked in at Mon May 21 12:44:46 CEST 2007. -------- --- KDE/kdebase3-SuSE/kdebase3-SuSE.changes 2007-05-19 17:21:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase3-SuSE/kdebase3-SuSE.changes 2007-05-21 09:31:35.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 21 09:31:24 CEST 2007 - stbinner(a)suse.de + +- update one bookmark (#276456) +- add mime type for Dia (#276483) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3-SuSE.spec ++++++ --- /var/tmp/diff_new_pack.B28487/_old 2007-05-21 12:44:19.000000000 +0200 +++ /var/tmp/diff_new_pack.B28487/_new 2007-05-21 12:44:19.000000000 +0200 @@ -35,7 +35,7 @@ PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 10.3 -Release: 50 +Release: 52 Source0: kdebase-SuSE-%{version}.tar.bz2 Source2: kdebase3-SuSE-displaymanager.fillup Source3: kdebase3-SuSE-windowmanager.fillup @@ -181,6 +181,9 @@ /var/lib/kde-profiles %changelog +* Mon May 21 2007 - stbinner(a)suse.de +- update one bookmark (#276456) +- add mime type for Dia (#276483) * Sat May 19 2007 - coolo(a)suse.de - fix desktop files * Mon May 14 2007 - coolo(a)suse.de ++++++ kdebase-SuSE-10.3.tar.bz2 ++++++ ++++ 1991 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 file
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package file checked in at Mon May 21 12:44:11 CEST 2007. -------- --- file/file.changes 2007-05-14 13:19:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file.changes 2007-05-21 11:50:29.821091000 +0200 @@ -1,0 +2,5 @@ +Mon May 21 11:49:45 CEST 2007 - werner(a)suse.de + +- Expand search area used before regex (also bug #263754) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.w27386/_old 2007-05-21 12:43:57.000000000 +0200 +++ /var/tmp/diff_new_pack.w27386/_new 2007-05-21 12:43:57.000000000 +0200 @@ -17,7 +17,7 @@ Group: Productivity/File utilities Autoreqprov: on Version: 4.20 -Release: 13 +Release: 15 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Patch: file-%{version}.dif @@ -147,6 +147,8 @@ %attr(644,root,root) %{_mandir}/man3/libmagic.3.gz %changelog +* Mon May 21 2007 - werner(a)suse.de +- Expand search area used before regex (also bug #263754) * Mon May 14 2007 - werner(a)suse.de - More on DoS attack with regex (bug #263754) - Avoid crash on unknown option and enable option `-e' ++++++ file-4.20-reg_dos.dif ++++++ --- /var/tmp/diff_new_pack.w27386/_old 2007-05-21 12:43:57.000000000 +0200 +++ /var/tmp/diff_new_pack.w27386/_new 2007-05-21 12:43:57.000000000 +0200 @@ -8,9 +8,9 @@ -100 regex/c =^\\s*say\ ['"] OS/2 REXX batch file text +#100 regex/c =^\\s*call\\s+rxfuncadd.*sysloadfu OS/2 REXX batch file text +#100 regex/c =^\\s*say\ ['"] OS/2 REXX batch file text -+100 search/0x200 rxfuncadd ++100 search/0xffff rxfuncadd +>100 regex/c =^\\s{0,255}call\\s{1,99}rxfuncadd OS/2 REXX batch file text -+100 search/0x200 say ++100 search/0xffff say +>100 regex/c =^\\s{0,255}say\ ['"] OS/2 REXX batch file text 0 leshort 0x14c MS Windows COFF Intel 80386 object file ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ddd
by root＠Hilbert.suse.de 21 May '07

21 May '07

Hello community, here is the log from the commit of package ddd checked in at Mon May 21 12:43:43 CEST 2007. -------- --- ddd/ddd.changes 2007-03-30 12:12:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/ddd/ddd.changes 2007-05-21 11:01:51.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 21 11:00:58 CEST 2007 - anosek(a)suse.cz + +- added README.SUSE explaning workaround for [#254472] + +------------------------------------------------------------------- New: ---- README.SUSE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ddd.spec ++++++ --- /var/tmp/diff_new_pack.Y26664/_old 2007-05-21 12:43:32.000000000 +0200 +++ /var/tmp/diff_new_pack.Y26664/_new 2007-05-21 12:43:32.000000000 +0200 @@ -19,12 +19,13 @@ Requires: gdb Autoreqprov: on Version: 3.3.11 -Release: 67 +Release: 83 Summary: Debugger with Graphical User Interface URL: http://www.gnu.org/software/ddd Source: ddd-%{version}.tar.bz2 Source1: ddd.png Source2: ddd.desktop +Source3: README.SUSE BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %install_info_prereq # NOTE: We don't want this dependency and desktop-data-SuSE is in all @@ -49,6 +50,7 @@ %setup -q %build +cp %{S:3} . #%{suse_update_config -f libiberty readline/support} CXXFLAGS="$RPM_OPT_FLAGS -Wno-deprecated -fno-strict-aliasing" \ ./configure --prefix=/usr --host=${RPM_ARCH}-suse-linux \ @@ -83,7 +85,7 @@ %files %defattr(-, root, root) -%doc AUTHORS COPYING COPYING.LIB INSTALL NEWS README TIPS TODO +%doc AUTHORS COPYING COPYING.LIB INSTALL NEWS README TIPS TODO README.SUSE %doc doc/ddd-paper.ps doc/*.pdf doc/html %config /usr/share/X11/app-defaults/Ddd %attr(755, root, root) /usr/bin/ddd @@ -94,6 +96,8 @@ /usr/share/pixmaps/ddd.png %changelog +* Mon May 21 2007 - anosek(a)suse.cz +- added README.SUSE explaning workaround for [#254472] * Fri Mar 30 2007 - dmueller(a)suse.de - add ncurses-devel buildrequires * Tue Feb 27 2007 - dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

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

20 May '07

Hello community, here is the log from the commit of package libiniparser checked in at Mon May 21 00:00:14 CEST 2007. -------- --- libiniparser/libiniparser.changes 2006-09-27 00:36:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/libiniparser/libiniparser.changes 2007-05-20 23:07:16.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 20 23:07:03 CEST 2007 - lmuelle(a)suse.de + +- Remove requires on release from devel packages. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libiniparser.spec ++++++ --- /var/tmp/diff_new_pack.O25705/_old 2007-05-21 00:00:05.000000000 +0200 +++ /var/tmp/diff_new_pack.O25705/_new 2007-05-21 00:00:05.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libiniparser (Version 2.15) # -# Copyright (c) 2006 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. # @@ -12,7 +12,7 @@ Name: libiniparser Version: 2.15 -Release: 1 +Release: 33 License: X11/MIT Group: System/Libraries URL: http://ndevilla.free.fr/iniparser/ @@ -36,7 +36,7 @@ Summary: Libraries and Header Files to Develop Programs with libiniparser Support Group: System/Libraries Autoreqprov: on -Requires: libiniparser = %{version}-%{release} +Requires: libiniparser = %{version} %description devel This package contains the static libraries and header files needed to @@ -86,9 +86,11 @@ %{_libdir}/libiniparser.so %doc html -%changelog -n libiniparser +%changelog +* Sun May 20 2007 - lmuelle(a)suse.de +- Remove requires on release from devel packages. * Wed Sep 27 2006 - gd(a)suse.de - Update to version 2.15 -- documentation fixes + - documentation fixes * Tue Apr 11 2006 - lmuelle(a)suse.de - Inital SuSE RPM. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ktorrent
by root＠Hilbert.suse.de 20 May '07

20 May '07

Hello community, here is the log from the commit of package ktorrent checked in at Sun May 20 21:32:21 CEST 2007. -------- --- KDE/ktorrent/ktorrent.changes 2007-05-14 17:37:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/ktorrent/ktorrent.changes 2007-05-20 16:47:40.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 20 16:47:28 CEST 2007 - stbinner(a)suse.de + +- fix package requires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktorrent.spec ++++++ --- /var/tmp/diff_new_pack.X29364/_old 2007-05-20 21:32:12.000000000 +0200 +++ /var/tmp/diff_new_pack.X29364/_new 2007-05-20 21:32:12.000000000 +0200 @@ -17,7 +17,7 @@ Group: Productivity/Networking/Other Summary: KDE BitTorrent Client Version: 2.1.4 -Release: 12 +Release: 14 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define rversion %{version} Source: %{name}-%{rversion}.tar.gz @@ -26,7 +26,7 @@ Patch10: ktorrent-fix-columns.diff Patch15: ktorrent-fix-compiler_warning.diff Patch16: disable-DHT.diff -Requires: %{name} = %{version} +Requires: %{name}-lang = %{version} %description Torrent is a BitTorrent program for KDE. Its main features are: * @@ -104,6 +104,8 @@ /opt/kde3/share/servicetypes/*.desktop %changelog +* Sun May 20 2007 - stbinner(a)suse.de +- fix package requires * Mon May 14 2007 - coolo(a)suse.de - split translations into special package * Tue Apr 24 2007 - stbinner(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 konversation
by root＠Hilbert.suse.de 20 May '07

20 May '07

Hello community, here is the log from the commit of package konversation checked in at Sun May 20 21:32:05 CEST 2007. -------- --- KDE/konversation/konversation.changes 2006-11-23 13:40:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/konversation/konversation.changes 2007-05-20 16:52:26.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 20 16:52:19 CEST 2007 - stbinner(a)suse.de + +- seperate translations in special package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konversation.spec ++++++ --- /var/tmp/diff_new_pack.h28552/_old 2007-05-20 21:31:55.000000000 +0200 +++ /var/tmp/diff_new_pack.h28552/_new 2007-05-20 21:31:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package konversation (Version 1.0.1) # -# Copyright (c) 2006 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. # @@ -18,10 +18,11 @@ Group: Productivity/Networking/IRC Autoreqprov: on Version: 1.0.1 -Release: 21 +Release: 58 Summary: A User-Friendly IRC Client for KDE 3 Source: konversation-%version.tar.bz2 Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) +Requires: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch1: default-channel-suse.diff Patch2: bnc-autoreplace.diff @@ -46,6 +47,7 @@ İsmail D�nmez <ismail(a)kde.org.tr> Eike Hein <sho(a)eikehein.com> +%lang_package %prep %setup -q %patch1 @@ -70,7 +72,9 @@ %suse_update_desktop_file %name IRCClient %find_lang %name -%files -f %name.lang +%files lang -f %name.lang + +%files %defattr(-,root,root) %dir /opt/kde3/share/icons/hicolor/* %dir /opt/kde3/share/icons/hicolor/*/apps @@ -83,7 +87,9 @@ /opt/kde3/share/apps/kconf_update/* /opt/kde3/share/services/* -%changelog -n konversation +%changelog +* Sun May 20 2007 - stbinner(a)suse.de +- seperate translations in special package * Thu Nov 23 2006 - dmueller(a)suse.de - fix defective server list window with compiz * Tue Oct 17 2006 - jreuter(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 kipi-plugins
by root＠Hilbert.suse.de 20 May '07

20 May '07

Hello community, here is the log from the commit of package kipi-plugins checked in at Sun May 20 21:31:44 CEST 2007. -------- --- KDE/kipi-plugins/kipi-plugins.changes 2007-05-14 17:01:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/kipi-plugins/kipi-plugins.changes 2007-05-20 16:48:41.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 20 16:48:37 CEST 2007 - stbinner(a)suse.de + +- fix packages requires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kipi-plugins.spec ++++++ --- /var/tmp/diff_new_pack.Y27960/_old 2007-05-20 21:31:32.000000000 +0200 +++ /var/tmp/diff_new_pack.Y27960/_new 2007-05-20 21:31:32.000000000 +0200 @@ -23,7 +23,7 @@ Group: Productivity/Graphics/Other Summary: KDE Plug-Ins for Image Manipulation Version: 0.1.3+svn655000 -Release: 15 +Release: 17 %define rversion 0.1.3 %if %suse_version > 1000 Recommends: dcraw @@ -32,7 +32,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%{rversion}.tar.bz2 Patch1: svn655000.diff -Requires: %{name} = %{version} +Requires: %{name}-lang = %{version} %description A set of plug-ins for the KDE KIPI interface, used by some KDE imaging @@ -99,6 +99,8 @@ %_mandir/man*/* %changelog +* Sun May 20 2007 - stbinner(a)suse.de +- fix packages requires * Mon May 14 2007 - coolo(a)suse.de - split translations into special package * Thu Apr 19 2007 - dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kerry
by root＠Hilbert.suse.de 20 May '07

20 May '07

Hello community, here is the log from the commit of package kerry checked in at Sun May 20 21:31:21 CEST 2007. -------- --- KDE/kerry/kerry.changes 2007-05-19 16:52:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/kerry/kerry.changes 2007-05-20 16:50:28.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 20 16:50:23 CEST 2007 - stbinner(a)suse.de + +- seperate translations in special package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kerry.spec ++++++ --- /var/tmp/diff_new_pack.R26145/_old 2007-05-20 21:30:56.000000000 +0200 +++ /var/tmp/diff_new_pack.R26145/_new 2007-05-20 21:30:56.000000000 +0200 @@ -17,10 +17,11 @@ Summary: Desktop search tool BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 0.2.2 -Release: 31 +Release: 33 Source: %{name}-%{version}.tar.bz2 Requires: beagle >= 0.2.6 Requires: libbeagle >= 0.2.6 +Requires: %{name}-lang = %{version} Patch: svn.diff Patch2: fix-desktop-file.diff @@ -33,6 +34,7 @@ -------- Stephan Binner <binner(a)kde.org> +%lang_package %prep %setup -q cd kerry @@ -60,7 +62,9 @@ %find_lang %name %endif -%files -f %name.lang +%files lang -f %name.lang + +%files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README TODO /opt/kde3/bin/kerry @@ -82,6 +86,8 @@ /opt/kde3/shutdown/beagled-shutdown.sh %changelog +* Sun May 20 2007 - stbinner(a)suse.de +- seperate translations in special package * Sat May 19 2007 - coolo(a)suse.de - remove X-SuSE-translate from desktop file * Mon Apr 30 2007 - stbinner(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 k3b
by root＠Hilbert.suse.de 20 May '07

20 May '07

Hello community, here is the log from the commit of package k3b checked in at Sun May 20 21:30:49 CEST 2007. -------- --- KDE/k3b/k3b.changes 2007-05-14 15:20:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/k3b/k3b.changes 2007-05-20 16:42:09.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 20 16:42:07 CEST 2007 - stbinner(a)suse.de + +- move one Requires: to where the used variable is defined + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k3b.spec ++++++ --- /var/tmp/diff_new_pack.b24133/_old 2007-05-20 21:30:21.000000000 +0200 +++ /var/tmp/diff_new_pack.b24133/_new 2007-05-20 21:30:21.000000000 +0200 @@ -30,9 +30,9 @@ Group: Productivity/Multimedia/CD/Record Summary: A Universal CD and DVD Burning Application Requires: /usr/bin/cdrecord /usr/bin/mkisofs /usr/bin/cdrdao dvd+rw-tools -Requires: %{name}-lang = %{version} Version: 1.0.1 -Release: 15 +Release: 17 +Requires: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%version.tar.bz2 Source1: %name-i18n-%version.tar.bz2 @@ -224,6 +224,8 @@ %endif %changelog +* Sun May 20 2007 - stbinner(a)suse.de +- move one Requires: to where the used variable is defined * Mon May 14 2007 - coolo(a)suse.de - seperate translations into special package * Thu Apr 19 2007 - stbinner(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 gzip
by root＠Hilbert.suse.de 20 May '07

20 May '07

Hello community, here is the log from the commit of package gzip checked in at Sun May 20 21:30:13 CEST 2007. -------- --- gzip/gzip.changes 2007-04-15 00:03:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/gzip/gzip.changes 2007-05-20 19:17:49.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 20 19:17:21 CEST 2007 - schwab(a)suse.de + +- Fix compiling with glibc 2.6. + +------------------------------------------------------------------- New: ---- futimens.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gzip.spec ++++++ --- /var/tmp/diff_new_pack.W22772/_old 2007-05-20 21:29:59.000000000 +0200 +++ /var/tmp/diff_new_pack.W22772/_new 2007-05-20 21:29:59.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on PreReq: %{install_info_prereq} Version: 1.3.12 -Release: 1 +Release: 9 Summary: GNU Zip Compression Utilities Source: %{name}-%{version}.tar.gz Patch: zgrep.diff @@ -25,6 +25,7 @@ Patch2: zmore.diff Patch3: non-exec-stack.diff Patch4: http://rsync.samba.org/ftp/unpacked/rsync/patches/gzip-rsyncable.diff +Patch5: futimens.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,6 +47,7 @@ %patch2 %patch3 %patch4 -p1 +%patch5 %build CFLAGS="$RPM_OPT_FLAGS -fomit-frame-pointer \ @@ -105,6 +107,8 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %changelog +* Sun May 20 2007 - schwab(a)suse.de +- Fix compiling with glibc 2.6. * Sun Apr 15 2007 - schwab(a)suse.de - Update to gzip 1.3.12. * znew now uses $TMPDIR (default /tmp) instead of always using /tmp. ++++++ futimens.diff ++++++ --- gzip.c +++ gzip.c @@ -1639,7 +1639,7 @@ } } - if (futimens (ofd, ofname, timespec) != 0) + if (gl_futimens (ofd, ofname, timespec) != 0) { int e = errno; WARN ((stderr, "%s: ", program_name)); --- lib/utimens.c +++ lib/utimens.c @@ -75,8 +75,8 @@ Return 0 on success, -1 (setting errno) on failure. */ int -futimens (int fd ATTRIBUTE_UNUSED, - char const *file, struct timespec const timespec[2]) +gl_futimens (int fd ATTRIBUTE_UNUSED, + char const *file, struct timespec const timespec[2]) { /* Some Linux-based NFS clients are buggy, and mishandle time stamps of files in NFS file systems in some cases. We have no @@ -185,5 +185,5 @@ int utimens (char const *file, struct timespec const timespec[2]) { - return futimens (-1, file, timespec); + return gl_futimens (-1, file, timespec); } --- lib/utimens.h +++ lib/utimens.h @@ -1,3 +1,3 @@ #include <time.h> -int futimens (int, char const *, struct timespec const [2]); +int gl_futimens (int, char const *, struct timespec const [2]); int utimens (char const *, struct timespec const [2]); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit coreutils
by root＠Hilbert.suse.de 20 May '07

20 May '07

Hello community, here is the log from the commit of package coreutils checked in at Sun May 20 21:29:53 CEST 2007. -------- --- coreutils/coreutils.changes 2007-05-20 10:53:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/coreutils/coreutils.changes 2007-05-20 19:17:37.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 20 19:17:21 CEST 2007 - schwab(a)suse.de + +- Fix compiling with glibc 2.6. + +------------------------------------------------------------------- New: ---- futimens.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coreutils.spec ++++++ --- /var/tmp/diff_new_pack.z21971/_old 2007-05-20 21:29:23.000000000 +0200 +++ /var/tmp/diff_new_pack.z21971/_new 2007-05-20 21:29:23.000000000 +0200 @@ -21,7 +21,7 @@ Autoreqprov: on PreReq: %{install_info_prereq} Version: 6.9 -Release: 14 +Release: 16 Summary: GNU Core Utilities Source: coreutils-%{version}.tar.bz2 Source1: su.pamd @@ -35,6 +35,7 @@ Patch7: fchownat.diff Patch8: coreutils-sysinfo.diff Patch9: ls-x.diff +Patch10: futimens.diff Patch11: i18n-monthsort.diff Patch16: invalid-ids.diff Patch17: no-no.diff @@ -104,6 +105,7 @@ %patch8 -p1 %patch9 -p1 chmod +x tests/ls/x-option +%patch10 %patch11 %patch16 -p1 %patch17 @@ -177,6 +179,8 @@ %changelog * Sun May 20 2007 - schwab(a)suse.de +- Fix compiling with glibc 2.6. +* Sun May 20 2007 - schwab(a)suse.de - Fix fchownat test. * Mon Apr 02 2007 - schwab(a)suse.de - Fix ls -x. ++++++ futimens.diff ++++++ --- lib/utimens.c +++ lib/utimens.c @@ -75,8 +75,8 @@ Return 0 on success, -1 (setting errno) on failure. */ int -futimens (int fd ATTRIBUTE_UNUSED, - char const *file, struct timespec const timespec[2]) +gl_futimens (int fd ATTRIBUTE_UNUSED, + char const *file, struct timespec const timespec[2]) { /* Some Linux-based NFS clients are buggy, and mishandle time stamps of files in NFS file systems in some cases. We have no @@ -185,5 +185,5 @@ int utimens (char const *file, struct timespec const timespec[2]) { - return futimens (-1, file, timespec); + return gl_futimens (-1, file, timespec); } --- lib/utimens.h +++ lib/utimens.h @@ -1,3 +1,3 @@ #include <time.h> -int futimens (int, char const *, struct timespec const [2]); +int gl_futimens (int, char const *, struct timespec const [2]); int utimens (char const *, struct timespec const [2]); --- src/copy.c +++ src/copy.c @@ -616,7 +616,7 @@ timespec[0] = get_stat_atime (src_sb); timespec[1] = get_stat_mtime (src_sb); - if (futimens (dest_desc, dst_name, timespec) != 0) + if (gl_futimens (dest_desc, dst_name, timespec) != 0) { error (0, errno, _("preserving times for %s"), quote (dst_name)); if (x->require_preserve) --- src/touch.c +++ src/touch.c @@ -182,7 +182,7 @@ t = timespec; } - ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); + ok = (gl_futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); if (fd == STDIN_FILENO) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 amarok
by root＠Hilbert.suse.de 20 May '07

20 May '07

Hello community, here is the log from the commit of package amarok checked in at Sun May 20 21:29:16 CEST 2007. -------- --- KDE/amarok/amarok.changes 2007-05-19 16:42:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/amarok/amarok.changes 2007-05-20 16:26:31.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 20 16:26:05 CEST 2007 - stbinner(a)suse.de + +- move one Requires: to where the used variable is defined + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.I18188/_old 2007-05-20 21:27:54.000000000 +0200 +++ /var/tmp/diff_new_pack.I18188/_new 2007-05-20 21:27:54.000000000 +0200 @@ -25,12 +25,12 @@ License: GNU General Public License (GPL) Requires: kdelibs3 >= %(rpm -q --queryformat '%{VERSION}' kdelibs3) Requires: amarok_engine -Requires: amarok-lang = %{version} Requires: ruby Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE Version: 1.4.5 -Release: 35 +Release: 37 +Requires: amarok-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %define mversion 0.5 Source0: %name-%version.tar.bz2 @@ -260,6 +260,8 @@ %endif %changelog +* Sun May 20 2007 - stbinner(a)suse.de +- move one Requires: to where the used variable is defined * Sat May 19 2007 - coolo(a)suse.de - remove duplicated call to translation macro * Mon May 14 2007 - coolo(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 gcc42
by root＠Hilbert.suse.de 20 May '07

20 May '07

Hello community, here is the log from the commit of package gcc42 checked in at Sun May 20 11:04:43 CEST 2007. -------- --- gcc42/cross-avr-gcc42.changes 2007-05-08 13:44:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc42/cross-avr-gcc42.changes 2007-05-19 19:07:02.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 18 14:13:26 CEST 2007 - rguenther(a)suse.de + +- Update to GCC 4.2.0 release on suse-gcc-4_2-branch. +- Enable profiledbootstrap where possible. + +------------------------------------------------------------------- gcc42.changes: same change libgcj42.changes: same change Old: ---- gcc-4.2.0-20070506.tar.bz2 New: ---- gcc-4.2.0-20070514.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-avr-gcc42.spec ++++++ --- /var/tmp/diff_new_pack.vK9424/_old 2007-05-20 11:03:50.000000000 +0200 +++ /var/tmp/diff_new_pack.vK9424/_new 2007-05-20 11:03:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package cross-avr-gcc42 (Version 4.2.0_20070506) +# spec file for package cross-avr-gcc42 (Version 4.2.0_20070514) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -26,7 +26,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc URL: http://gcc.gnu.org/ License: BSD License and BSD-like, GNU General Public License (GPL) -Version: 4.2.0_20070506 +Version: 4.2.0_20070514 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -286,6 +286,9 @@ %{_prefix} %changelog +* Fri May 18 2007 - rguenther(a)suse.de +- Update to GCC 4.2.0 release on suse-gcc-4_2-branch. +- Enable profiledbootstrap where possible. * Tue May 08 2007 - rguenther(a)suse.de - Update to SVN branch head (r124501). - Add unzip BuildRequires for building libjava. ++++++ gcc42.spec ++++++ --- /var/tmp/diff_new_pack.vK9424/_old 2007-05-20 11:03:50.000000000 +0200 +++ /var/tmp/diff_new_pack.vK9424/_new 2007-05-20 11:03:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gcc42 (Version 4.2.0_20070506) +# spec file for package gcc42 (Version 4.2.0_20070514) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -102,7 +102,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc URL: http://gcc.gnu.org/ License: GNU General Public License (GPL) -Version: 4.2.0_20070506 +Version: 4.2.0_20070514 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -1099,11 +1099,11 @@ --host=%{GCCDIST} # COMMON-END # Only run profiled bootstrap on archs where it works -#%ifarch %ix86 x86_64 ppc ppc64 ia64 -#make profiledbootstrap BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%else +%ifarch %ix86 x86_64 ppc ppc64 ia64 +make profiledbootstrap BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%else make bootstrap-lean BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%endif +%endif #make -C gcc proto make info %if %{run_tests} @@ -1935,6 +1935,9 @@ %endif %changelog +* Fri May 18 2007 - rguenther(a)suse.de +- Update to GCC 4.2.0 release on suse-gcc-4_2-branch. +- Enable profiledbootstrap where possible. * Tue May 08 2007 - rguenther(a)suse.de - Update to SVN branch head (r124501). - Add unzip BuildRequires for building libjava. ++++++ libgcj42.spec ++++++ --- /var/tmp/diff_new_pack.vK9424/_old 2007-05-20 11:03:50.000000000 +0200 +++ /var/tmp/diff_new_pack.vK9424/_new 2007-05-20 11:03:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libgcj42 (Version 4.2.0_20070506) +# spec file for package libgcj42 (Version 4.2.0_20070514) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -114,7 +114,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) -Version: 4.2.0_20070506 +Version: 4.2.0_20070514 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -586,11 +586,11 @@ --host=%{GCCDIST} # COMMON-END # Only run profiled bootstrap on archs where it works -#%ifarch %ix86 x86_64 ppc ppc64 ia64 -#make profiledbootstrap BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%else +%ifarch %ix86 x86_64 ppc ppc64 ia64 +make profiledbootstrap BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%else make bootstrap-lean BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%endif +%endif #make -C gcc proto make info %if %{run_tests} @@ -929,6 +929,9 @@ %endif %changelog +* Fri May 18 2007 - rguenther(a)suse.de +- Update to GCC 4.2.0 release on suse-gcc-4_2-branch. +- Enable profiledbootstrap where possible. * Tue May 08 2007 - rguenther(a)suse.de - Update to SVN branch head (r124501). - Add unzip BuildRequires for building libjava. ++++++ gcc-4.2.0-20070506.tar.bz2 -> gcc-4.2.0-20070514.tar.bz2 ++++++ gcc42/gcc-4.2.0-20070506.tar.bz2 /mounts/work_src_done/STABLE/gcc42/gcc-4.2.0-20070514.tar.bz2 differ: byte 11, line 1 ++++++ gcc.spec.in ++++++ --- gcc42/gcc.spec.in 2007-05-08 13:44:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc42/gcc.spec.in 2007-05-19 19:06:52.000000000 +0200 @@ -117,7 +117,7 @@ URL: http://gcc.gnu.org/ License: GPL -Version: 4.2.0_20070506 +Version: 4.2.0_20070514 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -848,11 +848,11 @@ # COMMON-END # Only run profiled bootstrap on archs where it works -#%ifarch %ix86 x86_64 ppc ppc64 ia64 -#make profiledbootstrap BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%else +%ifarch %ix86 x86_64 ppc ppc64 ia64 +make profiledbootstrap BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%else make bootstrap-lean BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%endif +%endif #make -C gcc proto make info %if %{run_tests} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 coreutils
by root＠Hilbert.suse.de 20 May '07

20 May '07

Hello community, here is the log from the commit of package coreutils checked in at Sun May 20 11:03:25 CEST 2007. -------- --- coreutils/coreutils.changes 2007-04-02 11:17:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/coreutils/coreutils.changes 2007-05-20 10:53:25.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 20 10:53:16 CEST 2007 - schwab(a)suse.de + +- Fix fchownat test. + +------------------------------------------------------------------- New: ---- fchownat.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coreutils.spec ++++++ --- /var/tmp/diff_new_pack.G29414/_old 2007-05-20 11:02:28.000000000 +0200 +++ /var/tmp/diff_new_pack.G29414/_new 2007-05-20 11:02:28.000000000 +0200 @@ -16,12 +16,12 @@ License: GNU General Public License (GPL) Group: System/Base Provides: fileutil fileutils sh-utils sh_utils shellutl stat textutil textutils textutl txtutils -Obsoletes: fileutil fileutils sh-utils sh_utils stat textutil textutils +Obsoletes: fileutils sh-utils stat textutils Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit >= 9 libselinux-64bit = 9 libselinux-x86 = 9 Autoreqprov: on PreReq: %{install_info_prereq} Version: 6.9 -Release: 4 +Release: 14 Summary: GNU Core Utilities Source: coreutils-%{version}.tar.bz2 Source1: su.pamd @@ -32,6 +32,7 @@ Patch4: coreutils-5.3.0-i18n-0.1.patch Patch5: i18n-uninit.diff Patch6: i18n-infloop.diff +Patch7: fchownat.diff Patch8: coreutils-sysinfo.diff Patch9: ls-x.diff Patch11: i18n-monthsort.diff @@ -99,6 +100,7 @@ %patch5 %patch6 %patch +%patch7 %patch8 -p1 %patch9 -p1 chmod +x tests/ls/x-option @@ -174,6 +176,8 @@ %dir %{_prefix}/share/locale/*/LC_TIME %changelog +* Sun May 20 2007 - schwab(a)suse.de +- Fix fchownat test. * Mon Apr 02 2007 - schwab(a)suse.de - Fix ls -x. * Fri Mar 23 2007 - schwab(a)suse.de ++++++ fchownat.diff ++++++ 2007-05-20 Jim Meyering <jim(a)meyering.net> Fix buggy test for the fchownat-deref bug. * m4/openat.m4 (gl_FUNC_FCHOWNAT_DEREF_BUG): Create the dangling symlink required for the run-test. Without it, this test would always declare that fchownat doesn't work, and client code would unnecessarily use the replacement function with fixed libc. (gl_FUNC_FCHOWNAT): Eliminate a variable that wasn't initialized. Reported by Greg Schafer. --- m4/openat.m4 +++ m4/openat.m4 @@ -38,6 +38,7 @@ rm -f $gl_dangle # Arrange for deletion of the temporary file this test creates. ac_clean_files="$ac_clean_files $gl_dangle" + ln -s conftest.no-such $gl_dangle AC_RUN_IFELSE( [AC_LANG_SOURCE( [[ @@ -74,10 +75,7 @@ AC_CHECK_FUNC([fchownat], [have_fchownat=yes], [have_fchownat=no]) if test $have_fchownat = yes; then - gl_FUNC_FCHOWNAT_DEREF_BUG([have_fchownat_bug=yes]) - if test $have_fchownat_bug = no; then - use_replacement_fchownat=no - fi + gl_FUNC_FCHOWNAT_DEREF_BUG([], [use_replacement_fchownat=no]) fi if test $use_replacement_fchownat = yes; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit scsi-changer
by root＠Hilbert.suse.de 20 May '07

20 May '07

Hello community, here is the log from the commit of package scsi-changer checked in at Sun May 20 11:01:08 CEST 2007. -------- --- scsi-changer/scsi-changer.changes 2006-05-26 13:17:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/scsi-changer/scsi-changer.changes 2007-05-19 16:58:44.518160000 +0200 @@ -1,0 +2,5 @@ +Sat May 19 16:56:56 CEST 2007 - coolo(a)suse.de + +- remove X-SuSE-translate from desktop file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scsi-changer.spec ++++++ --- /var/tmp/diff_new_pack.C23298/_old 2007-05-20 11:00:35.000000000 +0200 +++ /var/tmp/diff_new_pack.C23298/_new 2007-05-20 11:00:35.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scsi-changer (Version 0.20) # -# Copyright (c) 2006 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. # @@ -13,11 +13,11 @@ Name: scsi-changer BuildRequires: openmotif openmotif-devel update-desktop-files URL: http://bytesex.org/changer.html -License: GPL +License: GNU General Public License (GPL) Group: Hardware/Other Autoreqprov: on Version: 0.20 -Release: 520 +Release: 572 Summary: SCSI Media Changer Tools Source: %{name}-%{version}.tar.gz Source1: %name.desktop @@ -67,7 +67,9 @@ test "%{buildroot}" != "" -a "%{buildroot}" != "/" &&\ rm -rf "%{buildroot}" -%changelog -n scsi-changer +%changelog +* Sat May 19 2007 - coolo(a)suse.de +- remove X-SuSE-translate from desktop file * Fri May 26 2006 - schwab(a)suse.de - Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de ++++++ scsi-changer.desktop ++++++ --- scsi-changer/scsi-changer.desktop 2004-12-16 11:21:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/scsi-changer/scsi-changer.desktop 2007-05-19 16:56:54.166625000 +0200 @@ -1,5 +1,4 @@ [Desktop Entry] -X-SuSE-translate=true Type=Application Exec=xmover Name=CD Changer ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kerry
by root＠Hilbert.suse.de 20 May '07

20 May '07

Hello community, here is the log from the commit of package kerry checked in at Sun May 20 10:59:47 CEST 2007. -------- --- KDE/kerry/kerry.changes 2007-04-30 14:50:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/kerry/kerry.changes 2007-05-19 16:52:59.912111000 +0200 @@ -1,0 +2,5 @@ +Sat May 19 16:52:38 CEST 2007 - coolo(a)suse.de + +- remove X-SuSE-translate from desktop file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kerry.spec ++++++ --- /var/tmp/diff_new_pack.Q18133/_old 2007-05-20 10:59:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Q18133/_new 2007-05-20 10:59:41.000000000 +0200 @@ -17,7 +17,7 @@ Summary: Desktop search tool BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 0.2.2 -Release: 18 +Release: 31 Source: %{name}-%{version}.tar.bz2 Requires: beagle >= 0.2.6 Requires: libbeagle >= 0.2.6 @@ -82,6 +82,8 @@ /opt/kde3/shutdown/beagled-shutdown.sh %changelog +* Sat May 19 2007 - coolo(a)suse.de +- remove X-SuSE-translate from desktop file * Mon Apr 30 2007 - stbinner(a)suse.de - fix build with desktop-file-validate run * Fri Feb 09 2007 - stbinner(a)suse.de ++++++ fix-desktop-file.diff ++++++ --- /var/tmp/diff_new_pack.Q18133/_old 2007-05-20 10:59:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Q18133/_new 2007-05-20 10:59:41.000000000 +0200 @@ -6,3 +6,34 @@ X-SuSE-translate=true Encoding=UTF-8 Exec=sleep 5 && beagled --bg +Index: kerry/src/kerry.autostart.desktop +=================================================================== +--- kerry/src/kerry.autostart.desktop (Revision 666344) ++++ kerry/src/kerry.autostart.desktop (Revision 666345) +@@ -1,5 +1,4 @@ + [Desktop Entry] +-X-SuSE-translate=true + Encoding=UTF-8 + Name=Kerry Beagle + Name[pa]=ਕੈਰੀ ਬੀਗਲ +Index: kerry/src/beagled.desktop +=================================================================== +--- kerry/src/beagled.desktop (Revision 666344) ++++ kerry/src/beagled.desktop (Revision 666345) +@@ -1,6 +1,5 @@ + [Desktop Entry] + Type=Application +-X-SuSE-translate=true + Encoding=UTF-8 + Exec=sleep 5 && beagled --bg + Name=Beagle Daemon +Index: kerry/src/kerry.desktop +=================================================================== +--- kerry/src/kerry.desktop (Revision 666344) ++++ kerry/src/kerry.desktop (Revision 666345) +@@ -1,5 +1,4 @@ + [Desktop Entry] +-X-SuSE-translate=true + Encoding=UTF-8 + Name=Kerry Beagle + Name[pa]=ਕੈਰੀ ਬੀਗਲ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdebluetooth
by root＠Hilbert.suse.de 20 May '07

20 May '07

Hello community, here is the log from the commit of package kdebluetooth checked in at Sun May 20 10:59:33 CEST 2007. -------- --- KDE/kdebluetooth/kdebluetooth.changes 2007-05-15 09:56:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebluetooth/kdebluetooth.changes 2007-05-19 17:11:59.115437000 +0200 @@ -1,0 +2,5 @@ +Sat May 19 17:11:53 CEST 2007 - coolo(a)suse.de + +- fix duplicated macro call + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebluetooth.spec ++++++ --- /var/tmp/diff_new_pack.Y17001/_old 2007-05-20 10:59:23.000000000 +0200 +++ /var/tmp/diff_new_pack.Y17001/_new 2007-05-20 10:59:23.000000000 +0200 @@ -20,7 +20,7 @@ Group: Hardware/Other Summary: Bluetooth Support for KDE Version: 0.99.0svn576598 -Release: 78 +Release: 79 BuildRoot: %{_tmppath}/%{name}-%{version}-build # svn2dist extragear-pim kdebluetooth Source0: %name-%version.tar.bz2 @@ -100,7 +100,6 @@ for file in $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/bluetooth/*.desktop; do %suse_update_desktop_file $file done -%suse_update_desktop_file $RPM_BUILD_ROOT/opt/kde3/share/applnk/.hidden/kioobex_start.desktop %suse_update_desktop_file $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/kbemusedsrv.desktop %suse_update_desktop_file $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/kbtobexsrv.desktop %suse_update_desktop_file $RPM_BUILD_ROOT/opt/kde3/share/applnk/.hidden/kioobex_start.desktop @@ -152,6 +151,8 @@ #/opt/kde3/share/services/kresources/konnector %changelog +* Sat May 19 2007 - coolo(a)suse.de +- fix duplicated macro call * Tue May 15 2007 - coolo(a)suse.de - use %%find_lang - split translations into special package ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdebase3-SuSE
by root＠Hilbert.suse.de 20 May '07

20 May '07

Hello community, here is the log from the commit of package kdebase3-SuSE checked in at Sun May 20 10:59:14 CEST 2007. -------- --- KDE/kdebase3-SuSE/kdebase3-SuSE.changes 2007-05-14 15:30:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase3-SuSE/kdebase3-SuSE.changes 2007-05-19 17:21:13.114880000 +0200 @@ -1,0 +2,5 @@ +Sat May 19 17:16:49 CEST 2007 - coolo(a)suse.de + +- fix desktop files + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3-SuSE.spec ++++++ --- /var/tmp/diff_new_pack.e15410/_old 2007-05-20 10:59:00.000000000 +0200 +++ /var/tmp/diff_new_pack.e15410/_new 2007-05-20 10:59:00.000000000 +0200 @@ -35,7 +35,7 @@ PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 10.3 -Release: 49 +Release: 50 Source0: kdebase-SuSE-%{version}.tar.bz2 Source2: kdebase3-SuSE-displaymanager.fillup Source3: kdebase3-SuSE-windowmanager.fillup @@ -98,8 +98,7 @@ $RPM_BUILD_ROOT/opt/kde3/share/apps/konqsidebartng/virtual_folders/remote/ftp/suse_ftp.desktop \ $RPM_BUILD_ROOT/opt/kde3/share/apps/konqsidebartng/virtual_folders/remote/web/novell_linux.desktop \ $RPM_BUILD_ROOT/opt/kde3/share/apps/konqsidebartng/virtual_folders/remote/web/opensuse.desktop \ - $RPM_BUILD_ROOT/opt/kde3/share/apps/konqsidebartng/virtual_folders/remote/web/suse_linux.desktop \ - $RPM_BUILD_ROOT/opt/kde3/share/config/SuSE/default/Home.desktop + $RPM_BUILD_ROOT/opt/kde3/share/apps/konqsidebartng/virtual_folders/remote/web/suse_linux.desktop do %suse_update_desktop_file "$i" done @@ -182,6 +181,8 @@ /var/lib/kde-profiles %changelog +* Sat May 19 2007 - coolo(a)suse.de +- fix desktop files * Mon May 14 2007 - coolo(a)suse.de - seperate translations in special package * Tue Apr 24 2007 - coolo(a)suse.de ++++++ kdebase-SuSE-10.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/admin/cvs.sh new/kdebase-SuSE/admin/cvs.sh --- old/kdebase-SuSE/admin/cvs.sh 2007-01-15 10:06:45.000000000 +0100 +++ new/kdebase-SuSE/admin/cvs.sh 2007-05-14 09:16:15.000000000 +0200 @@ -316,7 +316,7 @@ fi fi if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then - VERSION="\"3.5.6\"" + VERSION="\"3.5.7\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then modulename=`pwd`; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/etc/opt/kde3/share/apps/konqueror/servicemenus/publish.desktop new/kdebase-SuSE/config-files/etc/opt/kde3/share/apps/konqueror/servicemenus/publish.desktop --- old/kdebase-SuSE/config-files/etc/opt/kde3/share/apps/konqueror/servicemenus/publish.desktop 2005-09-26 17:27:41.000000000 +0200 +++ new/kdebase-SuSE/config-files/etc/opt/kde3/share/apps/konqueror/servicemenus/publish.desktop 2007-05-14 14:12:51.000000000 +0200 @@ -1,16 +1,11 @@ [Desktop Entry] +Type=Application +Name=Copy to Public Folder ServiceTypes=allfiles -Actions=Publish +Actions=Publish; [Desktop Action Publish] Name=Copy to Public Folder Comment=Copy to public_html folder -Name[cs]=Kopírovat do veřejného adresáře -Name[de]=Kopiere in das öffentliche Verzeichnis -Name[da]=Kopier til det offentlige katalog -Name[nl]=Kopiëer naar de directory publiek -Name[fr]=copier dans le dossier publique -Comment[hu]=Bemásolja a könyvtár tartalmát a public_html könyvtárba -Name[hu]=Másolás a publikus mappába Icon=www Exec=/opt/kde3/bin/publish_item diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/etc/opt/kde3/share/mimelnk/application/x-dosexec.desktop new/kdebase-SuSE/config-files/etc/opt/kde3/share/mimelnk/application/x-dosexec.desktop --- old/kdebase-SuSE/config-files/etc/opt/kde3/share/mimelnk/application/x-dosexec.desktop 2003-01-14 11:10:56.000000000 +0100 +++ new/kdebase-SuSE/config-files/etc/opt/kde3/share/mimelnk/application/x-dosexec.desktop 2007-05-14 14:12:51.000000000 +0200 @@ -2,26 +2,6 @@ [KDE Desktop Entry] DefaultApp=wine Comment=Windows Executable -Comment[cs]=Spustiteln� soubor -Comment[da]=Program -Comment[de]=Windows Programm -Comment[es]=Ejecutable -Comment[fi]=Ohjelma -Comment[fr]=Application -Comment[hr]=Izvr�na datoteka -Comment[hu]=Futtathat� program -Comment[is]=Forrit -Comment[it]=Eseguibile -Comment[nl]=Programma -Comment[no]=Program -Comment[pl]=Program -Comment[pt]=Execut�vel -Comment[pt_BR]=Execut�vel -Comment[ro]=Fi�ier Executabil -Comment[ru]=�� -Comment[sk]=Spustite�n� s�bor -Comment[sl]=Izvodljiv program -Comment[sv]=K�rbar fil (program) Icon=wine_doc Type=MimeType MimeType=application/x-dosexec diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/etc/opt/kde3/share/mimelnk/image/x-portable-greymap.desktop new/kdebase-SuSE/config-files/etc/opt/kde3/share/mimelnk/image/x-portable-greymap.desktop --- old/kdebase-SuSE/config-files/etc/opt/kde3/share/mimelnk/image/x-portable-greymap.desktop 2003-01-14 11:10:56.000000000 +0100 +++ new/kdebase-SuSE/config-files/etc/opt/kde3/share/mimelnk/image/x-portable-greymap.desktop 2007-05-14 14:12:51.000000000 +0200 @@ -5,43 +5,3 @@ Icon=image Patterns=*.pgm; Comment=Portable Graymap File Format -Comment[af]=draagbaar graymap lêer formaat -Comment[ar]=نسق لمف Portable Graymap -Comment[bg]=Портативен файлов формат за Graymap -Comment[bs]=Portable Greymap File format -Comment[cs]=Formát "Portable Graymap File" -Comment[da]=Portable Graymap Filformat -Comment[de]=Portierbares Greymap-Format -Comment[el]=Τύπος Αρχείου Portable Graymap -Comment[en_GB]=Portable Greymap File Format -Comment[eo]=Portebla griza grafiko (PGM) -Comment[es]=Formato de archivo portable Graymap -Comment[et]=Portable Graymap failivorming -Comment[eu]=Graymap Fitxategi Formato Eramangarria -Comment[fi]=Portable Graymap tiedostomuoto -Comment[fr]=Format Portable Greymap -Comment[he]=תבנית קובץ מפת גווני אפור ניידת -Comment[hu]=Portable Graymap fájlformátum -Comment[is]=Bitamyndasnið (sv/hv) óháð vélartegund -Comment[it]=Formato Portable Graymap -Comment[ja]=ポータブルグレイマップファイルフォーマット -Comment[lt]=Perkeliamas graymap bylų formatas -Comment[lv]=Pārvietojams Graymap Faila Formāts -Comment[nb]=Portable Graymap File-format -Comment[nl]=Overdraagbaar greymap-bestandsformaat -Comment[nn]=Portable Graymap File-format -Comment[pl]=Plik przenośnej mapy bitowej (w poziomach szarości) -Comment[pt]=Formato Portável de 'Graymaps' -Comment[pt_BR]=Formato de Arquivo de Mapas de Escalas Cinza Portável -Comment[ro]=Imagine în nuanţe de gri în format portabil -Comment[ru]=GFF -Comment[sk]=Formát Portable Graymap File -Comment[sl]=Prenosljiva sivinska datotečna vrsta -Comment[sv]=Flyttbart gråskalefilformat -Comment[th]=แฟ้มภาพ Portable Graymap -Comment[uk]=Мобільний формат файлів graymap -Comment[ven]=Vhuvha ha faela ya Graymap yau farea -Comment[vi]=Định dạng tập tin Graymap đa nền -Comment[zh_CN]=Portable Graymap 文件格式 -Comment[zh_TW]=可攜式灰階檔案格式 -Comment[zu]=Ifomathi Yefayela Yephathekayo i Graymephu diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/etc/opt/kde3/share/mimelnk/image/x-portable-pixmap.desktop new/kdebase-SuSE/config-files/etc/opt/kde3/share/mimelnk/image/x-portable-pixmap.desktop --- old/kdebase-SuSE/config-files/etc/opt/kde3/share/mimelnk/image/x-portable-pixmap.desktop 2003-01-14 11:10:56.000000000 +0100 +++ new/kdebase-SuSE/config-files/etc/opt/kde3/share/mimelnk/image/x-portable-pixmap.desktop 2007-05-14 14:12:51.000000000 +0200 @@ -5,43 +5,3 @@ Icon=image Patterns=*.ppm;*.pnm; Comment=Portable Pixmap File Format -Comment[af]=draagbaar bispatroon lêer formaat -Comment[ar]=نسق لمف Portable Pixmap -Comment[bg]=Портативен файлов формат за Pixmap -Comment[bs]=Portable Pixmap File format -Comment[cs]=Formát "Portable Pixmap File" -Comment[da]=Portable Pixmap filformat -Comment[de]=Portierbares Pixmap-Format -Comment[el]=Τύπος Αρχείου Portable Pixmap -Comment[eo]=Portebla grafiko (PPM) -Comment[es]=Formato de archivo portable Pixmap -Comment[et]=Portable Pixmap failivorming -Comment[eu]=Pixmap Fitxategi Formato Eramangarria -Comment[fi]=Portable Pixmap tiedostomuoto -Comment[fr]=Format Portable Pixmap -Comment[he]=תבנית קובץ תמונה ניידת -Comment[hu]=Portable Pixmap fájlformátum -Comment[is]=Punktafylkismyndsnið óháð vélartegund -Comment[it]=Formato Portable Pixmap -Comment[ja]=ポータブルピックスマップファイルフォーマット -Comment[lt]=Perkeliamas taškinės grafikos (pixmap) bylų formatas -Comment[lv]=Pārvietojams Pixmap Faila Formāts -Comment[nb]=Portable Pixmap File-format -Comment[nl]=Overdraagbare pixmap bestandsformaat -Comment[nn]=Portable Pixmap File-format -Comment[pl]=Plik przenośnej mapy pikseli -Comment[pt]=Formato Portável de 'Pixmaps' -Comment[pt_BR]=Formato de Arquivo Pixmap Portável -Comment[ro]=Imagine pixmap în format portabil -Comment[ru]=PFF -Comment[sk]=Formát Portable Pixmap File -Comment[sl]=Prenosljiva slikovna datotečna vrsta -Comment[sv]=Flyttbart pixmappfilformat -Comment[th]=แฟ้มภาพ Portable Pixmap -Comment[uk]=Мобільний формат файлів pixmap -Comment[ven]=Vhuvha ha faela ya Pixmap yau farea -Comment[vi]=Định dạng tập tin Pixmap đa nền -Comment[xx]=xx -Comment[zh_CN]=Portable Pixmap 文件格式 -Comment[zh_TW]=可攜式像素檔案格式 -Comment[zu]=Ifomathi Yefayela Yephathekayo i Pixmephu diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/share/apps/konqueror/servicemenus/install_rpm.desktop new/kdebase-SuSE/config-files/opt/kde3/share/apps/konqueror/servicemenus/install_rpm.desktop --- old/kdebase-SuSE/config-files/opt/kde3/share/apps/konqueror/servicemenus/install_rpm.desktop 2006-11-16 16:49:04.000000000 +0100 +++ new/kdebase-SuSE/config-files/opt/kde3/share/apps/konqueror/servicemenus/install_rpm.desktop 2007-05-14 14:12:51.000000000 +0200 @@ -5,7 +5,6 @@ [Desktop Action Install] Name=Install with YaST -Name[de]=Mit YaST installieren Exec=kdesu --nonewdcop -- /opt/kde3/share/apps/krpmview/setup_temp_source %f Icon=yast diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/share/autostart/kmix_autostart.desktop new/kdebase-SuSE/config-files/opt/kde3/share/autostart/kmix_autostart.desktop --- old/kdebase-SuSE/config-files/opt/kde3/share/autostart/kmix_autostart.desktop 2006-11-14 23:52:33.000000000 +0100 +++ new/kdebase-SuSE/config-files/opt/kde3/share/autostart/kmix_autostart.desktop 2007-05-14 14:12:51.000000000 +0200 @@ -12,76 +12,5 @@ X-KDE-autostart-condition=kmixrc::AutoStart:true Icon=kmix GenericName=Sound Mixer -GenericName[af]=Klank Menger -GenericName[ar]=مازج الصوت -GenericName[bg]=Аудио миксер -GenericName[br]=Mesker ar Son -GenericName[bs]=Zvučni mikser -GenericName[ca]=Mesclador de so -GenericName[cs]=Zvukový směšovač -GenericName[cy]=Cymysgydd Sŵn -GenericName[da]=Lydmikser -GenericName[de]=Lautstärkeregler -GenericName[el]=Μείκτης ήχου -GenericName[eo]=Sonormiksilo -GenericName[es]=Un mezclador audio -GenericName[et]=Helimikser -GenericName[eu]=Soinu nahasgailua -GenericName[fa]= مخلوط‌کن صدا -GenericName[fi]=Äänimikseri -GenericName[fr]=Console de mixage -GenericName[gl]=Mesturador de Son -GenericName[he]=מערבל צליל -GenericName[hi]=ध्वनि मिक्सर -GenericName[hr]=Mikser zvuka -GenericName[hu]=Hangkeverő -GenericName[is]=Hljóðblöndun -GenericName[it]=Mixer audio -GenericName[ja]=サウンドミキサー -GenericName[km]=កម្មវិធីលាយសម្លេង -GenericName[lt]=Garsų maišiklis -GenericName[lv]=Skaņas Mikšeris -GenericName[mk]=Миксета за звук -GenericName[ms]=Pengadun Bunyi -GenericName[nb]=Lydmikser -GenericName[nds]=Klangmischer -GenericName[nl]=Geluidsmixer -GenericName[nn]=Lydmiksar -GenericName[pa]=ਧੁਨੀ ਮਿਕਸਰ -GenericName[pl]=Ustawienia głośności -GenericName[pt]=Mesa de Mistura de Áudio -GenericName[pt_BR]=Mixagem de som -GenericName[ro]=Mixer de sunet -GenericName[ru]=Звуковой микшер -GenericName[se]=Jietnamixer -GenericName[sk]=Zvukový mixér -GenericName[sl]=Mešalnik zvoka -GenericName[sr]=Звучна миксета -GenericName[sr@Latn]=Zvučna mikseta -GenericName[sv]=Ljudmixer -GenericName[ta]=ஒலி ஒன்றுசேர்ப்பான் -GenericName[tg]=Омехтакунаки Овоз -GenericName[th]=ปรับแต่งผสมเสียง -GenericName[tr]=Ses Karıştırıcı -GenericName[uk]=Аудіомікшер -GenericName[uz]=Аудио миксер -GenericName[ven]=Tshitanganisi tsha mubvumo -GenericName[wa]=Maxheu d' sons -GenericName[xh]=Umxubi WokuvakalayoU -GenericName[zh_CN]=混音器 -GenericName[zh_HK]=聲音混音器 -GenericName[zh_TW]=音效混音器 -GenericName[zu]=Umxubi Womsindo Name=KMix -Name[af]=Kmix -Name[bn]=কে-মিক্স -Name[ca]=Kmix -Name[eo]=Miksilo -Name[hi]=के-मिक्स -Name[lv]=KMiks -Name[sv]=Kmix -Name[ta]=கேமிக்ஸ் -Name[tg]=KОмезиш -Name[ven]=U tanganisa ha K -Name[zh_TW]=KMix 混音器 Categories=Qt;KDE;AudioVideo;AudioMixer; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/Home.desktop new/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/Home.desktop --- old/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/Home.desktop 2006-11-03 12:10:49.000000000 +0100 +++ new/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/Home.desktop 2007-05-14 14:12:51.000000000 +0200 @@ -6,154 +6,7 @@ Terminal=false Name=Home -Name[af]=Tuiste -Name[ar]=الدليل الخاص -Name[az]=Başlanğıc -Name[be]=Хатняя -Name[bg]=Домашна директория -Name[bn]=ব্যক্তিগত ফোল্ডার -Name[br]=Er-gêr -Name[bs]=Početak -Name[ca]=Inici -Name[cs]=Můj adresář -Name[cy]=Cartref -Name[da]=Hjem -Name[de]=Persönlicher Ordner -Name[el]=Σπίτι -Name[eo]=Hejmo -Name[es]=Personal -Name[et]=Kodu -Name[eu]=Etxea -Name[fa]=آغازه -Name[fi]=Koti -Name[fr]=Dossier personnel -Name[fy]=Thús -Name[ga]=Baile -Name[gl]=Persoal -Name[he]=בית -Name[hi]=घर -Name[hr]=Početak -Name[hu]=Saját könyvtár -Name[id]=Rumah -Name[is]=Heimasvæðið þitt -Name[ja]=ホーム -Name[km]=ផ្ទះ -Name[ko]=홈 -Name[lo]=ພື້ນທີ່ສ່ວນຕົວ -Name[lt]=Pradžia -Name[lv]=Mājas -Name[mk]=Дома -Name[mn]=Гэр -Name[ms]=Laman Utama -Name[mt]=Direttorju Personali -Name[nb]=Hjem -Name[nds]=Tohuus -Name[nn]=Heim -Name[nso]=Gae -Name[oc]=Inici -Name[pa]=ਘਰ -Name[pl]=Katalog domowy -Name[pt]=Pasta Pessoal -Name[pt_BR]=Pasta do Usuário -Name[ro]=Acasă -Name[ru]=Домой -Name[rw]=Urugo -Name[se]=Ruoktu -Name[sk]=Domov -Name[sl]=Domov -Name[sr]=Домаће -Name[sr@Latn]=Domaće -Name[ss]=Ekhaya -Name[sv]=Hem -Name[ta]=தொடக்கம் -Name[tg]=Хона -Name[th]=พื้นที่ส่วนตัว -Name[tr]=Başlangıç -Name[tt]=Anabit -Name[uk]=Домівка -Name[uz]=Уй -Name[ven]=Haya -Name[vi]=Nhà -Name[wa]=Måjhon -Name[xh]=Ikhaya -Name[zh_CN]=主文件夹 -Name[zh_TW]=家目錄 -Name[zu]=Ikhaya GenericName=Personal Files -GenericName[af]=Persoonlike Lêers -GenericName[ar]=الملفات الشخصية -GenericName[az]=Şəxsi Fayllar -GenericName[be]=Пэрсанальныя файлы -GenericName[bg]=Лични файлове -GenericName[bn]=ব্যক্তিগত ফাইলসমূহ -GenericName[br]=Restroù deoc'h -GenericName[bs]=Osobne datoteke -GenericName[ca]=Fitxers personals -GenericName[cs]=Osobní soubory -GenericName[cy]=Ffeiliau Personol -GenericName[da]=Personlige filer -GenericName[de]=Eigene Dateien -GenericName[el]=Προσωπικά αρχεία -GenericName[eo]=Personaj dosieroj -GenericName[es]=Archivos personales -GenericName[et]=Isiklikud failid -GenericName[eu]=Fitxategi pertsonalak -GenericName[fa]=پرونده‌های شخصی -GenericName[fi]=Omat tiedostot -GenericName[fr]=Fichiers personnels -GenericName[fy]=Persoanlike map -GenericName[ga]=Comhaid Phearsanta -GenericName[gl]=Arquivos Persoais -GenericName[he]=קבצים אישיים -GenericName[hi]=निजी फ़ाइलें -GenericName[hr]=Osobne datoteke -GenericName[hu]=Személyes fájlok -GenericName[id]=File Pribadi -GenericName[is]=Skrárnar þínar -GenericName[it]=File personali -GenericName[ja]=個人のファイル -GenericName[km]=ឯកសារផ្ទាល់ខ្លួន -GenericName[ko]=혼자만 쓰는 파일 -GenericName[lo]=ທີ່ເກັບແຟ້ມແລະເອກະສານສວ່ນຕົວຫລືອື່ນຯ -GenericName[lt]=Asmeninės bylos -GenericName[lv]=Personālie Faili -GenericName[mk]=Лични датотеки -GenericName[mn]=Өөрийн файлууд -GenericName[ms]=Fail Peribadi -GenericName[mt]=Fajls Personali -GenericName[nb]=Personlige filer -GenericName[nds]=De egen Dateien -GenericName[nl]=Persoonlijke map -GenericName[nn]=Personlege filer -GenericName[nso]=Difaele tsa Botho -GenericName[oc]=FiquièRs personals -GenericName[pa]=ਨਿੱਜੀ ਫਾਇਲ਼ਾਂ -GenericName[pl]=Pliki osobiste -GenericName[pt]=Ficheiros Pessoais -GenericName[pt_BR]=Arquivos Pessoais -GenericName[ro]=Fişiere personale -GenericName[ru]=Личные файлы -GenericName[rw]=Amadosiye Yihariye -GenericName[se]=Iežat fiillat -GenericName[sk]=Osobné súbory -GenericName[sl]=Osebne datoteke -GenericName[sr]=Лични фајлови -GenericName[sr@Latn]=Lični fajlovi -GenericName[sv]=Personliga filer -GenericName[ta]=சொந்த கோப்புகள் -GenericName[tg]=Файлҳои шахсӣ -GenericName[th]=แฟ้มส่วนตัว -GenericName[tr]=Kişisel Dosyalar -GenericName[tt]=Şäxsi Biremnär -GenericName[uk]=Особисті файли -GenericName[uz]=Шахсий файллар -GenericName[ven]=Dzifaela dza vhune -GenericName[vi]=Tập tin Cá nhân -GenericName[wa]=Fitchîs da vosse -GenericName[xh]=Iifayile Zobuqu -GenericName[zh_CN]=个人文件 -GenericName[zh_TW]=個人檔案 -GenericName[zu]=Amafayela Omuntu siqu Categories=Qt;KDE;Core; OnlyShowIn=KDE; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/myComputer.desktop new/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/myComputer.desktop --- old/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/myComputer.desktop 2006-02-28 10:34:46.000000000 +0100 +++ new/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/myComputer.desktop 2007-05-14 14:12:51.000000000 +0200 @@ -2,7 +2,6 @@ Encoding=UTF-8 Icon=mycomp Name=My Computer -Name[de]=Arbeits-\nplatz Type=Link URL=sysinfo:/ OnlyShowIn=KDE; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/Office.desktop new/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/Office.desktop --- old/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/Office.desktop 2006-03-17 16:51:38.000000000 +0100 +++ new/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/Office.desktop 2007-05-14 14:12:51.000000000 +0200 @@ -1,6 +1,5 @@ [Desktop Entry] Name=Office -Name[cs]=Kancelář Protocols=file;ftp;http; MiniIcon=openoffice MimeType=application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/userguide.desktop new/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/userguide.desktop --- old/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/userguide.desktop 2006-02-01 17:21:27.000000000 +0100 +++ new/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/userguide.desktop 2007-05-14 14:12:51.000000000 +0200 @@ -1,7 +1,6 @@ [Desktop Entry] Type=Application Name=User Guide -Name[de]=Benutze\nrhandbuch Comment=Introduction, Installation, Configuration. SUSE Linux - for Newbies. Exec=khelpcenter file:/usr/share/doc/manual/suselinux-userguide_en/html/index.html Exec[de]=khelpcenter file:/usr/share/doc/manual/suselinux-userguide_de/html/index.html diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/krpmview/konqfilemgr_rpm.desktop new/kdebase-SuSE/krpmview/konqfilemgr_rpm.desktop --- old/kdebase-SuSE/krpmview/konqfilemgr_rpm.desktop 2004-03-21 22:06:07.000000000 +0100 +++ new/kdebase-SuSE/krpmview/konqfilemgr_rpm.desktop 2007-05-14 14:12:51.000000000 +0200 @@ -8,58 +8,3 @@ Hidden=true Name=File Manager -Name[af]=lêer bestuurder -Name[ar]=مدير الملفات -Name[az]=Fayl İdarəcisi -Name[bg]=Файлов менаджър -Name[br]=Merour restroÃ¹ -Name[bs]=Upravitelj datotekama -Name[ca]=Gestor de fitxers -Name[cs]=Správce souborů -Name[da]=Filhåndtering -Name[de]=Dateimanager -Name[el]=Διαχειριστής Αρχείων -Name[eo]=Dosieradministrilo -Name[es]=Administrador de archivos -Name[et]=Failihaldur -Name[eu]=Fitxategi Kudeatzailea -Name[fi]=Tiedostonhallinta -Name[fr]=Gestionnaire de fichiers -Name[gl]=Xestor de Ficheiros -Name[he]=מנהל הקבצים -Name[hr]=Upravitelj datotekama -Name[hu]=Fájlkezelő -Name[id]=Manajer File -Name[is]=Skráastjóri -Name[it]=File manager -Name[ja]=ファイルマネージャ -Name[ko]=파일 관리자 -Name[lt]=Bylų Tvarkyklė -Name[lv]=Failu Menedžeris -Name[mi]=Whakahaere Könae -Name[mk]=Менаџер на датотеки -Name[mt]=Manager tal-Fajls -Name[nb]=Filbehandler -Name[nl]=Bestandsbeheerder -Name[nn]=Filbehandlar -Name[oc]=Gestionari de fiquièrs -Name[pl]=Menedżer plików -Name[pt]=Gestor de Ficheiros -Name[pt_BR]=Gerenciador de Arquivos -Name[ro]=Manager de fişiere -Name[ru]=Файловый менеджер -Name[sk]=Správca súborov -Name[sl]=Upravljalnik datotek -Name[sr]=Fajl Menadžer -Name[sv]=Filhanteraren -Name[ta]=§¸¡ôÒ §ÁÄ¡Ç÷ -Name[th]=เครื่องมือจัดการแฟ้ม -Name[tr]=Dosya Yöneticisi -Name[uk]=Менеджер файлів -Name[ven]=Mulanguli wa faela -Name[vi]=Trình quản lý file -Name[xh]=Umphathi wefayile -Name[xx]=xx -Name[zh_CN]=文件管理器 -Name[zh_TW]=檔案管理程式 -Name[zu]=Umphathi Wefayela diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/krpmview/krpmview.desktop new/kdebase-SuSE/krpmview/krpmview.desktop --- old/kdebase-SuSE/krpmview/krpmview.desktop 2003-09-13 18:26:25.000000000 +0200 +++ new/kdebase-SuSE/krpmview/krpmview.desktop 2007-04-30 14:10:32.000000000 +0200 @@ -7,5 +7,4 @@ Name=KRPMView ServiceTypes=KParts/ReadOnlyPart,Browser/View X-KDE-Library=libkrpmview -InitialPreference=5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/meta/setup_temp_source new/kdebase-SuSE/meta/setup_temp_source --- old/kdebase-SuSE/meta/setup_temp_source 2006-11-16 16:49:04.000000000 +0100 +++ new/kdebase-SuSE/meta/setup_temp_source 2007-05-09 14:43:53.000000000 +0200 @@ -36,9 +36,9 @@ fi unset IFS -$ZYPPER service-add --type=Plaindir dir://$TEMP _krpmview_temporary +$ZYPPER --non-interactive service-add --type=Plaindir dir://$TEMP _krpmview_temporary </dev/null /sbin/yast2 -i $ARG -$ZYPPER service-delete _krpmview_temporary +$ZYPPER --non-interactive service-delete _krpmview_temporary </dev/null rm -rf $TEMP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/patches/xinerama/01_active_desktop_plus_tabbox/kwin.patch new/kdebase-SuSE/patches/xinerama/01_active_desktop_plus_tabbox/kwin.patch --- old/kdebase-SuSE/patches/xinerama/01_active_desktop_plus_tabbox/kwin.patch 2006-09-01 16:08:04.000000000 +0200 +++ new/kdebase-SuSE/patches/xinerama/01_active_desktop_plus_tabbox/kwin.patch 2007-05-17 19:23:37.000000000 +0200 @@ -39,7 +39,7 @@ if ( val == "CDE" ) altTabStyle = CDE; + -+ separateScreenFocus = config->readBoolEntry( "SeparateScreenFocus", true ); ++ separateScreenFocus = config->readBoolEntry( "SeparateScreenFocus", false ); + activeMouseScreen = config->readBoolEntry( "ActiveMouseScreen", focusPolicy != ClickToFocus ); rollOverDesktops = config->readBoolEntry("RollOverDesktops", TRUE); @@ -191,7 +191,7 @@ +int Workspace::numScreens() const + { + if( !options->xineramaEnabled ) -+ return 0; ++ return 1; + return qApp->desktop()->numScreens(); + } + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/patches/xinerama/kdebase.patch new/kdebase-SuSE/patches/xinerama/kdebase.patch --- old/kdebase-SuSE/patches/xinerama/kdebase.patch 2006-09-01 16:08:04.000000000 +0200 +++ new/kdebase-SuSE/patches/xinerama/kdebase.patch 2007-05-18 14:55:44.000000000 +0200 @@ -491,7 +491,7 @@ if ( val == "CDE" ) altTabStyle = CDE; + -+ separateScreenFocus = config->readBoolEntry( "SeparateScreenFocus", true ); ++ separateScreenFocus = config->readBoolEntry( "SeparateScreenFocus", false ); + activeMouseScreen = config->readBoolEntry( "ActiveMouseScreen", focusPolicy != ClickToFocus ); rollOverDesktops = config->readBoolEntry("RollOverDesktops", TRUE); @@ -638,7 +638,7 @@ + } + } + -+ if( !options->separateScreenFocus && options->xineramaEnabled ) ++ if( options->separateScreenFocus && options->xineramaEnabled ) { - if ( start == c ) + if( c->screen() != workspace()->activeScreen()) @@ -792,7 +792,7 @@ +int Workspace::numScreens() const + { + if( !options->xineramaEnabled ) -+ return 0; ++ return 1; + return qApp->desktop()->numScreens(); + } + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/kfiledialog/el.po new/kdebase-SuSE/po/kfiledialog/el.po --- old/kdebase-SuSE/po/kfiledialog/el.po 2007-04-24 16:38:12.000000000 +0200 +++ new/kdebase-SuSE/po/kfiledialog/el.po 2007-05-19 17:15:19.000000000 +0200 @@ -1,4 +1,4 @@ -# translation of kfiledialog.el.po to Ελληνικά +# translation of kfiledialog.po to Ελληνικά # This file is put in the public domain. # # Hellenic SuSE Translation Groups <hstg(a)billg.gr>, 2005. @@ -6,13 +6,14 @@ # Hellenic SuSE Translation Team <hstg(a)billg.gr>, 2005. # Kostas Boukouvalas <quantis(a)hellug.gr>, 2006. # Vasileios Giannakopoulos <billg(a)hellug.gr>, 2007. +# Konstantinos Smanis <kon.smanis(a)gmail.com>, 2007. msgid "" msgstr "" -"Project-Id-Version: kfiledialog.el\n" +"Project-Id-Version: kfiledialog\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-18 10:26+0200\n" -"PO-Revision-Date: 2007-02-01 12:03+0000\n" -"Last-Translator: Vasileios Giannakopoulos <billg(a)hellug.gr>\n" +"PO-Revision-Date: 2007-05-03 18:01+0300\n" +"Last-Translator: Konstantinos Smanis <kon.smanis(a)gmail.com>\n" "Language-Team: Ελληνικά\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,7 +42,7 @@ #: main.cpp:28 msgid "Accept nonlocal files" -msgstr "Αποδοχή nonlocal αρχείων" +msgstr "Αποδοχή nonlocal (μη τοπικών) αρχείων" #: main.cpp:29 msgid "Set initial directory" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/kfiledialog/wa.po new/kdebase-SuSE/po/kfiledialog/wa.po --- old/kdebase-SuSE/po/kfiledialog/wa.po 2007-04-24 16:38:17.000000000 +0200 +++ new/kdebase-SuSE/po/kfiledialog/wa.po 2007-05-19 17:15:19.000000000 +0200 @@ -1,55 +1,57 @@ +# translation of kfiledialog.po to walon # Translation into the walloon language. # Copyright (C) 2007 SUSE Linux Products GmbH. +# # Pablo Saratxaga <pablo(a)walon.org>, 2001, 2004. # Jean Cayron <jean.cayron(a)gmail.com>, 2007. -# +# jean <jean.cayron(a)gmail.com>, 2007. msgid "" msgstr "" -"Project-Id-Version: lcn memory\n" +"Project-Id-Version: kfiledialog\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-09-14 17:19+0200\n" -"PO-Revision-Date: 2004-04-05 17:37+0200\n" -"Last-Translator: Jean Cayron <jean.cayron(a)gmail.com>\n" -"Language-Team: Walloon <i18n(a)suse.de>\n" +"PO-Revision-Date: 2007-04-29 18:05+0200\n" +"Last-Translator: jean <jean.cayron(a)gmail.com>\n" +"Language-Team: walon\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: KBabel 1.11.4\n" #: main.cpp:18 msgid "Front-end for the KDE file dialog" -msgstr "" +msgstr "Front-end pol divize di fitchî KDE" #: main.cpp:24 msgid "Set dialog mode to single file (default)" -msgstr "" +msgstr "Defini l' mode di dvize so -z on seu fitchî (tchoezi por vos)" #: main.cpp:25 msgid "Set dialog mode to multiple file" -msgstr "" +msgstr "Defini l' mode di dvize so sacwantes fitchîs" #: main.cpp:26 -#, fuzzy msgid "Set dialog mode to directory" -msgstr "Ridant des dnêyes di paket" +msgstr "Defini l' mode di dvize so ridant" #: main.cpp:27 msgid "Print selected files" -msgstr "" +msgstr "Rexhe les fitchîs d' tchoezis" #: main.cpp:28 msgid "Accept nonlocal files" -msgstr "" +msgstr "Accepter les fitchîs nén locås" #: main.cpp:29 -#, fuzzy msgid "Set initial directory" -msgstr "Ridant des dnêyes di paket" +msgstr "Defini l' prumî ridant" #: main.cpp:30 msgid "Set filter" -msgstr "" +msgstr "Defini l' passete" #: main.cpp:55 msgid "kfiledialog" -msgstr "" +msgstr "kfiledialog - kdvizefitchî" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/krpmview/pt.po new/kdebase-SuSE/po/krpmview/pt.po --- old/kdebase-SuSE/po/krpmview/pt.po 2007-04-24 16:38:25.000000000 +0200 +++ new/kdebase-SuSE/po/krpmview/pt.po 2007-05-19 17:15:21.000000000 +0200 @@ -1,16 +1,17 @@ -# translation of krpmview.pt.po to Portuguese +# translation of krpmview.pt.po to pt # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Elisio Andre Martins Catana <eacatana(a)netvisao.pt>, 2006. +# Ricardo Jorge Antunes <ricardo.antunes(a)magisom.pt>, 2007. msgid "" msgstr "" "Project-Id-Version: krpmview.pt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-10-07 19:48+0200\n" -"PO-Revision-Date: 2006-10-10 08:04+0100\n" -"Last-Translator: Elisio Andre Martins Catana <eacatana(a)netvisao.pt>\n" -"Language-Team: Portuguese <en(a)li.org>\n" +"PO-Revision-Date: 2007-05-16 12:49+0100\n" +"Last-Translator: Ricardo Jorge Antunes <ricardo.antunes(a)magisom.pt>\n" +"Language-Team: pt <language(a)novell.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -45,16 +46,14 @@ msgstr "krpmview" #: krpmview.cpp:226 -#, fuzzy msgid "Viewer for RPM files" msgstr "Visualizador de ficheiros rpm." #: krpmview.cpp:229 -#, fuzzy msgid "KRPMView views the content of RPM archives and can use YaST to install them" -msgstr "O KRPMView mostra o conteúdo dos pacotes rpm, pode utilizar o YaST para o instalár\n" +msgstr "O KRPMView mostra o conteúdo dos pacotes RPM, pode utilizar o YaST para o instalar" #: krpmview.cpp:232 -#, fuzzy msgid "Current Maintainer" msgstr "Contentor actual" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/kryptomedia/el.po new/kdebase-SuSE/po/kryptomedia/el.po --- old/kdebase-SuSE/po/kryptomedia/el.po 2007-04-24 16:38:27.000000000 +0200 +++ new/kdebase-SuSE/po/kryptomedia/el.po 2007-05-19 17:15:21.000000000 +0200 @@ -1,4 +1,4 @@ -# translation of kryptomedia.el.po to Greek +# translation of kryptomedia.po to Ελληνικά # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # @@ -6,14 +6,15 @@ # # Vasileios Giannakopoulos <billg(a)hellug.gr>, 2007. # Kostas Boukouvalas <quantis(a)hellug.gr>, 2007. +# Konstantinos Smanis <kon.smanis(a)gmail.com>, 2007. msgid "" msgstr "" -"Project-Id-Version: kryptomedia.el\n" +"Project-Id-Version: kryptomedia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-01-15 11:13+0100\n" -"PO-Revision-Date: 2007-02-27 20:46+0200\n" -"Last-Translator: Kostas Boukouvalas <quantis(a)hellug.gr>\n" -"Language-Team: Greek <i18ngr(a)lists.hellug.gr>\n" +"PO-Revision-Date: 2007-05-06 21:39+0300\n" +"Last-Translator: Konstantinos Smanis <kon.smanis(a)gmail.com>\n" +"Language-Team: Ελληνικά\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/SUSEgreeter/pa.po new/kdebase-SuSE/po/SUSEgreeter/pa.po --- old/kdebase-SuSE/po/SUSEgreeter/pa.po 2007-04-24 16:38:34.000000000 +0200 +++ new/kdebase-SuSE/po/SUSEgreeter/pa.po 2007-05-19 17:15:22.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: SUSEgreeter\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-10-19 17:53+0200\n" -"PO-Revision-Date: 2006-09-06 22:20+0530\n" +"PO-Revision-Date: 2006-12-24 09:47+0530\n" "Last-Translator: A S Alam <apbrar(a)gmail.com>\n" "Language-Team: Punjabi <fedora-trans-pa(a)redhat.com>\n" "MIME-Version: 1.0\n" @@ -65,9 +65,8 @@ msgstr "ਬੰਦ ਕਰੋ" #: translationdummy.cpp:25 -#, fuzzy msgid "Welcome to openSUSE Beta" -msgstr "openSUSE ਐਲਫ਼ਾ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ" +msgstr "openSUSE ਬੀਟਾ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ" #: translationdummy.cpp:27 msgid "In the final version of openSUSE 10.2, this is where you'll register for support. Because we don't provide formal technical support for test builds of openSUSE, we will simply thank you for your support and participation in the openSUSE community. As you use this development version, you will encounter things that don't work correctly. Please let us know what you discover that we should fix by submitting a bug in our bugzilla database. To learn how you can participate more fully in the openSUSE community, please visit opensuse.org." @@ -84,3 +83,4 @@ "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "apbrar(a)gmail.com" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/SUSEgreeter/wa.po new/kdebase-SuSE/po/SUSEgreeter/wa.po --- old/kdebase-SuSE/po/SUSEgreeter/wa.po 2007-04-24 16:38:36.000000000 +0200 +++ new/kdebase-SuSE/po/SUSEgreeter/wa.po 2007-05-19 17:15:22.000000000 +0200 @@ -1,74 +1,75 @@ +# translation of SUSEgreeter.po to walon # Translation into the walloon language. # Copyright (C) 2007 SUSE Linux Products GmbH. +# # Pablo Saratxaga <pablo(a)walon.org>, 2001, 2004. # Jean Cayron <jean.cayron(a)gmail.com>, 2007. -# +# jean <jean.cayron(a)gmail.com>, 2007. msgid "" msgstr "" -"Project-Id-Version: lcn memory\n" +"Project-Id-Version: SUSEgreeter\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-10-19 17:53+0200\n" -"PO-Revision-Date: 2004-04-05 17:37+0200\n" -"Last-Translator: Jean Cayron <jean.cayron(a)gmail.com>\n" -"Language-Team: Walloon <i18n(a)suse.de>\n" +"PO-Revision-Date: 2007-04-29 19:11+0200\n" +"Last-Translator: jean <jean.cayron(a)gmail.com>\n" +"Language-Team: walon\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: KBabel 1.11.4\n" #: greetings.cpp:61 greetings.cpp:77 -#, fuzzy msgid "Error loading %1" -msgstr "Aroke e scrijhant l' lisse des pakets a pårti d' %1" +msgstr "Aroke e tcherdjant %1" #: main.cpp:31 main.cpp:44 msgid "SUSEgreeter" -msgstr "" +msgstr "SUSEbondjoû" #: translationdummy.cpp:4 msgid "Register Now to Access Your Free Installation Support" -msgstr "" +msgstr "Eredjistrîz vs asteure po -z avu accès å sopoirt gratis d' astalaedje" #: translationdummy.cpp:6 msgid "If you have purchased a physical box of openSUSE 10.2, you have access to free installation support. For full access to the openSUSE installation support, register now at:" -msgstr "" +msgstr "Si vs avoz achté ene veritåve boesse openSUSE 10.3, vos avoz accès a -z on sopoirt d' astalaedje prodio. Po ttafwait avu accès å sopoirt d' astalaedje d' openSUSE, eredjistrîz vs asteure vaici:" #: translationdummy.cpp:8 msgid "The portal provides you access to your free installation support, important information, and access to additional services that support your copy of openSUSE. Your support registration code can be found on your media cover." -msgstr "" +msgstr "Li waibe vos dene l' accès å sopoirt d' astalaedje prodio, a des impôrtantès informåcions et a ds ôtes siervices ki sopoirtèt vosse copeye d' openSUSE. Vosse code d' eredjistraedje di sopoirt pout esse trové sol potchete di vosse media." #: translationdummy.cpp:10 translationdummy.cpp:29 msgid "Keep Your System Up-to-Date" -msgstr "" +msgstr "Wårdez vosse sistinme a djoû" #: translationdummy.cpp:12 translationdummy.cpp:31 msgid "Update your system regularly with performing an online update. It's easy!" -msgstr "" +msgstr "Metoz a djoû vosse sistinme erîleymint e fjhant on metaedje a djoû so fyis. C' est åjhey!" #: translationdummy.cpp:14 translationdummy.cpp:33 msgid "Get Your Free Novell Linux Newsletter!" -msgstr "" +msgstr "Riçuvoz gratis vosse corî d' informåcion Novell Linux" #: translationdummy.cpp:16 translationdummy.cpp:35 msgid "The openSUSE project is sponsored by Novell, which offers a suite of fully supported Linux solutions targeted for business users. The monthly Novell Linux Newsletter provides you with the latest tips and tricks for openSUSE plus comprehensive news and information about other Novell offerings. <a href=\"http://www.novell.com/company/subscribe/\">Subscribe today!</a>" -msgstr "" +msgstr "Li pordjet openSUSE, ecwårlé pa Novell, k' ofere ene shûte di solucions Linux pår sopoirtêyes fwaites po des uzeus dins leu mestî. Li corî d' informåcion Novell Linux vos dene tos les moes les dierinnès pices po -z openSUSE et des noveles completes et des informåcions so ls ôtès sacwè k' ofere Novell: <a href=\"http://www.novell.com/company/subscribe/\">Dimandez l' asteure!</a>" #: translationdummy.cpp:18 translationdummy.cpp:37 msgid "Enjoy openSUSE!" -msgstr "" +msgstr "Bråmint do plaijhi avou openSUSE!" #: translationdummy.cpp:20 translationdummy.cpp:39 msgid "CLOSE" -msgstr "" +msgstr "CLÔRE" #: translationdummy.cpp:25 -#, fuzzy msgid "Welcome to openSUSE Beta" -msgstr "Bénvnowe å remantchaedje sistinme" +msgstr "Bénvnowe a openSUSE Beta" #: translationdummy.cpp:27 msgid "In the final version of openSUSE 10.2, this is where you'll register for support. Because we don't provide formal technical support for test builds of openSUSE, we will simply thank you for your support and participation in the openSUSE community. As you use this development version, you will encounter things that don't work correctly. Please let us know what you discover that we should fix by submitting a bug in our bugzilla database. To learn how you can participate more fully in the openSUSE community, please visit opensuse.org." -msgstr "" +msgstr "Dins l' finåle modêye d' openSUSE 10.3, vos vs eredjistrêyroz vaici pol sopoirt. Paski nos n' dinans pont d' sopoirt tecnike formel po les modêyes di saye d' openSUSE, nos vs rimercirans djusse po vosse sopoirt et d' fé pråteye del cominålté openSUSE. Come vos eployîz cisse modêye di disvelopmint, vos resconterroz des sacwès ki n' rotèt nén comifåt. Fijhoz n' savu çou k' vos avoz discovrou et k' nos dvréns rezoude, s' i vs plait bén, e rimplixhant on bug dins nosse båze di dnêye bugzilla. Po savu comint pår fé pårteye del cominålté, vizitez opensuse.org." #: _translatorinfo.cpp:1 msgid "" @@ -87,3 +88,4 @@ "_: EMILE DES RATOURNEUS\n" "jean.cayron(a)gmail.com\n" "pablo(a)walon.org" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/suseplugger/et.po new/kdebase-SuSE/po/suseplugger/et.po --- old/kdebase-SuSE/po/suseplugger/et.po 2007-04-24 16:38:37.000000000 +0200 +++ new/kdebase-SuSE/po/suseplugger/et.po 2007-05-19 17:15:22.000000000 +0200 @@ -3,15 +3,15 @@ # Copyright (C) 2006 SUSE Linux Products GmbH. # Estonian message file for YaST2 (@memory@). # -# Ain Vagula <avagula(a)gmail.com>, 2006. +# Ain Vagula <avagula(a)gmail.com>, 2006, 2007. msgid "" msgstr "" "Project-Id-Version: suseplugger.et\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-09-14 17:19+0200\n" -"PO-Revision-Date: 2006-11-02 18:17+0200\n" +"PO-Revision-Date: 2007-05-04 13:45+0300\n" "Last-Translator: Ain Vagula <avagula(a)gmail.com>\n" -"Language-Team: Estonian <et(a)li.org>\n" +"Language-Team: Estonian <linux-ee(a)lists.eenet.ee>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -155,3 +155,6 @@ "Your monitor did not report its X and Y Size. This might cause display problems like unreadable fonts.\n" "Configure your monitor geometry manually?" msgstr "" +"Sinu monitor ei teata oma X- ega Y-mõõtu. See võib põhjustada probleeme kuvamisega, näiteks loetamatut teksti.\n" +"Kas häälestada monitori geomeetria käsitsi?" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/susetranslations/bn.po new/kdebase-SuSE/po/susetranslations/bn.po --- old/kdebase-SuSE/po/susetranslations/bn.po 2007-04-24 16:38:40.000000000 +0200 +++ new/kdebase-SuSE/po/susetranslations/bn.po 2007-05-19 17:15:23.000000000 +0200 @@ -92,7 +92,7 @@ #: kdeaddons3.spec.cpp:22 searchbar.cpp:4 msgid "Never" -msgstr "" +msgstr "কখনও না" #: kdebase3.spec.cpp:2 msgid "XFree theme %1 - incomplete for KDE" @@ -120,7 +120,7 @@ #: kdebase3.spec.cpp:29 msgid "Standby" -msgstr "" +msgstr "স্ট্যান্ডবাই" #: kdebase3.spec.cpp:33 msgid "Suspend Computer" @@ -170,7 +170,7 @@ #: kdebase3.spec.cpp:69 msgid "&Password:" -msgstr "" +msgstr "&পাসওয়ার্ড:" #: kdebase3.spec.cpp:72 msgid "&Domain:" @@ -381,7 +381,7 @@ #: kdebase3.spec.cpp:231 msgid "New Applications" -msgstr "" +msgstr "নতুন ইনস্টলেশন" #: kdebase3.spec.cpp:234 #, c-format @@ -540,11 +540,11 @@ #: kdebase3.spec.cpp:356 msgid "My Documents" -msgstr "" +msgstr "আমার দলিলপত্র (মাই ডকুমেন্ট)" #: kdebase3.spec.cpp:359 msgid "Network Folders" -msgstr "" +msgstr "নেটওয়ার্ক ফোল্ডার" #: kdebase3.spec.cpp:362 msgid "Documents" @@ -681,7 +681,7 @@ #: kdebase3.spec.cpp:460 msgid "Add to Favorites" -msgstr "" +msgstr "প্রিয়গুলিতে যুক্ত করুন" #: kdebase3.spec.cpp:463 msgid "Clear Recently Used Applications" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/susetranslations/et.po new/kdebase-SuSE/po/susetranslations/et.po --- old/kdebase-SuSE/po/susetranslations/et.po 2007-04-24 16:38:41.000000000 +0200 +++ new/kdebase-SuSE/po/susetranslations/et.po 2007-05-19 17:15:23.000000000 +0200 @@ -3,15 +3,15 @@ # Copyright (C) 2006 SUSE Linux Products GmbH. # Estonian message file for YaST2 (@memory@). # -# Ain Vagula <avagula(a)gmail.com>, 2006. +# Ain Vagula <avagula(a)gmail.com>, 2006, 2007. msgid "" msgstr "" "Project-Id-Version: susetranslations.et\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-10-27 12:08+0200\n" -"PO-Revision-Date: 2006-11-03 11:56+0200\n" +"PO-Revision-Date: 2007-05-04 13:44+0300\n" "Last-Translator: Ain Vagula <avagula(a)gmail.com>\n" -"Language-Team: Estonian <et(a)li.org>\n" +"Language-Team: Estonian <linux-ee(a)lists.eenet.ee>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -189,7 +189,7 @@ #: kdebase3.spec.cpp:75 msgid "&Top" -msgstr "" +msgstr "Ül&es" #: kdebase3.spec.cpp:78 msgid "This link references a home page or the top of some hierarchy." @@ -342,7 +342,7 @@ #: kdebase3.spec.cpp:196 msgid "(Attachment) " -msgstr "" +msgstr "(Manus) " #: kdebase3.spec.cpp:200 #, c-format @@ -679,7 +679,7 @@ #: kdebase3.spec.cpp:454 msgid "Could not start Tomboy." -msgstr "" +msgstr "Tomboy käivitamine nurjus." #: kdebase3.spec.cpp:457 msgid "Remove From Favorites" @@ -712,7 +712,7 @@ #: kdebase3.spec.cpp:479 msgid "Notes" -msgstr "" +msgstr "Märkmed" #: kdebase3.spec.cpp:482 msgid "Emails" @@ -732,7 +732,7 @@ #: kdebase3.spec.cpp:497 msgid "Feeds" -msgstr "" +msgstr "Uudisvood" #: kdebase3.spec.cpp:500 msgid "Pictures" @@ -757,7 +757,7 @@ #: kdebase3.spec.cpp:515 msgid "Low Disk Space" -msgstr "" +msgstr "Vähe kettaruumi" #: kdebase3.spec.cpp:518 msgid "Start Konqueror" @@ -785,21 +785,23 @@ #: kdebase3.spec.cpp:537 msgid "Suspend failed" -msgstr "" +msgstr "Suspendimine nurjus" #: kdebase3.spec.cpp:540 msgid "Would you like to turn off your computer?" -msgstr "" +msgstr "Soovid sa arvutit välja lülitada?" #: kdebase3.spec.cpp:543 msgid "" "This computer will turn off automatically\n" "after %1 seconds." msgstr "" +"Arvuti lülitub automaatselt välja\n" +"%1 sekundi pärast." #: kdebase3.spec.cpp:546 msgid "Would you like to reboot your computer?" -msgstr "" +msgstr "Kas soovid arvutit taaskäivitada?" #: kdebase3.spec.cpp:549 msgid "Would you like to reboot to \"%1\"?" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/susetranslations/hi.po new/kdebase-SuSE/po/susetranslations/hi.po --- old/kdebase-SuSE/po/susetranslations/hi.po 2007-04-24 16:38:41.000000000 +0200 +++ new/kdebase-SuSE/po/susetranslations/hi.po 2007-05-19 17:15:23.000000000 +0200 @@ -93,7 +93,7 @@ #: kdeaddons3.spec.cpp:22 searchbar.cpp:4 msgid "Never" -msgstr "" +msgstr "कभी नहीं" #: kdebase3.spec.cpp:2 msgid "XFree theme %1 - incomplete for KDE" @@ -121,7 +121,7 @@ #: kdebase3.spec.cpp:29 msgid "Standby" -msgstr "" +msgstr "स्टैंडबाइ" #: kdebase3.spec.cpp:33 msgid "Suspend Computer" @@ -172,7 +172,7 @@ #: kdebase3.spec.cpp:69 msgid "&Password:" -msgstr "" +msgstr "&पासवर्ड" #: kdebase3.spec.cpp:72 msgid "&Domain:" @@ -384,7 +384,7 @@ #: kdebase3.spec.cpp:231 msgid "New Applications" -msgstr "" +msgstr "नया इंनस्टलेशन" #: kdebase3.spec.cpp:234 #, c-format @@ -544,11 +544,11 @@ #: kdebase3.spec.cpp:356 msgid "My Documents" -msgstr "" +msgstr "मेरे दस्तावेज" #: kdebase3.spec.cpp:359 msgid "Network Folders" -msgstr "" +msgstr "नेटवर्क फोल्डर" #: kdebase3.spec.cpp:362 msgid "Documents" @@ -689,7 +689,7 @@ #: kdebase3.spec.cpp:460 msgid "Add to Favorites" -msgstr "" +msgstr "फिल्टर में जोोङें" #: kdebase3.spec.cpp:463 msgid "Clear Recently Used Applications" @@ -949,7 +949,7 @@ #: kdebase3.spec.cpp:654 msgid "Search:" -msgstr "" +msgstr "ढूँढे :" #: kdebase3.spec.cpp:657 msgid " Favorites" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/susetranslations/lt.po new/kdebase-SuSE/po/susetranslations/lt.po --- old/kdebase-SuSE/po/susetranslations/lt.po 2007-04-24 16:38:42.000000000 +0200 +++ new/kdebase-SuSE/po/susetranslations/lt.po 2007-05-19 17:15:23.000000000 +0200 @@ -6,7 +6,7 @@ "Project-Id-Version: susetranslations.lt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-10-27 12:08+0200\n" -"PO-Revision-Date: 2007-04-13 13:08+0300\n" +"PO-Revision-Date: 2007-04-29 16:22+0300\n" "Last-Translator: Andrius Štikonas <stikonas(a)gmail.com>\n" "Language-Team: Lietuvių <komp_lt(a)konf.lt>\n" "MIME-Version: 1.0\n" @@ -451,7 +451,7 @@ #: kdebase3.spec.cpp:279 msgid "Start '%1' (current)" -msgstr "Paleist „%1“ (dabartinis)" +msgstr "Paleisti „%1“ (dabartinė)" #: kdebase3.spec.cpp:282 msgid "Restart and boot directly into '%1'" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/susetranslations/ta.po new/kdebase-SuSE/po/susetranslations/ta.po --- old/kdebase-SuSE/po/susetranslations/ta.po 2007-04-24 16:38:43.000000000 +0200 +++ new/kdebase-SuSE/po/susetranslations/ta.po 2007-05-19 17:15:23.000000000 +0200 @@ -91,7 +91,7 @@ #: kdeaddons3.spec.cpp:22 searchbar.cpp:4 msgid "Never" -msgstr "" +msgstr "ஒருபோதும் இல்லை" #: kdebase3.spec.cpp:2 msgid "XFree theme %1 - incomplete for KDE" @@ -111,15 +111,15 @@ #: kdebase3.spec.cpp:19 msgid "Suspend to Disk" -msgstr "" +msgstr "தட்டில் நிலைநிறுத்தவும்" #: kdebase3.spec.cpp:24 msgid "Suspend to RAM" -msgstr "" +msgstr "RAMல் நிலைநிறுத்தவும்" #: kdebase3.spec.cpp:29 msgid "Standby" -msgstr "" +msgstr "செயலற்ற நிலை" #: kdebase3.spec.cpp:33 msgid "Suspend Computer" @@ -168,7 +168,7 @@ #: kdebase3.spec.cpp:69 msgid "&Password:" -msgstr "" +msgstr "&கடவுச்சொல்:" #: kdebase3.spec.cpp:72 msgid "&Domain:" @@ -375,7 +375,7 @@ #: kdebase3.spec.cpp:231 msgid "New Applications" -msgstr "" +msgstr "புதிய பயன்பாடுகள்" #: kdebase3.spec.cpp:234 #, c-format @@ -533,11 +533,11 @@ #: kdebase3.spec.cpp:356 msgid "My Documents" -msgstr "" +msgstr "என் ஆவணங்கள்" #: kdebase3.spec.cpp:359 msgid "Network Folders" -msgstr "" +msgstr "வலையமைப்பு கோப்புறைகள்" #: kdebase3.spec.cpp:362 msgid "Documents" @@ -674,7 +674,7 @@ #: kdebase3.spec.cpp:460 msgid "Add to Favorites" -msgstr "" +msgstr "விருப்பமானவைகளில் சேர்க்கவும்" #: kdebase3.spec.cpp:463 msgid "Clear Recently Used Applications" @@ -933,7 +933,7 @@ #: kdebase3.spec.cpp:654 msgid "Search:" -msgstr "" +msgstr "தேடுதல்:" #: kdebase3.spec.cpp:657 msgid " Favorites" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/totranslate/kdebase3.spec.cpp new/kdebase-SuSE/totranslate/kdebase3.spec.cpp --- old/kdebase-SuSE/totranslate/kdebase3.spec.cpp 2006-10-27 12:08:29.000000000 +0200 +++ new/kdebase-SuSE/totranslate/kdebase3.spec.cpp 2007-05-03 15:00:27.000000000 +0200 @@ -324,7 +324,7 @@ i18n("Pause without logging out"); /* File: kdebase-3.5.5/kicker/kicker/ui/k_new_mnu.cpp:1560 */ -i18n("Restart and boot this system"); +i18n("Restart and boot the default system"); /* File: kdebase-3.5.5/kicker/kicker/ui/k_new_mnu.cpp:1564 */ i18n("Start Operating System"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gwget
by root＠Hilbert.suse.de 20 May '07

20 May '07

Hello community, here is the log from the commit of package gwget checked in at Sun May 20 10:58:51 CEST 2007. -------- --- GNOME/gwget/gwget.changes 2007-04-23 16:22:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/gwget/gwget.changes 2007-05-19 16:56:41.077724000 +0200 @@ -1,0 +2,5 @@ +Sat May 19 16:56:31 CEST 2007 - coolo(a)suse.de + +- remove X-SuSE-translate from desktop file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwget.spec ++++++ --- /var/tmp/diff_new_pack.g13064/_old 2007-05-20 10:58:37.000000000 +0200 +++ /var/tmp/diff_new_pack.g13064/_new 2007-05-20 10:58:37.000000000 +0200 @@ -16,7 +16,7 @@ Group: Productivity/Networking/Web/Utilities Requires: wget Version: 0.98.2 -Release: 30 +Release: 45 Summary: Front-End for wget Written in GTK+ URL: http://gnome.org/projects/gwget/ PreReq: filesystem gconf2 @@ -80,6 +80,8 @@ %{_libdir}/epiphany/*/*/*.* %changelog +* Sat May 19 2007 - coolo(a)suse.de +- remove X-SuSE-translate from desktop file * Mon Apr 23 2007 - lmichnovic(a)suse.cz - fixed wrong executable in desktop file * Wed Apr 18 2007 - lmichnovic(a)suse.cz ++++++ gwget.desktop ++++++ --- GNOME/gwget/gwget.desktop 2007-04-23 16:21:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/gwget/gwget.desktop 2007-05-19 16:53:16.967050000 +0200 @@ -6,4 +6,3 @@ Terminal=false MultipleArgs=false Type=Application -X-SuSE-translate=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 amarok
by root＠Hilbert.suse.de 20 May '07

20 May '07

Hello community, here is the log from the commit of package amarok checked in at Sun May 20 10:57:58 CEST 2007. -------- --- KDE/amarok/amarok.changes 2007-05-14 14:52:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/amarok/amarok.changes 2007-05-19 16:42:26.537121000 +0200 @@ -1,0 +2,5 @@ +Sat May 19 16:42:04 CEST 2007 - coolo(a)suse.de + +- remove duplicated call to translation macro + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.LB5751/_old 2007-05-20 10:57:48.000000000 +0200 +++ /var/tmp/diff_new_pack.LB5751/_new 2007-05-20 10:57:48.000000000 +0200 @@ -30,7 +30,7 @@ Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE Version: 1.4.5 -Release: 34 +Release: 35 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define mversion 0.5 Source0: %name-%version.tar.bz2 @@ -164,7 +164,6 @@ make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET kde_post_install %suse_update_desktop_file %name AudioVideo Player -%suse_update_desktop_file $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop rm -v $RPM_BUILD_ROOT/opt/kde3/%_lib/*.la rm -rf $RPM_BUILD_ROOT/opt/kde3/share/locale/xx %find_lang %name @@ -261,6 +260,8 @@ %endif %changelog +* Sat May 19 2007 - coolo(a)suse.de +- remove duplicated call to translation macro * Mon May 14 2007 - coolo(a)suse.de - split out translations * Mon Feb 19 2007 - dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit selflinux
by root＠Hilbert.suse.de 19 May '07

19 May '07

Hello community, here is the log from the commit of package selflinux checked in at Sat May 19 11:33:46 CEST 2007. -------- --- selflinux/selflinux.changes 2006-01-25 21:47:46.000000000 +0100 +++ /mounts/work_src_done/NOARCH/selflinux/selflinux.changes 2007-05-19 10:05:46.246060000 +0200 @@ -1,0 +2,5 @@ +Sat May 19 10:05:36 CEST 2007 - coolo(a)suse.de + +- remove X-Suse-translate from desktop file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ selflinux.spec ++++++ --- /var/tmp/diff_new_pack.e23841/_old 2007-05-19 11:33:35.000000000 +0200 +++ /var/tmp/diff_new_pack.e23841/_new 2007-05-19 11:33:35.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package selflinux (Version 0.12.1) # -# Copyright (c) 2006 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://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -16,8 +16,8 @@ Group: Documentation/Other Autoreq: on Version: 0.12.1 -Release: 3 -License: LGPL, distributable +Release: 63 +License: GNU Free Documentation License, Version 1.1 (GFDL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Summary: Linux tutorial BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -87,7 +87,9 @@ %endif %config (noreplace) %{apache_sysconfdir}/conf.d/%{name}.conf -%changelog -n selflinux +%changelog +* Sat May 19 2007 - coolo(a)suse.de +- remove X-Suse-translate from desktop file * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Jan 09 2006 - coolo(a)suse.de ++++++ selflinux.desktop ++++++ --- selflinux/selflinux.desktop 2006-01-09 15:29:49.000000000 +0100 +++ /mounts/work_src_done/NOARCH/selflinux/selflinux.desktop 2007-05-19 10:05:32.401918000 +0200 @@ -7,31 +7,3 @@ URL=file:/usr/share/doc/selflinux/index.html GenericName=Linux Tutorial Categories=System;Documentation; - -Name[cs]=SelfLinux -Comment[cs]=Linuxový tutoriál v němčině -Name[de]=SelfLinux -Comment[de]=Ein Linux-Tutorial auf Deutsch -Name[es]=SelfLinux -Comment[es]=Una guía de Linux en alemán -Name[fr]=SelfLinux -Comment[fr]=Un tutoriel Linux en allemand -Name[it]= SelfLinux -Comment[it]=Un tutoria Linux in tedesco -Name[ja]=SelfLinux -Comment[ja]=ドイツ語の Linux チュートリアル -Name[nb]=SelfLinux -Comment[nb]=Linuxhåndbok på tysk -Name[nl]=SelfLinux -Comment[nl]=Een Linux cursus in het duits -Name[pl]=AutoLinux -Comment[pl]=Przewodnik po Linuksie w języku niemieckim -Name[pt_BR]=SelfLinux -Comment[pt_BR]=Tutorial Linux em Alemão -Name[sk]=SelfLinux -Comment[sk]=Úvod do Linuxu v nemčine -Name[zh_CN]=SelfLinux -Comment[zh_CN]=一套德语 Linux 教程 -Name[zh_TW]=SelfLinux -Comment[zh_TW]=德文版的 Linux 教學課程 -X-SuSE-translate=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yacas
by root＠Hilbert.suse.de 19 May '07

19 May '07

Hello community, here is the log from the commit of package yacas checked in at Sat May 19 10:26:36 CEST 2007. -------- --- yacas/yacas.changes 2007-05-17 19:57:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/yacas/yacas.changes 2007-05-19 09:59:45.009397000 +0200 @@ -1,0 +2,5 @@ +Sat May 19 09:59:33 CEST 2007 - coolo(a)suse.de + +- remove X-SuSE-translate from desktop file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yacas.spec ++++++ --- /var/tmp/diff_new_pack.kTw749/_old 2007-05-19 10:25:26.000000000 +0200 +++ /var/tmp/diff_new_pack.kTw749/_new 2007-05-19 10:25:26.000000000 +0200 @@ -32,7 +32,7 @@ Autoreqprov: on Summary: YACAS is an easy to use, general purpose Computer Algebra System. Version: 1.0.63 -Release: 26 +Release: 27 Source: %{name}-%{version}.tar.bz2 Source2: yacaslogo.xpm Source3: yacas.desktop @@ -142,6 +142,8 @@ %doc %{_defaultdocdir}/%{name} %changelog +* Sat May 19 2007 - coolo(a)suse.de +- remove X-SuSE-translate from desktop file * Thu May 17 2007 - lrupp(a)suse.de - make it build on older distributions again * Thu Apr 19 2007 - aj(a)suse.de ++++++ yacas.desktop ++++++ --- yacas/yacas.desktop 2007-02-26 17:59:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/yacas/yacas.desktop 2007-05-19 09:59:31.544872000 +0200 @@ -5,5 +5,3 @@ Type=Application Exec=proteusworksheet Icon=yacaslogo.xpm - -X-SuSE-translate=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xawtv
by root＠Hilbert.suse.de 19 May '07

19 May '07

Hello community, here is the log from the commit of package xawtv checked in at Sat May 19 10:25:19 CEST 2007. -------- --- xawtv/xawtv.changes 2007-04-19 01:40:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/xawtv/xawtv.changes 2007-05-19 10:14:06.450359000 +0200 @@ -1,0 +2,5 @@ +Sat May 19 10:13:50 CEST 2007 - coolo(a)suse.de + +- remove translations from desktop files + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xawtv.spec ++++++ --- /var/tmp/diff_new_pack.e31790/_old 2007-05-19 10:24:39.000000000 +0200 +++ /var/tmp/diff_new_pack.e31790/_new 2007-05-19 10:24:39.000000000 +0200 @@ -19,7 +19,7 @@ Conflicts: xaw3dd Autoreqprov: on Version: 3.95 -Release: 47 +Release: 58 Summary: Video4Linux TV application (Athena) Source: http://dl.bytesex.org/releases/xawtv/%{name}-%{version}.tar.bz2 Source1: xawtv.desktop @@ -285,6 +285,8 @@ rm -rf "%{buildroot}" %changelog +* Sat May 19 2007 - coolo(a)suse.de +- remove translations from desktop files * Thu Apr 19 2007 - ro(a)suse.de - added %%{_mandir}/fr directory to filelist * Fri Mar 30 2007 - rguenther(a)suse.de ++++++ motv.desktop ++++++ --- xawtv/motv.desktop 2006-10-16 15:11:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/xawtv/motv.desktop 2007-05-19 10:13:45.899930000 +0200 @@ -2,63 +2,6 @@ Categories=AudioVideo;TV;AudioVideo; Encoding=UTF-8 GenericName=Watch TV! -GenericName[af]=Waarneem Tv! -GenericName[az]=TV seyr et! -GenericName[bg]=Гледане на Телевизия! -GenericName[br]=Pellwel -GenericName[bs]=Gledajte TV! -GenericName[ca]=Mira la TV! -GenericName[cs]=Sledujte televizi! -#SUSE-Overwrite GenericName[da]=Se tv! -GenericName[da]=Se TV! -GenericName[de]=Fernsehen mit dem Computer -GenericName[el]=Δείτε TV! -GenericName[eo]=Televidprogramo -GenericName[es]=¡Vea la televisión! -GenericName[et]=Televiisor! -GenericName[eu]=Ikusi Telebista! -GenericName[fa]=تلویزیون ببینید! -#SUSE-Overwrite GenericName[fi]=Katso televisiota! -GenericName[fi]=Katsele televisiota! -GenericName[fo]=Sjónvarp -GenericName[fr]=Regardez la télévision ! -GenericName[he]=צפייה בטלוויזיה -GenericName[hu]=tévénéző program -GenericName[id]=Lihat TV! -GenericName[is]=Horfðu á sjónvarp! -GenericName[it]=Guarda la TV! -GenericName[ja]=TVです! -GenericName[ko]=TV를 보자! -GenericName[lo]=ເບິ່ງໂທລະພາບ ! -GenericName[lv]=Skatīties TV! -GenericName[mk]=Гледај телевизија! -GenericName[mn]=Зурагт үз! -GenericName[mt]=Ara t-TV! -GenericName[nb]=Se TV! -GenericName[nl]=tv kijken! -GenericName[nn]=Sjå TV! -GenericName[nso]=Bogela TV! -GenericName[pl]=Oglądanie TV! -GenericName[pt]=Veja Televisão! -GenericName[pt_BR]=Assista TV! -GenericName[ro]=Priveşte la TV! -GenericName[ru]=Телевизор -GenericName[se]=Geahčča TV! -GenericName[sk]=Pozerajte sa na TV! -GenericName[sl]=Glejte televizijo! -GenericName[sr]=Gledajte TV! -GenericName[ss]=Buka i-TV! -GenericName[sv]=Titta på TV -GenericName[ta]=¦¾¡¨Äì¸¡ðº¢ À¡Õí¸û! -GenericName[th]=ดูทีวี ! -GenericName[tr]=TV seyret! -GenericName[uk]=Дивитися ТБ! -GenericName[ven]=Talelani Tsumbazwifanyiso! -GenericName[vi]=Xem TV! -GenericName[xh]=Bukela Umabona-kude! -GenericName[zh_CN]=看电视！ -GenericName[zh_TW]=看電視！ -GenericName[zu]=Buka Umabonakude! Exec=motv Icon=xawtv Name=MoTV @@ -66,8 +9,3 @@ Terminal=0 TerminalOptions= Type=Application - -X-SuSE-translate=true -GenericName[km]=មើលទូរទស្សន៍ ! -GenericName[pa]=TV ਵੇਖੋ! - ++++++ xawtv.desktop ++++++ --- xawtv/xawtv.desktop 2006-10-16 15:48:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/xawtv/xawtv.desktop 2007-05-19 10:13:22.116735000 +0200 @@ -9,6 +9,3 @@ Terminal=0 TerminalOptions= Type=Application - -X-SuSE-translate=true - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 smart
by root＠Hilbert.suse.de 19 May '07

19 May '07

Hello community, here is the log from the commit of package smart checked in at Sat May 19 10:24:30 CEST 2007. -------- --- smart/smart.changes 2007-03-07 13:01:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/smart/smart.changes 2007-05-19 09:56:22.814796000 +0200 @@ -1,0 +2,5 @@ +Sat May 19 09:55:52 CEST 2007 - coolo(a)suse.de + +- remove X-SuSE-translate from desktop file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smart.spec ++++++ --- /var/tmp/diff_new_pack.r29952/_old 2007-05-19 10:24:04.000000000 +0200 +++ /var/tmp/diff_new_pack.r29952/_new 2007-05-19 10:24:04.000000000 +0200 @@ -20,7 +20,7 @@ %endif Summary: Smart Package Manager Version: 0.50 -Release: 8 +Release: 27 Source: %{name}-%{version}.tar.bz2 Source1: distro.py Source2: %{name}.desktop @@ -214,6 +214,8 @@ /opt/kde3/share/apps/konqueror %changelog +* Sat May 19 2007 - coolo(a)suse.de +- remove X-SuSE-translate from desktop file * Wed Mar 07 2007 - cthiel(a)suse.de - added channels.tar.bz2, which includes preconfigured openSUSE channels for smart. * Thu Mar 01 2007 - cthiel(a)suse.de ++++++ smart-ksmarttray.desktop ++++++ --- smart/smart-ksmarttray.desktop 2006-06-01 11:49:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/smart/smart-ksmarttray.desktop 2007-05-19 09:55:47.758881000 +0200 @@ -12,4 +12,3 @@ Comment=Monitors channels for new packages X-KDE-SubstituteUID=true X-KDE-Username=root -X-SuSE-translate=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rocksndiamonds
by root＠Hilbert.suse.de 19 May '07

19 May '07

Hello community, here is the log from the commit of package rocksndiamonds checked in at Sat May 19 10:23:55 CEST 2007. -------- --- rocksndiamonds/rocksndiamonds.changes 2007-03-05 09:59:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/rocksndiamonds/rocksndiamonds.changes 2007-05-19 10:05:06.651695000 +0200 @@ -1,0 +2,5 @@ +Sat May 19 10:04:46 CEST 2007 - coolo(a)suse.de + +- remove X-SuSE-translate from desktop file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rocksndiamonds.spec ++++++ --- /var/tmp/diff_new_pack.f28722/_old 2007-05-19 10:23:15.000000000 +0200 +++ /var/tmp/diff_new_pack.f28722/_new 2007-05-19 10:23:15.000000000 +0200 @@ -18,7 +18,7 @@ Obsoletes: rockdiam Autoreqprov: on Version: 3.2.3 -Release: 6 +Release: 24 PreReq: permissions Summary: Arcade style game with stereo sounds URL: http://www.artsoft.org/rocksndiamonds/ @@ -120,6 +120,8 @@ %attr(775,games,games) /var/games/rocksndiamonds %changelog +* Sat May 19 2007 - coolo(a)suse.de +- remove X-SuSE-translate from desktop file * Mon Mar 05 2007 - ssommer(a)suse.de - BuildRequires SDL_net-devel * Mon Feb 05 2007 - anosek(a)suse.cz ++++++ rocksndiamonds.desktop ++++++ --- rocksndiamonds/rocksndiamonds.desktop 2005-12-19 16:19:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/rocksndiamonds/rocksndiamonds.desktop 2007-05-19 10:04:42.914458000 +0200 @@ -6,5 +6,3 @@ Terminal=false Icon=rocksndiamonds Type=Application - -X-SuSE-translate=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenEXR
by root＠Hilbert.suse.de 19 May '07

19 May '07

Hello community, here is the log from the commit of package OpenEXR checked in at Sat May 19 10:23:08 CEST 2007. -------- --- OpenEXR/OpenEXR.changes 2007-05-15 00:23:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenEXR/OpenEXR.changes 2007-05-19 06:34:08.000000000 +0200 @@ -1,0 +2,5 @@ +Sat May 19 06:03:13 CEST 2007 - stbinner(a)suse.de + +- fix linking of new IlmThread lib versus libpthread + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenEXR.spec ++++++ --- /var/tmp/diff_new_pack.l26795/_old 2007-05-19 10:22:54.000000000 +0200 +++ /var/tmp/diff_new_pack.l26795/_new 2007-05-19 10:22:54.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: fltk-devel freeglut-devel gcc-c++ libdrm-devel Summary: Library to Handle EXR Pictures in 16-Bit Floating-Point Format Version: 1.4.0a -Release: 1 +Release: 2 License: BSD License and BSD-like, GNU General Public License (GPL) Group: Development/Libraries/C and C++ URL: http://www.openexr.com/ @@ -144,6 +144,7 @@ # export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" +export PTHREAD_LIBS="-lpthread" ./configure \ --prefix=/usr \ --libdir=%_libdir @@ -200,6 +201,8 @@ %doc IlmImfExamples/*.cpp IlmImfExamples/*.h %changelog +* Sat May 19 2007 - stbinner(a)suse.de +- fix linking of new IlmThread lib versus libpthread * Tue May 15 2007 - ltinkl(a)suse.cz - update to 1.4.6 - fix build, fix packaging examples and doc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 konserve
by root＠Hilbert.suse.de 19 May '07

19 May '07

Hello community, here is the log from the commit of package konserve checked in at Sat May 19 10:22:46 CEST 2007. -------- --- KDE/konserve/konserve.changes 2006-01-25 21:33:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/konserve/konserve.changes 2007-05-19 03:59:54.000000000 +0200 @@ -1,0 +2,5 @@ +Sat May 19 03:59:32 CEST 2007 - stbinner(a)suse.de + +- fix duplicate X-SuSE-translate in .desktop file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konserve.spec ++++++ --- /var/tmp/diff_new_pack.r24677/_old 2007-05-19 10:21:51.000000000 +0200 +++ /var/tmp/diff_new_pack.r24677/_new 2007-05-19 10:21:51.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package konserve (Version 0.10.3) # -# 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 @@ -13,12 +13,12 @@ Name: konserve BuildRequires: kdelibs3-devel URL: http://konserve.sourceforge.net/ -License: GPL +License: GNU General Public License (GPL) Group: Productivity/Archiving/Backup -Summary: A small Backup Tool +Summary: A Small Backup Tool BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 0.10.3 -Release: 6 +Release: 81 Source0: konserve-%{version}.tar.bz2 Patch: konserve.diff Patch1: fix-desktop-file.diff @@ -59,7 +59,9 @@ %doc %lang(en) /opt/kde3/share/doc/HTML/en/konserve /opt/kde3/share/icons/* -%changelog -n konserve +%changelog +* Sat May 19 2007 - stbinner(a)suse.de +- fix duplicate X-SuSE-translate in .desktop file * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Sun Oct 02 2005 - stbinner(a)suse.de ++++++ fix-desktop-file.diff ++++++ --- /var/tmp/diff_new_pack.r24677/_old 2007-05-19 10:21:51.000000000 +0200 +++ /var/tmp/diff_new_pack.r24677/_new 2007-05-19 10:21:51.000000000 +0200 @@ -1,8 +1,7 @@ --- konserve/konserve.desktop 2005/10/02 09:48:48 1.1 +++ konserve/konserve.desktop 2005/10/02 09:49:19 -@@ -11,3 +11,5 @@ +@@ -11,3 +11,4 @@ Name=konserve Name[sv]=Konserve Name[ta]=kio_uiserver +GenericName=Backup Tool -+X-SuSE-translate=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdeedu3
by root＠Hilbert.suse.de 19 May '07

19 May '07

Hello community, here is the log from the commit of package kdeedu3 checked in at Sat May 19 10:21:44 CEST 2007. -------- --- KDE/kdeedu3/kdeedu3.changes 2007-01-17 12:00:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdeedu3/kdeedu3.changes 2007-05-19 06:50:59.136314000 +0200 @@ -1,0 +2,5 @@ +Sat May 19 06:50:47 CEST 2007 - stbinner(a)suse.de + +- remove one duplicate suse_update_desktop call + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeedu3.spec ++++++ --- /var/tmp/diff_new_pack.P24099/_old 2007-05-19 10:21:29.000000000 +0200 +++ /var/tmp/diff_new_pack.P24099/_new 2007-05-19 10:21:29.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/GUI/KDE Summary: Education Applications Version: 3.5.6 -Release: 1 +Release: 24 Url: http://www.kde.org Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Provides: kgeo,keduca,kalzium @@ -83,7 +83,6 @@ %suse_update_desktop_file keduca Education Teaching %suse_update_desktop_file keducabuilder Education Teaching %suse_update_desktop_file ktouch Education Teaching -%suse_update_desktop_file kwordquiz Education Teaching %suse_update_desktop_file blinken Education Teaching %suse_update_desktop_file kgeography Education Teaching %suse_update_desktop_file kanagram Education Languages @@ -135,7 +134,9 @@ /opt/kde3/share/icons/*/*/*/* /opt/kde3/share/mimelnk/application/x-* -%changelog -n kdeedu3 +%changelog +* Sat May 19 2007 - stbinner(a)suse.de +- remove one duplicate suse_update_desktop call * Tue Jan 16 2007 - stbinner(a)suse.de - update to 3.5.6 release: * bugfixes within KGeography, kig, KTouch, KTurtle, KWorldQuiz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 albumshaper
by root＠Hilbert.suse.de 19 May '07

19 May '07

Hello community, here is the log from the commit of package albumshaper checked in at Sat May 19 10:21:22 CEST 2007. -------- --- albumshaper/albumshaper.changes 2007-04-05 17:16:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/albumshaper/albumshaper.changes 2007-05-19 10:04:27.375010000 +0200 @@ -1,0 +2,5 @@ +Sat May 19 10:04:18 CEST 2007 - coolo(a)suse.de + +- remove X-SuSE-translate from desktop file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ albumshaper.spec ++++++ --- /var/tmp/diff_new_pack.U23446/_old 2007-05-19 10:21:05.000000000 +0200 +++ /var/tmp/diff_new_pack.U23446/_new 2007-05-19 10:21:05.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: libdrm-devel libjpeg-devel libxslt-devel qt3-devel update-desktop-files Summary: Tool for Organizing and Enhancing Photos Version: 2.1 -Release: 58 +Release: 71 URL: http://albumshaper.sourceforge.net/ License: GNU General Public License (GPL) Group: Productivity/Graphics/Viewers @@ -85,6 +85,8 @@ /usr/share/pixmaps/albumshaper.png %changelog +* Sat May 19 2007 - coolo(a)suse.de +- remove X-SuSE-translate from desktop file * Thu Apr 05 2007 - pnemec(a)suse.cz - another fix to use RPM_BUILD_ROOT correctly - package has to be called using shell wraper, ++++++ albumshaper.desktop ++++++ --- albumshaper/albumshaper.desktop 2005-10-07 12:13:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/albumshaper/albumshaper.desktop 2007-05-19 10:04:14.109295000 +0200 @@ -1,5 +1,4 @@ [Desktop Entry] -X-SuSE-translate=true Encoding=UTF-8 Name=AlbumShaper Type=Application @@ -7,5 +6,3 @@ Exec=AlbumShaper Icon=albumshaper GenericName=Photo Manager -GenericName[cs]=Správce fotografií - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 CASA_auth_token_svc
by root＠Hilbert.suse.de 18 May '07

18 May '07

Hello community, here is the log from the commit of package CASA_auth_token_svc checked in at Fri May 18 23:51:55 CEST 2007. -------- --- CASA_auth_token_svc/CASA_auth_token_svc.changes 2007-04-26 17:51:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/CASA_auth_token_svc/CASA_auth_token_svc.changes 2007-05-17 19:42:40.000000000 +0200 @@ -1,0 +2,33 @@ +Thu May 10 10:55:22 MDT 2007 - jluciani(a)novell.com + +- Removed the temporary work around made to the SPEC files + which was allowing the user casaatsd to have a shell. + +- Removed the OES workaround from the CasaBasicATSSetup script + since it is no longer needed. + +------------------------------------------------------------------- +Wed May 9 16:38:14 MDT 2007 - jluciani(a)novell.com + +- Added the capability to read REALM credentials from miCASA to + avoid having the credentials in the clear in the iaRealms.xml + file. This change adds a dependency on CASA and partially + addresses BUG265414. + +- Created a utility that allows users to edit the iaRealms.xml + file. This was necessary to support the CASA ATS Yast Module + enhancements. + +- Fixed settings and policy utilities to output error messages + to stderr instead of stdout to avoid messing up the CASA ATS + Yast Module. + +- Fixed the SPEC files to set the appropriate home folder for + the casaatsd user. + +- Temporary changed the SPEC files to allow the casaatsd user + to have a shell. This change will be reverted as soon as + the CASAcli is updated to allow a root user to pass the + UID of the user being targeted. + +------------------------------------------------------------------- Old: ---- CASA_auth_token_svc-1.7.1327.tar.bz2 check-build.sh New: ---- CASA_auth_token_svc-1.7.1365.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CASA_auth_token_svc.spec ++++++ --- /var/tmp/diff_new_pack.X15733/_old 2007-05-18 23:51:30.000000000 +0200 +++ /var/tmp/diff_new_pack.X15733/_new 2007-05-18 23:51:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package CASA_auth_token_svc (Version 1.7.1327 ) +# spec file for package CASA_auth_token_svc (Version 1.7.1365 ) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,19 +16,19 @@ URL: http://www.novell.com/products BuildRequires: gcc-c++ glib2-devel identity-abstraction insserv libstdc++ libstdc++-devel mono-devel pkgconfig servletapi5 sysvinit xerces-j2 xml-commons-apis -BuildRequires: jakarta-commons-logging java-sdk-1.5.0 log4j pwdutils update-alternatives +BuildRequires: CASA-devel jakarta-commons-logging java-sdk-1.5.0 log4j pwdutils update-alternatives %define prefix /usr License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Autoreqprov: on -%define bldno 1.7.1327 -Version: 1.7.1327 +%define bldno 1.7.1365 +Version: 1.7.1365 Release: 1 Summary: Novell CASA Authentication Token Service Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: jre >= 1.5.0 -Requires: servletapi5 tomcat5 sysvinit insserv identity-abstraction sed log4j xerces-j2 +Requires: servletapi5 tomcat5 sysvinit insserv identity-abstraction sed log4j xerces-j2 CASA PreReq: %fillup_prereq %insserv_prereq PreReq: /usr/bin/awk, /usr/bin/test, /bin/grep, /bin/cat, /usr/bin/install, /bin/pwd PreReq: /usr/sbin/groupadd, /usr/sbin/useradd, /usr/sbin/userdel, /usr/bin/getent @@ -155,6 +155,7 @@ install -m 755 %{_lib}/java/CasaSvcSettingsEditor.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaSvcSettingsEditor-%{bldno}.jar install -m 755 %{_lib}/java/CasaAuthPolicyEditor.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaAuthPolicyEditor-%{bldno}.jar install -m 755 %{_lib}/java/CasaTomcatConnectorEditor.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaTomcatConnectorEditor-%{bldno}.jar +install -m 755 %{_lib}/java/CasaIaRealmsEditor.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaIaRealmsEditor-%{bldno}.jar # Symbolic Links ln -sf CasaAuthTokenSvc-%{bldno}.war %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaAuthTokenSvc.war ln -sf CasaAuthTokenSettingsEditor-%{bldno}.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaAuthTokenSettingsEditor.jar @@ -162,6 +163,7 @@ ln -sf CasaSvcSettingsEditor-%{bldno}.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaSvcSettingsEditor.jar ln -sf CasaAuthPolicyEditor-%{bldno}.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaAuthPolicyEditor.jar ln -sf CasaTomcatConnectorEditor-%{bldno}.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaTomcatConnectorEditor.jar +ln -sf CasaIaRealmsEditor-%{bldno}.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaIaRealmsEditor.jar # Settings and configuration files install -m 600 Svc/templates/svc.settings %{buildroot}/etc/CASA/authtoken/svc/templates/svc.settings install -m 600 Svc/templates/auth.policy %{buildroot}/etc/CASA/authtoken/svc/templates/auth.policy @@ -178,6 +180,7 @@ install -m 700 Svc/linux/CasaBasicATSSetup.sh %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaBasicATSSetup.sh install -m 700 Svc/linux/CasaAuthPolicyEditor.sh %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaAuthPolicyEditor.sh install -m 700 Svc/linux/CasaTomcatConnectorEditor.sh %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaTomcatConnectorEditor.sh +install -m 700 Svc/linux/CasaIaRealmsEditor.sh %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaIaRealmsEditor.sh install -m 700 Svc/linux/CasaAuthTokenSettingsEditor.sh %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaAuthTokenSettingsEditor.sh install -m 700 Svc/linux/CasaIdenTokenSettingsEditor.sh %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaIdenTokenSettingsEditor.sh install -m 700 Svc/linux/CasaSvcSettingsEditor.sh %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaSvcSettingsEditor.sh @@ -215,7 +218,7 @@ fi user_present=`getent passwd | grep ^casaatsd` if [ -z "$user_present" ] ; then - /usr/sbin/useradd -c "casaatsd System User" -s /bin/false -r -d /var/lib/CASA/authtoken/validate -g casaauth casaatsd 2> /dev/null || : + /usr/sbin/useradd -c "casaatsd System User" -s /bin/false -r -d /var/lib/CASA/authtoken/svc -g casaauth casaatsd 2> /dev/null || : fi %post @@ -253,6 +256,7 @@ %{prefix}/share/java/CASA/authtoken/bin/CasaBasicATSSetup.sh %{prefix}/share/java/CASA/authtoken/bin/CasaAuthPolicyEditor.sh %{prefix}/share/java/CASA/authtoken/bin/CasaTomcatConnectorEditor.sh +%{prefix}/share/java/CASA/authtoken/bin/CasaIaRealmsEditor.sh %{prefix}/share/java/CASA/authtoken/bin/CasaAuthTokenSettingsEditor.sh %{prefix}/share/java/CASA/authtoken/bin/CasaIdenTokenSettingsEditor.sh %{prefix}/share/java/CASA/authtoken/bin/CasaSvcSettingsEditor.sh @@ -266,6 +270,8 @@ %{prefix}/share/java/CASA/authtoken/bin/CasaAuthPolicyEditor.jar %{prefix}/share/java/CASA/authtoken/bin/CasaTomcatConnectorEditor-%{bldno}.jar %{prefix}/share/java/CASA/authtoken/bin/CasaTomcatConnectorEditor.jar +%{prefix}/share/java/CASA/authtoken/bin/CasaIaRealmsEditor-%{bldno}.jar +%{prefix}/share/java/CASA/authtoken/bin/CasaIaRealmsEditor.jar /etc/init.d/casa_atsd %defattr(-,casaatsd,casaauth) %dir /srv/www/casaats @@ -342,6 +348,28 @@ %config /etc/CASA/authtoken/keys/client/casa_crypto.properties %changelog +* Thu May 10 2007 - jluciani(a)novell.com +- Removed the temporary work around made to the SPEC files + which was allowing the user casaatsd to have a shell. +- Removed the OES workaround from the CasaBasicATSSetup script + since it is no longer needed. +* Wed May 09 2007 - jluciani(a)novell.com +- Added the capability to read REALM credentials from miCASA to + avoid having the credentials in the clear in the iaRealms.xml + file. This change adds a dependency on CASA and partially + addresses BUG265414. +- Created a utility that allows users to edit the iaRealms.xml + file. This was necessary to support the CASA ATS Yast Module + enhancements. +- Fixed settings and policy utilities to output error messages + to stderr instead of stdout to avoid messing up the CASA ATS + Yast Module. +- Fixed the SPEC files to set the appropriate home folder for + the casaatsd user. +- Temporary changed the SPEC files to allow the casaatsd user + to have a shell. This change will be reverted as soon as + the CASAcli is updated to allow a root user to pass the + UID of the user being targeted. * Fri Apr 20 2007 - jluciani(a)novell.com - Created utilities for editing the connector entry for the server.xml Tomcat configuration file so that it can be ++++++ CASA_auth_token_svc-1.7.1327.tar.bz2 -> CASA_auth_token_svc-1.7.1365.tar.bz2 ++++++ CASA_auth_token_svc/CASA_auth_token_svc-1.7.1327.tar.bz2 /mounts/work_src_done/STABLE/CASA_auth_token_svc/CASA_auth_token_svc-1.7.1365.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit CASA
by root＠Hilbert.suse.de 18 May '07

18 May '07

Hello community, here is the log from the commit of package CASA checked in at Fri May 18 23:49:10 CEST 2007. -------- --- CASA/CASA.changes 2007-04-25 23:31:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/CASA/CASA.changes 2007-05-17 18:49:36.000000000 +0200 @@ -1,0 +2,49 @@ +Thu May 17 10:09:57 MDT 2007 - jnorman(a)novell.com + +- Bug 265898. Fix makefile to build cli + +------------------------------------------------------------------- +Wed May 16 17:01:03 MDT 2007 - jnorman(a)novell.com + +- Bug 265898. Replace mono based cli with native based one. + This was needed to support changing the UID + +------------------------------------------------------------------- +Fri May 11 10:09:25 MDT 2007 - jnorman(a)novell.com + +- Bug 251414. Added Title to Destroy Secrets dialog. + +------------------------------------------------------------------- +Thu May 10 15:05:45 MDT 2007 - jnorman(a)novell.com + +- Bug 260131. Handle UTF8 values properly. + +------------------------------------------------------------------- +Tue May 8 12:01:24 MDT 2007 - jnorman(a)novell.com + +- Bug 222012. Fix for security audit 5.1.2 + +------------------------------------------------------------------- +Wed May 2 11:59:20 MDT 2007 - jnorman(a)novell.com + +- Bug 267542. Creating salt file threw an exception. Changed mode + of file creation. + +------------------------------------------------------------------- +Wed May 2 10:04:42 MDT 2007 - jnorman(a)novell.com + +- Bug 265898. CLI change. Read the KEYVALUE environment variable + when setting the value of a key. + +------------------------------------------------------------------- +Tue May 1 09:15:13 MDT 2007 - jnorman(a)novell.com + +- Bug 265898. Rename CASAUtil to CASAcli per Baber's request + +------------------------------------------------------------------- +Mon Apr 30 17:01:33 MDT 2007 - jnorman(a)novell.com + +- Bug 265898. Seperate CLI into it's own rpm for cypress. + CASAUtil is no longer in the base CASA rpm. + +------------------------------------------------------------------- Old: ---- CASA-1.7.1326.tar.bz2 New: ---- CASA-1.7.1365.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CASA.spec ++++++ --- /var/tmp/diff_new_pack.Cs9404/_old 2007-05-18 23:48:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Cs9404/_new 2007-05-18 23:48:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package CASA (Version 1.7.1326 ) +# spec file for package CASA (Version 1.7.1365 ) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -22,7 +22,7 @@ Group: Productivity/Other Autoreqprov: on %define bldno 1.1.1 -Version: 1.7.1326 +Version: 1.7.1365 Release: 1 Summary: Novell Common Authentication Service Adapter (CASA) Source: %{name}-%{version}.tar.bz2 @@ -49,6 +49,22 @@ -------- Novell, Inc. +%package cli +Summary: CASA command line interface +Group: Productivity/Other +Requires: CASA = %{version} + +%description cli +This package contains a CLI(command line interface) that provides a way +for administrators to set, reset or delete credentials used by +services. These credentials are stored in CASA. + + + +Authors: +-------- + Novell, Inc. + %package devel Summary: CASA include Files and Libraries mandatory for Development Group: Productivity/Other @@ -103,6 +119,9 @@ %install export NO_BRP_CHECK_BYTECODE_VERSION="true" mkdir -p %{buildroot}%{prefix} +mkdir -p %{buildroot}%{bin_prefix}/share +mkdir -p %{buildroot}%{bin_prefix}/share/java +mkdir -p %{buildroot}%{bin_prefix}/share/java/CASA mkdir -p %{buildroot}%{prefix}/CASA mkdir -p %{buildroot}%{bin_prefix}/%{_lib} mkdir -p %{buildroot}%{bin_prefix}/bin @@ -129,10 +148,9 @@ install -m 755 %{binsource}/%{cfg}/micasad.exe %{buildroot}%{bin_prefix}/bin install -m 755 %{binsource}/%{cfg}/micasad-init %{buildroot}%{bin_prefix}/bin install -m 755 %{binsource}/%{cfg}/CASAManager.exe %{buildroot}%{bin_prefix}/bin -install -m 755 %{binsource}/%{cfg}/CASAUtil.exe %{buildroot}%{bin_prefix}/bin +install -m 755 %{binsource}/%{cfg}/CASAcli %{buildroot}%{bin_prefix}/bin install -m 755 gui/CASAManager.sh %{buildroot}%{bin_prefix}/bin install -m 755 gui/CASAManager.exe.config %{buildroot}%{bin_prefix}/bin -install -m 755 cli/CASAUtil %{buildroot}%{bin_prefix}/bin install -m 644 gui/images/* %{buildroot}%{prefix}/CASA/images install -m 644 gui/help/en/* %{buildroot}%{prefix}/CASA/help/en install -m 755 micasad/startup/micasad %{buildroot}/etc/init.d @@ -154,6 +172,7 @@ install -d %{buildroot}/etc/init.d #install -m 644 %{buildroot}%{prefix}/%{_lib}/miCASA.jar %{buildroot}%{prefix}/CASA/%{_lib} install -m 755 %{_lib}/%{cfg}/miCASA.jar %{buildroot}%{bin_prefix}/%{_lib} +install -m 755 %{_lib}/%{cfg}/miCASA.jar %{buildroot}%{bin_prefix}/share/java/CASA/miCASA.jar install -m 644 doc/product/CASA_Reference_Guide.pdf %{buildroot}%{prefix}/CASA/doc install -m 644 doc/product/License.txt %{buildroot}%{prefix}/CASA/doc install -m 644 doc/product/Readme.txt %{buildroot}%{prefix}/CASA/doc @@ -204,6 +223,7 @@ %files %defattr(-,root,root) +%dir %{bin_prefix}/share/java/CASA %dir %{prefix}/CASA %dir %{prefix}/CASA/doc %dir %{bin_prefix}/%{_lib}/libmicasa.so.%{bldno} @@ -226,13 +246,16 @@ %{bin_prefix}/sbin/iscasaconfiged %{bin_prefix}/sbin/micasad.sh %{bin_prefix}/%{_lib}/miCASA.jar +%{bin_prefix}/share/java/CASA/miCASA.jar %{bin_prefix}/bin/micasad.exe %{bin_prefix}/bin/micasad-init %{prefix}/CASA/doc/CASA_Reference_Guide.pdf %{prefix}/CASA/doc/License.txt %{prefix}/CASA/doc/Readme.txt -%{bin_prefix}/bin/CASAUtil.exe -%{bin_prefix}/bin/CASAUtil + +%files cli +%defattr(-,root,root) +%{bin_prefix}/bin/CASAcli %files devel %defattr(-,root,root) @@ -266,6 +289,28 @@ %{prefix}/CASA/help/en/* %changelog +* Thu May 17 2007 - jnorman(a)novell.com +- Bug 265898. Fix makefile to build cli +* Wed May 16 2007 - jnorman(a)novell.com +- Bug 265898. Replace mono based cli with native based one. + This was needed to support changing the UID +* Fri May 11 2007 - jnorman(a)novell.com +- Bug 251414. Added Title to Destroy Secrets dialog. +* Thu May 10 2007 - jnorman(a)novell.com +- Bug 260131. Handle UTF8 values properly. +* Tue May 08 2007 - jnorman(a)novell.com +- Bug 222012. Fix for security audit 5.1.2 +* Wed May 02 2007 - jnorman(a)novell.com +- Bug 267542. Creating salt file threw an exception. Changed mode + of file creation. +* Wed May 02 2007 - jnorman(a)novell.com +- Bug 265898. CLI change. Read the KEYVALUE environment variable + when setting the value of a key. +* Tue May 01 2007 - jnorman(a)novell.com +- Bug 265898. Rename CASAUtil to CASAcli per Baber's request +* Mon Apr 30 2007 - jnorman(a)novell.com +- Bug 265898. Seperate CLI into it's own rpm for cypress. + CASAUtil is no longer in the base CASA rpm. * Wed Apr 18 2007 - jnorman(a)novell.com - Bug 265898. Added a CLI for cypress for management of service credentials. ++++++ CASA-1.7.1326.tar.bz2 -> CASA-1.7.1365.tar.bz2 ++++++ CASA/CASA-1.7.1326.tar.bz2 /mounts/work_src_done/STABLE/CASA/CASA-1.7.1365.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-update
by root＠Hilbert.suse.de 18 May '07

18 May '07

Hello community, here is the log from the commit of package yast2-update checked in at Fri May 18 19:06:04 CEST 2007. -------- --- yast2-update/yast2-update.changes 2007-05-03 16:42:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2007-05-18 16:34:25.000000000 +0200 @@ -1,0 +2,12 @@ +Thu May 17 22:40:09 CEST 2007 - locilka(a)suse.cz + +- System Update icon is back in Control Center (#274064) +- System Update functionality is allowed only when product versions + are matching (can have a different name). Non-matching product + means no possibility for System Update. +- Warning is printed when versions match but product names are + different (#274064). +- System Update temporarily renamed to 'FACTORY Update'. +- 2.15.12 + +------------------------------------------------------------------- Old: ---- yast2-update-2.15.11.tar.bz2 New: ---- yast2-update-2.15.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.i14487/_old 2007-05-18 19:05:39.000000000 +0200 +++ /var/tmp/diff_new_pack.i14487/_new 2007-05-18 19:05:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-update (Version 2.15.11) +# spec file for package yast2-update (Version 2.15.12) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,14 +11,14 @@ # norootforbuild Name: yast2-update -Version: 2.15.11 +Version: 2.15.12 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-update-2.15.11.tar.bz2 +Source0: yast2-update-2.15.12.tar.bz2 prefix: /usr -BuildRequires: perl-XML-Writer yast2 yast2-add-on yast2-devtools yast2-packager yast2-testsuite +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-add-on yast2-devtools yast2-packager yast2-testsuite Requires: yast2 Requires: yast2-installation Requires: yast2-packager @@ -51,7 +51,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-update-2.15.11 +%setup -n yast2-update-2.15.12 %build %{prefix}/bin/y2tool y2autoconf @@ -77,7 +77,7 @@ %files %defattr(-,root,root) %{prefix}/lib/YaST2/bin/* -#%{prefix}/share/applications/YaST2/*.desktop +%{prefix}/share/applications/YaST2/*.desktop /usr/share/YaST2/modules/* /usr/share/YaST2/clients/*.ycp /usr/share/YaST2/include/update @@ -86,6 +86,15 @@ %doc %{prefix}/share/doc/packages/yast2-update %changelog +* Thu May 17 2007 - locilka(a)suse.cz +- System Update icon is back in Control Center (#274064) +- System Update functionality is allowed only when product versions + are matching (can have a different name). Non-matching product + means no possibility for System Update. +- Warning is printed when versions match but product names are + different (#274064). +- System Update temporarily renamed to 'FACTORY Update'. +- 2.15.12 * Thu May 03 2007 - lslezak(a)suse.cz - Don't display excessive progress popup (#269920) - 2.15.11 ++++++ yast2-update-2.15.11.tar.bz2 -> yast2-update-2.15.12.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/configure new/yast2-update-2.15.12/configure --- old/yast2-update-2.15.11/configure 2007-05-03 16:37:46.000000000 +0200 +++ new/yast2-update-2.15.12/configure 2007-05-18 17:35:42.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-update 2.15.11. +# Generated by GNU Autoconf 2.60 for yast2-update 2.15.12. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-update' PACKAGE_TARNAME='yast2-update' -PACKAGE_VERSION='2.15.11' -PACKAGE_STRING='yast2-update 2.15.11' +PACKAGE_VERSION='2.15.12' +PACKAGE_STRING='yast2-update 2.15.12' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1181,7 +1181,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-update 2.15.11 to adapt to many kinds of systems. +\`configure' configures yast2-update 2.15.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1252,7 +1252,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-update 2.15.11:";; + short | recursive ) echo "Configuration of yast2-update 2.15.12:";; esac cat <<\_ACEOF @@ -1330,7 +1330,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-update configure 2.15.11 +yast2-update configure 2.15.12 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1344,7 +1344,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-update $as_me 2.15.11, which was +It was created by yast2-update $as_me 2.15.12, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2145,7 +2145,7 @@ # Define the identity of the package. PACKAGE='yast2-update' - VERSION='2.15.11' + VERSION='2.15.12' cat >>confdefs.h <<_ACEOF @@ -2372,7 +2372,7 @@ -VERSION="2.15.11" +VERSION="2.15.12" RPMNAME="yast2-update" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3260,7 +3260,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-update $as_me 2.15.11, which was +This file was extended by yast2-update $as_me 2.15.12, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3303,7 +3303,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-update config.status 2.15.11 +yast2-update config.status 2.15.12 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/configure.in new/yast2-update-2.15.12/configure.in --- old/yast2-update-2.15.11/configure.in 2007-05-03 16:37:39.000000000 +0200 +++ new/yast2-update-2.15.12/configure.in 2007-05-18 17:35:37.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-update dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-update, 2.15.11, http://bugs.opensuse.org/, yast2-update) +AC_INIT(yast2-update, 2.15.12, http://bugs.opensuse.org/, yast2-update) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.11" +VERSION="2.15.12" RPMNAME="yast2-update" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/src/clients/update_proposal.ycp new/yast2-update-2.15.12/src/clients/update_proposal.ycp --- old/yast2-update-2.15.11/src/clients/update_proposal.ycp 2007-05-03 16:02:14.000000000 +0200 +++ new/yast2-update-2.15.12/src/clients/update_proposal.ycp 2007-05-18 17:26:10.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Let user choose update settings. * - * $Id: update_proposal.ycp 37811 2007-05-03 14:02:12Z lslezak $ + * $Id: update_proposal.ycp 38044 2007-05-18 15:26:10Z locilka $ */ { textdomain "update"; @@ -414,14 +414,49 @@ "raw_proposal" : [] ]; } + // TRANSLATORS: unknown product (label) + string update_from = _("Unknown product"); + if (Update::installedVersion["show"]:"" != "" && Update::installedVersion["show"]:"?" != "?") { + update_from = Update::installedVersion["show"]:""; + } else if (Update::installedVersion["version"]:"" != "" && Update::installedVersion["version"]:"?" != "?") { + update_from = Update::installedVersion["name"]:""; + } + + // TRANSLATORS: unknown product (label) + string update_to = _("Unknown product"); + if (Update::updateVersion["show"]:"" != "") { + update_to = Update::updateVersion["show"]:""; + } else if (Update::updateVersion["version"]:"" != "") { + update_to = Update::updateVersion["name"]:""; + } + // when versions don't match and upgrade is not allowed (running system) - if ((Update::installedVersion["show"]:"A" != Update::updateVersion["show"]:"B") && Update::disallow_upgrade) { - // proposal error - return $[ "warning" : _("Updating to another version is not supported from the running system."), + if ((Update::installedVersion["version"]:"A" != Update::updateVersion["version"]:"B") && Update::disallow_upgrade) { + return $[ "warning" : sformat( + // TRANSLATORS: proposal error, %1 is the version of installed system + // %2 is the version being installed + _("Updating system to another version (%1 -> %2) is not supported on the running system. +Please, boot from the installation media and use a normal upgrade +or disable installation sources of products with different versions."), + update_from, update_to + ), "warning_level" : `fatal, "raw_proposal" : [] ]; } + string warning_message = nil; + // when labels don't match + if (Update::installedVersion["show"]:"A" != Update::updateVersion["show"]:"B") { + warning_message = sformat( + // TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names + _("Warning: Updating from '%1' to '%2', products do not exactly match."), + // TRANSLATORS: unknown product name + _("Unknown product"), + // TRANSLATORS: unknown product name + _("Unknown product") + ); + } + // stores the proposal text output string summary_text = ""; @@ -482,6 +517,11 @@ "preformatted_proposal" : HTML::ListStart() + summary_text + HTML::ListEnd(), "help" : update_options_help, ]; + + if (warning_message != nil) { + ret["warning"] = warning_message; + ret["warning_level"] = `warning; + } } else if ( func == "AskUser" ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/src/config/Makefile.am new/yast2-update-2.15.12/src/config/Makefile.am --- old/yast2-update-2.15.11/src/config/Makefile.am 2007-04-23 13:32:23.000000000 +0200 +++ new/yast2-update-2.15.12/src/config/Makefile.am 2007-05-18 10:44:11.000000000 +0200 @@ -7,4 +7,6 @@ control_DATA = \ update.xml +desktop_DATA = update.desktop + EXTRA_DIST = $(desktop_DATA) $(control_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/src/config/Makefile.in new/yast2-update-2.15.12/src/config/Makefile.in --- old/yast2-update-2.15.11/src/config/Makefile.in 2007-05-03 16:37:47.000000000 +0200 +++ new/yast2-update-2.15.12/src/config/Makefile.in 2007-05-18 17:35:44.000000000 +0200 @@ -57,9 +57,10 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(controldir)" +am__installdirs = "$(DESTDIR)$(controldir)" "$(DESTDIR)$(desktopdir)" controlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(control_DATA) +desktopDATA_INSTALL = $(INSTALL_DATA) +DATA = $(control_DATA) $(desktop_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -174,6 +175,7 @@ control_DATA = \ update.xml +desktop_DATA = update.desktop EXTRA_DIST = $(desktop_DATA) $(control_DATA) all: all-am @@ -225,6 +227,23 @@ echo " rm -f '$(DESTDIR)$(controldir)/$$f'"; \ rm -f "$(DESTDIR)$(controldir)/$$f"; \ done +install-desktopDATA: $(desktop_DATA) + @$(NORMAL_INSTALL) + test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)" + @list='$(desktop_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \ + $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \ + done + +uninstall-desktopDATA: + @$(NORMAL_UNINSTALL) + @list='$(desktop_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \ + rm -f "$(DESTDIR)$(desktopdir)/$$f"; \ + done tags: TAGS TAGS: @@ -263,7 +282,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(controldir)"; do \ + for dir in "$(DESTDIR)$(controldir)" "$(DESTDIR)$(desktopdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -308,7 +327,7 @@ info-am: -install-data-am: install-controlDATA +install-data-am: install-controlDATA install-desktopDATA install-exec-am: @@ -334,17 +353,18 @@ ps-am: -uninstall-am: uninstall-controlDATA uninstall-info-am +uninstall-am: uninstall-controlDATA uninstall-desktopDATA \ + uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-controlDATA install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-controlDATA \ - uninstall-info-am + install-data-am install-desktopDATA install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-controlDATA uninstall-desktopDATA uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/src/config/update.desktop new/yast2-update-2.15.12/src/config/update.desktop --- old/yast2-update-2.15.11/src/config/update.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-update-2.15.12/src/config/update.desktop 2007-05-18 13:47:11.000000000 +0200 @@ -0,0 +1,25 @@ +[Desktop Entry] +Type=Application +Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Software; + +X-KDE-ModuleType=Library +X-KDE-RootOnly=true +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=update + +X-SuSE-YaST-Group=Software +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst= +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoinstResource= + +Icon=yast-update +Exec=/sbin/yast2 update + +Name=FACTORY Update +GenericName=Update your system to the newest packages from FACTORY (expert tool) +Comment=Update your system to the newest packages from FACTORY (expert tool) +X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/src/modules/RootPart.ycp new/yast2-update-2.15.12/src/modules/RootPart.ycp --- old/yast2-update-2.15.11/src/modules/RootPart.ycp 2007-04-23 13:32:23.000000000 +0200 +++ new/yast2-update-2.15.12/src/modules/RootPart.ycp 2007-05-18 10:44:11.000000000 +0200 @@ -6,7 +6,7 @@ * Purpose: Responsible for searching of root partitions and * mounting of target partitions. * - * $Id: RootPart.ycp 37337 2007-04-05 12:43:28Z locilka $ + * $Id: RootPart.ycp 37857 2007-05-07 13:38:20Z arvin $ */ { module "RootPart"; @@ -563,7 +563,7 @@ } /** - * Find a monut poing in fstab + * Find a mount point in fstab * @param fstab a list of fstab entries * @param mountpoint string a mount point to find * @return string the found partition @@ -1273,6 +1273,8 @@ fstab[0,"spec"]:"" ); // Why this doesn't match? + // Possible reasons: + // - /var not mounted so hwinfo cannot translate device names if (ok != true) { y2warning ("Device does not match fstab: '%1' vs. '%2'", p_dev, fstab[0,"spec"]:""); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/src/modules/Update.ycp new/yast2-update-2.15.12/src/modules/Update.ycp --- old/yast2-update-2.15.11/src/modules/Update.ycp 2007-02-23 10:33:21.000000000 +0100 +++ new/yast2-update-2.15.12/src/modules/Update.ycp 2007-05-18 17:26:10.000000000 +0200 @@ -6,7 +6,7 @@ * * Purpose: Update module * - * $Id: Update.ycp 36182 2007-02-15 13:21:54Z locilka $ + * $Id: Update.ycp 38044 2007-05-18 15:26:10Z locilka $ */ { module "Update"; @@ -443,7 +443,11 @@ */ global define void fill_version_map (map <string, any>& data) { - data["nameandversion"] = data["name"]:"?" + " " + data["version"]:"?"; + if (data["name"]:"?" == "?" && data["version"]:"?" == "?") { + data["nameandversion"] = "?"; + } else { + data["nameandversion"] = data["name"]:"?" + " " + data["version"]:"?"; + } list <string> tmp0 = []; if (regexpmatch (data["version"]:"", " -")) { @@ -532,6 +536,7 @@ // get new product name integer num = size (Packages::theSources); + if (num <= 0) { y2error ("No source"); @@ -541,8 +546,35 @@ return false; } - map new_product = Pkg::SourceProductData (Packages::theSources[num-1]:0); - y2milestone ("First source product %1", new_product); + integer update_to_source = nil; + + // So-called System Update + if (Stage::normal()) { + foreach (integer source_id, Packages::theSources, { + map source_map = Pkg::SourceProductData(source_id); + + // source need to be described + if (source_map != $[]) { + if (source_map["productversion"]:"A" == installedVersion["version"]:"B") { + y2milestone ("Found matching product: %1", source_map); + // first valid product is selected + if (update_to_source == nil) + update_to_source = source_id; + } else { + y2error ("Found non-matching product: %1", source_map); + // every invalid product is selected + update_to_source = source_id; + } + } + }); + } + + // a fallback for Stage::normal(), default for !Stage::normal() + if (update_to_source == nil) update_to_source = Packages::theSources[num-1]:0; + + map new_product = Pkg::SourceProductData (update_to_source); + y2milestone ("Product to update to: %1 %2", update_to_source, new_product); + if (new_product == nil) { updateVersion["name"] = "?"; @@ -556,7 +588,12 @@ updateVersion["show"] = new_product["label"]:nil; if (updateVersion["show"]:nil == nil) { y2warning ("No \"label\" defined in product"); - updateVersion["show"] = new_product["productname"]:"?" + " " + new_product["productversion"]:"?"; + + if (new_product["productname"]:"?" == "?" && new_product["productversion"]:"?" == "?") { + updateVersion["show"] = "?"; + } else { + updateVersion["show"] = new_product["productname"]:"?" + " " + new_product["productversion"]:"?"; + } } updateVersion["name"] = new_product["label"]:new_product["productname"]:"?"; updateVersion["version"] = new_product["productversion"]:"?"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/VERSION new/yast2-update-2.15.12/VERSION --- old/yast2-update-2.15.11/VERSION 2007-05-03 15:50:53.000000000 +0200 +++ new/yast2-update-2.15.12/VERSION 2007-05-18 13:49:39.000000000 +0200 @@ -1 +1 @@ -2.15.11 +2.15.12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-installation
by root＠Hilbert.suse.de 18 May '07

18 May '07

Hello community, here is the log from the commit of package yast2-installation checked in at Fri May 18 19:02:27 CEST 2007. -------- --- yast2-installation/yast2-installation.changes 2007-05-11 16:49:35.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-05-18 17:50:03.000000000 +0200 @@ -1,0 +2,12 @@ +Thu May 17 22:18:29 CEST 2007 - locilka(a)suse.cz + +- Progress dialog for initializing installation sources. +- 2.15.24 + +------------------------------------------------------------------- +Tue May 15 14:14:13 CEST 2007 - locilka(a)suse.cz + +- Changed control file in partitioning/evms_config section from + 'true' to 'false' (#274702). + +------------------------------------------------------------------- Old: ---- yast2-installation-2.15.23.tar.bz2 New: ---- yast2-installation-2.15.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.Oo5421/_old 2007-05-18 19:02:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Oo5421/_new 2007-05-18 19:02:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.15.23) +# spec file for package yast2-installation (Version 2.15.24) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-installation -Version: 2.15.23 +Version: 2.15.24 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.15.23.tar.bz2 +Source0: yast2-installation-2.15.24.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-country yast2-devtools yast2-testsuite BuildRequires: yast2 >= 2.15.22 @@ -83,7 +83,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-installation-2.15.23 +%setup -n yast2-installation-2.15.24 %build %{prefix}/bin/y2tool y2autoconf @@ -146,6 +146,12 @@ %endif %changelog +* Thu May 17 2007 - locilka(a)suse.cz +- Progress dialog for initializing installation sources. +- 2.15.24 +* Tue May 15 2007 - locilka(a)suse.cz +- Changed control file in partitioning/evms_config section from + 'true' to 'false' (#274702). * Fri May 11 2007 - locilka(a)suse.cz - Removing directories '/var/lib/zypp/cache' and '/var/lib/zypp/db' if they exist at the beginning of the installation (#267763). ++++++ yast2-installation-2.15.23.tar.bz2 -> yast2-installation-2.15.24.tar.bz2 ++++++ ++++ 1836 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.15.23/configure.in new/yast2-installation-2.15.24/configure.in --- old/yast2-installation-2.15.23/configure.in 2007-05-10 17:21:46.000000000 +0200 +++ new/yast2-installation-2.15.24/configure.in 2007-05-18 17:50:36.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.15.22, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.15.24, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.22" +VERSION="2.15.24" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.15.23/src/clients/inst_system_analysis.ycp new/yast2-installation-2.15.24/src/clients/inst_system_analysis.ycp --- old/yast2-installation-2.15.23/src/clients/inst_system_analysis.ycp 2007-05-11 16:49:51.000000000 +0200 +++ new/yast2-installation-2.15.24/src/clients/inst_system_analysis.ycp 2007-05-18 10:44:04.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain(a)suse.cz> * Lukas Ocilka <locilka(a)suse.cz> * - * $Id: inst_system_analysis.ycp 37940 2007-05-11 14:49:49Z locilka $ + * $Id: inst_system_analysis.ycp 38028 2007-05-17 20:20:15Z locilka $ * */ @@ -616,6 +616,15 @@ return `finish; } +Wizard::SetContents ( + _("Initializing Installation Catalogs"), + // TRANSLATORS: progress message + `Label (_("Initializing installation catalogs...")), + "", + false, false +); +Wizard::SetTitleIcon ("yast-software"); + Packages::InitializeCatalogs (); if (Packages::InitFailed ()) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.15.23/VERSION new/yast2-installation-2.15.24/VERSION --- old/yast2-installation-2.15.23/VERSION 2007-05-11 16:49:40.000000000 +0200 +++ new/yast2-installation-2.15.24/VERSION 2007-05-18 17:49:47.000000000 +0200 @@ -1 +1 @@ -2.15.23 +2.15.24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 MyODBC-unixODBC
by root＠Hilbert.suse.de 18 May '07

18 May '07

Hello community, here is the log from the commit of package MyODBC-unixODBC checked in at Fri May 18 17:44:25 CEST 2007. -------- --- MyODBC-unixODBC/MyODBC-unixODBC.changes 2006-06-12 16:04:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/MyODBC-unixODBC/MyODBC-unixODBC.changes 2007-05-18 17:35:15.000000000 +0200 @@ -1,0 +2,18 @@ +Fri May 18 17:30:45 CEST 2007 - anosek(a)suse.cz + +- updated to version 3.51.15r409 + * Added auto-reconnect option because automatic reconnect is now + disabled by default in libmysql + * Added auto is null option (Bug #10910) + * Added support for SQLMoreResults + * Checking SQL_ATTR_CONNECTION_DEAD now always calls mysql_ping() to + check for a dead connection. + * Remove ODBC escape syntax { and } that begin and terminate statements, + allowing {CALL (?)} for procedures that don't require OUT or INOUT + parameters + * Improved regression tests + * Added --with-separate-debug-driver ./configure option + * Lots of bugfixes +- dropped obsoleted patch (stringh.diff) + +------------------------------------------------------------------- Old: ---- MyODBC-3.51.12.diff MyODBC-3.51.12-setlocale.patch MyODBC-3.51.12-stringh.diff mysql-connector-odbc-3.51.12.tar.bz2 New: ---- MyODBC-3.51.15r409.diff MyODBC-3.51.15r409-setlocale.patch mysql-connector-odbc-3.51.15r409.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MyODBC-unixODBC.spec ++++++ --- /var/tmp/diff_new_pack.hV6901/_old 2007-05-18 17:43:09.000000000 +0200 +++ /var/tmp/diff_new_pack.hV6901/_new 2007-05-18 17:43:09.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package MyODBC-unixODBC (Version 3.51.12) +# spec file for package MyODBC-unixODBC (Version 3.51.15r409) # -# Copyright (c) 2006 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. # @@ -13,11 +13,11 @@ Name: MyODBC-unixODBC BuildRequires: mysql-devel unixODBC-devel %define manager unixODBC -License: LGPL +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Productivity/Databases/Tools Autoreqprov: on -Version: 3.51.12 -Release: 13 +Version: 3.51.15r409 +Release: 1 Summary: ODBC Interface for Communication with MySQL Compiled with UnixODBC URL: http://www.mysql.com/products/myodbc/index.html Obsoletes: MyODBC-libiodbc @@ -27,7 +27,6 @@ Source2: odbc.ini.%{manager}.sample Source3: README Patch: MyODBC-%{version}.diff -Patch1: MyODBC-%{version}-stringh.diff Patch2: MyODBC-%{version}-setlocale.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,7 +45,6 @@ %prep %setup -q -n mysql-connector-odbc-%{version} %patch -%patch1 %patch2 %build @@ -68,7 +66,8 @@ make "DESTDIR=$RPM_BUILD_ROOT" install # documentation install -d -m 755 $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ -install -m 644 {ChangeLog,README} $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ +install -m 644 {ChangeLog,README,README.debug} $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ +rm $RPM_BUILD_ROOT/%{_datadir}/mysql-connector-odbc/{ChangeLog,README,README.debug} # samples mkdir $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ini/ sed -e 's/@driverpath@/\/usr\/%{_lib}\/%{manager}/g' %{S:1} >$RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ini/odbcinst.ini.sample @@ -86,7 +85,22 @@ %doc %{_defaultdocdir}/%{name}/ %{_libdir}/%{manager}/* -%changelog -n MyODBC-unixODBC +%changelog +* Fri May 18 2007 - anosek(a)suse.cz +- updated to version 3.51.15r409 + * Added auto-reconnect option because automatic reconnect is now + disabled by default in libmysql + * Added auto is null option (Bug #10910) + * Added support for SQLMoreResults + * Checking SQL_ATTR_CONNECTION_DEAD now always calls mysql_ping() to + check for a dead connection. + * Remove ODBC escape syntax { and } that begin and terminate statements, + allowing {CALL (?)} for procedures that don't require OUT or INOUT + parameters + * Improved regression tests + * Added --with-separate-debug-driver ./configure option + * Lots of bugfixes +- dropped obsoleted patch (stringh.diff) * Mon Jun 12 2006 - mmarek(a)suse.cz - use "C", not "English" in setlocale() calls [http://www.openoffice.org/issues/show_bug.cgi?id=66283] ++++++ MyODBC-3.51.12-stringh.diff -> MyODBC-3.51.15r409.diff ++++++ --- MyODBC-unixODBC/MyODBC-3.51.12-stringh.diff 2005-08-02 10:42:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/MyODBC-unixODBC/MyODBC-3.51.15r409.diff 2007-05-17 11:27:06.000000000 +0200 @@ -1,21 +1,13 @@ ---- samples/my_cursor.c 2005-01-22 06:22:25.000000000 +0100 -+++ samples/my_cursor.c 2005-08-02 10:42:08.445889238 +0200 -@@ -30,6 +30,8 @@ +--- configure.in ++++ configure.in +@@ -120,6 +120,10 @@ + # define _UNIX_ + AC_DEFINE(_UNIX_,1,[Define if we are using unix build environment (always true)]) - #include "my_utility.h" /* MyODBC 3.51 sample utility header */ ++AC_LIBLTDL_INSTALLABLE ++AC_SUBST(LTDLINCL) ++AC_SUBST(LIBLTDL) ++AC_LIBTOOL_DLOPEN + AM_PROG_LIBTOOL + AC_CHECK_LIB(z,compress) -+#include <string.h> -+ - /******************************************************** - * prints the statement resultset * - *********************************************************/ ---- test/mytest3.h 2005-01-22 06:22:25.000000000 +0100 -+++ test/mytest3.h 2005-08-02 10:27:59.916483469 +0200 -@@ -34,6 +34,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <assert.h> -+#include <string.h> - - /* ODBC HEADERS */ - #include <sql.h> ++++++ MyODBC-3.51.15r409-setlocale.patch ++++++ --- driver/execute.c +++ driver/execute.c @@ -226,7 +226,8 @@ net= &stmt->dbc->mysql.net; to= (char*) net->buff; if ( !(stmt->dbc->flag & FLAG_NO_LOCALE) ) - setlocale(LC_NUMERIC,"English"); /* force use of '.' as decimal point */ + setlocale(LC_NUMERIC,"C"); /* force use of '.' as decimal point */ + for ( i= 0; i < stmt->param_count; i++ ) { PARAM_BIND *param= dynamic_element(&stmt->params,i,PARAM_BIND*); --- driver/results.c +++ driver/results.c @@ -771,7 +771,7 @@ "NULL"))); #endif if ( !(stmt->dbc->flag & FLAG_NO_LOCALE) ) - setlocale(LC_NUMERIC,"English"); + setlocale(LC_NUMERIC,"C"); result= sql_get_data( stmt, (SQLSMALLINT) (fCType == SQL_C_DEFAULT ? stmt->odbc_types[icol] : fCType), stmt->result->fields+icol, @@ -1205,7 +1205,7 @@ } if ( !(stmt->dbc->flag & FLAG_NO_LOCALE) ) - setlocale(LC_NUMERIC,"English"); + setlocale(LC_NUMERIC,"C"); res= SQL_SUCCESS; for ( i= 0 ; i < rows_to_fetch ; i++ ) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org
by root＠Hilbert.suse.de 18 May '07

18 May '07

Hello community, here is the log from the commit of package OpenOffice_org checked in at Fri May 18 17:42:07 CEST 2007. -------- --- arch/i386/OpenOffice_org/OpenOffice_org.changes 2007-05-10 21:22:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org.changes 2007-05-17 20:39:30.000000000 +0200 @@ -1,0 +2,14 @@ +Thu May 17 20:31:14 CEST 2007 - pmladek(a)suse.cz + +- updated to milestone oof680-m16 (2.2.1rc1) +- updated ooo-build to 2.2.0.1: + * target oof680-m16 + * libpaper support + * printing with Trim and Tile options [n#237134] + * javaunohelper build dependency [i#77465] +- updated the prebuilt cli_types.dll for openSUSE < 10.3 builds +- fixed BuildRequires for the Build Service: + * added j2sdk update-alternatives for SLED10 (temporary workaround) + * added mozilla-devel mozilla-nss-devel mozilla-nss for SL 10.0 + +------------------------------------------------------------------- Old: ---- minmem oof680-m14-binfilter.tar.bz2 oof680-m14-core.tar.bz2 oof680-m14-lang.tar.bz2 oof680-m14-sdk_oo.tar.bz2 oof680-m14-system.tar.bz2 ooo-build-2.2.0.0.tar.gz New: ---- oof680-m16-binfilter.tar.bz2 oof680-m16-core.tar.bz2 oof680-m16-lang.tar.bz2 oof680-m16-sdk_oo.tar.bz2 oof680-m16-system.tar.bz2 ooo-build-2.2.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org.spec ++++++ --- /var/tmp/diff_new_pack.g31642/_old 2007-05-18 17:39:49.000000000 +0200 +++ /var/tmp/diff_new_pack.g31642/_new 2007-05-18 17:39:49.000000000 +0200 @@ -13,7 +13,13 @@ Name: OpenOffice_org BuildRequires: ImageMagick ant bison boost-devel ccache cups-devel curl-devel db-devel db-java flac-devel flex gnome-vfs2-devel gtk2-devel kdelibs3-devel krb5 libexif libsndfile-devel mono-devel neon-devel openclipart openldap2-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode startup-notification-devel unixODBC-devel unzip xml-commons-apis xorg-x11 xorg-x11-Xvfb zip %ifarch %ix86 +%if %sles_version == 10 +# FIXME: workaround for Build Service; it substitutes java2-devel-packages to +# java-1_5_0 which is not available for SLED10 +BuildRequires: j2sdk update-alternatives +%else BuildRequires: java2-devel-packages +%endif %else BuildRequires: gcc-java java-1_4_2-gcj-compat-devel %if %suse_version > 1010 @@ -24,7 +30,13 @@ %if %suse_version > 1010 BuildRequires: mozilla-xulrunner181-devel %else +%if %suse_version > 1000 +# for SL 10.1 BuildRequires: gecko-sdk mozilla-xulrunner +%else +# for BuildService on SL 10.0 +BuildRequires: mozilla-devel mozilla-nss mozilla-nss-devel +%endif %endif # CODE10 features %if %suse_version > 1000 @@ -95,12 +107,12 @@ %define ooo_prefix %_libdir %define ooo_home ooo-2.0 %define ooo_build_dir build -%define ooo_build_version 2.2.0.0 -%define ooo_build_tag oof680-m14 +%define ooo_build_version 2.2.0.1 +%define ooo_build_tag oof680-m16 License: Artistic License, BSD License and BSD-like Group: Productivity/Office/Suite Version: 2.2 -Release: 1 +Release: 5 Autoreqprov: on PreReq: coreutils /usr/bin/update-mime-database Prereq: %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq} @@ -2119,6 +2131,17 @@ %endif %changelog +* Thu May 17 2007 - pmladek(a)suse.cz +- updated to milestone oof680-m16 (2.2.1rc1) +- updated ooo-build to 2.2.0.1: + * target oof680-m16 + * libpaper support + * printing with Trim and Tile options [n#237134] + * javaunohelper build dependency [i#77465] +- updated the prebuilt cli_types.dll for openSUSE < 10.3 builds +- fixed BuildRequires for the Build Service: + * added j2sdk update-alternatives for SLED10 (temporary workaround) + * added mozilla-devel mozilla-nss-devel mozilla-nss for SL 10.0 * Thu May 10 2007 - pmladek(a)suse.cz - updated to version 2.2 - updated ooo-build to 2.2.0.0: ++++++ cli_types.dll ++++++ Files arch/i386/OpenOffice_org/cli_types.dll and /mounts/work_src_done/STABLE/OpenOffice_org/cli_types.dll differ ++++++ oof680-m14-binfilter.tar.bz2 -> oof680-m16-binfilter.tar.bz2 ++++++ arch/i386/OpenOffice_org/oof680-m14-binfilter.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/oof680-m16-binfilter.tar.bz2 differ: byte 11, line 1 ++++++ oof680-m14-core.tar.bz2 -> oof680-m16-core.tar.bz2 ++++++ arch/i386/OpenOffice_org/oof680-m14-core.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/oof680-m16-core.tar.bz2 differ: byte 11, line 1 ++++++ oof680-m14-lang.tar.bz2 -> oof680-m16-lang.tar.bz2 ++++++ arch/i386/OpenOffice_org/oof680-m14-lang.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/oof680-m16-lang.tar.bz2 differ: byte 11, line 1 ++++++ oof680-m14-sdk_oo.tar.bz2 -> oof680-m16-sdk_oo.tar.bz2 ++++++ arch/i386/OpenOffice_org/oof680-m14-sdk_oo.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/oof680-m16-sdk_oo.tar.bz2 differ: byte 11, line 1 ++++++ oof680-m14-system.tar.bz2 -> oof680-m16-system.tar.bz2 ++++++ arch/i386/OpenOffice_org/oof680-m14-system.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/oof680-m16-system.tar.bz2 differ: byte 11, line 1 ++++++ ooo-build-2.2.0.0.tar.gz -> ooo-build-2.2.0.1.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/ChangeLog new/ooo-build-2.2.0.1/ChangeLog --- old/ooo-build-2.2.0.0/ChangeLog 2007-05-10 20:37:12.000000000 +0200 +++ new/ooo-build-2.2.0.1/ChangeLog 2007-05-17 20:41:12.000000000 +0200 @@ -1,3 +1,49 @@ +2007-05-17 Petr Mladek <pmladek(a)suse.cz> + + * Version 2.2.0.1 + + * patches/src680/javaunohelper-deps.diff, patches/src680/apply: fix + build dependency; JavaUNOHelperServices.class must be built before + juh.jar, i#77465 + +2007-05-16 Petr Mladek <pmladek(a)suse.cz> + + * patches/src680/build-wizard-bitmap-scp.diff, patches/src680/apply: + the patch does actually nothing => bin it, i#77351 + +2007-05-16 Radek Doulik <rodo(a)novell.com> + + * patches/src680/apply: added fix for i#73014, fixes printing with + Trim option and Tile one as well + +2006-05-15 Rene Engelhard <rene(a)debian.org> + + * patches/src680/cws-l10n77316fix.diff: add, fix "~Insert slide" + localization in m16 + +2007-05-15 Rene Engelhard <rene(a)debian.org> + + * patches/src680/libpaper-support.diff: use version from + cws vcl78 (thanks pl!) which uses the paperconf command + +2007-05-15 Rene Engelhard <rene(a)debian.org> + + * patches/src680/libpaper-link.diff: remove + * distro-configs/{Debian,Ubuntu}*.conf.in: remove + --enable-libpaper-link + + libpaper is GPL... + +2007-05-12 Rene Engelhard <rene(a)debian.org> + + * patches/src680/apply, + patches/src680/community-splash-m15.diff, + patches/src680/community-splash.diff, + patches/src680/intros-svx-m15.diff. + patches/src680/intros-svx.diff, + patches/src680/config-unix-wrapper-m15.diff, + patches/src680/config-unix-wrapper.diff: oof680-m16 + 2007-05-10 Petr Mladek <pmladek(a)suse.cz> * Version 2.2.0.0 (openSUSE-10.3-alpha4) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/configure new/ooo-build-2.2.0.1/configure --- old/ooo-build-2.2.0.0/configure 2007-05-10 21:17:43.000000000 +0200 +++ new/ooo-build-2.2.0.1/configure 2007-05-17 20:43:32.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for ooo-build 2.2.0.0. +# Generated by GNU Autoconf 2.60 for ooo-build 2.2.0.1. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -557,8 +557,8 @@ # Identity of this package. PACKAGE_NAME='ooo-build' PACKAGE_TARNAME='ooo-build' -PACKAGE_VERSION='2.2.0.0' -PACKAGE_STRING='ooo-build 2.2.0.0' +PACKAGE_VERSION='2.2.0.1' +PACKAGE_STRING='ooo-build 2.2.0.1' PACKAGE_BUGREPORT='' ac_unique_file="bin/build-ooo" @@ -1272,7 +1272,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ooo-build 2.2.0.0 to adapt to many kinds of systems. +\`configure' configures ooo-build 2.2.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1338,7 +1338,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ooo-build 2.2.0.0:";; + short | recursive ) echo "Configuration of ooo-build 2.2.0.1:";; esac cat <<\_ACEOF @@ -1600,7 +1600,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ooo-build configure 2.2.0.0 +ooo-build configure 2.2.0.1 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1614,7 +1614,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ooo-build $as_me 2.2.0.0, which was +It was created by ooo-build $as_me 2.2.0.1, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2295,7 +2295,7 @@ # Define the identity of the package. PACKAGE='ooo-build' - VERSION='2.2.0.0' + VERSION='2.2.0.1' cat >>confdefs.h <<_ACEOF @@ -2523,7 +2523,7 @@ -OOO_BUILDVERSION=2.2.0.0 +OOO_BUILDVERSION=2.2.0.1 PROPAGATED_ARGS=$ac_configure_args @@ -6906,7 +6906,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ooo-build $as_me 2.2.0.0, which was +This file was extended by ooo-build $as_me 2.2.0.1, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6953,7 +6953,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -ooo-build config.status 2.2.0.0 +ooo-build config.status 2.2.0.1 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/configure.in new/ooo-build-2.2.0.1/configure.in --- old/ooo-build-2.2.0.0/configure.in 2007-05-02 14:38:58.000000000 +0200 +++ new/ooo-build-2.2.0.1/configure.in 2007-05-17 19:57:34.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT(ooo-build, 2.2.0.0) +AC_INIT(ooo-build, 2.2.0.1) AC_PREREQ(2.51) AC_CONFIG_SRCDIR(bin/build-ooo) AC_PREFIX_DEFAULT(/usr) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/Debian64.conf.in new/ooo-build-2.2.0.1/distro-configs/Debian64.conf.in --- old/ooo-build-2.2.0.0/distro-configs/Debian64.conf.in 2007-05-02 14:38:57.000000000 +0200 +++ new/ooo-build-2.2.0.1/distro-configs/Debian64.conf.in 2007-05-15 19:24:08.000000000 +0200 @@ -16,4 +16,3 @@ --enable-pam-link --with-dynamic-xinerama --enable-xsltproc ---enable-libpaper-link diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/Debian.conf.in new/ooo-build-2.2.0.1/distro-configs/Debian.conf.in --- old/ooo-build-2.2.0.0/distro-configs/Debian.conf.in 2007-05-02 14:38:57.000000000 +0200 +++ new/ooo-build-2.2.0.1/distro-configs/Debian.conf.in 2007-05-15 19:24:08.000000000 +0200 @@ -16,4 +16,3 @@ --enable-pam-link --with-dynamic-xinerama --enable-xsltproc ---enable-libpaper-link diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/DebianEtch64.conf.in new/ooo-build-2.2.0.1/distro-configs/DebianEtch64.conf.in --- old/ooo-build-2.2.0.0/distro-configs/DebianEtch64.conf.in 2007-05-02 14:38:57.000000000 +0200 +++ new/ooo-build-2.2.0.1/distro-configs/DebianEtch64.conf.in 2007-05-15 19:24:08.000000000 +0200 @@ -16,4 +16,3 @@ --enable-pam-link --with-dynamic-xinerama --enable-xsltproc ---enable-libpaper-link diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/DebianEtch.conf.in new/ooo-build-2.2.0.1/distro-configs/DebianEtch.conf.in --- old/ooo-build-2.2.0.0/distro-configs/DebianEtch.conf.in 2007-05-02 14:38:57.000000000 +0200 +++ new/ooo-build-2.2.0.1/distro-configs/DebianEtch.conf.in 2007-05-15 19:24:08.000000000 +0200 @@ -16,4 +16,3 @@ --enable-pam-link --with-dynamic-xinerama --enable-xsltproc ---enable-libpaper-link diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/Ubuntu64.conf.in new/ooo-build-2.2.0.1/distro-configs/Ubuntu64.conf.in --- old/ooo-build-2.2.0.0/distro-configs/Ubuntu64.conf.in 2007-05-02 14:38:57.000000000 +0200 +++ new/ooo-build-2.2.0.1/distro-configs/Ubuntu64.conf.in 2007-05-15 19:24:08.000000000 +0200 @@ -17,4 +17,3 @@ --enable-pam-link --with-dynamic-xinerama --enable-xsltproc ---enable-libpaper-link diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/Ubuntu.conf.in new/ooo-build-2.2.0.1/distro-configs/Ubuntu.conf.in --- old/ooo-build-2.2.0.0/distro-configs/Ubuntu.conf.in 2007-05-02 14:38:57.000000000 +0200 +++ new/ooo-build-2.2.0.1/distro-configs/Ubuntu.conf.in 2007-05-15 19:24:08.000000000 +0200 @@ -17,4 +17,3 @@ --enable-pam-link --with-dynamic-xinerama --enable-xsltproc ---enable-libpaper-link diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/UbuntuDapper64.conf.in new/ooo-build-2.2.0.1/distro-configs/UbuntuDapper64.conf.in --- old/ooo-build-2.2.0.0/distro-configs/UbuntuDapper64.conf.in 2007-05-02 14:38:57.000000000 +0200 +++ new/ooo-build-2.2.0.1/distro-configs/UbuntuDapper64.conf.in 2007-05-15 19:24:08.000000000 +0200 @@ -17,4 +17,3 @@ --enable-pam-link --with-dynamic-xinerama --enable-xsltproc ---enable-libpaper-link diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/UbuntuDapper.conf.in new/ooo-build-2.2.0.1/distro-configs/UbuntuDapper.conf.in --- old/ooo-build-2.2.0.0/distro-configs/UbuntuDapper.conf.in 2007-05-02 14:38:57.000000000 +0200 +++ new/ooo-build-2.2.0.1/distro-configs/UbuntuDapper.conf.in 2007-05-15 19:24:08.000000000 +0200 @@ -17,4 +17,3 @@ --enable-pam-link --with-dynamic-xinerama --enable-xsltproc ---enable-libpaper-link diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/UbuntuEdgy64.conf.in new/ooo-build-2.2.0.1/distro-configs/UbuntuEdgy64.conf.in --- old/ooo-build-2.2.0.0/distro-configs/UbuntuEdgy64.conf.in 2007-05-02 14:38:57.000000000 +0200 +++ new/ooo-build-2.2.0.1/distro-configs/UbuntuEdgy64.conf.in 2007-05-15 19:24:08.000000000 +0200 @@ -17,4 +17,3 @@ --enable-pam-link --with-dynamic-xinerama --enable-xsltproc ---enable-libpaper-link diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/UbuntuEdgy.conf.in new/ooo-build-2.2.0.1/distro-configs/UbuntuEdgy.conf.in --- old/ooo-build-2.2.0.0/distro-configs/UbuntuEdgy.conf.in 2007-05-02 14:38:57.000000000 +0200 +++ new/ooo-build-2.2.0.1/distro-configs/UbuntuEdgy.conf.in 2007-05-15 19:24:08.000000000 +0200 @@ -17,4 +17,3 @@ --enable-pam-link --with-dynamic-xinerama --enable-xsltproc ---enable-libpaper-link diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/UbuntuFeisty64.conf.in new/ooo-build-2.2.0.1/distro-configs/UbuntuFeisty64.conf.in --- old/ooo-build-2.2.0.0/distro-configs/UbuntuFeisty64.conf.in 2007-05-02 14:38:57.000000000 +0200 +++ new/ooo-build-2.2.0.1/distro-configs/UbuntuFeisty64.conf.in 2007-05-15 19:24:08.000000000 +0200 @@ -17,4 +17,3 @@ --enable-pam-link --with-dynamic-xinerama --enable-xsltproc ---enable-libpaper-link diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/UbuntuFeisty.conf.in new/ooo-build-2.2.0.1/distro-configs/UbuntuFeisty.conf.in --- old/ooo-build-2.2.0.0/distro-configs/UbuntuFeisty.conf.in 2007-05-02 14:38:57.000000000 +0200 +++ new/ooo-build-2.2.0.1/distro-configs/UbuntuFeisty.conf.in 2007-05-15 19:24:08.000000000 +0200 @@ -17,4 +17,3 @@ --enable-pam-link --with-dynamic-xinerama --enable-xsltproc ---enable-libpaper-link diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/UbuntuL10n.conf.in new/ooo-build-2.2.0.1/distro-configs/UbuntuL10n.conf.in --- old/ooo-build-2.2.0.0/distro-configs/UbuntuL10n.conf.in 2007-05-02 14:38:57.000000000 +0200 +++ new/ooo-build-2.2.0.1/distro-configs/UbuntuL10n.conf.in 2007-05-15 19:24:08.000000000 +0200 @@ -18,4 +18,3 @@ --with-dynamic-xinerama --enable-xsltproc --disable-qadevooo ---enable-libpaper-link diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/NEWS new/ooo-build-2.2.0.1/NEWS --- old/ooo-build-2.2.0.0/NEWS 2007-05-10 20:34:39.000000000 +0200 +++ new/ooo-build-2.2.0.1/NEWS 2007-05-17 20:24:39.000000000 +0200 @@ -1,3 +1,14 @@ +ooo-build-2.2.0.1 + + + features: + + target oof680-m16 (Rene) + + libpaper support (Rene) + + bug fixes: + + printing with Trim and Tile options (Radek) + + build bits: + + javaunohelper build dependency (Petr) + + updated Debian bits (Rene) + ooo-build-2.2.0.0 + features: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/apply new/ooo-build-2.2.0.1/patches/src680/apply --- old/ooo-build-2.2.0.0/patches/src680/apply 2007-05-09 17:43:32.000000000 +0200 +++ new/ooo-build-2.2.0.1/patches/src680/apply 2007-05-17 19:47:09.000000000 +0200 @@ -184,7 +184,7 @@ # hack for n#240776 sw-graphic-save-problem.diff, flr, n#240776 - +[ TemporaryHacks < oof680-m16 < OOF680_m16 ] # fixes build with gcc-3.3; required by MacOSX build # we will move to gcc-4.x within a year, so it does not make sense to push # it upstream @@ -277,9 +277,6 @@ # Make debugging easier by allowing cerr << aOUString << endl sal-oustring-debug.diff, i#65920, jholesov -# Default to splash without the Sun logo -community-splash.diff, jholesov - # Tell the desktop we support the VFS uses-vfs.diff, i#43504, michael @@ -289,9 +286,19 @@ # add mozilla certificate dir detection to soffice soffice-detect-mozilla-certificates.diff +[ FixesNotForUpstream >= oof680-m16 >= OOF680_m16 ] +# Default to splash without the Sun logo +community-splash.diff, jholesov + +[ FixesNotForUpstream < oof680-m16 < OOF680_m16 ] +# Default to splash without the Sun logo +community-splash-m15.diff, jholesov [ Fixes ] +# sd printing fixes +printing-bugfix-73014.diff, i#73014, rodo + # let sd accept uri-list drop, n#183719 sd-accept-uri-list-drop.diff, n#183719, rodo @@ -394,16 +401,10 @@ # backport from cws vcl75, honour /etc/papersize libpaper-support.diff -# add option to link against libpaper -libpaper-link.diff # Don't add system path to LD_LIBRARY_PATH soffice-ldlibpath.diff, i#76122, mklose -# Make opening by double-clicking in Windows Explorer work on files -# with any Unicode chars in name -issue-59251.diff, i#59251.diff - # find locked certs, fix by Jacob Berkman <jberkman(a)novell.com> libxmlsec-findcerts.diff, i#76870, pmladek # allow other types of signing certs, fix by Jacob Berkman <jberkman(a)novell.com> @@ -412,6 +413,11 @@ # database fields with leading 0 vanish from tables derived from xls documents connectivity-vanishing-fields.diff, i#76668, tml +[ Fixes < oof680-m16 < OOF680_m16 ] +# Make opening by double-clicking in Windows Explorer work on files +# with any Unicode chars in name +issue-59251.diff, i#59251.diff + [ Fixes < oof680-m15 < OOF680_m15 ] # HZ will no longer defined by glibc because the value is architecture dependent. # sysconf(_SC_CLK_TCK) must be used instead, i#68616 @@ -688,7 +694,6 @@ pushfont-psstream.diff scp2-user-config-ooo-2.0.diff -build-wizard-bitmap-scp.diff [ MandrivaOnly ] @@ -705,7 +710,6 @@ SectionOwner => gghibo help-support-mdv.diff -build-wizard-bitmap-scp.diff, michael # change user config dir name from ~/.openoffice.org2.0 to ~/.ooo-2.0 scp2-user-config-ooo-2.0.diff, pmladek @@ -714,8 +718,6 @@ # Help Support page help-support.diff, michael -# mark the files in share/template/<lang>/wizard/bitmap as lang specific -build-wizard-bitmap-scp.diff, michael # change user config dir name from ~/.openoffice.org1.9.milestone to ~/.ooo-2.0-pre scp2-user-config-ooo-2.0.diff, pmladek # Push fonts into the ps stream always @@ -806,6 +808,10 @@ # fix pa-IN translation ooo75790.sc.pa-IN-translate.diff +[ SDFPatches == oof680-m16 == OOF680_m16 ] +# fix Insert slide in m16 +cws-l10n77316fix.diff, i#77316 + [ Features ] # ask user on logout/shutdown to save documents session-management.diff, i#63156, rodo @@ -867,6 +873,9 @@ # add --with-seamonkey configure flag to link with seamonkey-*.pc config_with-seamonkey.diff, i#73440, hmth +# JavaUNOHelperServices.class must be built before juh.jar is created +javaunohelper-deps.diff, i#77465, pmladek + [ MandrivaOnly ] SectionOwner => gghibo @@ -1000,10 +1009,17 @@ # Easier branding of OOo intro intros-config_office.diff intros-scp2.diff -intros-svx.diff abouts-sfx2.diff intros-desktop.diff +[ Branding < oof680-m16 < OOF680_m16 ] +intros-svx-m15.diff +# allows to redefine the name of the UNIX wrapper that will be used +# in the desktop files; needed for qstart +config-unix-wrapper-m15.diff, i#75366, n#252242, pmladek + +[ Branding >= oof680-m16 >= OOF680_m16 ] +intros-svx.diff # allows to redefine the name of the UNIX wrapper that will be used # in the desktop files; needed for qstart config-unix-wrapper.diff, i#75366, n#252242, pmladek diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/build-wizard-bitmap-scp.diff new/ooo-build-2.2.0.1/patches/src680/build-wizard-bitmap-scp.diff --- old/ooo-build-2.2.0.0/patches/src680/build-wizard-bitmap-scp.diff 2007-05-02 14:38:26.000000000 +0200 +++ new/ooo-build-2.2.0.1/patches/src680/build-wizard-bitmap-scp.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -Index: scp2/source/ooo/file_extra_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_extra_ooo.scp,v -retrieving revision 1.8 -diff -u -r1.8 file_extra_ooo.scp ---- scp2/source/ooo/file_extra_ooo.scp 9 Nov 2004 16:51:18 -0000 1.8 -+++ scp2/source/ooo/file_extra_ooo.scp 7 Dec 2004 10:22:18 -0000 -@@ -332,7 +332,7 @@ - EXTRA_ALL_LANG(tplpresntimpr); - End - --File gid_File_Extra_Tplwizbitmap -+File gid_File_Extra_Tplwizbitmap_Lang - Dir = gid_Dir_Template_Wizard_Bitmap; - TXT_FILE_BODY; - Styles = (ARCHIVE, DONT_OVERWRITE); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/community-splash.diff new/ooo-build-2.2.0.1/patches/src680/community-splash.diff --- old/ooo-build-2.2.0.0/patches/src680/community-splash.diff 2007-05-02 14:38:26.000000000 +0200 +++ new/ooo-build-2.2.0.1/patches/src680/community-splash.diff 2007-05-15 19:24:08.000000000 +0200 @@ -11,6 +11,6 @@ ..\res\soffice.bmp %COMMON_DEST%\pck%_EXT%\staroffice_bitmap\intro.bmp -..\res\ooointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp +..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp + ..\res\oooabout.bmp %COMMON_DEST%\pck%_EXT%\openoffice\about.bmp ..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\nologointro.bmp ..\res\ooodevintro.bmp %COMMON_DEST%\pck%_EXT%\openoffice_dev\intro.bmp - ..\res\ooodevnologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice_dev\nologointro.bmp diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/community-splash-m15.diff new/ooo-build-2.2.0.1/patches/src680/community-splash-m15.diff --- old/ooo-build-2.2.0.0/patches/src680/community-splash-m15.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/ooo-build-2.2.0.1/patches/src680/community-splash-m15.diff 2007-05-15 19:24:08.000000000 +0200 @@ -0,0 +1,16 @@ +Index: svx/prj/d.lst +=================================================================== +RCS file: /cvs/graphics/svx/prj/d.lst,v +retrieving revision 1.108 +diff -u -r1.108 d.lst +--- svx/prj/d.lst 9 Dec 2004 16:36:45 -0000 1.108 ++++ svx/prj/d.lst 16 Dec 2004 12:43:47 -0000 +@@ -55,7 +55,7 @@ + ..\res\cjkintro.bmp %COMMON_DEST%\pck%_EXT%\starsuite_bitmap\intro.bmp + ..\res\ofaabout.bmp %COMMON_DEST%\pck%_EXT%\staroffice_bitmap\about.bmp + ..\res\soffice.bmp %COMMON_DEST%\pck%_EXT%\staroffice_bitmap\intro.bmp +-..\res\ooointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp ++..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp + ..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\nologointro.bmp + ..\res\ooodevintro.bmp %COMMON_DEST%\pck%_EXT%\openoffice_dev\intro.bmp + ..\res\ooodevnologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice_dev\nologointro.bmp diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/config-unix-wrapper.diff new/ooo-build-2.2.0.1/patches/src680/config-unix-wrapper.diff --- old/ooo-build-2.2.0.0/patches/src680/config-unix-wrapper.diff 2007-05-02 14:38:26.000000000 +0200 +++ new/ooo-build-2.2.0.1/patches/src680/config-unix-wrapper.diff 2007-05-15 19:24:08.000000000 +0200 @@ -42,12 +42,19 @@ ToFile( "CALL_CDECL", $CALL_CDECL, "e" ); --- sysui/desktop/productversion.mk.old 2006-11-17 10:25:46.000000000 +0100 +++ sysui/desktop/productversion.mk 2007-03-12 19:25:04.000000000 +0100 -@@ -36,7 +36,7 @@ - PRODUCTNAME = OpenOffice.org - PRODUCTVERSION = 2.2 - LONGPRODUCTNAME = OpenOffice.org 2.2 --UNIXFILENAME = openoffice.org2.2 -+UNIXFILENAME *= openoffice.org2.2 - PKGVERSION = 2.2 - .IF "$(OS)"=="LINUX" - PKGREV = $(BUILD) +@@ -66,13 +66,13 @@ + PRODUCTNAME.openoffice.org = OpenOffice.org + PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION) + PKGVERSION.openoffice.org = $(PKGVERSION) +-UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSION.openoffice.org) ++UNIXFILENAME.openoffice.org *= $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSION.openoffice.org) + ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g) + + PRODUCTNAME.broffice.org = BrOffice.org + PRODUCTVERSION.broffice.org = $(PRODUCTVERSION) + PKGVERSION.broffice.org = $(PKGVERSION) +-UNIXFILENAME.broffice.org = $(PRODUCTNAME.broffice.org:l)$(PRODUCTVERSION.broffice.org) ++UNIXFILENAME.broffice.org *= $(PRODUCTNAME.broffice.org:l)$(PRODUCTVERSION.broffice.org) + ICONPREFIX.broffice.org = $(UNIXFILENAME.broffice.org:s/.//g) + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/config-unix-wrapper-m15.diff new/ooo-build-2.2.0.1/patches/src680/config-unix-wrapper-m15.diff --- old/ooo-build-2.2.0.0/patches/src680/config-unix-wrapper-m15.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/ooo-build-2.2.0.1/patches/src680/config-unix-wrapper-m15.diff 2007-05-15 19:24:08.000000000 +0200 @@ -0,0 +1,53 @@ +--- config_office/configure.in.old 2007-03-12 17:57:08.000000000 +0100 ++++ config_office/configure.in 2007-03-12 19:57:39.000000000 +0100 +@@ -584,6 +584,12 @@ + + Usage: --with-about-bitmaps=/path/my_ooo_about.bmp + ],,) ++AC_ARG_WITH(unix-wrapper, ++[ --with-unix-wrapper Redefines the name of the UNIX wrapper that will be used ++ in the desktop files and in the desktop-integration RPMs. ++ ++ Usage: --with-unix-wrapper=ooffice ++],,) + AC_ARG_WITH(vendor, + [ --with-vendor Set vendor of the build. + +@@ -5439,6 +5445,16 @@ + AC_SUBST(ABOUT_BITMAPS) + AC_SUBST(ABOUT_BITMAP_NAMES) + ++UNIXFILENAME= ++AC_MSG_CHECKING([for UNIX wrapper name]) ++if test -z "$with_unix_wrapper" -o "$with_unix_wrapper" = "no" -o "$with_unix_wrapper" = "yes" ; then ++ AC_MSG_RESULT([not set]) ++else ++ UNIXFILENAME="$with_unix_wrapper" ++ AC_MSG_RESULT([$UNIXFILENAME]) ++fi ++AC_SUBST(UNIXFILENAME) ++ + OOO_VENDOR= + AC_MSG_CHECKING([for vendor]) + if test -z "$with_vendor" -o "$with_vendor" = "no" ; then +--- config_office/set_soenv.in.old 2007-03-12 17:57:08.000000000 +0100 ++++ config_office/set_soenv.in 2007-03-13 17:16:02.000000000 +0100 +@@ -1503,6 +1503,7 @@ + ToFile( "INTRO_BITMAP_NAMES","@INTRO_BITMAP_NAMES@","e" ); + ToFile( "ABOUT_BITMAPS", "@ABOUT_BITMAPS@", "e" ); + ToFile( "ABOUT_BITMAP_NAMES","@ABOUT_BITMAP_NAMES@","e" ); ++ToFile( "UNIXFILENAME", "@UNIXFILENAME@", "e" ); + ToFile( "OOO_VENDOR", "@OOO_VENDOR@", "e" ); + + ToFile( "CALL_CDECL", $CALL_CDECL, "e" ); +--- sysui/desktop/productversion.mk.old 2006-11-17 10:25:46.000000000 +0100 ++++ sysui/desktop/productversion.mk 2007-03-12 19:25:04.000000000 +0100 +@@ -36,7 +36,7 @@ + PRODUCTNAME = OpenOffice.org + PRODUCTVERSION = 2.2 + LONGPRODUCTNAME = OpenOffice.org 2.2 +-UNIXFILENAME = openoffice.org2.2 ++UNIXFILENAME *= openoffice.org2.2 + PKGVERSION = 2.2 + .IF "$(OS)"=="LINUX" + PKGREV = $(BUILD) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/cws-l10n77316fix.diff new/ooo-build-2.2.0.1/patches/src680/cws-l10n77316fix.diff --- old/ooo-build-2.2.0.0/patches/src680/cws-l10n77316fix.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/ooo-build-2.2.0.1/patches/src680/cws-l10n77316fix.diff 2007-05-15 19:24:08.000000000 +0200 @@ -0,0 +1,92 @@ +Index: source/ui/app/localize.sdf +=================================================================== +RCS file: /cvs/graphics/sd/source/ui/app/localize.sdf,v +retrieving revision 1.30.40.1 +retrieving revision 1.30.40.1.16.1 +diff -u -u -r1.30.40.1 -r1.30.40.1.16.1 +--- sd/source/ui/app/localize.sdf 2 Feb 2007 10:34:36 -0000 1.30.40.1 ++++ sd/source/ui/app/localize.sdf 15 May 2007 10:26:47 -0000 1.30.40.1.16.1 +@@ -22030,6 +22030,83 @@ + sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE SID_INSERTPAGE 0 zh-CN 插入幻灯片(~I) 2002-02-02 02:02:02 + sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE SID_INSERTPAGE 0 zh-TW 插入投影片(~I) 2002-02-02 02:02:02 + sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE SID_INSERTPAGE 0 zu ~Faka Islaydi 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 af ~Voeg skyfie in! 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ar ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 as ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 be-BY Уставіць слайд 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 bg ~Вмъкване на кадър 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 bn ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 br ~Enlakaat un dreyonenn 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 bs ~Ubaci slajd 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ca ~Insereix una diapositiva 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 cs Vložit snímek 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 cy Mewnosod Tryloyw 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 da ~Indsæt dias 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 el Ε~ισαγωγή διαφάνειας 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 en-GB ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 en-ZA ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 eo ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 es ~Insertar diapositiva 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 et Lisa slaid 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 eu ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 fa ~درج اسلاید 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 fi ~Lisää dia 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 fr ~Insérer une diapo 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ga ~Ionsáigh Sleamhnán 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 gl-ES ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 gu-IN સ્લાઈડ ઉમેરો (~I) 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 he הכנסת שקף 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 hi-IN जोड़ें स्लाइड (~I) 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 hr ~Umetni slajd 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 hu ~Dia beszúrása 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 it ~Inserisci diapositiva 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ja スライドの挿入(~I) 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ka ~სლაიდების ჩასმა 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 km បញ្ចូលស្លាយ 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 kn ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ko 슬라이드 삽입(~I) 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ku Slaytan ~Lê Zêde Bike 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 lt Įterpti ~lapą 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 mk ~Вметни слајд 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ml ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 mr ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 nb Sett ~inn lysbilde 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ne स्लाईड घुसाउनुहोस् 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 nl Dia ~invoegen 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 nn Set ~inn lysbilete 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 nr ~Faka Isilayidi 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ns ~Tsenya Selaete 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 or ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 pa-IN ਸਲਾਈਡ ਸ਼ਾਮਲ(~i) 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 pl ~Wstaw slajd 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 pt ~Inserir diapositivo 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 pt-BR Inserir página 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ru Вставить слайд 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 rw Kongeramo Igice 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 sh-YU U~metni slajd 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 sk Vlož~iť snímok 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 sl ~Vstavi prosojnico 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 sr-CS У~метни слајд 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ss ~Faka Bomsheleletane 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 st ~Kenya Selaete 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 sv Infoga sida 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 sw-TZ ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ta ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 te ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 tg Иловакунии слайд 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 th แ~ทรกภาพนิ่ง 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ti ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 tn ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 tr Slayt ~Ekle 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ts ~Nghenisa Slayidi 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 uk ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ur ~Insert Slide 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ve ~Longelani Siḽaidi 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 vi Chèn ảnh ch~iếu 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 xh ~Faka Islayidi 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 zh-CN 插入幻灯片(~I) 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 zh-TW 插入投影片(~I) 2002-02-02 02:02:02 ++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 zu ~Faka Islaydi 2002-02-02 02:02:02 + sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_TP_APPLY_TO_SELECTED_SLIDES SID_TP_APPLY_TO_SELECTED_SLIDES 0 af Pas op ~geselekteerde skyfies toe 2002-02-02 02:02:02 + sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_TP_APPLY_TO_SELECTED_SLIDES SID_TP_APPLY_TO_SELECTED_SLIDES 0 as-IN নিৰ্বাচিত শ্লাইডবোৰলৈ প্ৰয়োগ কৰক 2002-02-02 02:02:02 + sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_TP_APPLY_TO_SELECTED_SLIDES SID_TP_APPLY_TO_SELECTED_SLIDES 13691 be-BY Ужыць над азначанымі слайдамі 2002-02-02 02:02:02 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/intros-svx.diff new/ooo-build-2.2.0.1/patches/src680/intros-svx.diff --- old/ooo-build-2.2.0.0/patches/src680/intros-svx.diff 2007-05-02 14:38:26.000000000 +0200 +++ new/ooo-build-2.2.0.1/patches/src680/intros-svx.diff 2007-05-15 19:24:08.000000000 +0200 @@ -1,9 +1,9 @@ --- svx/prj/d.lst 2006-05-29 16:01:51.000000000 +0000 +++ svx/prj/d.lst 2006-05-31 14:00:22.000000000 +0000 @@ -48,6 +48,7 @@ mkdir: %COMMON_DEST%\pck%_EXT%\openoffic - ..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\nologointro.bmp - ..\res\ooodevintro.bmp %COMMON_DEST%\pck%_EXT%\openoffice_dev\intro.bmp - ..\res\ooodevnologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice_dev\nologointro.bmp + ..\res\brabout.bmp %COMMON_DEST%\pck%_EXT%\broffice\about.bmp + ..\res\brintro.bmp %COMMON_DEST%\pck%_EXT%\broffice\intro.bmp + ..\res\brdevintro.bmp %COMMON_DEST%\pck%_EXT%\broffice_dev\intro.bmp +..\%__SRC%\bin\intros.zip %_DEST%\bin%_EXT%\intros.zip mkdir: %_DEST%\inc%_EXT%\svx diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/intros-svx-m15.diff new/ooo-build-2.2.0.1/patches/src680/intros-svx-m15.diff --- old/ooo-build-2.2.0.0/patches/src680/intros-svx-m15.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/ooo-build-2.2.0.1/patches/src680/intros-svx-m15.diff 2007-05-15 19:24:08.000000000 +0200 @@ -0,0 +1,22 @@ +--- svx/prj/d.lst 2006-05-29 16:01:51.000000000 +0000 ++++ svx/prj/d.lst 2006-05-31 14:00:22.000000000 +0000 +@@ -48,6 +48,7 @@ mkdir: %COMMON_DEST%\pck%_EXT%\openoffic + ..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\nologointro.bmp + ..\res\ooodevintro.bmp %COMMON_DEST%\pck%_EXT%\openoffice_dev\intro.bmp + ..\res\ooodevnologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice_dev\nologointro.bmp ++..\%__SRC%\bin\intros.zip %_DEST%\bin%_EXT%\intros.zip + + mkdir: %_DEST%\inc%_EXT%\svx + hedabu: ..\inc\flagsdef.hxx %_DEST%\inc%_EXT%\svx\flagsdef.hxx +--- svx/source/intro/makefile.mk 2006-05-29 16:01:51.000000000 +0000 ++++ svx/source/intro/makefile.mk 2006-05-31 13:40:14.000000000 +0000 +@@ -72,6 +72,9 @@ RESLIB4IMAGES=$(PRJ)$/res + RESLIB2SRSFILES= \ + $(SRS)$/$(SRS2NAME).srs + ++ZIP1TARGET=intros ++ZIP1LIST=$(INTRO_BITMAPS) ++ + .INCLUDE : target.mk + + $(SRS)$/iso.srs: $(INCCOM)$/intro.hrc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/javaunohelper-deps.diff new/ooo-build-2.2.0.1/patches/src680/javaunohelper-deps.diff --- old/ooo-build-2.2.0.0/patches/src680/javaunohelper-deps.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/ooo-build-2.2.0.1/patches/src680/javaunohelper-deps.diff 2007-05-17 19:10:31.000000000 +0200 @@ -0,0 +1,8 @@ +--- javaunohelper/prj/build.lst.old 2006-12-14 15:59:01.000000000 +0100 ++++ javaunohelper/prj/build.lst 2007-05-17 19:09:24.000000000 +0200 +@@ -7,4 +7,4 @@ + jh javaunohelper\com\sun\star\lib\uno\adapter nmake - all jh_adapter jh_libhelp jh_inc NULL + jh javaunohelper\com\sun\star\lib\uno\helper nmake - all jh_libhelp jh_inc NULL + jh javaunohelper\source nmake - all jh_source jh_inc NULL +-jh javaunohelper\util nmake - all jh_util jh_helper jh_source jh_adapter jh_libhelp NULL ++jh javaunohelper\util nmake - all jh_util jh_helper jh_comp jh_source jh_adapter jh_libhelp NULL diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/libpaper-link.diff new/ooo-build-2.2.0.1/patches/src680/libpaper-link.diff --- old/ooo-build-2.2.0.0/patches/src680/libpaper-link.diff 2007-05-02 14:38:25.000000000 +0200 +++ new/ooo-build-2.2.0.1/patches/src680/libpaper-link.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,121 +0,0 @@ ---- psprint/source/printer/makefile.mk-old 2007-03-26 16:03:15.000000000 +0200 -+++ psprint/source/printer/makefile.mk 2007-03-26 16:04:21.000000000 +0200 -@@ -47,6 +47,10 @@ - CDEFS += -DENABLE_CUPS - .ENDIF - -+.IF "$(LIBPAPER_LINK)" == "YES" -+CDEFS += -DLIBPAPER_LINK -+.ENDIF -+ - # --- Files -------------------------------------------------------- - - .IF "$(GUIBASE)"=="aqua" ---- psprint/source/printer/printerinfomanager.cxx-old 2007-03-26 16:25:28.000000000 +0200 -+++ psprint/source/printer/printerinfomanager.cxx 2007-03-26 16:29:56.000000000 +0200 -@@ -64,6 +64,10 @@ - - #include <hash_set> - -+#ifdef LIBPAPER_LINK -+#include <paper.h> -+#endif -+ - using namespace psp; - using namespace rtl; - using namespace osl; -@@ -142,6 +146,9 @@ - - void PrinterInfoManager::initSystemDefaultPaper() - { -+ bool bSuccess = false; -+ const char* pPaper; -+#ifndef LIBPAPER_LINK - // try libpaper - OUString aModName( RTL_CONSTASCII_USTRINGPARAM( "libpaper.so.1" ) ); - OUString aInitName( RTL_CONSTASCII_USTRINGPARAM( "paperinit" ) ); -@@ -150,14 +157,17 @@ - oslModule hMod = osl_loadModule( aModName.pData, SAL_LOADMODULE_NOW ); - if( hMod ) - { -- bool bSuccess = false; - int (*init)() = (int(*)())osl_getFunctionSymbol( hMod, aInitName.pData ); - int (*done)() = (int(*)())osl_getFunctionSymbol( hMod, aDoneName.pData ); - const char* (*sys)() = (const char*(*)())osl_getFunctionSymbol( hMod, aSystemName.pData ); - if( init && done && sys ) - { - init(); -- const char* pPaper = sys(); -+ pPaper = sys(); -+#else -+ paperinit(); -+ pPaper = systempapername(); -+#endif - if( pPaper && *pPaper ) - { - m_aSystemDefaultPaper = OUString( OStringToOUString( pPaper, osl_getThreadTextEncoding() ) ); -@@ -166,12 +176,18 @@ - fprintf( stderr, "paper from libpaper = %s\n", pPaper ); - #endif - } -+#ifndef LIBPAPER_LINK - done(); - } - osl_unloadModule( hMod ); -+#else -+ paperdone(); -+#endif - if( bSuccess ) - return; -+#ifndef LIBPAPER_LINK - } -+#endif - - // default value is Letter for US (en_US), Cannada (en_CA, fr_CA); else A4 - // en will be interpreted as en_US ---- psprint/util/makefile.mk-old 2006-04-07 15:44:51.000000000 +0200 -+++ psprint/util/makefile.mk 2007-03-26 16:10:34.000000000 +0200 -@@ -82,6 +82,10 @@ - SHL1STDLIBS+=$(JVMFWKLIB) - .ENDIF - -+.IF "$(LIBPAPER_LINK)" == "YES" -+SHL1STDLIBS += -lpaper -+.ENDIF -+ - SHL1DEF= $(MISC)$/$(SHL1TARGET).def - - .ENDIF # "$(OS)"=="WNT" ---- config_office/configure.in-old 2007-03-26 16:11:32.000000000 +0200 -+++ config_office/configure.in 2007-03-26 16:14:40.000000000 +0200 -@@ -1880,6 +1880,20 @@ - fi - AC_SUBST(CRYPT_LINK) - -+AC_MSG_CHECKING([whether to link to libpaper]) -+if test -n "$enable_libpaper_link"; then -+ AC_MSG_RESULT([yes]) -+ LIBPAPER_LINK=YES -+ AC_CHECK_HEADER(paper.h, [], -+ [AC_MSG_ERROR([paper.h needed. install libpaper headers])], []) -+ AC_CHECK_LIB(paper, systempapername, [], -+ [AC_MSG_ERROR([libpaper not found or functional])], []) -+else -+ AC_MSG_RESULT([no]) -+ LIBPAPER_LINK=NO -+fi -+AC_SUBST(LIBPAPER_LINK) -+ - dnl =================================================================== - dnl Testing for c++ compiler and version... - dnl =================================================================== ---- config_office/set_soenv.in-old 2007-03-26 16:14:48.000000000 +0200 -+++ config_office/set_soenv.in 2007-03-26 16:15:14.000000000 +0200 -@@ -1903,6 +1903,7 @@ - ToFile( "NEW_SHADOW_API", "@NEW_SHADOW_API@", "e" ); - ToFile( "PAM_LINK", "@PAM_LINK@", "e" ); - ToFile( "CRYPT_LINK", "@CRYPT_LINK@", "e" ); -+ToFile( "LIBPAPER_LINK", "@LIBPAPER_LINK@", "e" ); - ToFile( "XAU_LIBS", "@XAU_LIBS@", "e" ); - ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@", "e" ); - ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/libpaper-support.diff new/ooo-build-2.2.0.1/patches/src680/libpaper-support.diff --- old/ooo-build-2.2.0.0/patches/src680/libpaper-support.diff 2007-05-02 14:38:25.000000000 +0200 +++ new/ooo-build-2.2.0.1/patches/src680/libpaper-support.diff 2007-05-15 19:24:08.000000000 +0200 @@ -80,39 +80,33 @@ } // ----------------------------------------------------------------- -@@ -138,6 +140,87 @@ +@@ -138,6 +140,81 @@ // ----------------------------------------------------------------- +void PrinterInfoManager::initSystemDefaultPaper() +{ ++ bool bSuccess = false; ++ + // try libpaper -+ OUString aModName( RTL_CONSTASCII_USTRINGPARAM( "libpaper.so.1" ) ); -+ OUString aInitName( RTL_CONSTASCII_USTRINGPARAM( "paperinit" ) ); -+ OUString aDoneName( RTL_CONSTASCII_USTRINGPARAM( "paperdone" ) ); -+ OUString aSystemName( RTL_CONSTASCII_USTRINGPARAM( "systempapername" ) ); -+ oslModule hMod = osl_loadModule( aModName.pData, SAL_LOADMODULE_NOW ); -+ if( hMod ) ++ FILE* pPipe = popen( "paperconf", "r" ); ++ if( pPipe ) + { -+ bool bSuccess = false; -+ int (*init)() = (int(*)())osl_getFunctionSymbol( hMod, aInitName.pData ); -+ int (*done)() = (int(*)())osl_getFunctionSymbol( hMod, aDoneName.pData ); -+ const char* (*sys)() = (const char*(*)())osl_getFunctionSymbol( hMod, aSystemName.pData ); -+ if( init && done && sys ) -+ { -+ init(); -+ const char* pPaper = sys(); -+ if( pPaper && *pPaper ) -+ { -+ m_aSystemDefaultPaper = OUString( OStringToOUString( pPaper, osl_getThreadTextEncoding() ) ); -+ bSuccess = true; -+ #if OSL_DEBUG_LEVEL > 1 -+ fprintf( stderr, "paper from libpaper = %s\n", pPaper ); -+ #endif -+ } -+ done(); ++ char pBuffer[ 1024 ]; ++ *pBuffer = 0; ++ fgets( pBuffer, sizeof(pBuffer)-1, pPipe ); ++ pclose( pPipe ); ++ ++ ByteString aPaper( pBuffer ); ++ aPaper = WhitespaceToSpace( aPaper ); ++ if( aPaper.Len() ) ++ { ++ m_aSystemDefaultPaper = OUString( OStringToOUString( aPaper, osl_getThreadTextEncoding() ) ); ++ bSuccess = true; ++ #if OSL_DEBUG_LEVEL > 1 ++ fprintf( stderr, "paper from paperconf = %s\n", aPaper.GetBuffer() ); ++ #endif + } -+ osl_unloadModule( hMod ); + if( bSuccess ) + return; + } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/printing-bugfix-73014.diff new/ooo-build-2.2.0.1/patches/src680/printing-bugfix-73014.diff --- old/ooo-build-2.2.0.0/patches/src680/printing-bugfix-73014.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/ooo-build-2.2.0.1/patches/src680/printing-bugfix-73014.diff 2007-05-16 19:51:22.000000000 +0200 @@ -0,0 +1,45 @@ +Index: sd/source/ui/view/PrintManager.cxx +=================================================================== +RCS file: /cvs/graphics/sd/source/ui/view/PrintManager.cxx,v +retrieving revision 1.15 +diff -u -p -r1.15 PrintManager.cxx +--- sd/source/ui/view/PrintManager.cxx 3 Apr 2007 16:27:36 -0000 1.15 ++++ sd/source/ui/view/PrintManager.cxx 15 May 2007 12:27:20 -0000 +@@ -1543,15 +1543,20 @@ void PrintManager::PrintStdOrNotes ( + // printable area. + if (bPrint) + { +- if (bScalePage +- || (rInfo.mpPrintOpts && rInfo.mpPrintOpts->GetOptionsPrint().IsCutPage())) ++ bool bCutPage = (rInfo.mpPrintOpts && rInfo.mpPrintOpts->GetOptionsPrint().IsCutPage()); ++ if (bScalePage || bCutPage) + { + // Handlee 1 and 2. ++ ++ // if CutPage is set then do not move ++ // it, otherwise move the scaled page ++ // to printable area ++ + PrintPagePart( + rInfo, + pPage, + *pPrintView, +- Point(0,0), ++ bCutPage ? Point(-aPageOfs.X(), -aPageOfs.Y()) : Point(0,0), + bPrintMarkedOnly, + aPageStr, + aPageOfs); +@@ -1561,7 +1566,12 @@ void PrintManager::PrintStdOrNotes ( + // Handle 3. Print parts of the page in the + // size of the printable area until the + // whole page is covered. +- Point aOrigin (-aPageOfs.X(), -aPageOfs.Y()); ++ ++ // keep the page content at its ++ // position if it fits, otherwise move ++ // it to the printable area ++ ++ Point aOrigin (aPageWidth < aPrintWidth ? -aPageOfs.X() : 0, aPageHeight < aPrintHeight ? -aPageOfs.Y() : 0); + for (aPageOrigin = aOrigin; + -aPageOrigin.Y()<aPageHeight; + aPageOrigin.Y() -= aPrintHeight) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mrtg
by root＠Hilbert.suse.de 18 May '07

18 May '07

Hello community, here is the log from the commit of package mrtg checked in at Fri May 18 16:51:06 CEST 2007. -------- --- mrtg/mrtg.changes 2006-12-13 11:48:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/mrtg/mrtg.changes 2007-05-04 21:21:53.000000000 +0200 @@ -1,0 +2,19 @@ +Fri May 4 21:20:57 CEST 2007 - anicka(a)suse.cz + +- update 2.15.2 + * Improve parsing reliability of indexmaker + * Fixed deadhost detection in mrtg + * added config option noHC for boxes that don't have HC counters + but run SNMPv2/v3 + * Updated Net_SNMP_util module (error messages) + * Updated Makefiles for Win32 and Netware + * New Netware version of rateup.nlm + * make cfgmaker detect broken snmpv1 counters more reliably + * latest Net_SNMP_util.pm with many small fixes + * more cfgmaker smarts and documentation for snmpv3 + * be happy even if no threshmail sending is configured + * add install target for traffic-summer + * fix mrtg-traffic-sum default catch expression to be + in sync with docs + +------------------------------------------------------------------- Old: ---- mrtg-2.15.0-icons.diff mrtg-2.15.0.tar.bz2 New: ---- mrtg-2.15.2-icons.diff mrtg-2.15.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mrtg.spec ++++++ --- /var/tmp/diff_new_pack.aM6898/_old 2007-05-18 16:50:42.000000000 +0200 +++ /var/tmp/diff_new_pack.aM6898/_new 2007-05-18 16:50:42.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package mrtg (Version 2.15.0) +# spec file for package mrtg (Version 2.15.2) # -# Copyright (c) 2006 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. # @@ -12,7 +12,7 @@ Name: mrtg BuildRequires: gd-devel libjpeg-devel libpng-devel xorg-x11 xorg-x11-devel -Version: 2.15.0 +Version: 2.15.2 Release: 1 Requires: perl = %{perl_version} Autoreqprov: on @@ -37,6 +37,7 @@ %prep %setup -q %patch0 +rm -rf contrib/mrtgindex.cgi %build %define iconsdir /srv/www/icons @@ -76,7 +77,23 @@ %{_prefix}/lib/mrtg2 %{_datadir}/apache2 -%changelog -n mrtg +%changelog +* Fri May 04 2007 - anicka(a)suse.cz +- update 2.15.2 + * Improve parsing reliability of indexmaker + * Fixed deadhost detection in mrtg + * added config option noHC for boxes that don't have HC counters + but run SNMPv2/v3 + * Updated Net_SNMP_util module (error messages) + * Updated Makefiles for Win32 and Netware + * New Netware version of rateup.nlm + * make cfgmaker detect broken snmpv1 counters more reliably + * latest Net_SNMP_util.pm with many small fixes + * more cfgmaker smarts and documentation for snmpv3 + * be happy even if no threshmail sending is configured + * add install target for traffic-summer + * fix mrtg-traffic-sum default catch expression to be + in sync with docs * Wed Dec 13 2006 - anicka(a)suse.cz - update to 2.15.0 * Free positioning of a generated ifIndex in the OID string using· ++++++ mrtg-2.15.0-icons.diff -> mrtg-2.15.2-icons.diff ++++++ --- mrtg/mrtg-2.15.0-icons.diff 2006-07-17 15:09:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/mrtg/mrtg-2.15.2-icons.diff 2007-05-09 15:17:06.000000000 +0200 @@ -12,7 +12,7 @@ --- bin/mrtg +++ bin/mrtg -@@ -1626,7 +1626,8 @@ +@@ -1666,7 +1666,8 @@ #lets make sure there is a trailing path separator $gifPath =~ s|/*$|/|; } else { ++++++ mrtg-2.15.0.tar.bz2 -> mrtg-2.15.2.tar.bz2 ++++++ ++++ 11952 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 openobex
by root＠Hilbert.suse.de 18 May '07

18 May '07

Hello community, here is the log from the commit of package openobex checked in at Fri May 18 15:54:08 CEST 2007. -------- --- openobex/openobex.changes 2007-05-16 21:46:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/openobex/openobex.changes 2007-05-18 10:42:25.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 18 10:42:14 CEST 2007 - olh(a)suse.de + +- -devel package requires libusb-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openobex.spec ++++++ --- /var/tmp/diff_new_pack.G23489/_old 2007-05-18 15:54:02.000000000 +0200 +++ /var/tmp/diff_new_pack.G23489/_new 2007-05-18 15:54:02.000000000 +0200 @@ -15,7 +15,7 @@ License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Libraries/Other Version: 1.3 -Release: 44 +Release: 45 Summary: Open Source Implementation of the Object Exchange (OBEX) Protocol URL: http://openobex.sourceforge.net/ Source: %{name}-%{version}.tar.bz2 @@ -63,7 +63,7 @@ %package devel Summary: Development package for openobex Group: Development/Libraries/Other -Requires: %{name} = %{version} bluez-libs libusb +Requires: %{name} = %{version} bluez-libs libusb-devel %description devel Files needed for software development using openobex. @@ -180,6 +180,8 @@ %{_libdir}/pkgconfig/openobex-glib.pc %changelog +* Fri May 18 2007 - olh(a)suse.de +- -devel package requires libusb-devel * Wed May 16 2007 - olh(a)suse.de - Buildrequires libusb -> libusb-devel * Mon Apr 30 2007 - sbrabec(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 obexftp
by root＠Hilbert.suse.de 18 May '07

18 May '07

Hello community, here is the log from the commit of package obexftp checked in at Fri May 18 15:53:58 CEST 2007. -------- --- obexftp/obexftp.changes 2007-05-07 18:13:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/obexftp/obexftp.changes 2007-05-18 08:58:37.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 18 08:58:21 CEST 2007 - olh(a)suse.de + +- remove unneeded libusb from -devel Requires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obexftp.spec ++++++ --- /var/tmp/diff_new_pack.f20468/_old 2007-05-18 15:53:52.000000000 +0200 +++ /var/tmp/diff_new_pack.f20468/_new 2007-05-18 15:53:52.000000000 +0200 @@ -16,7 +16,7 @@ Group: Productivity/Networking/Other Autoreqprov: on Version: 0.21 -Release: 49 +Release: 55 Summary: ObexFTP Implements the Object Exchange (OBEX) Protocol's File Transfer Feature URL: http://triq.net/obexftp Source: %name-%version.tar.bz2 @@ -39,7 +39,7 @@ Summary: Development package for obexftp Group: Productivity/Networking/Other Requires: %name = %version -Requires: bluez-libs libusb openobex-devel +Requires: bluez-libs openobex-devel %description devel Files needed for software development using obexftp. @@ -95,6 +95,8 @@ %_includedir/multicobex %changelog +* Fri May 18 2007 - olh(a)suse.de +- remove unneeded libusb from -devel Requires * Mon May 07 2007 - sbrabec(a)suse.cz - Fixed LDFLAGS to include needed libraries explicitly. * Sun Apr 22 2007 - dgollub(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 kdebase4
by root＠Hilbert.suse.de 18 May '07

18 May '07

Hello community, here is the log from the commit of package kdebase4 checked in at Fri May 18 15:52:42 CEST 2007. -------- --- KDE/kdebase4/kdebase4.changes 2007-05-15 16:41:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4/kdebase4.changes 2007-05-18 14:53:58.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 16 21:32:29 CEST 2007 - olh(a)suse.de + +- Buildrequires libusb -> libusb-devel + +------------------------------------------------------------------- kdebase4-wallpapers.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.M29761/_old 2007-05-18 15:52:27.000000000 +0200 +++ /var/tmp/diff_new_pack.M29761/_new 2007-05-18 15:52:27.000000000 +0200 @@ -10,13 +10,13 @@ Name: kdebase4 -BuildRequires: NetworkManager-devel bluez-libs libkdepimlibs4-devel libsmbclient-devel libusb libxklavier-devel +BuildRequires: NetworkManager-devel bluez-libs libkdepimlibs4-devel libsmbclient-devel libusb-devel libxklavier-devel License: GNU General Public License (GPL) Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 3.90.1.svn661136 -Release: 10 +Release: 11 Source0: kdebase.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch: fix-build.diff @@ -1625,6 +1625,8 @@ /usr/share/templates %changelog +* Wed May 16 2007 - olh(a)suse.de +- Buildrequires libusb -> libusb-devel * Tue May 15 2007 - stbinner(a)suse.de - show .desktop files of kdebase4-runtime only in a KDE session * Sat May 12 2007 - stbinner(a)suse.de ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.M29761/_old 2007-05-18 15:52:27.000000000 +0200 +++ /var/tmp/diff_new_pack.M29761/_new 2007-05-18 15:52:27.000000000 +0200 @@ -10,13 +10,13 @@ Name: kdebase4-wallpapers -BuildRequires: NetworkManager-devel bluez-libs libkdepimlibs4-devel libsmbclient-devel libusb libxklavier-devel +BuildRequires: NetworkManager-devel bluez-libs libkdepimlibs4-devel libsmbclient-devel libusb-devel libxklavier-devel License: GNU General Public License (GPL) Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 3.90.1 -Release: 11 +Release: 12 Source0: kdebase.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -55,6 +55,8 @@ /usr/share/wallpapers %changelog +* Wed May 16 2007 - olh(a)suse.de +- Buildrequires libusb -> libusb-devel * Tue May 15 2007 - stbinner(a)suse.de - show .desktop files of kdebase4-runtime only in a KDE session * Sat May 12 2007 - stbinner(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 jpackage-utils
by root＠Hilbert.suse.de 18 May '07

18 May '07

Hello community, here is the log from the commit of package jpackage-utils checked in at Fri May 18 15:52:18 CEST 2007. -------- --- jpackage-utils/jpackage-utils.changes 2007-05-15 17:47:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/jpackage-utils/jpackage-utils.changes 2007-05-18 11:23:28.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 18 10:23:41 CEST 2007 - dbornkessel(a)suse.de + +- added directories for 1.6.0 java + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jpackage-utils.spec ++++++ --- /var/tmp/diff_new_pack.S22818/_old 2007-05-18 15:52:08.000000000 +0200 +++ /var/tmp/diff_new_pack.S22818/_new 2007-05-18 15:52:08.000000000 +0200 @@ -15,7 +15,7 @@ %define section free %define runtimescript java.binfmt_misc Version: 1.7.0 -Release: 42 +Release: 43 Summary: JPackage Utilities License: GNU General Public License (GPL) URL: http://www.jpackage.org/ @@ -70,8 +70,8 @@ install -dm 755 ${RPM_BUILD_ROOT}${_jvmcommonsysconfdir} install -dm 755 ${RPM_BUILD_ROOT}%{_javadir} install -dm 755 ${RPM_BUILD_ROOT}%{_jnidir} -install -dm 755 ${RPM_BUILD_ROOT}%{_javadir}-{utils,ext,1.4.0,1.4.1,1.4.2,1.5.0} -install -dm 755 ${RPM_BUILD_ROOT}%{_jnidir}-{ext,1.4.0,1.4.1,1.4.2,1.5.0} +install -dm 755 ${RPM_BUILD_ROOT}%{_javadir}-{utils,ext,1.4.0,1.4.1,1.4.2,1.5.0,1.6.0} +install -dm 755 ${RPM_BUILD_ROOT}%{_jnidir}-{ext,1.4.0,1.4.1,1.4.2,1.5.0,1.6.0} install -dm 755 ${RPM_BUILD_ROOT}%{_javadocdir} install -dm 755 ${RPM_BUILD_ROOT}%{_sbindir} install -pm 755 bin/* ${RPM_BUILD_ROOT}%{_bindir} @@ -202,6 +202,8 @@ %{_datadir}/pixmaps/* %changelog +* Fri May 18 2007 - dbornkessel(a)suse.de +- added directories for 1.6.0 java * Tue May 15 2007 - dbornkessel(a)suse.de - corrected the category of the desktop files (Bug #274752) - added 'NoDisplay' do desktop files in order to hide wrapper scripts ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gnome-utils
by root＠Hilbert.suse.de 18 May '07

18 May '07

Hello community, here is the log from the commit of package gnome-utils checked in at Fri May 18 15:52:02 CEST 2007. -------- --- GNOME/gnome-utils/gnome-utils.changes 2007-05-14 18:47:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-utils/gnome-utils.changes 2007-04-27 12:32:13.000000000 +0200 @@ -2,6 +1,0 @@ -Mon May 14 18:46:41 CEST 2007 - pgajdos(a)suse.cz - -- removed gnome-icon-theme from Requires and BuildRequires - [#247450] - -------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-utils.spec ++++++ --- /var/tmp/diff_new_pack.e18094/_old 2007-05-18 15:26:38.000000000 +0200 +++ /var/tmp/diff_new_pack.e18094/_new 2007-05-18 15:26:38.000000000 +0200 @@ -11,13 +11,13 @@ # norootforbuild Name: gnome-utils -BuildRequires: e2fsprogs-devel gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-panel-devel gnome-patch-translation gnutls-devel gtk-doc libgnomeprintui-devel libgtop-devel mDNSResponder-devel perl-XML-Parser scrollkeeper update-desktop-files +BuildRequires: e2fsprogs-devel gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-icon-theme gnome-panel-devel gnome-patch-translation gnutls-devel gtk-doc libgnomeprintui-devel libgtop-devel mDNSResponder-devel perl-XML-Parser scrollkeeper update-desktop-files License: GNU General Public License (GPL) Group: System/GUI/GNOME Provides: gnome-utils2 Obsoletes: gnome-utils2 Version: 2.18.0 -Release: 17 +Release: 18 Summary: Basic Utilities for the GNOME 2.x Desktop Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-utils/2.16/%{name}-%{version}.t… Source1: gnome-screenshot.desktop @@ -31,6 +31,7 @@ Patch28: abuild-warnings.patch URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: gnome-icon-theme %gconf_schemas_prereq @@ -372,9 +373,6 @@ %{_datadir}/gtk-doc/html/gdict %changelog -* Mon May 14 2007 - pgajdos(a)suse.cz -- removed gnome-icon-theme from Requires and BuildRequires - [#247450] * Fri Apr 27 2007 - sbrabec(a)suse.cz - Do not call meinproc (#227624). * Thu Apr 05 2007 - maw(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 gnome-bluetooth
by root＠Hilbert.suse.de 18 May '07

18 May '07

Hello community, here is the log from the commit of package gnome-bluetooth checked in at Fri May 18 15:26:34 CEST 2007. -------- --- GNOME/gnome-bluetooth/gnome-bluetooth.changes 2007-05-03 17:42:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-bluetooth/gnome-bluetooth.changes 2007-05-18 13:05:13.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 18 13:04:50 CEST 2007 - prusnak(a)suse.cz + +- removed X-SuSE-translate from desktop file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-bluetooth.spec ++++++ --- /var/tmp/diff_new_pack.Q14064/_old 2007-05-18 15:26:26.000000000 +0200 +++ /var/tmp/diff_new_pack.Q14064/_new 2007-05-18 15:26:26.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/GUI/GNOME Requires: gnome-vfs2 python-gnome Version: 0.8.0 -Release: 57 +Release: 67 Summary: GNOME Bluetooth Support URL: http://usefulinc.com/software/gnome-bluetooth/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -156,6 +156,8 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Fri May 18 2007 - prusnak(a)suse.cz +- removed X-SuSE-translate from desktop file * Thu May 03 2007 - prusnak(a)suse.cz - changed expat to libexpat-devel in Requires of devel subpackage * Sun Feb 18 2007 - aj(a)suse.de ++++++ gnome-bluetooth-desktop.diff ++++++ --- /var/tmp/diff_new_pack.Q14064/_old 2007-05-18 15:26:26.000000000 +0200 +++ /var/tmp/diff_new_pack.Q14064/_new 2007-05-18 15:26:26.000000000 +0200 @@ -1,9 +1,8 @@ --- gnome-bluetooth-0.7.0/obex/gnome-obex-server.desktop.in +++ gnome-bluetooth-0.7.0/obex/gnome-obex-server.desktop.in -@@ -1,12 +1,11 @@ +@@ -1,12 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 -+X-SuSE-translate=true _Name=Bluetooth File Sharing -_Comment=Receive files sent by Bluetooth devices +_GenericName=Receive files sent by Bluetooth devices ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-firewall
by root＠Hilbert.suse.de 18 May '07

18 May '07

Hello community, here is the log from the commit of package yast2-firewall checked in at Fri May 18 15:15:06 CEST 2007. -------- --- yast2-firewall/yast2-firewall.changes 2007-04-04 10:29:14.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-firewall/yast2-firewall.changes 2007-05-18 10:44:16.000000000 +0200 @@ -1,0 +2,15 @@ +Wed May 16 12:09:01 CEST 2007 - locilka(a)suse.cz + +- Opening "service:sshd" (defined by package) instead "ssh" in the + firewall proposal and "service:xorg-x11-Xvnc" instead of "vnc" + (#274761) +- Disabling "ssh" by one-click-feature in the firewall proposal + disables both "service:sshd" and "ssh" port if added manually. +- 2.15.6 + +------------------------------------------------------------------- +Wed May 9 11:02:55 CEST 2007 - locilka(a)suse.cz + +- Fixed typo (#270965). + +------------------------------------------------------------------- Old: ---- yast2-firewall-2.15.5.tar.bz2 New: ---- yast2-firewall-2.15.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firewall.spec ++++++ --- /var/tmp/diff_new_pack.i32088/_old 2007-05-18 15:14:16.000000000 +0200 +++ /var/tmp/diff_new_pack.i32088/_new 2007-05-18 15:14:16.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-firewall (Version 2.15.5) +# spec file for package yast2-firewall (Version 2.15.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-firewall -Version: 2.15.5 +Version: 2.15.6 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-firewall-2.15.5.tar.bz2 +Source0: yast2-firewall-2.15.6.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite # SuSEFirewallExpertRules::DeleteRuleID() @@ -41,7 +41,7 @@ Lukas Ocilka <locilka(a)suse.de> %prep -%setup -n yast2-firewall-2.15.5 +%setup -n yast2-firewall-2.15.6 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +75,15 @@ %doc %{prefix}/share/doc/packages/yast2-firewall %changelog +* Wed May 16 2007 - locilka(a)suse.cz +- Opening "service:sshd" (defined by package) instead "ssh" in the + firewall proposal and "service:xorg-x11-Xvnc" instead of "vnc" + (#274761) +- Disabling "ssh" by one-click-feature in the firewall proposal + disables both "service:sshd" and "ssh" port if added manually. +- 2.15.6 +* Wed May 09 2007 - locilka(a)suse.cz +- Fixed typo (#270965). * Wed Apr 04 2007 - locilka(a)suse.cz - A brand new and better revolutionary solution has been worked out for a firewall service starting/stopping and enabling/disabling ++++++ yast2-firewall-2.15.5.tar.bz2 -> yast2-firewall-2.15.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.15.5/configure new/yast2-firewall-2.15.6/configure --- old/yast2-firewall-2.15.5/configure 2007-02-27 12:46:33.000000000 +0100 +++ new/yast2-firewall-2.15.6/configure 2007-05-18 12:56:18.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-firewall 2.15.1. +# Generated by GNU Autoconf 2.60 for yast2-firewall 2.15.6. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-firewall' PACKAGE_TARNAME='yast2-firewall' -PACKAGE_VERSION='2.15.1' -PACKAGE_STRING='yast2-firewall 2.15.1' +PACKAGE_VERSION='2.15.6' +PACKAGE_STRING='yast2-firewall 2.15.6' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1181,7 +1181,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-firewall 2.15.1 to adapt to many kinds of systems. +\`configure' configures yast2-firewall 2.15.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1252,7 +1252,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-firewall 2.15.1:";; + short | recursive ) echo "Configuration of yast2-firewall 2.15.6:";; esac cat <<\_ACEOF @@ -1330,7 +1330,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-firewall configure 2.15.1 +yast2-firewall configure 2.15.6 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1344,7 +1344,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-firewall $as_me 2.15.1, which was +It was created by yast2-firewall $as_me 2.15.6, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2145,7 +2145,7 @@ # Define the identity of the package. PACKAGE='yast2-firewall' - VERSION='2.15.1' + VERSION='2.15.6' cat >>confdefs.h <<_ACEOF @@ -2372,7 +2372,7 @@ -VERSION="2.15.1" +VERSION="2.15.6" RPMNAME="yast2-firewall" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3258,7 +3258,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-firewall $as_me 2.15.1, which was +This file was extended by yast2-firewall $as_me 2.15.6, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3301,7 +3301,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-firewall config.status 2.15.1 +yast2-firewall config.status 2.15.6 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.15.5/configure.in new/yast2-firewall-2.15.6/configure.in --- old/yast2-firewall-2.15.5/configure.in 2007-02-27 12:46:28.000000000 +0100 +++ new/yast2-firewall-2.15.6/configure.in 2007-05-18 12:56:13.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-firewall dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-firewall, 2.15.1, http://bugs.opensuse.org/, yast2-firewall) +AC_INIT(yast2-firewall, 2.15.6, http://bugs.opensuse.org/, yast2-firewall) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.1" +VERSION="2.15.6" RPMNAME="yast2-firewall" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.15.5/src/dialogs.ycp new/yast2-firewall-2.15.6/src/dialogs.ycp --- old/yast2-firewall-2.15.5/src/dialogs.ycp 2007-04-04 10:31:09.000000000 +0200 +++ new/yast2-firewall-2.15.6/src/dialogs.ycp 2007-05-18 10:44:16.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Configuration dialogs and workflow * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: dialogs.ycp 37297 2007-04-04 08:31:07Z locilka $ + * $Id: dialogs.ycp 37865 2007-05-09 09:03:28Z locilka $ * * Configuration dialogs and workflow. * Both Expert and Simple. @@ -277,7 +277,8 @@ firewall_caption + ": " + _("Summary"), BoxSummary(), HelpForDialog("box-summary"), - Label::BackButton (), Label::AcceptButton () + Label::BackButton (), + (Mode::normal() ? Label::FinishButton() : Label::AcceptButton ()) ); SetFirewallIcon(); UI::ChangeWidget(`id(`back), `Enabled, true); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.15.5/src/firewall_proposal.ycp new/yast2-firewall-2.15.6/src/firewall_proposal.ycp --- old/yast2-firewall-2.15.5/src/firewall_proposal.ycp 2007-02-28 17:15:18.000000000 +0100 +++ new/yast2-firewall-2.15.6/src/firewall_proposal.ycp 2007-05-18 13:33:13.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Firewall configuration proposal * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: firewall_proposal.ycp 36585 2007-02-28 15:47:34Z locilka $ + * $Id: firewall_proposal.ycp 38039 2007-05-18 11:33:13Z locilka $ */ { @@ -17,6 +17,7 @@ y2milestone("Arguments: %1", WFM::Args()); import "SuSEFirewall"; +import "SuSEFirewallServices"; import "SuSEFirewallProposal"; import "Popup"; import "Progress"; @@ -124,28 +125,48 @@ // Enable SSH service } else if (chosen_id == "firewall--enable_ssh_in_proposal") { y2milestone("SSH enabled by a single-click"); - SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("ssh"); + + if (SuSEFirewallServices::IsKnownService("service:sshd")) { + y2milestone ("Service 'service:sshd' is known"); + SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("service:sshd"); + } else if (SuSEFirewallServices::IsKnownService("ssh")) { + y2warning ("Only service 'ssh' is known"); + SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("ssh"); + } + ret = $[ "workflow_sequence" : `next ]; SuSEFirewallProposal::SetChangedByUser(true); // Disable SSH service } else if (chosen_id == "firewall--disable_ssh_in_proposal") { y2milestone("SSH disabled by a single-click"); - SuSEFirewall::SetServicesForZones (["ssh"], SuSEFirewall::GetKnownFirewallZones(), false); + // new service definition + if (SuSEFirewallServices::IsKnownService("service:sshd")) + SuSEFirewall::SetServicesForZones (["service:sshd"], SuSEFirewall::GetKnownFirewallZones(), false); + // old service definition + if (SuSEFirewallServices::IsKnownService("ssh")) + SuSEFirewall::SetServicesForZones (["ssh"], SuSEFirewall::GetKnownFirewallZones(), false); + + // SSH might be also defined by a port, not only using a service:sshd + foreach (string zone, SuSEFirewall::GetKnownFirewallZones(), { + if (SuSEFirewall::HaveService("ssh", "TCP", zone)) + SuSEFirewall::RemoveService("ssh", "TCP", zone); + }); + ret = $[ "workflow_sequence" : `next ]; SuSEFirewallProposal::SetChangedByUser(true); // Enable VNC service } else if (chosen_id == "firewall--enable_vnc_in_proposal") { y2milestone("VNC enabled by a single-click"); - SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("vnc"); + SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("service:xorg-x11-Xvnc"); ret = $[ "workflow_sequence" : `next ]; SuSEFirewallProposal::SetChangedByUser(true); // Disable VNC service } else if (chosen_id == "firewall--disable_vnc_in_proposal") { y2milestone("VNC disabled by a single-click"); - SuSEFirewall::SetServicesForZones (["vnc"], SuSEFirewall::GetKnownFirewallZones(), false); + SuSEFirewall::SetServicesForZones (["service:xorg-x11-Xvnc"], SuSEFirewall::GetKnownFirewallZones(), false); ret = $[ "workflow_sequence" : `next ]; SuSEFirewallProposal::SetChangedByUser(true); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.15.5/src/helps.ycp new/yast2-firewall-2.15.6/src/helps.ycp --- old/yast2-firewall-2.15.5/src/helps.ycp 2007-02-27 14:30:52.000000000 +0100 +++ new/yast2-firewall-2.15.6/src/helps.ycp 2007-05-18 10:44:16.000000000 +0200 @@ -6,7 +6,7 @@ * Summary: Firewall dialogs helps * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: helps.ycp 36538 2007-02-27 13:30:50Z locilka $ + * $Id: helps.ycp 37865 2007-05-09 09:03:28Z locilka $ * * File includes helps for yast2-firewall dialogs. */ @@ -186,7 +186,7 @@ // TRANSLATORS: general help for Custom Rules 1/5 "custom-rules" : _("<big>Custom Rules</big> -Here yoy can set special firewall rules that allow new connections +Here you can set special firewall rules that allow new connections matching these rules.") + // TRANSLATORS: general help for Custom Rules 2/5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.15.5/VERSION new/yast2-firewall-2.15.6/VERSION --- old/yast2-firewall-2.15.5/VERSION 2007-04-04 10:30:52.000000000 +0200 +++ new/yast2-firewall-2.15.6/VERSION 2007-05-18 10:44:16.000000000 +0200 @@ -1 +1 @@ -2.15.5 +2.15.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 log4j
by root＠Hilbert.suse.de 18 May '07

18 May '07

Hello community, here is the log from the commit of package log4j checked in at Fri May 18 15:14:11 CEST 2007. -------- --- log4j/log4j.changes 2007-05-08 17:11:02.000000000 +0200 +++ /mounts/work_src_done/NOARCH/log4j/log4j.changes 2007-05-18 11:49:20.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 18 11:48:26 CEST 2007 - dbornkessel(a)suse.de + +- removed mx4j BuildReq to avoid build cycle ... apparently it was not used at compile time + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ log4j.spec ++++++ --- /var/tmp/diff_new_pack.W31116/_old 2007-05-18 15:13:53.000000000 +0200 +++ /var/tmp/diff_new_pack.W31116/_new 2007-05-18 15:13:53.000000000 +0200 @@ -11,10 +11,10 @@ # norootforbuild Name: log4j -BuildRequires: ant jaf java2-devel-packages javamail jms mx4j update-desktop-files xml-commons-apis xml-commons-apis-javadoc +BuildRequires: ant jaf java2-devel-packages javamail jms update-desktop-files xml-commons-apis xml-commons-apis-javadoc %define section free Version: 1.2.12 -Release: 69 +Release: 80 Summary: Java logging tool License: The Apache Software License URL: http://logging.apache.org/log4j/ @@ -73,10 +73,10 @@ %__rm -rf docs/api %build -export CLASSPATH=$(build-classpath jaf javamail/mailapi jms mx4j/mx4j-jmx mx4j/mx4j-tools) +export CLASSPATH=$(build-classpath jaf javamail jms ) # javac.source=1.1 doesn't work with Sun's 1.4.2_09/1.5.0_05 -%ant -Djavac.source=1.2 -Djdk.javadoc=%{_javadocdir}/java jar javadoc +%ant -Djavac.source=1.2 -Djdk.javadoc=%{_javadocdir}/java -Djms.jar=$(build-classpath jms) -Djndi.jar=$(build-classpath jndi) -Dactivation.jar=/usr/share/java/activation.jar -Djavamail.jar=$(build-classpath javamail/mailapi-1.4) jar javadoc %install # jars @@ -195,6 +195,8 @@ %ghost %dir %{_javadocdir}/%{name} %changelog +* Fri May 18 2007 - dbornkessel(a)suse.de +- removed mx4j BuildReq to avoid build cycle ... apparently it was not used at compile time * Tue May 08 2007 - dbornkessel(a)suse.de - use mx4j instead of jmx * Wed Feb 15 2006 - stbinner(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 git
by root＠Hilbert.suse.de 18 May '07

18 May '07

Hello community, here is the log from the commit of package git checked in at Fri May 18 02:05:15 CEST 2007. -------- --- git/git.changes 2006-11-18 04:47:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/git/git.changes 2007-05-18 00:42:01.000000000 +0200 @@ -1,0 +2,12 @@ +Fri May 18 00:34:20 CEST 2007 - dmueller(a)suse.de + +- Update to 1.5.1.4: + * GIT <-> SVN gateway + * New porcelain, much improved index handling + * git-config + * Bare repositories refuse commands that need a working tree + * packed ref support + * 3-way merges can be done without rcs + * python dependency dropped + +------------------------------------------------------------------- Old: ---- git-1.4.3.4.tar.bz2 gitweb-suse.diff New: ---- git-1.5.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.N28480/_old 2007-05-18 02:04:53.000000000 +0200 +++ /var/tmp/diff_new_pack.N28480/_new 2007-05-18 02:04:53.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package git (Version 1.4.3.4) +# spec file for package git (Version 1.5.1.4) # -# Copyright (c) 2006 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. # @@ -12,14 +12,13 @@ Name: git BuildRequires: asciidoc curl-devel sgml-skel xmlto -Version: 1.4.3.4 -Release: 3 +Version: 1.5.1.4 +Release: 1 Summary: git - a source code management tool License: GNU General Public License (GPL) Group: Development/Tools/Version Control URL: http://www.kernel.org/pub/software/scm/git/ Source0: git-%{version}.tar.bz2 -Patch0: gitweb-suse.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk @@ -42,7 +41,7 @@ %package core Summary: git-core--a Source Code Management Tool Group: Development/Tools/Version Control -Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh, python >= 2.3 +Requires: rsync, curl, less, openssh %description core This is an extremely fast directory content manager. It is intended to @@ -62,6 +61,7 @@ Summary: git-svn - Git tools for importing Subversion repositories Group: Development/Tools/Version Control Requires: git-core = %{version}-%{release}, subversion +Requires: subversion-perl %description svn Tools for importing Subversion repositories to the Git version control @@ -138,11 +138,14 @@ %prep %setup -%patch0 %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease NO_EXPAT=1 \ - prefix=%{_prefix} all %{!?_without_docs: doc} +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ + GITWEB_CONFIG="/etc/gitweb.conf" \ + GITWEB_PROJECTROOT="/srv/git" \ + WITH_OWN_SUBPROCESS_PY=YesPlease NO_EXPAT=1 \ + prefix=%{_prefix} mandir=%{_mandir} \ + all %{!?without_docs: doc} %{?jobs:-j %jobs} %install rm -rf $RPM_BUILD_ROOT @@ -156,7 +159,10 @@ %if %{!?_without_docs:1}0 (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %endif -make -C perl DESTDIR=${RPM_BUILD_ROOT} install_vendor +( pushd perl + perl Makefile.PL + make -f perl.mak DESTDIR=${RPM_BUILD_ROOT} install_vendor +) rm -rf ${RPM_BUILD_ROOT}/usr/lib/perl5/site_perl %perl_process_packlist find $RPM_BUILD_ROOT/%_mandir -type f -print0 | xargs -0 chmod 644 @@ -215,7 +221,16 @@ %{perl_vendorlib}/Git.pm %{perl_vendorarch}/auto/Git/ -%changelog -n git +%changelog +* Fri May 18 2007 - dmueller(a)suse.de +- Update to 1.5.1.4: + * GIT <-> SVN gateway + * New porcelain, much improved index handling + * git-config + * Bare repositories refuse commands that need a working tree + * packed ref support + * 3-way merges can be done without rcs + * python dependency dropped * Sat Nov 18 2006 - pbaudis(a)suse.cz - Fix build failure from previous change (trivial omission) * Fri Nov 17 2006 - pbaudis(a)suse.cz ++++++ git-1.4.3.4.tar.bz2 -> git-1.5.1.4.tar.bz2 ++++++ ++++ 107402 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 xorg-x11-driver-video
by root＠Hilbert.suse.de 17 May '07

17 May '07

Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Fri May 18 00:03:58 CEST 2007. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-05-17 13:53:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-05-17 22:45:15.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 17 22:36:11 CEST 2007 - sndirsch(a)suse.de + +- updated ATI RANDR1.2 driver (git 20070517) + +------------------------------------------------------------------- Old: ---- xf86-video-ati.randr12-20070511.tar.bz2 New: ---- xf86-video-ati.randr12-20070517.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.x20041/_old 2007-05-18 00:03:09.000000000 +0200 +++ /var/tmp/diff_new_pack.x20041/_new 2007-05-18 00:03:09.000000000 +0200 @@ -15,7 +15,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 99 +Release: 100 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -68,7 +68,7 @@ Source43: xf86-video-impact-0.2.0.tar.bz2 Source44: HALlib-4.1.tar.gz Source45: xf86-video-intel-2.0.0.tar.bz2 -Source46: xf86-video-ati.randr12-20070511.tar.bz2 +Source46: xf86-video-ati.randr12-20070517.tar.bz2 Source48: xf86-video-mga.randr12-20070417.tar.bz2 Patch: xf86-video-intel.diff Patch1: radeon-xrandr-dotclock.diff @@ -264,6 +264,8 @@ %changelog * Thu May 17 2007 - sndirsch(a)suse.de +- updated ATI RANDR1.2 driver (git 20070517) +* Thu May 17 2007 - sndirsch(a)suse.de - updated nv driver to release 2.0.96 * This release adds simple VBE-based dualhead support for pre-G80 graphics cards. This mode has a few restrictions: ++++++ xf86-video-ati.randr12-20070511.tar.bz2 -> xf86-video-ati.randr12-20070517.tar.bz2 ++++++ ++++ 5606 lines of diff (skipped) ++++++ xf86-video-ati.randr12.diff ++++++ --- /var/tmp/diff_new_pack.x20041/_old 2007-05-18 00:03:13.000000000 +0200 +++ /var/tmp/diff_new_pack.x20041/_new 2007-05-18 00:03:13.000000000 +0200 @@ -81,7 +81,8 @@ radeon_accel.c radeon_cursor.c radeon_dga.c \ radeon_driver.c radeon_video.c radeon_bios.c radeon_mm_i2c.c \ radeon_vip.c radeon_misc.c radeon_probe.c radeon_display.c \ - radeon_modes.c $(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) + radeon_crtc.c radeon_output.c radeon_modes.c \ + $(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) -theatre_detect_drv_la_LTLIBRARIES = theatre_detect_drv.la -theatre_detect_drv_la_LDFLAGS = -module -avoid-version ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ncpfs
by root＠Hilbert.suse.de 17 May '07

17 May '07

Hello community, here is the log from the commit of package ncpfs checked in at Fri May 18 00:03:00 CEST 2007. -------- --- ncpfs/ncpfs.changes 2007-02-07 13:32:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/ncpfs/ncpfs.changes 2007-05-17 21:14:25.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 17 21:11:16 CEST 2007 - olh(a)suse.de + +- update to hg revision 458 + new nwsalvage tool + misc small fixes + +------------------------------------------------------------------- Old: ---- ncpfs.gcc4.patch ncpfs._PutFilterFirstPass.patch ncpfs.uninialized.patch New: ---- ncpfs-hg-commit-403.patch ncpfs-hg-commit-404.patch ncpfs-hg-commit-405.patch ncpfs-hg-commit-406.patch ncpfs-hg-commit-407.patch ncpfs-hg-commit-408.patch ncpfs-hg-commit-409.patch ncpfs-hg-commit-410.patch ncpfs-hg-commit-411.patch ncpfs-hg-commit-412.patch ncpfs-hg-commit-413.patch ncpfs-hg-commit-414.patch ncpfs-hg-commit-415.patch ncpfs-hg-commit-416.patch ncpfs-hg-commit-417.patch ncpfs-hg-commit-419.patch ncpfs-hg-commit-420.patch ncpfs-hg-commit-421.patch ncpfs-hg-commit-422.patch ncpfs-hg-commit-423.patch ncpfs-hg-commit-424.patch ncpfs-hg-commit-425.patch ncpfs-hg-commit-426.patch ncpfs-hg-commit-427.patch ncpfs-hg-commit-428.patch ncpfs-hg-commit-429.patch ncpfs-hg-commit-430.patch ncpfs-hg-commit-431.patch ncpfs-hg-commit-432.patch ncpfs-hg-commit-433.patch ncpfs-hg-commit-434.patch ncpfs-hg-commit-435.patch ncpfs-hg-commit-436.patch ncpfs-hg-commit-437.patch ncpfs-hg-commit-438.patch ncpfs-hg-commit-439.patch ncpfs-hg-commit-440.patch ncpfs-hg-commit-441.patch ncpfs-hg-commit-442.patch ncpfs-hg-commit-443.patch ncpfs-hg-commit-444.patch ncpfs-hg-commit-445.patch ncpfs-hg-commit-446.patch ncpfs-hg-commit-447.patch ncpfs-hg-commit-448.patch ncpfs-hg-commit-449.patch ncpfs-hg-commit-450.patch ncpfs-hg-commit-451.patch ncpfs-hg-commit-452.patch ncpfs-hg-commit-453.patch ncpfs-hg-commit-454.patch ncpfs-hg-commit-455.patch ncpfs-hg-commit-456.patch ncpfs-hg-commit-457.patch ncpfs-hg-commit-458.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncpfs.spec ++++++ --- /var/tmp/diff_new_pack.s15681/_old 2007-05-18 00:01:14.000000000 +0200 +++ /var/tmp/diff_new_pack.s15681/_new 2007-05-18 00:01:14.000000000 +0200 @@ -16,7 +16,7 @@ Group: Productivity/Networking/Novell Autoreqprov: on Version: 2.2.6 -Release: 47 +Release: 62 PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Tools for Accessing Novell File Systems @@ -26,12 +26,64 @@ Source11: ncpfs-ipxmount.sysconfig Source12: ncpfs-example.tar.bz2 Source20: cups-novell.pl -Patch0: ncpfs.gcc4.patch -Patch1: ncpfs.uninialized.patch -Patch2: ncpfs.LDFLAGS.patch -Patch3: ncpfs.pam_ncp_auth.syslog.patch -Patch4: ncpfs._PutFilterFirstPass.patch -Patch5: ncpfs.offsetof.patch +Patch403: ncpfs-hg-commit-403.patch +Patch404: ncpfs-hg-commit-404.patch +Patch405: ncpfs-hg-commit-405.patch +Patch406: ncpfs-hg-commit-406.patch +Patch407: ncpfs-hg-commit-407.patch +Patch408: ncpfs-hg-commit-408.patch +Patch409: ncpfs-hg-commit-409.patch +Patch410: ncpfs-hg-commit-410.patch +Patch411: ncpfs-hg-commit-411.patch +Patch412: ncpfs-hg-commit-412.patch +Patch413: ncpfs-hg-commit-413.patch +Patch414: ncpfs-hg-commit-414.patch +Patch415: ncpfs-hg-commit-415.patch +Patch416: ncpfs-hg-commit-416.patch +Patch417: ncpfs-hg-commit-417.patch +Patch419: ncpfs-hg-commit-419.patch +Patch420: ncpfs-hg-commit-420.patch +Patch421: ncpfs-hg-commit-421.patch +Patch422: ncpfs-hg-commit-422.patch +Patch423: ncpfs-hg-commit-423.patch +Patch424: ncpfs-hg-commit-424.patch +Patch425: ncpfs-hg-commit-425.patch +Patch426: ncpfs-hg-commit-426.patch +Patch427: ncpfs-hg-commit-427.patch +Patch428: ncpfs-hg-commit-428.patch +Patch429: ncpfs-hg-commit-429.patch +Patch430: ncpfs-hg-commit-430.patch +Patch431: ncpfs-hg-commit-431.patch +Patch432: ncpfs-hg-commit-432.patch +Patch433: ncpfs-hg-commit-433.patch +Patch434: ncpfs-hg-commit-434.patch +Patch435: ncpfs-hg-commit-435.patch +Patch436: ncpfs-hg-commit-436.patch +Patch437: ncpfs-hg-commit-437.patch +Patch438: ncpfs-hg-commit-438.patch +Patch439: ncpfs-hg-commit-439.patch +Patch440: ncpfs-hg-commit-440.patch +Patch441: ncpfs-hg-commit-441.patch +Patch442: ncpfs-hg-commit-442.patch +Patch443: ncpfs-hg-commit-443.patch +Patch444: ncpfs-hg-commit-444.patch +Patch445: ncpfs-hg-commit-445.patch +Patch446: ncpfs-hg-commit-446.patch +Patch447: ncpfs-hg-commit-447.patch +Patch448: ncpfs-hg-commit-448.patch +Patch449: ncpfs-hg-commit-449.patch +Patch450: ncpfs-hg-commit-450.patch +Patch451: ncpfs-hg-commit-451.patch +Patch452: ncpfs-hg-commit-452.patch +Patch453: ncpfs-hg-commit-453.patch +Patch454: ncpfs-hg-commit-454.patch +Patch455: ncpfs-hg-commit-455.patch +Patch456: ncpfs-hg-commit-456.patch +Patch457: ncpfs-hg-commit-457.patch +Patch458: ncpfs-hg-commit-458.patch +Patch1002: ncpfs.LDFLAGS.patch +Patch1003: ncpfs.pam_ncp_auth.syslog.patch +Patch1005: ncpfs.offsetof.patch %description With this program, you can mount Netware server file systems under @@ -65,12 +117,65 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%patch403 -p1 +%patch404 -p1 +%patch405 -p1 +%patch406 -p1 +%patch407 -p1 +%patch408 -p1 +%patch409 -p1 +%patch410 -p1 +%patch411 -p1 +%patch412 -p1 +%patch413 -p1 +%patch414 -p1 +%patch415 -p1 +%patch416 -p1 +%patch417 -p1 +%patch419 -p1 +%patch420 -p1 +%patch421 -p1 +%patch422 -p1 +%patch423 -p1 +%patch424 -p1 +%patch425 -p1 +%patch426 -p1 +%patch427 -p1 +%patch428 -p1 +%patch429 -p1 +%patch430 -p1 +%patch431 -p1 +%patch432 -p1 +%patch433 -p1 +%patch434 -p1 +%patch435 -p1 +%patch436 -p1 +%patch437 -p1 +%patch438 -p1 +%patch439 -p1 +%patch440 -p1 +%patch441 -p1 +%patch442 -p1 +%patch443 -p1 +%patch444 -p1 +%patch445 -p1 +%patch446 -p1 +%patch447 -p1 +%patch448 -p1 +%patch449 -p1 +%patch450 -p1 +%patch451 -p1 +%patch452 -p1 +%patch453 -p1 +%patch454 -p1 +%patch455 -p1 +%patch456 -p1 +%patch457 -p1 +%patch458 -p1 +# +%patch1002 -p1 +%patch1003 -p1 +%patch1005 -p1 tar xfvj %{SOURCE12} if [ "$UID" = 0 ] ; then chown -R 0:0 . ; fi @@ -150,12 +255,14 @@ /usr/bin/nwfsinfo /usr/bin/nwfstime /usr/bin/nwgrant +/usr/bin/nwlistsalvage /usr/bin/nwpasswd /usr/bin/nwpjmv /usr/bin/nwpqjob /usr/bin/nwpurge /usr/bin/nwrevoke /usr/bin/nwrights +/usr/bin/nwsalvage /usr/bin/nwtrustee /usr/bin/nwtrustee2 /usr/bin/nwuserlist @@ -175,7 +282,11 @@ %{_libdir}/libncp.a %{_libdir}/libncp.so -%changelog -n ncpfs +%changelog +* Thu May 17 2007 - olh(a)suse.de +- update to hg revision 458 + new nwsalvage tool + misc small fixes * Wed Feb 07 2007 - olh(a)suse.de - add Hungarian translation for ncpfs (242603) * Sat Apr 29 2006 - olh(a)suse.de ++++++ ncpfs-hg-commit-403.patch ++++++ changeset: 403:08f41478a208 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sun Apr 10 10:36:35 2005 +0000 files: man/ncpmount.8 description: Change charset from iso-8859-1 to iso8859-1 in ncpmount manpage. diff -r 722e35906cab -r 08f41478a208 man/ncpmount.8 --- a/man/ncpmount.8 Thu Jan 27 16:35:36 2005 +0000 +++ b/man/ncpmount.8 Sun Apr 10 10:36:35 2005 +0000 @@ -282,7 +282,7 @@ You can specify character translation ru You can specify character translation rules for converting names from unicode to your desktop (it works together with \fB-p\fP). .I iocharset -is charset name, for example \fIiso-8859-1\fP. +is charset name, for example \fIiso8859-1\fP. .RE .B -p ++++++ ncpfs-hg-commit-404.patch ++++++ ++++ 691 lines (skipped) ++++++ ncpfs-hg-commit-405.patch ++++++ changeset: 405:8aededcd3e6a user: Scott Bentley <bentleys(a)hhangus.com> date: Sun May 22 23:35:00 2005 +0000 files: man/Makefile.in man/nwlistsalvage.1 man/nwsalvage.1 description: Add nwsalvage and nwlistsalvage manpages. diff -r fc77f4249198 -r 8aededcd3e6a man/Makefile.in --- a/man/Makefile.in Wed May 11 20:46:55 2005 +0000 +++ b/man/Makefile.in Sun May 22 23:35:00 2005 +0000 @@ -16,7 +16,8 @@ MAN1 := nprint.1 nsend.1 nwauth.1 nwbols MAN1 := nprint.1 nsend.1 nwauth.1 nwbols.1 nwboprops.1 nwbpset.1 \ nwbpvalues.1 nwdir.1 nwfsinfo.1 nwfstime.1 nwpasswd.1 nwpurge.1 \ nwrights.1 nwsfind.1 nwtrustee.1 nwuserlist.1 nwvolinfo.1 pqlist.1 \ - nwpqjob.1 pqstat.1 pserver.1 slist.1 nwpjmv.1 + nwpqjob.1 pqstat.1 pserver.1 slist.1 nwpjmv.1 \ + nwsalvage.1 nwlistsalvage.1 MAN3 := $(notdir $(wildcard ${this_srcdir}/*.3ncp)) MAN5 := nwclient.5 MAN8 := nwbocreate.8 nwborm.8 nwbpadd.8 nwbpcreate.8 nwbprm.8 nwfsctrl.8 \ diff -r fc77f4249198 -r 8aededcd3e6a man/nwlistsalvage.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/man/nwlistsalvage.1 Sun May 22 23:35:00 2005 +0000 @@ -0,0 +1,49 @@ +.TH NWLISTSALVAGE 1 11/05/2005 nwlistsalvage nwlistsalvage +.SH NAME +nwlistsalvage +.SH SYNOPSIS +.B nwlistsalvage +[ \fB-h\fP ] [ \fB-n\fP \fInamespace\fP ] [ \fB-v\fP ] \fBdirectory\fP + +.SH DESCRIPTION +.B nwlistsalvage +lists all salvageable files in the specified NetWare directory. + +.SH OPTIONS + +.B -h +.RS 3 +Print out a short help text. +.RE + +.B -n +.RS 3 +Specify a different NetWare file namespace. Possible options include DOS, +MAC, NFS, FTAM, LONG. Default is LONG. +.RE + +.B -v +.RS 3 +List verbose file information. +.RE + +.B directory +.RS 3 +The directory to scan for salvageable files. Current +working directory is used by default. You have to specify path in +Linux format, not in NetWare format. +.RE + +.SH EXAMPLES + +nwlistsalvage /mnt/NetWare/server/volume/directory/ + +This example will return the file-type, file-id (see \fBnwsalvage\fP) +and file-name of all salvageable files found in /mnt/NetWare/server/volume/directory/ + +.SH AUTHORS +nwlistsalvage was written by Scott Bentley. See the Changes file of ncpfs +for other contributors. + +.SH SEE ALSO +nwsalvage diff -r fc77f4249198 -r 8aededcd3e6a man/nwsalvage.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/man/nwsalvage.1 Sun May 22 23:35:00 2005 +0000 @@ -0,0 +1,54 @@ +.TH NWSALVAGE 1 11/05/2005 nwsalvage nwsalvage +.SH NAME +nwsalvage +.SH SYNOPSIS +.B nwsalvage +[ \fB-h\fP ] [ \fB-s\fP ] [ \fB-n\fP \fInamespace\fP ] [ \fBdirectory\fP ] [ \fBfile_id\fP ] + +.SH DESCRIPTION +.B nwsalvage +recovers a file from the specified NetWare directory. + +.SH OPTIONS + +.B -h +.RS 3 +Print out a short help text. +.RE + +.B -n +.RS 3 +Specify a different NetWare file namespace. Possible options include DOS, +MAC, NFS, FTAM, LONG. Default is LONG. +.RE + +.B -s +.RS 3 +Silent mode +.RE + +.B directory +.RS 3 +The directory from which the file to be salvaged was deleted. Current +working directory is used by default. You have to specify path in +Linux format, not in NetWare format. +.RE + +.B file_id +.RS 3 +The numeric file identifier specifying the file you want to salvage. +This number is obtained from \fBnwlistsalvage\fP. + +.SH EXAMPLES + +nwsalvage /mnt/NetWare/server/volume/directory/ 123456 + +With this example, the file identified by 123456 deleted from the +directory /mnt/NetWare/server/volume/directory/ will be recovered. + +.SH AUTHORS +nwsalvage was written by Scott Bentley. See the Changes file of ncpfs +for other contributors. + +.SH SEE ALSO +nwlistsalvage ++++++ ncpfs-hg-commit-406.patch ++++++ changeset: 406:6af6a89be103 user: Scott Bentley <bentleys(a)hhangus.com> date: Sun May 22 23:37:08 2005 +0000 files: util/nwsalvage.c description: Do not use absolute path in nwsalvage. Salvage limits filename to 256 characters. diff -r 8aededcd3e6a -r 6af6a89be103 util/nwsalvage.c --- a/util/nwsalvage.c Sun May 22 23:35:00 2005 +0000 +++ b/util/nwsalvage.c Sun May 22 23:37:08 2005 +0000 @@ -23,7 +23,6 @@ */ #include <stdlib.h> -#include <string.h> #include <ncp/nwcalls.h> #include <unistd.h> @@ -58,15 +57,8 @@ static void process_salvage(struct ncp_c static void process_salvage(struct ncp_conn* conn, int volume, u_int32_t directory_id, int file_id) { struct ncp_deleted_file info; int found; - char dirname[1024]; - char filename[1024]; - char name[1024]; - - if (!ncp_ns_get_full_name(conn, g_nwns, g_nwns, - 1, volume, directory_id, NULL, 0, - dirname, sizeof(dirname))) { - } - strcat(dirname,"/"); + char oldfilename[256]; + char newfilename[256]; NWCCODE err; @@ -74,31 +66,29 @@ static void process_salvage(struct ncp_c info.seq = -1; while (!ncp_ns_scan_salvageable_file(conn, g_nwns, 1, volume, directory_id, NULL, 0, - &info, filename, sizeof(filename))){ - - strcpy(name,dirname); - strcat(name,filename); + &info, oldfilename, sizeof(oldfilename))) { if (info.seq == file_id) { + strcpy(newfilename, oldfilename); found++; - if ((err = ncp_ns_salvage_file(conn, g_nwns, &info, name)) != 0) { + if ((err = ncp_ns_salvage_file(conn, g_nwns, &info, newfilename)) != 0) { if (!g_silent) { if (err == 0x89FE) { printf(_("%8s%d -- failed (File already exists, or path inaccessible)\n"), "", info.seq); } else { - printf(_("%8s%d %s -- failed (%s)\n"), "", info.seq, name, strnwerror(err)); + printf(_("%8s%d %s -- failed (%s)\n"), "", info.seq, newfilename, strnwerror(err)); } } } else { if (!g_silent) { - printf(_("%8s%d %s -- salvaged \n"), "", info.seq, name); + printf(_("%8s%d %s -- salvaged \n"), "", info.seq, newfilename); } } break; } } if (!found) { - printf(_("%8sFile with scan ID '%d' was not found in directory '%s'."), "", file_id, dirname); + printf(_("%8sFile with scan ID '%d' was not found."), "", file_id); } printf("\n"); } @@ -121,7 +111,7 @@ int main(int argc, char* argv[]) { case '?': case ':':break; case 'h':usage(); exit(2); - case 's':g_silent=1; + case 's':g_silent = 1; break; case 'n': opt_n = argv[optind++]; ++++++ ncpfs-hg-commit-407.patch ++++++ changeset: 407:8a41f32f7288 user: Scott Bentley <bentleys(a)hhangus.com> date: Sun May 22 23:50:08 2005 +0000 files: util/nwsalvage.c description: Add `-r' option for renaming file while salvaging it. diff -r 6af6a89be103 -r 8a41f32f7288 util/nwsalvage.c --- a/util/nwsalvage.c Sun May 22 23:37:08 2005 +0000 +++ b/util/nwsalvage.c Sun May 22 23:50:08 2005 +0000 @@ -35,14 +35,15 @@ static void usage(void) { "\n" "-h Print this help text.\n" "-s Silent mode.\n" -"-n <namespace> Namespace for accessing files\n" +"-n <namespace> Namespace for accessing files.\n" " DOS\n" " LONG - Default\n" " MAC\n" " FTAM\n" " NFS\n" +"-r <newname> Rename the salvaged file. 255 chars max." "\n" -"directory Directory in which salvageable file(s) resides.\n" +"directory Directory in which salvageable file resides.\n" " Default is current directory.\n" "\n" "file_id The file identified by file_id will be salvaged.\n" @@ -52,13 +53,14 @@ static void usage(void) { } static int g_silent = 0; +static int g_rename = 0; +static char* g_newname; static int g_nwns = NW_NS_LONG; static void process_salvage(struct ncp_conn* conn, int volume, u_int32_t directory_id, int file_id) { struct ncp_deleted_file info; int found; - char oldfilename[256]; - char newfilename[256]; + char filename[256]; NWCCODE err; @@ -66,22 +68,26 @@ static void process_salvage(struct ncp_c info.seq = -1; while (!ncp_ns_scan_salvageable_file(conn, g_nwns, 1, volume, directory_id, NULL, 0, - &info, oldfilename, sizeof(oldfilename))) { + &info, filename, sizeof(filename))) { if (info.seq == file_id) { - strcpy(newfilename, oldfilename); found++; - if ((err = ncp_ns_salvage_file(conn, g_nwns, &info, newfilename)) != 0) { + + if (g_rename) { + strcpy(filename, g_newname); + } + + if ((err = ncp_ns_salvage_file(conn, g_nwns, &info, filename)) != 0) { if (!g_silent) { if (err == 0x89FE) { printf(_("%8s%d -- failed (File already exists, or path inaccessible)\n"), "", info.seq); } else { - printf(_("%8s%d %s -- failed (%s)\n"), "", info.seq, newfilename, strnwerror(err)); + printf(_("%8s%d %s -- failed (%s)\n"), "", info.seq, filename, strnwerror(err)); } } } else { if (!g_silent) { - printf(_("%8s%d %s -- salvaged \n"), "", info.seq, newfilename); + printf(_("%8s%d %s -- salvaged \n"), "", info.seq, filename); } } break; @@ -101,12 +107,13 @@ int main(int argc, char* argv[]) { int err; int c; char* opt_n; + char* opt_r; setlocale(LC_ALL, ""); bindtextdomain(NCPFS_PACKAGE, LOCALEDIR); textdomain(NCPFS_PACKAGE); - while ((c = getopt(argc, argv, "hsn")) != -1) { + while ((c = getopt(argc, argv, "hsnr")) != -1) { switch (c) { case '?': case ':':break; @@ -130,6 +137,15 @@ int main(int argc, char* argv[]) { exit(1); } break; + case 'r': + opt_r = argv[optind++]; + if (strlen(opt_r) > 255 || strlen(opt_r) < 1) { + fprintf(stderr, _("Filename for option '-%c' has invalid length."), c); + exit(1); + } + g_rename = 1; + g_newname = opt_r; + break; default: fprintf(stderr, _("Unexpected option `-%c'\n"), c); break; } ++++++ ncpfs-hg-commit-408.patch ++++++ changeset: 408:3ad605e1e151 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat May 28 13:36:26 2005 +0000 files: contrib/php/php_auth_nds.c description: There are no localized strings in php_auth_nds, so no need for including <libintl.h>. diff -r 8a41f32f7288 -r 3ad605e1e151 contrib/php/php_auth_nds.c --- a/contrib/php/php_auth_nds.c Sun May 22 23:50:08 2005 +0000 +++ b/contrib/php/php_auth_nds.c Sat May 28 13:36:26 2005 +0000 @@ -110,8 +110,6 @@ for more examples see /contrib/php/site #include <wchar.h> #include <string.h> #include <syslog.h> -#include <libintl.h> -#define _(X) gettext(X) static int is_member_of_group_bind( char* errstr,NWCONN_HANDLE conn,const char* user,const char* group) { int err; ++++++ ncpfs-hg-commit-409.patch ++++++ changeset: 409:0cc3f7f08de0 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat May 28 13:38:37 2005 +0000 files: mkinstalldirs description: New mkinstalldirs. diff -r 3ad605e1e151 -r 0cc3f7f08de0 mkinstalldirs --- a/mkinstalldirs Sat May 28 13:36:26 2005 +0000 +++ b/mkinstalldirs Sat May 28 13:38:37 2005 +0000 @@ -1,40 +1,150 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman <friedman(a)prep.ai.mit.edu> + +scriptversion=2004-02-15.20 + +# Original author: Noah Friedman <friedman(a)prep.ai.mit.edu> # Created: 1993-05-16 -# Public domain - -# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $ +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to <bug-automake(a)gnu.org> or send patches to +# <automake-patches(a)gnu.org>. errstatus=0 +dirmode="" + +usage="\ +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to <bug-automake(a)gnu.org>." + +# process command line arguments +while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" + exit 0 + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --version) + echo "$0 $scriptversion" + exit 0 + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac +done for file do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift + if test -d "$file"; then + shift + else + break + fi +done - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac +case $# in + 0) exit 0 ;; +esac - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. +case $dirmode in + '') + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version + fi + ;; + *) + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done + fi + ;; +esac - mkdir "$pathcomp" || lasterr=$? +for file +do + set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` + shift - if test ! -d "$pathcomp"; then - errstatus=$lasterr - fi - fi + pathcomp= + for d + do + pathcomp="$pathcomp$d" + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac - pathcomp="$pathcomp/" - done + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? + + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi + fi + fi + + pathcomp="$pathcomp/" + done done exit $errstatus -# mkinstalldirs ends here +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: ++++++ ncpfs-hg-commit-410.patch ++++++ changeset: 410:4216c218ee44 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat May 28 13:40:15 2005 +0000 files: include/ncp/ncplib.h description: Prefer off_t over __off_t unless _FILE_OFFSET_BITS=64 is defined. Needed for building on Darwin. diff -r 0cc3f7f08de0 -r 4216c218ee44 include/ncp/ncplib.h --- a/include/ncp/ncplib.h Sat May 28 13:38:37 2005 +0000 +++ b/include/ncp/ncplib.h Sat May 28 13:40:15 2005 +0000 @@ -94,6 +94,13 @@ typedef enum NET_ADDRESS_TYPE { NT_URL = 13, NT_COUNT = 14 } NET_ADDRESS_TYPE; + +#if !defined(_FILE_OFFSET_BITS) || _FILE_OFFSET_BITS != 64 +typedef off_t ncp_off_t; +#else +/* Maintain unchanged ABI - these functions use 32bit off_t... */ +typedef __off_t ncp_off_t; +#endif #ifdef SWIG /* ncp_off64_t is defined to double by Perl interface */ @@ -872,11 +879,11 @@ long #ifdef SWIG long ncp_read(NWCONN_HANDLE conn, const char fileHandle[6], - __off_t offset, size_t count, char *RETBUFFER_LENPREV); + ncp_off_t offset, size_t count, char *RETBUFFER_LENPREV); long ncp_write(NWCONN_HANDLE conn, const char fileHandle[6], - __off_t offset, size_t IGNORE, const char *STRING_LENPREV); + ncp_off_t offset, size_t IGNORE, const char *STRING_LENPREV); long ncp_copy_file(NWCONN_HANDLE conn, @@ -889,11 +896,11 @@ long #else long ncp_read(NWCONN_HANDLE conn, const char fileHandle[6], - __off_t offset, size_t count, char *target); + ncp_off_t offset, size_t count, char *target); long ncp_write(NWCONN_HANDLE conn, const char fileHandle[6], - __off_t offset, size_t count, const char *source); + ncp_off_t offset, size_t count, const char *source); NWCCODE ncp_read64(NWCONN_HANDLE conn, const char fileHandle[6], ncp_off64_t offset, size_t count, void *target, size_t *bytesread); ++++++ ncpfs-hg-commit-411.patch ++++++ ++++ 11057 lines (skipped) ++++++ ncpfs-hg-commit-412.patch ++++++ changeset: 412:b4b6191b3d97 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat May 28 13:46:29 2005 +0000 files: lib/nwclient.c description: Define ENOPKG error as ENOSYS if ENOPKG does not exist. Needed for Darwin. diff -r e04165992166 -r b4b6191b3d97 lib/nwclient.c --- a/lib/nwclient.c Sat May 28 13:45:22 2005 +0000 +++ b/lib/nwclient.c Sat May 28 13:46:29 2005 +0000 @@ -88,6 +88,10 @@ #endif #include <pwd.h> #include <sys/stat.h> + +#ifndef ENOPKG +#define ENOPKG ENOSYS +#endif /*should be in ndslib.h ?*/ #define NWE_BIND_NO_SUCH_PROP NWE_NCP_NOT_SUPPORTED ++++++ ncpfs-hg-commit-413.patch ++++++ changeset: 413:94680aa0251a user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat May 28 13:47:31 2005 +0000 files: lib/rdn.c description: Do not include <sys/mman.h> in lib/rdn.h. It is not needed there. diff -r b4b6191b3d97 -r 94680aa0251a lib/rdn.c --- a/lib/rdn.c Sat May 28 13:46:29 2005 +0000 +++ b/lib/rdn.c Sat May 28 13:47:31 2005 +0000 @@ -30,8 +30,6 @@ #include <stdlib.h> #include <errno.h> #include <string.h> - -#include <sys/mman.h> #include "nwnet_i.h" #include "ncplib_i.h" ++++++ ncpfs-hg-commit-414.patch ++++++ changeset: 414:5e027b02f28c user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat May 28 13:49:58 2005 +0000 files: lib/resolve.c description: Properly wrap sockaddr_ipx accesses with NCP_IPX_SUPPORT and sockaddr_in with NCP_IN_SUPPORT. Needed on IPX-less architectures. diff -r 94680aa0251a -r 5e027b02f28c lib/resolve.c --- a/lib/resolve.c Sat May 28 13:47:31 2005 +0000 +++ b/lib/resolve.c Sat May 28 13:49:58 2005 +0000 @@ -875,7 +875,9 @@ NWCCODE ncp_find_server_addr(const char err = NWCCGetConnInfo(conn, NWCC_INFO_TRAN_ADDR, sizeof(ta), &ta); if (!err) { - if (ta.type == NT_IPX) { + switch (ta.type) { +#ifdef NCP_IPX_SUPPORT + case NT_IPX: { struct sockaddr_ipx* ipx = (struct sockaddr_ipx*)addr; if (len < sizeof(*ipx)) { @@ -887,7 +889,12 @@ NWCCODE ncp_find_server_addr(const char memcpy(&ipx->sipx_port, buffer + 10, 2); ipx->sipx_type = 0x11; } - } else if (ta.type == NT_UDP || ta.type == NT_TCP) { + break; + } +#endif +#ifdef NCP_IN_SUPPORT + case NT_UDP: + case NT_TCP: { struct sockaddr_in* in = (struct sockaddr_in*)addr; if (len < sizeof(*in)) { @@ -897,8 +904,12 @@ NWCCODE ncp_find_server_addr(const char memcpy(&in->sin_addr.s_addr, buffer + 2, 4); memcpy(&in->sin_port, buffer, 2); } - } else { + break; + } +#endif + default: err = EINVAL; + break; } if (!err) { err = NWGetFileServerName(conn, sname); ++++++ ncpfs-hg-commit-415.patch ++++++ changeset: 415:005801e1fd28 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat May 28 15:07:13 2005 +0000 files: include/private/list.h lib/ncplib.c lib/nwnet.c description: Rename LIST_HEAD to NCP_LIST_HEAD. LIST_HEAD exists on Darwin. diff -r 5e027b02f28c -r 005801e1fd28 include/private/list.h --- a/include/private/list.h Sat May 28 13:49:58 2005 +0000 +++ b/include/private/list.h Sat May 28 15:07:13 2005 +0000 @@ -16,10 +16,10 @@ struct list_head { struct list_head *next, *prev; }; -#define LIST_HEAD(name) \ +#define NCP_LIST_HEAD(name) \ struct list_head name = { &name, &name } -#define INIT_LIST_HEAD(ptr) do { \ +#define NCP_INIT_LIST_HEAD(ptr) do { \ (ptr)->next = (ptr); (ptr)->prev = (ptr); \ } while (0) @@ -64,7 +64,7 @@ static __inline__ void list_del(struct l static __inline__ void list_del(struct list_head *entry) { __list_del(entry->prev, entry->next); - INIT_LIST_HEAD(entry); + NCP_INIT_LIST_HEAD(entry); } static __inline__ int list_empty(struct list_head *head) diff -r 5e027b02f28c -r 005801e1fd28 lib/ncplib.c --- a/lib/ncplib.c Sat May 28 13:49:58 2005 +0000 +++ b/lib/ncplib.c Sat May 28 15:07:13 2005 +0000 @@ -194,7 +194,7 @@ int in_options = 0; #endif static ncpt_mutex_t conn_lock = NCPT_MUTEX_INITIALIZER; -static LIST_HEAD(conn_list); +static NCP_LIST_HEAD(conn_list); ncpt_mutex_t nds_ring_lock = NCPT_MUTEX_INITIALIZER; /* return number of bytes in packet */ @@ -775,9 +775,9 @@ static struct ncp_conn *ncp_alloc_conn(v memset(conn, 0, sizeof(*conn)); ncpt_atomic_set(&conn->use_count, 1); ncpt_atomic_set(&conn->store_count, 0); - INIT_LIST_HEAD(&conn->nds_ring); + NCP_INIT_LIST_HEAD(&conn->nds_ring); // conn->nds_conn = NULL; - INIT_LIST_HEAD(&conn->conn_ring); + NCP_INIT_LIST_HEAD(&conn->conn_ring); ncpt_mutex_init(&conn->buffer_mutex); ncpt_mutex_init(&conn->serverInfo.mutex); // conn->serverInfo.valid = 0; diff -r 5e027b02f28c -r 005801e1fd28 lib/nwnet.c --- a/lib/nwnet.c Sat May 28 13:49:58 2005 +0000 +++ b/lib/nwnet.c Sat May 28 15:07:13 2005 +0000 @@ -943,8 +943,8 @@ static NWDSCCODE __NWDSCreateDSConnectio memset(tmp, 0, sizeof(*tmp)); tmp->dck.tree_name = NULL; - INIT_LIST_HEAD(&tmp->contexts); - INIT_LIST_HEAD(&tmp->conns); + NCP_INIT_LIST_HEAD(&tmp->contexts); + NCP_INIT_LIST_HEAD(&tmp->conns); *dsh = tmp; return 0; } @@ -1172,7 +1172,7 @@ NWDSCCODE NWDSCreateContextHandle(NWDSCo return ERR_NOT_ENOUGH_MEMORY; } memset(tmp, 0, sizeof(*tmp)); - INIT_LIST_HEAD(&tmp->context_ring); + NCP_INIT_LIST_HEAD(&tmp->context_ring); tmp->dck.flags = DCV_DEREF_ALIASES | DCV_XLATE_STRINGS | DCV_CANONICALIZE_NAMES; tmp->dck.name_form = 0; tmp->dck.last_connection.conn = NULL; @@ -1237,7 +1237,7 @@ NWDSCCODE NWDSDuplicateContextHandleInt( return ERR_NOT_ENOUGH_MEMORY; memset(tmp, 0, sizeof(*tmp)); - INIT_LIST_HEAD(&tmp->context_ring); + NCP_INIT_LIST_HEAD(&tmp->context_ring); /* return typed absolute names */ tmp->dck.flags = srcctx->dck.flags & ~(DCV_CANONICALIZE_NAMES | DCV_TYPELESS_NAMES); tmp->dck.name_form = srcctx->dck.name_form; ++++++ ncpfs-hg-commit-416.patch ++++++ changeset: 416:48879aeab0b6 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat May 28 15:42:43 2005 +0000 files: configure.ac lib/ds/filter.c lib/ds/iterhandle.c lib/ds/request.c lib/ds/search.c lib/ds/setkeys.c lib/fs/eas.c lib/fs/filelock.c lib/ncpext.c lib/ncplib.c lib/ncplib_i.h lib/nwcalls.c lib/nwtime.c lib/queue.c lib/rdn.c description: Add support for SO_NOSIGPIPE (Darwin) in addition to MSG_NOSIGNAL. diff -r 005801e1fd28 -r 48879aeab0b6 configure.ac --- a/configure.ac Sat May 28 15:07:13 2005 +0000 +++ b/configure.ac Sat May 28 15:42:43 2005 +0000 @@ -495,6 +495,38 @@ else socklen_t="typedef $ncp_cv_socklen_t socklen_t;" fi AC_SUBST(socklen_t) + +AC_CACHE_CHECK(whether SO_NOSIGPIPE exists, + ncp_cv_so_nosigpipe, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[[#include <sys/types.h> +#include <sys/socket.h>]]], + [[[int s; + int o = 0; + s = socket(0, 0, 0); + setsockopt(s, SOL_SOCKET, SO_NOSIGPIPE, &o, sizeof(o))]]])], + [ncp_cv_so_nosigpipe="yes"], + [ncp_cv_so_nosigpipe="no"] + ) +) +if test "$ncp_cv_so_nosigpipe" = "yes" +then + AC_DEFINE(HAVE_SO_NOSIGPIPE, 1, [Define when SO_NOSIGPIPE exists]) +fi + +AC_CACHE_CHECK(whether MSG_NOSIGNAL exists, + ncp_cv_msg_nosignal, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[[#include <sys/types.h> +#include <sys/socket.h> +struct msghdr msg;]]], + [[[sendmsg(0, &msg, MSG_NOSIGNAL)]]])], + [ncp_cv_msg_nosignal="yes"], + [ncp_cv_msg_nosignal="no"] + ) +) +if test "$ncp_cv_msg_nosignal" = "yes" +then + AC_DEFINE(HAVE_MSG_NOSIGNAL, 1, [Define when MSG_NOSIGNAL exists]) +fi dnl UNICODE AC_CHECK_TYPE([wchar_t], , [AC_DEFINE([wchar_t], [unsigned int], [Define to 'unsigned int' if wchar_t is not defined.])]) diff -r 005801e1fd28 -r 48879aeab0b6 lib/ds/filter.c --- a/lib/ds/filter.c Sat May 28 15:07:13 2005 +0000 +++ b/lib/ds/filter.c Sat May 28 15:42:43 2005 +0000 @@ -26,6 +26,8 @@ Fix coredumps, endless loops and so on in NWDSPutFilter. */ + +#include "config.h" #include <stddef.h> #include <stdlib.h> diff -r 005801e1fd28 -r 48879aeab0b6 lib/ds/iterhandle.c --- a/lib/ds/iterhandle.c Sat May 28 15:07:13 2005 +0000 +++ b/lib/ds/iterhandle.c Sat May 28 15:42:43 2005 +0000 @@ -22,6 +22,8 @@ Initial release. */ + +#include "config.h" #include "iterhandle.h" diff -r 005801e1fd28 -r 48879aeab0b6 lib/ds/request.c --- a/lib/ds/request.c Sat May 28 15:07:13 2005 +0000 +++ b/lib/ds/request.c Sat May 28 15:42:43 2005 +0000 @@ -22,6 +22,8 @@ Initial release */ + +#include "config.h" #include <stddef.h> #include <stdlib.h> diff -r 005801e1fd28 -r 48879aeab0b6 lib/ds/search.c --- a/lib/ds/search.c Sat May 28 15:07:13 2005 +0000 +++ b/lib/ds/search.c Sat May 28 15:42:43 2005 +0000 @@ -32,6 +32,8 @@ to NWDSSearch. */ + +#include "config.h" #include <stddef.h> #include <stdlib.h> diff -r 005801e1fd28 -r 48879aeab0b6 lib/ds/setkeys.c --- a/lib/ds/setkeys.c Sat May 28 15:07:13 2005 +0000 +++ b/lib/ds/setkeys.c Sat May 28 15:42:43 2005 +0000 @@ -35,6 +35,8 @@ Modified nds_login to use unaliased name in NWDSSetKeys. */ + +#include "config.h" #include <stddef.h> #include <stdlib.h> diff -r 005801e1fd28 -r 48879aeab0b6 lib/fs/eas.c --- a/lib/fs/eas.c Sat May 28 15:07:13 2005 +0000 +++ b/lib/fs/eas.c Sat May 28 15:42:43 2005 +0000 @@ -23,6 +23,7 @@ */ +#include "config.h" #include <ncp/eas.h> #include "ncplib_i.h" diff -r 005801e1fd28 -r 48879aeab0b6 lib/fs/filelock.c --- a/lib/fs/filelock.c Sat May 28 15:07:13 2005 +0000 +++ b/lib/fs/filelock.c Sat May 28 15:42:43 2005 +0000 @@ -23,6 +23,7 @@ */ +#include "config.h" #include "ncplib_i.h" #include <ncp/nwnet.h> diff -r 005801e1fd28 -r 48879aeab0b6 lib/ncpext.c --- a/lib/ncpext.c Sat May 28 15:07:13 2005 +0000 +++ b/lib/ncpext.c Sat May 28 15:42:43 2005 +0000 @@ -22,6 +22,8 @@ Initial version. */ + +#include "config.h" #include <ncp/nwcalls.h> #include <ncp/nwnet.h> diff -r 005801e1fd28 -r 48879aeab0b6 lib/ncplib.c --- a/lib/ncplib.c Sat May 28 15:07:13 2005 +0000 +++ b/lib/ncplib.c Sat May 28 15:42:43 2005 +0000 @@ -460,6 +460,18 @@ restart: return 0; } +int +ncp_fd_nosigpipe(UNUSED(int fd)) +{ +#ifdef HAVE_SO_NOSIGPIPE + static const int one = 1; + + return setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &one, sizeof(one)); +#else + return 0; +#endif +} + #ifdef CONFIG_NATIVE_IPX static int exec_nwsfind(const char* request[]) { @@ -521,8 +533,11 @@ ipx_make_reachable_rip(const struct sock memset(&rip, 0, sizeof(rip)); sock = socket(PF_IPX, SOCK_DGRAM, IPXPROTO_IPX); - if (sock == -1) { + return errno; + } + if (ncp_fd_nosigpipe(sock)) { + close(sock); return errno; } opt = 1; @@ -1291,7 +1306,16 @@ ncp_connect_ipx_addr(struct ncp_conn *co if ((ncp_sock = socket(PF_IPX, SOCK_DGRAM, IPXPROTO_IPX)) == -1) { return errno; } + if (ncp_fd_nosigpipe(ncp_sock)) { + close(ncp_sock); + return errno; + } if ((wdog_sock = socket(PF_IPX, SOCK_DGRAM, IPXPROTO_IPX)) == -1) { + close(ncp_sock); + return errno; + } + if (ncp_fd_nosigpipe(wdog_sock)) { + close(wdog_sock); close(ncp_sock); return errno; } @@ -1385,6 +1409,10 @@ ncp_connect_in_addr(struct ncp_conn *con if ((ncp_sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) { return errno; } + if (ncp_fd_nosigpipe(ncp_sock)) { + close(ncp_sock); + return errno; + } addr.sin_family = AF_INET; addr.sin_port = htons(0x0); addr.sin_addr.s_addr = INADDR_ANY; @@ -1444,6 +1472,10 @@ ncp_connect_tcp_addr(struct ncp_conn *co if ((ncp_sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) { return errno; } + if (ncp_fd_nosigpipe(ncp_sock)) { + close(ncp_sock); + return errno; + } addr.sin_family = AF_INET; addr.sin_port = htons(0x0); addr.sin_addr.s_addr = INADDR_ANY; @@ -1503,6 +1535,10 @@ ncp_connect_un_addr(struct ncp_conn *con conn->verbose = 0; if ((fd = socket(PF_UNIX, SOCK_DGRAM, 0)) == -1) { + return errno; + } + if (ncp_fd_nosigpipe(fd)) { + close(fd); return errno; } addr.sun_family = AF_UNIX; diff -r 005801e1fd28 -r 48879aeab0b6 lib/ncplib_i.h --- a/lib/ncplib_i.h Sat May 28 15:07:13 2005 +0000 +++ b/lib/ncplib_i.h Sat May 28 15:42:43 2005 +0000 @@ -62,6 +62,10 @@ extern "C" { #include "private/ncp_fs.h" #include <string.h> + +#ifndef HAVE_MSG_NOSIGNAL +#define MSG_NOSIGNAL 0 +#endif #define UNUSED(x) x __attribute__((unused)) @@ -328,6 +332,8 @@ static inline NWCCODE x_recv(int sock, v NWCCODE __NWReadFileServerInfo(struct ncp_conn* conn); +int ncp_fd_nosigpipe(int fd); + #ifdef __cplusplus } #endif diff -r 005801e1fd28 -r 48879aeab0b6 lib/nwcalls.c --- a/lib/nwcalls.c Sat May 28 15:07:13 2005 +0000 +++ b/lib/nwcalls.c Sat May 28 15:42:43 2005 +0000 @@ -343,6 +343,10 @@ retryLoop:; } fd = socket(PF_UNIX, SOCK_STREAM, 0); if (fd < 0) { + goto errquit; + } + if (ncp_fd_nosigpipe(fd)) { + close(fd); goto errquit; } sunlen = offsetof(struct sockaddr_un, sun_path) + sprintf(sun.sun_path, "%cncpfs.permanent.mount.%lu", 0, diff -r 005801e1fd28 -r 48879aeab0b6 lib/nwtime.c --- a/lib/nwtime.c Sat May 28 15:07:13 2005 +0000 +++ b/lib/nwtime.c Sat May 28 15:42:43 2005 +0000 @@ -22,6 +22,8 @@ Initial version - NWGetFileServerUTCTime moved from nwcalls.c. */ + +#include "config.h" #include <errno.h> #include <string.h> diff -r 005801e1fd28 -r 48879aeab0b6 lib/queue.c --- a/lib/queue.c Sat May 28 15:07:13 2005 +0000 +++ b/lib/queue.c Sat May 28 15:42:43 2005 +0000 @@ -29,6 +29,8 @@ 1.00 1999, November 20 Petr Vandrovec <vandrove(a)vc.cvut.cz> Added license. */ + +#include "config.h" #include "ncplib_i.h" diff -r 005801e1fd28 -r 48879aeab0b6 lib/rdn.c --- a/lib/rdn.c Sat May 28 15:07:13 2005 +0000 +++ b/lib/rdn.c Sat May 28 15:42:43 2005 +0000 @@ -25,6 +25,8 @@ DN length check in __NWDSExtractRDN and NWDSRemoveAllTypesW */ + +#include "config.h" #include <stddef.h> #include <stdlib.h> ++++++ ncpfs-hg-commit-417.patch ++++++ ++++ 7568 lines (skipped) ++++++ ncpfs-hg-commit-419.patch ++++++ changeset: 419:56ca340a8425 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat May 28 18:48:12 2005 +0000 files: sutil/Makefile.in util/Makefile.in description: Link utils with LIBICONV in addition to INTLLIBS... diff -r 9bf8cc97936c -r 56ca340a8425 sutil/Makefile.in --- a/sutil/Makefile.in Sat May 28 15:48:03 2005 +0000 +++ b/sutil/Makefile.in Sat May 28 18:48:12 2005 +0000 @@ -13,7 +13,7 @@ USE_KERNEL = @USE_KERNEL@ USE_KERNEL = @USE_KERNEL@ NDS_SUPPORT = @NDS_SUPPORT@ -LIBS = @INTLLIBS@ @LIBS@ +LIBS = @INTLLIBS@ @LIBICONV@ @LIBS@ # environ in ncpmount CCFLAGS += -D_GNU_SOURCE diff -r 9bf8cc97936c -r 56ca340a8425 util/Makefile.in --- a/util/Makefile.in Sat May 28 15:48:03 2005 +0000 +++ b/util/Makefile.in Sat May 28 18:48:12 2005 +0000 @@ -14,7 +14,7 @@ NDS_SUPPORT = @NDS_SUPPORT@ NDS_SUPPORT = @NDS_SUPPORT@ MOUNT2 = @MOUNT2@ -LIBS = @INTLLIBS@ @LIBS@ +LIBS = @INTLLIBS@ @LIBICONV@ @LIBS@ O_OTHER = dsqueue.o O_USERUTILS = slist.o pqlist.o nwfsinfo.o pserver.o nprint.o nsend.o \ ++++++ ncpfs-hg-commit-420.patch ++++++ changeset: 420:c7f1c54278c9 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat May 28 18:54:50 2005 +0000 files: sutil/Makefile.in description: Fix build failure while building with --disable-kernel. diff -r 56ca340a8425 -r c7f1c54278c9 sutil/Makefile.in --- a/sutil/Makefile.in Sat May 28 18:48:12 2005 +0000 +++ b/sutil/Makefile.in Sat May 28 18:54:50 2005 +0000 @@ -36,9 +36,6 @@ CFLAGS_ncpmap.o = -DNCPMAP=1 -DMAKE_NCPL CFLAGS_ncpmap.o = -DNCPMAP=1 -DMAKE_NCPLIB CFLAGS_ncplogin.o = -DMAKE_NCPLIB CFLAGS_ncpm_common.o = -DNWMSG=\"$(sbindir)/nwmsg\" -LDFLAGS_ncpmount = ncpm_common.o mount_login.o -LDFLAGS_ncplogin = ncpm_common.o mount_login.o -LDFLAGS_ncpmap = ncpm_common.o .PHONY : all install install-dev dep clean mrproper distclean .PHONY : default @@ -68,6 +65,10 @@ install-dev: | sed 's,$$*$\.o[ :]*,\1.o \1.do \1.to $@ : ,g' > $@; \ [ -s $@ ] || rm -f $@ +ncpmount: ncpm_common.o mount_login.o +ncplogin: ncpm_common.o mount_login.o +ncpmap: ncpm_common.o + ncpmap.o: %.o: ncplogin.c $(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $< @@ -84,8 +85,8 @@ ncpm_common.d mount_login.d: %.d: %.c | sed 's,$$*$\.o[ :]*,\1.o \1.do \1.to $@ : ,g' > $@; \ [ -s $@ ] || rm -f $@ -$(UTILS): %: %.o ../lib/libncp.a ncpm_common.o mount_login.o - $(CC) @GC_SECTIONS@-o $@ $(addsuffix .o,$@) $(LDFLAGS_$@) ../lib/libncp.a ${LIBS} +$(UTILS): %: %.o ../lib/libncp.a + $(CC) @GC_SECTIONS@-o $@ $^ ${LIBS} ../lib/libncp.a: make -C ../lib libncp.a ++++++ ncpfs-hg-commit-421.patch ++++++ changeset: 421:50351d213ba9 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat May 28 18:57:50 2005 +0000 files: Make.rules.in lib/Makefile.in description: Perform ranlib on static library after build. diff -r c7f1c54278c9 -r 50351d213ba9 Make.rules.in --- a/Make.rules.in Sat May 28 18:54:50 2005 +0000 +++ b/Make.rules.in Sat May 28 18:57:50 2005 +0000 @@ -2,6 +2,7 @@ INSTALL := @INSTALL@ INSTALL := @INSTALL@ INSTALL_DATA := @INSTALL_DATA@ CC := @CC@ +RANLIB := @RANLIB@ prefix := @prefix@ exec_prefix := @exec_prefix@ diff -r c7f1c54278c9 -r 50351d213ba9 lib/Makefile.in --- a/lib/Makefile.in Sat May 28 18:54:50 2005 +0000 +++ b/lib/Makefile.in Sat May 28 18:57:50 2005 +0000 @@ -130,6 +130,7 @@ install_static: $(STATIC_NCPLIB_BIN) $(STATIC_NCPLIB): $(STATIC_O_OBJ) ar r $@ $(STATIC_O_OBJ) + $(RANLIB) $@ ifeq ($(NEED_DEP),yes) include $(STATIC_O_OBJ:.o=.d) ++++++ ncpfs-hg-commit-422.patch ++++++ changeset: 422:bda42d4b9cf1 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat May 28 19:21:17 2005 +0000 files: Make.rules.in Makefile.in configure configure.ac contrib/tcl-utils/Makefile.in contrib/tknwmsg/Makefile.in lib/Makefile.in util/Makefile.in description: Add support for disabling build of shared library with --disable-shared. diff -r 50351d213ba9 -r bda42d4b9cf1 Make.rules.in --- a/Make.rules.in Sat May 28 18:57:50 2005 +0000 +++ b/Make.rules.in Sat May 28 19:21:17 2005 +0000 @@ -48,6 +48,7 @@ CCFLAGS := $(CFLAGS_DEFINES) $(CFLAGS_OP # directory where the dynamic library resides to the environment # variable LD_LIBRARY_PATH HAVE_ELF := @ELF_TARGET@ +BUILD_SHARED := @BUILD_SHARED@ VERSION_SOLIB := 2.3.0 VERSION_SONAME := 2.3 diff -r 50351d213ba9 -r bda42d4b9cf1 Makefile.in --- a/Makefile.in Sat May 28 18:57:50 2005 +0000 +++ b/Makefile.in Sat May 28 19:21:17 2005 +0000 @@ -19,11 +19,11 @@ CLEAN_SUBDIRS := lib sutil util man intl contrib/testing/pp contrib/tests contrib/libtrace contrib/nss64 \ contrib/tcl-utils contrib/php contrib/pam -export INCLUDES VERSION HAVE_ELF CFLAGS +export INCLUDES VERSION BUILD_SHARED CFLAGS all: set -e; for i in $(EXECSUBDIRS); do make -C $$i all; done - @if [ "$(HAVE_ELF)" = yes ] ;\ + @if [ "$(BUILD_SHARED)" = yes ] ;\ then \ echo ; echo ; echo ;\ echo Please add \'`pwd`/lib\' to the environment ; \ diff -r 50351d213ba9 -r bda42d4b9cf1 configure --- a/configure Sat May 28 18:57:50 2005 +0000 +++ b/configure Sat May 28 19:21:17 2005 +0000 @@ -313,7 +313,7 @@ ac_includes_default="\ #endif" ac_subdirs_all="$ac_subdirs_all contrib/php" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC_WARNINGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S PACKAGE VERSION MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CPP EGREP GLIBC2 RANLIB ac_ct_RANLIB ALLOCA GLIBC21 INTL_MACOSX_LIBS HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB localedir ncp_ipx_headers_1 ncp_ipx_headers_2 ncp_ipx_defsiocprotoprivate ncp_ipx_defsiocaipx ncp_sys_mount_h ncp_linux_fs_h ncp_net_if_h ncp_net_route_h ncp_if_ether_support ncp_sys_select_h stdint_types socklen_t wchar_h LIB_PAM_SECURITY php_found REENTRANT_CFLAGS ncphost ELF_TARGET VERSIONED_LINK ncp_in_support ncp_ipx_support NDS_SUPPORT SIGNATURES MOUNT2 MOUNT3 USE_KERNEL ADDON_SUBDIRS ADDON_DEV_SUBDIRS FFUNCTION_SECTIONS GC_SECTIONS subdirs LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC_WARNINGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S PACKAGE VERSION MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CPP EGREP GLIBC2 RANLIB ac_ct_RANLIB ALLOCA GLIBC21 INTL_MACOSX_LIBS HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB localedir ncp_ipx_headers_1 ncp_ipx_headers_2 ncp_ipx_defsiocprotoprivate ncp_ipx_defsiocaipx ncp_sys_mount_h ncp_linux_fs_h ncp_net_if_h ncp_net_route_h ncp_if_ether_support ncp_sys_select_h stdint_types socklen_t wchar_h LIB_PAM_SECURITY php_found REENTRANT_CFLAGS ncphost ELF_TARGET VERSIONED_LINK ncp_in_support ncp_ipx_support NDS_SUPPORT SIGNATURES MOUNT2 MOUNT3 USE_KERNEL ADDON_SUBDIRS ADDON_DEV_SUBDIRS FFUNCTION_SECTIONS GC_SECTIONS BUILD_SHARED subdirs LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -864,6 +864,7 @@ Optional Features: --disable-reentrant do not compile threading support into library --disable-versions do not use version symbols in library --disable-function-sections do not use -ffunction-sections for static libraries + --disable-shared disable build/use of shared libncp --enable-trace enable trace of ncp calls --enable-ncp-debug enable builtin debugging support --disable-nls do not use Native Language Support @@ -1432,6 +1433,12 @@ fi; # Check whether --enable-function_sections or --disable-function_sections was given. if test "${enable_function_sections+set}" = set; then enableval="$enable_function_sections" + +fi; + +# Check whether --enable-shared or --disable-shared was given. +if test "${enable_shared+set}" = set; then + enableval="$enable_shared" fi; @@ -14049,6 +14056,16 @@ ELF_TARGET="$ncp_cv_elf_target" ELF_TARGET="$ncp_cv_elf_target" +BUILD_SHARED="$ELF_TARGET" +if test "$enable_shared" = "no" +then + BUILD_SHARED="no" +fi +if test "$enable_shared" = "yes" +then + BUILD_SHARED="yes" +fi + FFUNCTION_SECTIONS="" GC_SECTIONS="" if test "$function_sections" = "yes" @@ -14174,6 +14191,7 @@ fi ADDON_SUBDIRS="$ADDON_SUBDIRS $ADDON_DEV_SUBDIRS" + @@ -14944,6 +14962,7 @@ s,@ADDON_DEV_SUBDIRS@,$ADDON_DEV_SUBDIRS s,@ADDON_DEV_SUBDIRS@,$ADDON_DEV_SUBDIRS,;t t s,@FFUNCTION_SECTIONS@,$FFUNCTION_SECTIONS,;t t s,@GC_SECTIONS@,$GC_SECTIONS,;t t +s,@BUILD_SHARED@,$BUILD_SHARED,;t t s,@subdirs@,$subdirs,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t diff -r 50351d213ba9 -r bda42d4b9cf1 configure.ac --- a/configure.ac Sat May 28 18:57:50 2005 +0000 +++ b/configure.ac Sat May 28 19:21:17 2005 +0000 @@ -50,6 +50,9 @@ AC_ARG_ENABLE(versions, AC_ARG_ENABLE(function_sections, [ --disable-function-sections do not use -ffunction-sections for static libraries]) + +AC_ARG_ENABLE(shared, +[ --disable-shared disable build/use of shared libncp]) AC_ARG_ENABLE(trace, [ --enable-trace enable trace of ncp calls]) @@ -892,6 +895,16 @@ ELF_TARGET="$ncp_cv_elf_target" ELF_TARGET="$ncp_cv_elf_target" AC_SUBST(ELF_TARGET) +BUILD_SHARED="$ELF_TARGET" +if test "$enable_shared" = "no" +then + BUILD_SHARED="no" +fi +if test "$enable_shared" = "yes" +then + BUILD_SHARED="yes" +fi + FFUNCTION_SECTIONS="" GC_SECTIONS="" if test "$function_sections" = "yes" @@ -999,6 +1012,7 @@ AC_SUBST(ADDON_DEV_SUBDIRS) AC_SUBST(ADDON_DEV_SUBDIRS) AC_SUBST(FFUNCTION_SECTIONS) AC_SUBST(GC_SECTIONS) +AC_SUBST(BUILD_SHARED) AC_CONFIG_FILES([ Make.rules diff -r 50351d213ba9 -r bda42d4b9cf1 contrib/tcl-utils/Makefile.in --- a/contrib/tcl-utils/Makefile.in Sat May 28 18:57:50 2005 +0000 +++ b/contrib/tcl-utils/Makefile.in Sat May 28 19:21:17 2005 +0000 @@ -26,7 +26,7 @@ SBINUTILS = $(O_SBINUTILS:%.o=%) UTILS = $(USERUTILS) $(SBINUTILS) -ifeq ($(HAVE_ELF),yes) +ifeq ($(BUILD_SHARED),yes) NCP_LIB := libncp.so else NCP_LIB := libncp.a diff -r 50351d213ba9 -r bda42d4b9cf1 contrib/tknwmsg/Makefile.in --- a/contrib/tknwmsg/Makefile.in Sat May 28 18:57:50 2005 +0000 +++ b/contrib/tknwmsg/Makefile.in Sat May 28 19:21:17 2005 +0000 @@ -19,7 +19,7 @@ SBINUTILS = $(O_SBINUTILS:%.o=%) UTILS = $(USERUTILS) $(SBINUTILS) -ifeq ($(HAVE_ELF),yes) +ifeq ($(BUILD_SHARED),yes) NCP_LIB = libncp.so NCPLIB_DIR = ../../lib LIBDEP = $(NCPLIB_DIR)/$(NCP_LIB) diff -r 50351d213ba9 -r bda42d4b9cf1 lib/Makefile.in --- a/lib/Makefile.in Sat May 28 18:57:50 2005 +0000 +++ b/lib/Makefile.in Sat May 28 19:21:17 2005 +0000 @@ -63,9 +63,14 @@ SHARED_CFLAGS := $(CFLAGS) $(CCFLAGS) .PHONY : all dep install install-dev clean mrproper distclean .PHONY : install_shared install_static install_static_su + +ifeq ($(BUILD_SHARED),yes) all: $(STATIC_NCPLIB) $(SHARED_NCPLIB) - install: install_shared +else +all: $(STATIC_NCPLIB) +install: +endif %.d: %.c set -e; $(CC) -M $(STATIC_CFLAGS) $(CFLAGS_$(@:.d=.o)) $(BASE_CFLAGS) $< \ diff -r 50351d213ba9 -r bda42d4b9cf1 util/Makefile.in --- a/util/Makefile.in Sat May 28 18:57:50 2005 +0000 +++ b/util/Makefile.in Sat May 28 19:21:17 2005 +0000 @@ -37,7 +37,7 @@ SBINUTILS = $(O_SBINUTILS:%.o=%) UTILS = $(USERUTILS) $(SBINUTILS) ncptest -ifeq ($(HAVE_ELF),yes) +ifeq ($(BUILD_SHARED),yes) NCP_LIB = libncp.so NCPLIB_DIR = ../lib LIBDEP = $(NCPLIB_DIR)/$(NCP_LIB) ++++++ ncpfs-hg-commit-423.patch ++++++ changeset: 423:bef6bf5896d3 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat May 28 19:42:20 2005 +0000 files: Make.rules.in configure configure.ac contrib/pam/Makefile.in contrib/tcl-utils/Makefile.in contrib/tknwmsg/Makefile.in lib/Makefile.in sutil/Makefile.in util/Makefile.in description: Do not hardwire library .a/.so extension. diff -r bda42d4b9cf1 -r bef6bf5896d3 Make.rules.in --- a/Make.rules.in Sat May 28 19:21:17 2005 +0000 +++ b/Make.rules.in Sat May 28 19:42:20 2005 +0000 @@ -50,6 +50,9 @@ HAVE_ELF := @ELF_TARGET@ HAVE_ELF := @ELF_TARGET@ BUILD_SHARED := @BUILD_SHARED@ +libext := @libext@ +shlibext := @shlibext@ + VERSION_SOLIB := 2.3.0 VERSION_SONAME := 2.3 diff -r bda42d4b9cf1 -r bef6bf5896d3 configure --- a/configure Sat May 28 19:21:17 2005 +0000 +++ b/configure Sat May 28 19:42:20 2005 +0000 @@ -313,7 +313,7 @@ ac_includes_default="\ #endif" ac_subdirs_all="$ac_subdirs_all contrib/php" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC_WARNINGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S PACKAGE VERSION MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CPP EGREP GLIBC2 RANLIB ac_ct_RANLIB ALLOCA GLIBC21 INTL_MACOSX_LIBS HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB localedir ncp_ipx_headers_1 ncp_ipx_headers_2 ncp_ipx_defsiocprotoprivate ncp_ipx_defsiocaipx ncp_sys_mount_h ncp_linux_fs_h ncp_net_if_h ncp_net_route_h ncp_if_ether_support ncp_sys_select_h stdint_types socklen_t wchar_h LIB_PAM_SECURITY php_found REENTRANT_CFLAGS ncphost ELF_TARGET VERSIONED_LINK ncp_in_support ncp_ipx_support NDS_SUPPORT SIGNATURES MOUNT2 MOUNT3 USE_KERNEL ADDON_SUBDIRS ADDON_DEV_SUBDIRS FFUNCTION_SECTIONS GC_SECTIONS BUILD_SHARED subdirs LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC_WARNINGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S PACKAGE VERSION MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CPP EGREP GLIBC2 RANLIB ac_ct_RANLIB ALLOCA GLIBC21 INTL_MACOSX_LIBS HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB localedir ncp_ipx_headers_1 ncp_ipx_headers_2 ncp_ipx_defsiocprotoprivate ncp_ipx_defsiocaipx ncp_sys_mount_h ncp_linux_fs_h ncp_net_if_h ncp_net_route_h ncp_if_ether_support ncp_sys_select_h stdint_types socklen_t wchar_h LIB_PAM_SECURITY php_found REENTRANT_CFLAGS ncphost ELF_TARGET VERSIONED_LINK ncp_in_support ncp_ipx_support NDS_SUPPORT SIGNATURES MOUNT2 MOUNT3 USE_KERNEL ADDON_SUBDIRS ADDON_DEV_SUBDIRS FFUNCTION_SECTIONS GC_SECTIONS BUILD_SHARED shlibext libext subdirs LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -14106,6 +14106,39 @@ then GC_SECTIONS="-Wl,--gc-sections " fi + + + echo "$as_me:$LINENO: checking for shared library run path origin" >&5 +echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6 +if test "${acl_cv_rpath+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh + . ./conftest.sh + rm -f ./conftest.sh + acl_cv_rpath=done + +fi +echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 +echo "${ECHO_T}$acl_cv_rpath" >&6 + wl="$acl_cv_wl" + libext="$acl_cv_libext" + shlibext="$acl_cv_shlibext" + hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + hardcode_direct="$acl_cv_hardcode_direct" + hardcode_minus_L="$acl_cv_hardcode_minus_L" + # Check whether --enable-rpath or --disable-rpath was given. +if test "${enable_rpath+set}" = set; then + enableval="$enable_rpath" + : +else + enable_rpath=yes +fi; + + if test "$VERSIONED_LINK" = "yes" then echo "$as_me:$LINENO: checking for working versioned link" >&5 @@ -14126,7 +14159,7 @@ void lsym(void) { }; void lsym(void) { }; void gsym(void) { }; EOF - if ${CC} -shared -Wl,-version-script=conftest.vers -o conftest.so conftest.c -lc >/dev/null 2>&1 + if ${CC} -shared -Wl,-version-script=conftest.vers -o conftest.${shlibext} conftest.c -lc >/dev/null 2>&1 then ncp_cv_versioned_link=yes fi @@ -14134,7 +14167,7 @@ fi fi echo "$as_me:$LINENO: result: $ncp_cv_versioned_link" >&5 echo "${ECHO_T}$ncp_cv_versioned_link" >&6 - rm -f conftest.c conftest.vers conftest.so + rm -f conftest.c conftest.vers conftest.${shlibext} if test "$ncp_cv_versioned_link" = "no" then if test "$versions_forced" = "yes" @@ -14191,6 +14224,8 @@ fi ADDON_SUBDIRS="$ADDON_SUBDIRS $ADDON_DEV_SUBDIRS" + + @@ -14963,6 +14998,8 @@ s,@FFUNCTION_SECTIONS@,$FFUNCTION_SECTIO s,@FFUNCTION_SECTIONS@,$FFUNCTION_SECTIONS,;t t s,@GC_SECTIONS@,$GC_SECTIONS,;t t s,@BUILD_SHARED@,$BUILD_SHARED,;t t +s,@shlibext@,$shlibext,;t t +s,@libext@,$libext,;t t s,@subdirs@,$subdirs,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t diff -r bda42d4b9cf1 -r bef6bf5896d3 configure.ac --- a/configure.ac Sat May 28 19:21:17 2005 +0000 +++ b/configure.ac Sat May 28 19:42:20 2005 +0000 @@ -937,6 +937,8 @@ then GC_SECTIONS="-Wl,--gc-sections " fi +AC_LIB_RPATH + if test "$VERSIONED_LINK" = "yes" then AC_CACHE_CHECK(for working versioned link, @@ -954,12 +956,12 @@ void lsym(void) { }; void lsym(void) { }; void gsym(void) { }; EOF - if ${CC} -shared -Wl,-version-script=conftest.vers -o conftest.so conftest.c -lc >/dev/null 2>&1 + if ${CC} -shared -Wl,-version-script=conftest.vers -o conftest.${shlibext} conftest.c -lc >/dev/null 2>&1 then ncp_cv_versioned_link=yes fi] ) - rm -f conftest.c conftest.vers conftest.so + rm -f conftest.c conftest.vers conftest.${shlibext} if test "$ncp_cv_versioned_link" = "no" then if test "$versions_forced" = "yes" @@ -1013,6 +1015,8 @@ AC_SUBST(FFUNCTION_SECTIONS) AC_SUBST(FFUNCTION_SECTIONS) AC_SUBST(GC_SECTIONS) AC_SUBST(BUILD_SHARED) +AC_SUBST(shlibext) +AC_SUBST(libext) AC_CONFIG_FILES([ Make.rules diff -r bda42d4b9cf1 -r bef6bf5896d3 contrib/pam/Makefile.in --- a/contrib/pam/Makefile.in Sat May 28 19:21:17 2005 +0000 +++ b/contrib/pam/Makefile.in Sat May 28 19:42:20 2005 +0000 @@ -10,10 +10,10 @@ LIBS = @INTLLIBS@ @LIBS@ LIBS = @INTLLIBS@ @LIBS@ LIB_PAM_SECURITY = @LIB_PAM_SECURITY@ -NCP_LIB = libncp.so +NCP_LIB = libncp.$(shlibext) NCPLIB_DIR = ../../lib -PAM_LIBRARY = pam_ncp_auth.so +PAM_LIBRARY = pam_ncp_auth.$(shlibext) PAM_OBJECTS = pam_ncp_auth.do support.do CFLAGS_pam_ncp_auth.do := -DNCPMOUNT_PATH=\"$(bindir)/ncpmount\" -DNCPUMOUNT_PATH=\"$(bindir)/ncpumount\" diff -r bda42d4b9cf1 -r bef6bf5896d3 contrib/tcl-utils/Makefile.in --- a/contrib/tcl-utils/Makefile.in Sat May 28 19:21:17 2005 +0000 +++ b/contrib/tcl-utils/Makefile.in Sat May 28 19:42:20 2005 +0000 @@ -27,9 +27,9 @@ UTILS = $(USERUTILS) $(SBINUTILS) UTILS = $(USERUTILS) $(SBINUTILS) ifeq ($(BUILD_SHARED),yes) -NCP_LIB := libncp.so +NCP_LIB := libncp.$(shlibext) else -NCP_LIB := libncp.a +NCP_LIB := libncp.$(libext) endif NCPLIB_DIR := ${top_builddir}/lib LIBDEP := $(NCPLIB_DIR)/$(NCP_LIB) @@ -49,11 +49,11 @@ install: all install-dev: -${NCPLIB_DIR}/libncp.a: - make -C ${NCPLIB_DIR} libncp.a +${NCPLIB_DIR}/libncp.$(libext): + make -C ${NCPLIB_DIR} libncp.$(libext) -${NCPLIB_DIR}/libncp.so: - make -C ${NCPLIB_DIR} libncp.so +${NCPLIB_DIR}/libncp.$(shlibext): + make -C ${NCPLIB_DIR} libncp.$(shlibext) $(O_USERUTILS) $(O_SBINUTILS) $(O_OTHER): %.o: %.c $(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $< diff -r bda42d4b9cf1 -r bef6bf5896d3 contrib/tknwmsg/Makefile.in --- a/contrib/tknwmsg/Makefile.in Sat May 28 19:21:17 2005 +0000 +++ b/contrib/tknwmsg/Makefile.in Sat May 28 19:42:20 2005 +0000 @@ -20,14 +20,12 @@ UTILS = $(USERUTILS) $(SBINUTILS) UTILS = $(USERUTILS) $(SBINUTILS) ifeq ($(BUILD_SHARED),yes) -NCP_LIB = libncp.so -NCPLIB_DIR = ../../lib +NCP_LIB = libncp.$(shlibext) +else +NCP_LIB = libncp.$(libext) +endif +NCPLIB_DIR = $(top_builddir)/lib LIBDEP = $(NCPLIB_DIR)/$(NCP_LIB) -else -NCP_LIB = libncp.a -NCPLIB_DIR = ../../lib -LIBDEP = $(NCPLIB_DIR)/$(NCP_LIB) -endif .PHONY : all install install-dev dep clean mrproper distclean .PHONY : default @@ -46,11 +44,11 @@ install: all install-dev: -../../lib/libncp.a: - make -C ../../lib libncp.a +../../lib/libncp.$(libext): + make -C ../../lib libncp.$(libext) -../../lib/libncp.so: - make -C ../../lib libncp.so +../../lib/libncp.$(shlibext): + make -C ../../lib libncp.$(shlibext) $(O_USERUTILS) $(O_SBINUTILS): %.o: %.c $(CC) $(CFLAGS) $(CCFLAGS) -o $@ -c $< diff -r bda42d4b9cf1 -r bef6bf5896d3 lib/Makefile.in --- a/lib/Makefile.in Sat May 28 19:21:17 2005 +0000 +++ b/lib/Makefile.in Sat May 28 19:42:20 2005 +0000 @@ -14,10 +14,10 @@ REENTRANT_CFLAGS := @REENTRANT_CFLAGS@ REENTRANT_CFLAGS := @REENTRANT_CFLAGS@ VERSIONED_LINK := @VERSIONED_LINK@ -SHARED_NCPLIB := libncp.so +SHARED_NCPLIB := libncp.$(shlibext) SHARED_NCPLIB_BIN := $(SHARED_NCPLIB).$(VERSION_SOLIB) SHARED_NCPLIB_SONAME := $(SHARED_NCPLIB).$(VERSION_SONAME) -STATIC_NCPLIB := libncp.a +STATIC_NCPLIB := libncp.$(libext) STATIC_NCPLIB_BIN := $(STATIC_NCPLIB) CCFLAGS += -I. @@ -93,7 +93,7 @@ dep: clean: rm -f *.o *.do *.to *~ ds/*.o ds/*.do ds/*.to ds/*~ fs/*.o fs/*.do fs/*.to fs/*~ - rm -f libncp.a libncp.so* libncpsu.* + rm -f $(STATIC_NCPLIB) libncp.$(shlibext)* mrproper: clean rm -f $(UTILS) $(DISTFILE) *.d fs/*.d ds/*.d diff -r bda42d4b9cf1 -r bef6bf5896d3 sutil/Makefile.in --- a/sutil/Makefile.in Sat May 28 19:21:17 2005 +0000 +++ b/sutil/Makefile.in Sat May 28 19:42:20 2005 +0000 @@ -85,11 +85,11 @@ ncpm_common.d mount_login.d: %.d: %.c | sed 's,$$*$\.o[ :]*,\1.o \1.do \1.to $@ : ,g' > $@; \ [ -s $@ ] || rm -f $@ -$(UTILS): %: %.o ../lib/libncp.a +$(UTILS): %: %.o ../lib/libncp.$(libext) $(CC) @GC_SECTIONS@-o $@ $^ ${LIBS} -../lib/libncp.a: - make -C ../lib libncp.a +../lib/libncp.$(libext): + make -C ../lib libncp.$(libext) dep: diff -r bda42d4b9cf1 -r bef6bf5896d3 util/Makefile.in --- a/util/Makefile.in Sat May 28 19:21:17 2005 +0000 +++ b/util/Makefile.in Sat May 28 19:42:20 2005 +0000 @@ -38,14 +38,12 @@ UTILS = $(USERUTILS) $(SBINUTILS) ncptes UTILS = $(USERUTILS) $(SBINUTILS) ncptest ifeq ($(BUILD_SHARED),yes) -NCP_LIB = libncp.so +NCP_LIB = libncp.$(shlibext) +else +NCP_LIB = libncp.$(libext) +endif NCPLIB_DIR = ../lib LIBDEP = $(NCPLIB_DIR)/$(NCP_LIB) -else -NCP_LIB = libncp.a -NCPLIB_DIR = ../lib -LIBDEP = $(NCPLIB_DIR)/$(NCP_LIB) -endif CFLAGS_ncopy.o = -D_GNU_SOURCE ADDOBJS_pqstat = dsqueue.o @@ -76,11 +74,11 @@ endif install-dev: -../lib/libncp.a: - make -C ../lib libncp.a +../lib/libncp.$(libext): + make -C $(NCPLIB_DIR) libncp.$(libext) -../lib/libncp.so: - make -C ../lib libncp.so +../lib/libncp.$(shlibext): + make -C $(NCPLIB_DIR) libncp.$(shlibext) $(O_USERUTILS) $(O_SBINUTILS) $(O_OTHER) ncptest.o: %.o: %.c $(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $< ++++++ ncpfs-hg-commit-424.patch ++++++ changeset: 424:81e0853d48a9 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat May 28 19:59:35 2005 +0000 files: include/ncp/kernel/types.h.in description: Use stdint.h when possible. Fixes problems on Darwin. diff -r bef6bf5896d3 -r 81e0853d48a9 include/ncp/kernel/types.h.in --- a/include/ncp/kernel/types.h.in Sat May 28 19:42:20 2005 +0000 +++ b/include/ncp/kernel/types.h.in Sat May 28 19:59:35 2005 +0000 @@ -7,6 +7,9 @@ @ncp_in_support@ @ncp_ipx_support@ +#if @stdint_types@ +#include <stdint.h> +#else /* FIXME: What about configure?! */ #ifndef __BIT_TYPES_DEFINED__ #define __BIT_TYPES_DEFINED__ 1 @@ -26,6 +29,7 @@ typedef signed long long int64_t; #endif #endif /* __BIT_TYPES_DEFINED__ */ +#endif #if @USE_KERNEL@ ++++++ ncpfs-hg-commit-425.patch ++++++ ++++ 2802 lines (skipped) ++++++ ncpfs-hg-commit-426.patch ++++++ changeset: 426:08cd551d8c1c user: Petr Vandrovec <petr(a)vandrovec.name> date: Sun Jun 05 14:23:57 2005 +0000 files: include/ncp/ipxlib.h include/ncp/kernel/ncp.h include/ncp/ncplib.h ipx-1.0/Samples/rip.c ipx-1.0/Samples/sap.c ipx-1.0/ipx_cmd.c ipxdump/ipxparse.c lib/ncplib.c description: Add __attribute__((packed)) at structure level too. Darwin's gcc-3.3 needs that, otherwise it (at least) adds one byte to ncp_request_header, completely mangling sent packet. diff -r 8341fcd1dc86 -r 08cd551d8c1c include/ncp/ipxlib.h --- a/include/ncp/ipxlib.h Sat May 28 20:02:00 2005 +0000 +++ b/include/ncp/ipxlib.h Sun Jun 05 14:23:57 2005 +0000 @@ -73,7 +73,7 @@ struct sap_server_ident #endif IPXPort server_port __attribute__((packed)); u_int16_t intermediate_network __attribute__((packed)); -}; +} __attribute__((packed)); #define IPX_RIP_REQUEST (0x1) #define IPX_RIP_RESPONSE (0x2) @@ -82,13 +82,13 @@ struct ipx_rt_def { u_int32_t network __attribute__((packed)); u_int16_t hops __attribute__((packed)); u_int16_t ticks __attribute__((packed)); -}; +} __attribute__((packed)); struct ipx_rip_packet { u_int16_t operation __attribute__((packed)); struct ipx_rt_def rt[1] __attribute__((packed)); -}; +} __attribute__((packed)); #ifdef SWIG #define IPX_BROADCAST_NODE "\xff\xff\xff\xff\xff\xff" diff -r 8341fcd1dc86 -r 08cd551d8c1c include/ncp/kernel/ncp.h --- a/include/ncp/kernel/ncp.h Sat May 28 20:02:00 2005 +0000 +++ b/include/ncp/kernel/ncp.h Sun Jun 05 14:23:57 2005 +0000 @@ -59,7 +59,7 @@ struct ncp_request_header { u_int8_t conn_high __attribute__((packed)); u_int8_t function __attribute__((packed)); u_int8_t data[0] __attribute__((packed)); -}; +} __attribute__((packed)); #define NCP_REPLY (0x3333) #define NCP_POSITIVE_ACK (0x9999) @@ -73,7 +73,7 @@ struct ncp_reply_header { u_int8_t completion_code __attribute__((packed)); u_int8_t connection_state __attribute__((packed)); u_int8_t data[0] __attribute__((packed)); -}; +} __attribute__((packed)); #define NCP_VOLNAME_LEN (16) #define NCP_NUMBER_OF_VOLUMES (64) @@ -232,7 +232,7 @@ struct nw_info_struct { u_int32_t NSCreator __attribute__((packed)); u_int8_t nameLen __attribute__((packed)); u_int8_t entryName[256] __attribute__((packed)); -}; +} __attribute__((packed)); #endif /* modify mask - use with MODIFY_DOS_INFO structure */ @@ -265,7 +265,7 @@ struct nw_modify_dos_info { u_int16_t inheritanceGrantMask __attribute__((packed)); u_int16_t inheritanceRevokeMask __attribute__((packed)); u_int32_t maximumSpace __attribute__((packed)); -}; +} __attribute__((packed)); #ifdef SWIG struct nw_file_info { @@ -284,13 +284,13 @@ struct nw_file_info { u_int32_t server_file_handle __attribute__((packed)); u_int8_t open_create_action __attribute__((packed)); u_int8_t file_handle[6] __attribute__((packed)); -}; +} __attribute__((packed)); #endif struct nw_search_sequence { u_int8_t volNumber __attribute__((packed)); u_int32_t dirBase __attribute__((packed)); u_int32_t sequence __attribute__((packed)); -}; +} __attribute__((packed)); #endif /* _LINUX_NCP_H */ diff -r 8341fcd1dc86 -r 08cd551d8c1c include/ncp/ncplib.h --- a/include/ncp/ncplib.h Sat May 28 20:02:00 2005 +0000 +++ b/include/ncp/ncplib.h Sun Jun 05 14:23:57 2005 +0000 @@ -492,7 +492,7 @@ struct ncp_file_server_info u_int8_t RestrictionLevel __attribute__((packed)); u_int8_t InternetBridge __attribute__((packed)); u_int8_t Reserved[60] __attribute__((packed)); -}; +} __attribute__((packed)); #endif struct ncp_file_server_info_2 { @@ -607,7 +607,7 @@ struct ncp_station_addr u_int8_t Node[6] __attribute__((packed)); #endif u_int16_t Socket __attribute__((packed)); -}; +} __attribute__((packed)); struct ncp_prop_login_control { @@ -640,7 +640,7 @@ struct ncp_prop_login_control u_int16_t BadLoginCount __attribute__((packed)); u_int32_t BadLoginCountDown __attribute__((packed)); struct ncp_station_addr LastIntruder __attribute__((packed)); -}; +} __attribute__((packed)); NWCCODE NWReadPropertyValue(NWCONN_HANDLE conn, const char *objName, NWObjectType objType, const char *propertyName, diff -r 8341fcd1dc86 -r 08cd551d8c1c ipx-1.0/Samples/rip.c --- a/ipx-1.0/Samples/rip.c Sat May 28 20:02:00 2005 +0000 +++ b/ipx-1.0/Samples/rip.c Sun Jun 05 14:23:57 2005 +0000 @@ -5,7 +5,7 @@ struct rip_data u_int32_t rip_net __attribute__((packed)); u_int16_t rip_hops __attribute__((packed)); u_int16_t rip_ticks __attribute__((packed)); -}; +} __attribute__((packed)); int main(int argc, char **argv) diff -r 8341fcd1dc86 -r 08cd551d8c1c ipx-1.0/Samples/sap.c --- a/ipx-1.0/Samples/sap.c Sat May 28 20:02:00 2005 +0000 +++ b/ipx-1.0/Samples/sap.c Sun Jun 05 14:23:57 2005 +0000 @@ -8,7 +8,7 @@ struct sap_data u_int8_t sap_node[6] __attribute__((packed)); u_int16_t sap_sock __attribute__((packed)); u_int16_t sap_hops __attribute__((packed)); -}; +} __attribute__((packed)); int main(int argc, char **argv) diff -r 8341fcd1dc86 -r 08cd551d8c1c ipx-1.0/ipx_cmd.c --- a/ipx-1.0/ipx_cmd.c Sat May 28 20:02:00 2005 +0000 +++ b/ipx-1.0/ipx_cmd.c Sun Jun 05 14:23:57 2005 +0000 @@ -66,8 +66,8 @@ struct { u_int8_t dst[6] __attribute__((packed)); u_int8_t src[6] __attribute__((packed)); u_int16_t type __attribute__((packed)); - u_int8_t ipx[16384]; - } buffer; + u_int8_t ipx[16384] __attribute__((packed)); + } __attribute__((packed)) buffer; static int getiflist(int fd, struct ifconf* ifc) { int i; diff -r 8341fcd1dc86 -r 08cd551d8c1c ipxdump/ipxparse.c --- a/ipxdump/ipxparse.c Sat May 28 20:02:00 2005 +0000 +++ b/ipxdump/ipxparse.c Sun Jun 05 14:23:57 2005 +0000 @@ -60,7 +60,7 @@ struct ipx_address IPXNet net __attribute__((packed)); IPXNode node __attribute__((packed)); IPXPort sock __attribute__((packed)); -}; +} __attribute__((packed)); struct ipx_packet { @@ -77,7 +77,7 @@ struct ipx_packet #define IPX_TYPE_PPROP 0x14 /* complicated flood fill brdcast [Not supported] */ struct ipx_address ipx_dest __attribute__((packed)); struct ipx_address ipx_source __attribute__((packed)); -}; +} __attribute__((packed)); #define NCP_ALLOC_SLOT_REQUEST (0x1111) #define NCP_REQUEST (0x2222) @@ -92,7 +92,7 @@ struct ncp_request_header u_int8_t conn_high __attribute__((packed)); u_int8_t function __attribute__((packed)); u_int8_t data[0] __attribute__((packed)); -}; +} __attribute__((packed)); #define NCP_REPLY (0x3333) #define NCP_POSITIVE_ACK (0x9999) @@ -107,7 +107,7 @@ struct ncp_reply_header u_int8_t completion_code __attribute__((packed)); u_int8_t connection_state __attribute__((packed)); u_int8_t data[0] __attribute__((packed)); -}; +} __attribute__((packed)); #define NCP_BURST_PACKET (0x7777) @@ -126,7 +126,7 @@ struct ncp_burst_header u_int32_t data_offset __attribute__((packed)); u_int16_t data_bytes __attribute__((packed)); u_int16_t missing_frags __attribute__((packed)); -}; +} __attribute__((packed)); void handle_ipx(unsigned char *buf, int length, char *frame, int no); void handle_ncp(struct sockaddr_ipx *source, @@ -149,7 +149,7 @@ typedef struct saps u_int8_t serverName[SAP_MAX_SERVER_NAME_LENGTH] __attribute__((packed)); struct ipx_address serverAddress __attribute__((packed)); u_int16_t serverHops __attribute__((packed)); /* NBO */ -} +} __attribute__((packed)) SAPS; /* General Service/Nearest Server Response SAP packet */ @@ -160,14 +160,14 @@ union sap_packet { u_int16_t sapOperation __attribute__((packed)); u_int16_t serverType __attribute__((packed)); - } + } __attribute__((packed)) query; struct sap_response { u_int16_t sapOperation __attribute__((packed)); /* each SAP can has a max of SAP_MAX_SAPS_PER_PACKET packets */ SAPS sap[SAP_MAX_SAPS_PER_PACKET] __attribute__((packed)); - } + } __attribute__((packed)) response; }; @@ -356,7 +356,7 @@ handle_burst(struct sockaddr_ipx *source u_int8_t reserved[8] __attribute__((packed)); u_int32_t file_offset __attribute__((packed)); u_int32_t number_of_bytes __attribute__((packed)); - } + } __attribute__((packed)) *brq = (struct ncp_burst_request *) rq; printf("Assuming Burst Request:\n"); diff -r 8341fcd1dc86 -r 08cd551d8c1c lib/ncplib.c --- a/lib/ncplib.c Sat May 28 20:02:00 2005 +0000 +++ b/lib/ncplib.c Sun Jun 05 14:23:57 2005 +0000 @@ -2627,7 +2627,7 @@ struct nw_time_buffer u_int8_t minute __attribute__((packed)); u_int8_t second __attribute__((packed)); u_int8_t wday __attribute__((packed)); -}; +} __attribute__((packed)); static time_t nw_to_ctime(struct nw_time_buffer *source) ++++++ ncpfs-hg-commit-427.patch ++++++ changeset: 427:225fa587c2d8 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sun Jun 05 14:35:13 2005 +0000 files: ipx-1.0/Samples/rip.c ipx-1.0/Samples/sap.c description: Fix problems in ipx samples when packet with zero or 1 byte received. diff -r 08cd551d8c1c -r 225fa587c2d8 ipx-1.0/Samples/rip.c --- a/ipx-1.0/Samples/rip.c Sun Jun 05 14:23:57 2005 +0000 +++ b/ipx-1.0/Samples/rip.c Sun Jun 05 14:35:13 2005 +0000 @@ -36,6 +36,8 @@ main(int argc, char **argv) } while (1) { + size_t rclen; + len = sizeof(sipx); result = recvfrom(s, msg, sizeof(msg), 0, (struct sockaddr *) &sipx, &len); @@ -44,8 +46,12 @@ main(int argc, char **argv) perror("IPX: recvfrom"); exit(-1); } + if (result < 2) { + fprintf(stderr, "Received packet is too short to be RIP packet (%d bytes)\n", result); + continue; + } + rclen = result - 2; bptr = msg; - result -= 2; printf("RIP packet from: %08X:%02X%02X%02X%02X%02X%02X\n", (u_int32_t)htonl(sipx.sipx_network), sipx.sipx_node[0], sipx.sipx_node[1], @@ -53,11 +59,11 @@ main(int argc, char **argv) sipx.sipx_node[6], sipx.sipx_node[5]); bptr += 2; rp = (struct rip_data *) bptr; - while (result >= sizeof(struct rip_data)) + while (rclen >= sizeof(struct rip_data)) { printf("\tNET: %08X HOPS: %d\n", (u_int32_t)ntohl(rp->rip_net), ntohs(rp->rip_hops)); - result -= sizeof(struct rip_data); + rclen -= sizeof(struct rip_data); rp++; } } diff -r 08cd551d8c1c -r 225fa587c2d8 ipx-1.0/Samples/sap.c --- a/ipx-1.0/Samples/sap.c Sun Jun 05 14:23:57 2005 +0000 +++ b/ipx-1.0/Samples/sap.c Sun Jun 05 14:35:13 2005 +0000 @@ -47,6 +47,8 @@ main(int argc, char **argv) } while (1) { + size_t rclen; + len = 1024; result = recvfrom(s, msg, sizeof(msg), 0, (struct sockaddr *) &sipx, &len); @@ -55,16 +57,20 @@ main(int argc, char **argv) perror("IPX: recvfrom: "); exit(-1); } + if (result < 2) { + fprintf(stderr, "Received packet is too short to be SAP packet (%d bytes)\n", result); + continue; + } + rclen = result - 2; bptr = msg; - result -= 2; printf("SAP: OP is %x %x\n", bptr[0], bptr[1]); - printf("Length is %d\n", result); + printf("Length is %u\n", rclen); if (bptr[1] != 2) continue; bptr += 2; sp = (struct sap_data *) bptr; - while (result >= sizeof(struct sap_data)) + while (rclen >= sizeof(struct sap_data)) { int i; @@ -83,7 +89,7 @@ main(int argc, char **argv) sp->sap_node[4], sp->sap_node[5], ntohs(sp->sap_sock)); - result -= sizeof(struct sap_data); + rclen -= sizeof(struct sap_data); sp++; } } ++++++ ncpfs-hg-commit-428.patch ++++++ changeset: 428:cccdaf2ce097 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sun Jun 05 14:35:46 2005 +0000 files: ipx-1.0/Samples/samples.h description: Include <stdlib.h> into samples, to get rid of warning about exit() not having a prototype. diff -r 225fa587c2d8 -r cccdaf2ce097 ipx-1.0/Samples/samples.h --- a/ipx-1.0/Samples/samples.h Sun Jun 05 14:35:13 2005 +0000 +++ b/ipx-1.0/Samples/samples.h Sun Jun 05 14:35:46 2005 +0000 @@ -1,4 +1,5 @@ #include <stdio.h> +#include <stdlib.h> #include <sys/types.h> #include <ncp/kernel/ipx.h> #include <netinet/in.h> ++++++ ncpfs-hg-commit-429.patch ++++++ changeset: 429:776dc4052e39 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sun Jun 05 14:36:28 2005 +0000 files: ipxdump/ipxparse.c description: Remove warnings about shadowing variables in ipxparse. Also add __attribute__((packed)) into ipxparse as needed. diff -r cccdaf2ce097 -r 776dc4052e39 ipxdump/ipxparse.c --- a/ipxdump/ipxparse.c Sun Jun 05 14:35:46 2005 +0000 +++ b/ipxdump/ipxparse.c Sun Jun 05 14:36:28 2005 +0000 @@ -636,43 +636,43 @@ handle_ncp(struct sockaddr_ipx *source, { struct INPUT { - u_int16_t proposed_max_size; - u_int8_t security_flag; - } - *i = (struct INPUT *) data; + u_int16_t proposed_max_size __attribute__((packed)); + u_int8_t security_flag __attribute__((packed)); + } __attribute__((packed)) + *d = (struct INPUT *) data; printf("fn: %-3d\n", rq->function); printf("Get Big Packet NCP Max Packet Size\n"); printf("proposed_max_size: %x\n", - ntohs(i->proposed_max_size)); + ntohs(d->proposed_max_size)); printf("security_flag: %x\n", - i->security_flag); + d->security_flag); break; } case 101: { struct INPUT { - u_int32_t local_conn_id; - u_int32_t local_max_packet_size; - u_int16_t local_target_socket; - u_int32_t local_max_send_size; - u_int32_t local_max_recv_size; - } - *i = (struct INPUT *) data; + u_int32_t local_conn_id __attribute__((packed)); + u_int32_t local_max_packet_size __attribute__((packed)); + u_int16_t local_target_socket __attribute__((packed)); + u_int32_t local_max_send_size __attribute__((packed)); + u_int32_t local_max_recv_size __attribute__((packed)); + } __attribute__((packed)) + *d = (struct INPUT *) data; printf("fn: %-3d\n", rq->function); printf("Packet Burst Connection Request\n"); printf("local_conn_id: %x\n", - (u_int32_t)ntohl(i->local_conn_id)); + (u_int32_t)ntohl(d->local_conn_id)); printf("local_max_packet_size: %x\n", - (u_int32_t)ntohl(i->local_max_packet_size)); + (u_int32_t)ntohl(d->local_max_packet_size)); printf("local_target_socket: %x\n", - (u_int32_t)ntohl(i->local_target_socket)); + (u_int32_t)ntohl(d->local_target_socket)); printf("local_max_send_size: %x\n", - (u_int32_t)ntohl(i->local_max_send_size)); + (u_int32_t)ntohl(d->local_max_send_size)); printf("local_max_recv_size: %x\n", - (u_int32_t)ntohl(i->local_max_recv_size)); + (u_int32_t)ntohl(d->local_max_recv_size)); } break; case 104: @@ -700,26 +700,26 @@ handle_ncp(struct sockaddr_ipx *source, { struct INPUT { - u_int8_t subfunction_code; - u_int32_t fragger_handle; - u_int32_t max_fragment_size; - u_int32_t message_size; - u_int32_t fragment_flag; - u_int32_t verb; - } - *i = (struct INPUT *) data; + u_int8_t subfunction_code __attribute__((packed)); + u_int32_t fragger_handle __attribute__((packed)); + u_int32_t max_fragment_size __attribute__((packed)); + u_int32_t message_size __attribute__((packed)); + u_int32_t fragment_flag __attribute__((packed)); + u_int32_t verb __attribute__((packed)); + } __attribute__((packed)) + *d = (struct INPUT *) data; printf("Send NDS Fragment Request/Reply\n"); printf("fragger_handle: %lx\n", - (unsigned long) i->fragger_handle); + (unsigned long) d->fragger_handle); printf("max_fragment_size: %lx\n", - (unsigned long) i->max_fragment_size); + (unsigned long) d->max_fragment_size); printf("message_size: %lx\n", - (unsigned long) i->message_size); + (unsigned long) d->message_size); printf("fragment_flag: %lx\n", - (unsigned long) i->fragment_flag); - printf("verb: %d\n", i->verb); - - switch (i->verb) + (unsigned long) d->fragment_flag); + printf("verb: %d\n", d->verb); + + switch (d->verb) { case 1: printf("Resolve Name\n"); @@ -1001,9 +1001,9 @@ handle_ncp(struct sockaddr_ipx *source, { struct XDATA { - u_int8_t new_directory_handle; - u_int8_t access_rights_mask; - } + u_int8_t new_directory_handle __attribute__((packed)); + u_int8_t access_rights_mask __attribute__((packed)); + } __attribute__((packed)) *x = (struct XDATA *) data; printf("new_directory_handle: %x\n", x->new_directory_handle); @@ -1021,10 +1021,10 @@ handle_ncp(struct sockaddr_ipx *source, { struct XDATA { - u_int16_t accepted_max_size; - u_int16_t echo_socket; - u_int8_t security_flag; - } + u_int16_t accepted_max_size __attribute__((packed)); + u_int16_t echo_socket __attribute__((packed)); + u_int8_t security_flag __attribute__((packed)); + } __attribute__((packed)) *x = (struct XDATA *) data; printf("accepted_max_size: %x\n", ntohs(x->accepted_max_size)); @@ -1038,9 +1038,9 @@ handle_ncp(struct sockaddr_ipx *source, { struct XDATA { - u_int8_t completion_code; - u_int32_t remote_target_id; - u_int32_t remote_max_packet_size; + u_int8_t completion_code __attribute__((packed)); + u_int32_t remote_target_id __attribute__((packed)); + u_int32_t remote_max_packet_size __attribute__((packed)); } *x = (struct XDATA *) data; printf("completion_code: %x\n", ++++++ ncpfs-hg-commit-430.patch ++++++ changeset: 430:3fc1f5c9c744 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sun Jun 05 21:25:42 2005 +0000 files: lib/ncplib.c description: Set tm_isdst to -1 (unknown DST state) when converting date/time from NetWare to Unix format. It should give better results when DST is active. diff -r 776dc4052e39 -r 3fc1f5c9c744 lib/ncplib.c --- a/lib/ncplib.c Sun Jun 05 14:36:28 2005 +0000 +++ b/lib/ncplib.c Sun Jun 05 21:25:42 2005 +0000 @@ -2641,6 +2641,7 @@ nw_to_ctime(struct nw_time_buffer *sourc u_time.tm_mday = source->day; u_time.tm_mon = source->month - 1; u_time.tm_year = source->year; + u_time.tm_isdst = -1; if (u_time.tm_year < 80) { u_time.tm_year += 100; ++++++ ncpfs-hg-commit-431.patch ++++++ ++++ 2957 lines (skipped) ++++++ ncpfs-hg-commit-432.patch ++++++ changeset: 432:93a411983bcc user: Petr Vandrovec <petr(a)vandrovec.name> date: Sun Jul 03 20:34:45 2005 +0100 files: contrib/php/libtool description: Regenerate php's libtool with gcc instead of gcc-4.0 diff -r 06020cf028e1 -r 93a411983bcc contrib/php/libtool --- a/contrib/php/libtool Sat Jun 11 19:59:00 2005 +0000 +++ b/contrib/php/libtool Sun Jul 03 20:34:45 2005 +0100 @@ -76,10 +76,10 @@ AR_FLAGS="cru" AR_FLAGS="cru" # A C compiler. -LTCC="gcc-4.0" +LTCC="gcc" # A language-specific compiler. -CC="gcc-4.0" +CC="gcc" # Is the compiler the GNU C compiler? with_gcc=yes @@ -316,11 +316,10 @@ link_all_deplibs=unknown link_all_deplibs=unknown # Compile-time system search path for libraries -sys_lib_search_path_spec=" /usr/lib/gcc/i486-linux/4.0.1/ /usr/lib/gcc/i486-linux/4.0.1/ /usr/lib/gcc/i486-linux/4.0.1/../../../../i486-linux/lib/i486-linux/4.0.1/ /usr/lib/gcc/i486-linux/4.0.1/../../../../i486-linux/lib/ /usr/lib/gcc/i486-linux/4.0.1/../../../i486-linux/4.0.1/ /usr/lib/gcc/i486-linux/4.0.1/../../../ /lib/i486-linux/4.0.1/ /lib/ /usr/lib/i486-linux/4.0.1/ /usr/lib/" +sys_lib_search_path_spec=" /usr/lib/gcc-lib/i486-linux-gnu/3.3.6/ /usr/lib/gcc/i486-linux-gnu/3.3.6/ /usr/lib/gcc-lib/i486-linux-gnu/3.3.6/../../../../i486-linux-gnu/lib/i486-linux-gnu/3.3.6/ /usr/lib/gcc-lib/i486-linux-gnu/3.3.6/../../../../i486-linux-gnu/lib/ /usr/lib/gcc-lib/i486-linux-gnu/3.3.6/../../../i486-linux-gnu/3.3.6/ /usr/lib/gcc-lib/i486-linux-gnu/3.3.6/../../../ /lib/i486-linux-gnu/3.3.6/ /lib/ /usr/lib/i486-linux-gnu/3.3.6/ /usr/lib/" # Run-time system search path for libraries sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib - /usr/lib/libc5-compat /lib/libc5-compat /usr/i486-linuxlibc1/lib @@ -6740,7 +6739,7 @@ AR_FLAGS="cru" AR_FLAGS="cru" # A C compiler. -LTCC="gcc-4.0" +LTCC="gcc" # A language-specific compiler. CC="g++" @@ -6881,11 +6880,11 @@ striplib="strip --strip-unneeded" # Dependencies to place before the objects being linked to create a # shared library. -predep_objects="/usr/lib/gcc-lib/i486-linux/3.3.6/../../../crti.o /usr/lib/gcc-lib/i486-linux/3.3.6/crtbeginS.o" +predep_objects="/usr/lib/gcc-lib/i486-linux-gnu/3.3.6/../../../crti.o /usr/lib/gcc-lib/i486-linux-gnu/3.3.6/crtbeginS.o" # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects="/usr/lib/gcc-lib/i486-linux/3.3.6/crtendS.o /usr/lib/gcc-lib/i486-linux/3.3.6/../../../crtn.o" +postdep_objects="/usr/lib/gcc-lib/i486-linux-gnu/3.3.6/crtendS.o /usr/lib/gcc-lib/i486-linux-gnu/3.3.6/../../../crtn.o" # Dependencies to place before the objects being linked to create a # shared library. @@ -6897,7 +6896,7 @@ postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path="-L/usr/lib/gcc-lib/i486-linux/3.3.6 -L/usr/lib/gcc-lib/i486-linux/3.3.6/../../.." +compiler_lib_search_path="-L/usr/lib/gcc-lib/i486-linux-gnu/3.3.6 -L/usr/lib/gcc-lib/i486-linux-gnu/3.3.6/../../.." # Method to check whether dependent libraries are shared objects. deplibs_check_method="pass_all" @@ -6977,11 +6976,10 @@ link_all_deplibs=unknown link_all_deplibs=unknown # Compile-time system search path for libraries -sys_lib_search_path_spec=" /usr/lib/gcc-lib/i486-linux/3.3.6/ /usr/lib/gcc/i486-linux/3.3.6/ /usr/lib/gcc-lib/i486-linux/3.3.6/../../../../i486-linux/lib/i486-linux/3.3.6/ /usr/lib/gcc-lib/i486-linux/3.3.6/../../../../i486-linux/lib/ /usr/lib/gcc-lib/i486-linux/3.3.6/../../../i486-linux/3.3.6/ /usr/lib/gcc-lib/i486-linux/3.3.6/../../../ /lib/i486-linux/3.3.6/ /lib/ /usr/lib/i486-linux/3.3.6/ /usr/lib/" +sys_lib_search_path_spec=" /usr/lib/gcc-lib/i486-linux-gnu/3.3.6/ /usr/lib/gcc/i486-linux-gnu/3.3.6/ /usr/lib/gcc-lib/i486-linux-gnu/3.3.6/../../../../i486-linux-gnu/lib/i486-linux-gnu/3.3.6/ /usr/lib/gcc-lib/i486-linux-gnu/3.3.6/../../../../i486-linux-gnu/lib/ /usr/lib/gcc-lib/i486-linux-gnu/3.3.6/../../../i486-linux-gnu/3.3.6/ /usr/lib/gcc-lib/i486-linux-gnu/3.3.6/../../../ /lib/i486-linux-gnu/3.3.6/ /lib/ /usr/lib/i486-linux-gnu/3.3.6/ /usr/lib/" # Run-time system search path for libraries sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib - /usr/lib/libc5-compat /lib/libc5-compat /usr/i486-linuxlibc1/lib ++++++ ncpfs-hg-commit-433.patch ++++++ changeset: 433:6a7c398b04a7 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sun Jul 03 20:36:50 2005 +0100 files: .hgignore description: Switch from BitKeeper to Mercurial. Get rid of BitKeeper config files, and introduce Mercurial's .hgignore. diff -r 93a411983bcc -r 6a7c398b04a7 .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Sun Jul 03 20:36:50 2005 +0100 @@ -0,0 +1,179 @@ +\.a$ +\.d$ +\.do$ +\.la$ +\.lo$ +\.o$ +\.so$ +^Make\.rules$ +^Makefile$ +^autom4te.cache/ +^config\.log$ +^config\.status$ +^contrib/pam/Makefile$ +^contrib/php/Makefile$ +^contrib/php/Makefile\.in$ +^contrib/php/\.deps$ +^contrib/php/\.libs/ +^contrib/php/config\.h$ +^contrib/php/config\.log$ +^contrib/php/config\.nice$ +^contrib/php/config\.status$ +^contrib/php/config_vars\.mk$ +^contrib/php/libs\.mk$ +^contrib/php/php_auth_nds\.slo$ +^contrib/tcl-utils/Makefile$ +^contrib/testing/Makefile$ +^contrib/testing/abbrev$ +^contrib/testing/canon$ +^contrib/testing/chgpwd$ +^contrib/testing/cmpattr$ +^contrib/testing/copyauth$ +^contrib/testing/dirlimit$ +^contrib/testing/dirlist2$ +^contrib/testing/dssearch$ +^contrib/testing/dsstream$ +^contrib/testing/eaops$ +^contrib/testing/effright$ +^contrib/testing/fileinfo$ +^contrib/testing/large$ +^contrib/testing/lic$ +^contrib/testing/mkattr$ +^contrib/testing/mkclass$ +^contrib/testing/mkfile$ +^contrib/testing/mkobj$ +^contrib/testing/modclass$ +^contrib/testing/modobj$ +^contrib/testing/mvobj$ +^contrib/testing/nfssetinfo$ +^contrib/testing/nsfileinfo$ +^contrib/testing/nwbcast$ +^contrib/testing/nwdsgethost$ +^contrib/testing/nwdsgetstat$ +^contrib/testing/nwdsgetvi$ +^contrib/testing/nwdslist$ +^contrib/testing/nwdspartjoin$ +^contrib/testing/nwdspartlist$ +^contrib/testing/nwdspartrm$ +^contrib/testing/nwdspartsplit$ +^contrib/testing/nwdsresetstat$ +^contrib/testing/nwgettime$ +^contrib/testing/partroot$ +^contrib/testing/physlock$ +^contrib/testing/pp/Makefile$ +^contrib/testing/pp/bcastmd$ +^contrib/testing/pp/getconn_addr$ +^contrib/testing/pp/getsynt$ +^contrib/testing/pp/nwc_next_object$ +^contrib/testing/pp/nwgetconnlist$ +^contrib/testing/pp/nwwhoami$ +^contrib/testing/pp/open_conn_by_name$ +^contrib/testing/pp/readsdef$ +^contrib/testing/pp/readsynt$ +^contrib/testing/pp/return_block_of_tree$ +^contrib/testing/pp/scantree$ +^contrib/testing/pp/scanvolr$ +^contrib/testing/pp/semaphor$ +^contrib/testing/pp/treelist$ +^contrib/testing/pp/vlist$ +^contrib/testing/pp/volres$ +^contrib/testing/readaddr$ +^contrib/testing/readadef$ +^contrib/testing/readattr$ +^contrib/testing/readcc$ +^contrib/testing/readcls$ +^contrib/testing/readsynt$ +^contrib/testing/reloadds$ +^contrib/testing/renobj$ +^contrib/testing/replops$ +^contrib/testing/resint$ +^contrib/testing/resolve$ +^contrib/testing/rmattr$ +^contrib/testing/rmclass$ +^contrib/testing/rmobj$ +^contrib/testing/schsync$ +^contrib/testing/semaphore$ +^contrib/testing/setkeys$ +^contrib/testing/time$ +^contrib/testing/timegv$ +^contrib/testing/timeinfo$ +^contrib/testing/verpwd$ +^contrib/testing/verunix$ +^contrib/testing/vollist$ +^contrib/testing/wcsmbs-tst1$ +^contrib/tests/Makefile$ +^contrib/tknwmsg/Makefile$ +^include/config\.h$ +^include/ncp/ext/socket\.h$ +^include/ncp/ext/stdint\.h$ +^include/ncp/kernel/fs\.h$ +^include/ncp/kernel/if\.h$ +^include/ncp/kernel/ipx\.h$ +^include/ncp/kernel/route\.h$ +^include/ncp/kernel/types\.h$ +^include/ncp/nwnet\.h$ +^intl/Makefile$ +^ipx-1\.0/.*\.gz$ +^ipx-1\.0/Makefile$ +^ipx-1\.0/Samples/Makefile$ +^ipx-1\.0/Samples/ipxrcv$ +^ipx-1\.0/Samples/ipxsend$ +^ipx-1\.0/Samples/rip$ +^ipx-1\.0/Samples/sap$ +^ipx-1\.0/ipx_cmd$ +^ipx-1\.0/ipx_configure$ +^ipx-1\.0/ipx_interface$ +^ipx-1\.0/ipx_internal_net$ +^ipx-1\.0/ipx_route$ +^ipxdump/Makefile$ +^lib/Makefile$ +^lib/libncp\.so\..*$ +^man/.*\.gz$ +^man/Makefile$ +^po/Makefile$ +^po/Makefile\.in$ +^po/POTFILES$ +^sutil/Makefile$ +^sutil/ncplogin$ +^sutil/ncpmap$ +^sutil/ncpmount$ +^sutil/ncpumount$ +^sutil/nwsfind$ +^util/Makefile$ +^util/ncopy$ +^util/ncptest$ +^util/nprint$ +^util/nsend$ +^util/nwauth$ +^util/nwbocreate$ +^util/nwbols$ +^util/nwboprops$ +^util/nwborm$ +^util/nwbpadd$ +^util/nwbpcreate$ +^util/nwbprm$ +^util/nwbpset$ +^util/nwbpvalues$ +^util/nwdir$ +^util/nwdpvalues$ +^util/nwfsctrl$ +^util/nwfsinfo$ +^util/nwfstime$ +^util/nwgrant$ +^util/nwlistsalvage$ +^util/nwmsg$ +^util/nwpasswd$ +^util/nwpjmv$ +^util/nwpqjob$ +^util/nwpurge$ +^util/nwrevoke$ +^util/nwrights$ +^util/nwsalvage$ +^util/nwtrustee$ +^util/nwtrustee2$ +^util/nwuserlist$ +^util/nwvolinfo$ +^util/pqlist$ +^util/pqstat$ +^util/pserver$ +^util/slist$ ++++++ ncpfs-hg-commit-434.patch ++++++ changeset: 434:5eb60dbc36bd user: Petr Vandrovec <petr(a)vandrovec.name> date: Sun Jul 03 21:43:04 2005 +0100 files: include/ncp/ncplib.h description: Fix compilation with gcc 3.1 and older - no always_inline attribute available. diff -r 6a7c398b04a7 -r 5eb60dbc36bd include/ncp/ncplib.h --- a/include/ncp/ncplib.h Sun Jul 03 20:36:50 2005 +0100 +++ b/include/ncp/ncplib.h Sun Jul 03 21:43:04 2005 +0100 @@ -181,7 +181,10 @@ DSET_HL(void * buf, int pos, dword val) DSET_LH(buf, pos, htonl(val)); } -static inline __attribute__((always_inline)) void +static inline void +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2) +__attribute__((always_inline)) +#endif QSET_HL(void * buf, int pos, u_int64_t val) { DSET_HL(buf, pos, val >> 32); DSET_HL(buf, pos + 4, val); ++++++ ncpfs-hg-commit-435.patch ++++++ changeset: 435:12722b2b7268 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sun Jul 03 21:44:37 2005 +0100 files: util/nwauth.c description: Rename daemon to daemon_auth in util/nwauth.c Fix a warning in nwauth.c build that global daemon() function is shadowed by daemon variable in nwauth.c. diff -r 5eb60dbc36bd -r 12722b2b7268 util/nwauth.c --- a/util/nwauth.c Sun Jul 03 21:43:04 2005 +0100 +++ b/util/nwauth.c Sun Jul 03 21:44:37 2005 +0100 @@ -82,7 +82,7 @@ main(int argc, char *argv[]) char *str; int opt; - int daemon = 0; + int daemon_auth = 0; setlocale(LC_ALL, ""); bindtextdomain(NCPFS_PACKAGE, LOCALEDIR); @@ -114,7 +114,7 @@ main(int argc, char *argv[]) #endif break; case 'D': - daemon = 1; + daemon_auth = 1; break; case 'h': case '?': @@ -127,7 +127,7 @@ main(int argc, char *argv[]) } err = ncp_find_conn_spec3(server, object_name, "", - 1, daemon ? ~0U : getuid(), 0, &spec); + 1, daemon_auth ? ~0U : getuid(), 0, &spec); if (err) { ++++++ ncpfs-hg-commit-436.patch ++++++ ++++ 2931 lines (skipped) ++++++ ncpfs-hg-commit-437.patch ++++++ ++++ 3065 lines (skipped) ++++++ ncpfs-hg-commit-438.patch ++++++ changeset: 438:e635f8099d50 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sun Jul 03 22:46:56 2005 +0100 files: po/cs.gmo po/cs.po description: Fix typo in Czech translations. diff -r 06067530cbec -r e635f8099d50 po/cs.gmo Binary file po/cs.gmo has changed diff -r 06067530cbec -r e635f8099d50 po/cs.po --- a/po/cs.po Sun Jul 03 21:50:24 2005 +0100 +++ b/po/cs.po Sun Jul 03 22:46:56 2005 +0100 @@ -2137,7 +2137,7 @@ msgstr "chyba při vytváření\n" #: util/ncptest.c:134 #, c-format msgid "dealloc error\n" -msgstr "chyba při dealokaci" +msgstr "chyba při dealokaci\n" #: util/ncptest.c:137 #, c-format ++++++ ncpfs-hg-commit-439.patch ++++++ changeset: 439:0ba24cdb345c user: Petr Vandrovec <petr(a)vandrovec.name> date: Sun Jul 03 23:57:27 2005 +0100 files: lib/ndslib.c description: Convert some unsigned char* to const unsigned char* in lib/ndslib.c. Constify some pointers in the RSA computations, so we do not see any ugly warnings during build. diff -r e635f8099d50 -r 0ba24cdb345c lib/ndslib.c --- a/lib/ndslib.c Sun Jul 03 22:46:56 2005 +0100 +++ b/lib/ndslib.c Sun Jul 03 23:57:27 2005 +0100 @@ -233,7 +233,7 @@ static void fillrandom(nuint8 *buf, size } #endif -static int countbits_l(unsigned char *buf, int bufsize) { +static int countbits_l(const unsigned char *buf, int bufsize) { unsigned char b; while ((--bufsize) && (!buf[bufsize])); @@ -253,7 +253,7 @@ static void copyfill(void *outbuf, int o static char keyprefix[] = {1, 0, 0, 0, 3, 0, 1, 0}; -static int initkey(const unsigned char *key, unsigned char **keyptr, size_t *keylen) { /* 1=ok, 0=err */ +static int initkey(const unsigned char *key, const unsigned char **keyptr, size_t *keylen) { /* 1=ok, 0=err */ if (!memcmp(key, keyprefix, 8)) { if (keylen) *keylen = WVAL_LH(key, 8); if (keyptr) *keyptr = key + 10; @@ -263,14 +263,14 @@ static int initkey(const unsigned char * } static void clearkey(unsigned char *key) { - unsigned char *keyptr; + const unsigned char *keyptr; size_t keylen; if (initkey(key, &keyptr, &keylen)) memset(key, 0, keylen + 10); } -static int findchunk(const unsigned char *keyptr, size_t keylen, const char *chunk, unsigned char **chunkptr) { +static int findchunk(const unsigned char *keyptr, size_t keylen, const char *chunk, const unsigned char **chunkptr) { const unsigned char *p; if ((p = keyptr)) { @@ -278,7 +278,7 @@ static int findchunk(const unsigned char if ((p[0] != chunk[0]) || (p[1] != chunk[1])) { p += 4 + p[2] + p[3]; } else { - if (chunkptr) *chunkptr = (unsigned char*)p + 4; + if (chunkptr) *chunkptr = p + 4; return p[2] + p[3]; } } @@ -332,7 +332,7 @@ static void dumpkey(const nuint8 *key, s static int checkkey(const unsigned char *key) { /* 0 - wrong key, != 0 - key ok */ unsigned char temp[8]; - unsigned char *keyptr, *p; + const unsigned char *keyptr, *p; size_t keylen; if ((initkey(key, &keyptr, &keylen)) && @@ -350,12 +350,12 @@ static ncpt_mutex_t mpilock = NCPT_MUTEX static ncpt_mutex_t mpilock = NCPT_MUTEX_INITIALIZER; static long modexpkey(const unsigned char *s_key, unsigned char *buf, unsigned char *outbuf, int bufsize) { - unsigned char *s_keyptr; + const unsigned char *s_keyptr; size_t s_keylen; int i, nbits, nblocksize; int err = -1; unitptr nmod, nexp, nin, nout; - unsigned char *p; + const unsigned char *p; nmod = nexp = nin = nout = NULL; @@ -402,7 +402,7 @@ end1: /* ctx must be in WCHAR_T mode, without DCV_CANONICALIZE_NAMES */ static NWDSCCODE get_public_key(NWDSContextHandle ctx, const wchar_t* objname, nuint8 **key) { - unsigned char *keybuf, *kptr; + const unsigned char *keybuf, *kptr; NWDSCCODE err; size_t keylen, ofs, klen; Octet_String_T* ost; @@ -420,12 +420,14 @@ static NWDSCCODE get_public_key(NWDSCont goto err_exit; } if (key) { - if (!(kptr = malloc(klen + 10))) { + unsigned char *kbuf; + + if (!(kbuf = malloc(klen + 10))) { err = ENOMEM; goto err_exit; } - memcpy(kptr, keybuf + ofs, klen + 10); - *key = kptr; + memcpy(kbuf, keybuf + ofs, klen + 10); + *key = kbuf; } err = 0; err_exit: @@ -1073,7 +1075,8 @@ err_exit: static unsigned char *allocfillchunk(const unsigned char *keyptr, int keylen, const char *chunk, int destsize) { - unsigned char *p, *p2; + const unsigned char *p; + unsigned char *p2; int i; i = findchunk(keyptr, keylen, chunk, &p); @@ -1108,7 +1111,7 @@ static NWDSCCODE gen_auth_data( const nuint8* authid, nuint8 *loginstrc, int loginstrc_len) { - nuint8 *keyptr; + const unsigned char *keyptr; size_t keylen; int i, j; int nbits, nblocksize, nbytes, nblocksize_nw; @@ -1117,6 +1120,7 @@ static NWDSCCODE gen_auth_data( unitptr n_key_dp, n_key_dq; unitptr up, up2; unitptr randbuf; + const unsigned char *pkey; nuint8 *p; nuint8 *tempbuf; nuint8 hashbuf[0x42]; @@ -1127,12 +1131,12 @@ static NWDSCCODE gen_auth_data( ISRPrint("Initkey failed\n"); return ERR_INVALID_SERVER_RESPONSE; } - i = findchunk(keyptr, keylen, "NN", &p); - if (!p) { + i = findchunk(keyptr, keylen, "NN", &pkey); + if (!pkey) { ISRPrint("NN chunk not found\n"); return ERR_INVALID_SERVER_RESPONSE; } - nbits = countbits_l(p, i); + nbits = countbits_l(pkey, i); nbytes = (nbits + 7) >> 3; nmask = (unsigned char)(255 >> (8 - (nbits & 7))); /* we really want (x + 31) & ~15... I'm sorry, but Novell thinks that way */ @@ -1828,7 +1832,7 @@ NWDSCCODE __NWGenerateKeyPair( void* privkey, size_t* privkey_len ) { - nuint8 def_exp[] = { 1, 0, 1}; + static const nuint8 def_exp[] = { 1, 0, 1}; struct keyparam kp; NWDSCCODE err; size_t bits; ++++++ ncpfs-hg-commit-440.patch ++++++ changeset: 440:7f46ab032bd8 user: Petr Vandrovec <petr(a)vandrovec.name> date: Mon Jul 04 00:01:49 2005 +0100 files: lib/ndslib.c lib/ndslib_i.h description: Rename exp argument to n_exp in ndslib. Rename exp to n_exp (and exp_len to n_exp_len) to get rid of warning that exp argument shadows exp() mathematic function. Although we do not use exp() function anywhere, it is gcc builtin internal, and exists in the namespace since compilation start. diff -r 0ba24cdb345c -r 7f46ab032bd8 lib/ndslib.c --- a/lib/ndslib.c Sun Jul 03 23:57:27 2005 +0100 +++ b/lib/ndslib.c Mon Jul 04 00:01:49 2005 +0100 @@ -1825,8 +1825,8 @@ static int ComputeKey(struct keyparam *k NWDSCCODE __NWGenerateKeyPair( size_t key_len, - const void* exp, - size_t exp_len, + const void* n_exp, + size_t n_exp_len, void* pubkey, size_t* pubkey_len, void* privkey, @@ -1839,19 +1839,19 @@ NWDSCCODE __NWGenerateKeyPair( size_t words; /* netware native units */ if (!pubkey || !pubkey_len || !privkey || !privkey_len) return -2; - if (!key_len || !exp || !exp_len) { - exp = def_exp; - exp_len = sizeof(def_exp); + if (!key_len || !n_exp || !n_exp_len) { + n_exp = def_exp; + n_exp_len = sizeof(def_exp); key_len = 420; /* well, at least 620 does work too */ } else { - if ((key_len > 760) || (key_len < 256) || (key_len & 1) || (exp_len > 16)) { + if ((key_len > 760) || (key_len < 256) || (key_len & 1) || (n_exp_len > 16)) { return NWE_PARAM_INVALID; } } memset(&kp, 0, sizeof(kp)); kp.BA = 48; kp.BL = key_len; - memcpy(kp.n_exp, exp, exp_len); + memcpy(kp.n_exp, n_exp, n_exp_len); ncpt_mutex_lock(&mpilock); set_precision(bits2units(kp.BL) + SLOP_BITS); if ((countbits(kp.n_exp) > kp.BL) || !(kp.n_exp[0] & 1)) { diff -r 0ba24cdb345c -r 7f46ab032bd8 lib/ndslib_i.h --- a/lib/ndslib_i.h Sun Jul 03 23:57:27 2005 +0100 +++ b/lib/ndslib_i.h Mon Jul 04 00:01:49 2005 +0100 @@ -38,7 +38,7 @@ NWDSCCODE NWDSGetKeys(NWDSContextHandle /* ctx must be in wchar_t mode */ NWDSCCODE __NWDSGetPublicKeyFromConnection(NWDSContextHandle ctx, NWCONN_HANDLE conn, nuint8 **skey); -NWDSCCODE __NWGenerateKeyPair(size_t key_len, const void* exp, size_t exp_len, +NWDSCCODE __NWGenerateKeyPair(size_t key_len, const void* n_exp, size_t n_exp_len, void* pubkey, size_t* pubkey_len, void* privkey, size_t* privkey_len); NWDSCCODE __NWEncryptWithSK(const void* hashsrc, size_t hashsrclen, ++++++ ncpfs-hg-commit-441.patch ++++++ ++++ 977 lines (skipped) ++++++ ncpfs-hg-commit-442.patch ++++++ changeset: 442:093f842dbd98 user: Petr Vandrovec <petr(a)vandrovec.name> date: Mon Jul 11 00:44:36 2005 +0100 files: include/ncp/ipxlib.h lib/resolve.c description: Fix few remaining unsigned char pointer <-> signed char pointer conversion warnings. diff -r fbfcfbb3c88d -r 093f842dbd98 include/ncp/ipxlib.h --- a/include/ncp/ipxlib.h Mon Jul 11 00:42:47 2005 +0100 +++ b/include/ncp/ipxlib.h Mon Jul 11 00:44:36 2005 +0100 @@ -94,8 +94,8 @@ struct ipx_rip_packet #define IPX_BROADCAST_NODE "\xff\xff\xff\xff\xff\xff" #define IPX_THIS_NODE "\0\0\0\0\0\0" #else -#define IPX_BROADCAST_NODE ("\xff\xff\xff\xff\xff\xff") -#define IPX_THIS_NODE ("\0\0\0\0\0\0") +#define IPX_BROADCAST_NODE ((const u_int8_t*)"\xff\xff\xff\xff\xff\xff") +#define IPX_THIS_NODE ((const u_int8_t*)"\0\0\0\0\0\0") #endif #define IPX_THIS_NET (0) diff -r fbfcfbb3c88d -r 093f842dbd98 lib/resolve.c --- a/lib/resolve.c Mon Jul 11 00:42:47 2005 +0100 +++ b/lib/resolve.c Mon Jul 11 00:44:36 2005 +0100 @@ -429,13 +429,13 @@ static void sap_report(int fd, const str } } -static int sap_name_cmp(const unsigned char *my, const unsigned char *net, size_t cmplen) { +static int sap_name_cmp(const unsigned char *my, const char *net, size_t cmplen) { if (memcmp(my, net, cmplen)) { size_t ln; /* If it is exact match, allow trailing spaces and garbage after terminating zero. */ - ln = strnlen(my, cmplen); + ln = strnlen((const char*)my, cmplen); if (memcmp(my, net, ln)) { return 1; } @@ -635,7 +635,7 @@ static NWCCODE sap_start(void **prh, UNU if (ln >= NW_MAX_SERVER_NAME_LEN) { return ENAMETOOLONG; } - memcpy_toupper(sap_request + 4, name, ln); + memcpy_toupper((char*)sap_request + 4, name, ln); if (ln < 48) { memset(sap_request + 4 + ln, 0, 48 - ln); } @@ -650,7 +650,7 @@ static NWCCODE sap_start(void **prh, UNU if (ln >= NW_MAX_SERVER_NAME_LEN) { return ENAMETOOLONG; } - memcpy_toupper(sap_request + 4, name, ln); + memcpy_toupper((char*)sap_request + 4, name, ln); if (ln <= 32) { if (ln < 32) { memset(sap_request + 4 + ln, '_', 32 - ln); ++++++ ncpfs-hg-commit-443.patch ++++++ changeset: 443:c943b66ae2f6 user: vana(a)ppc.vc.cvut.cz date: Mon Jul 11 02:35:19 2005 +0100 files: util/nwfsinfo.c util/nwfstime.c description: Use NWGetFileServerUTCTime() instead of ncp_get_file_server_time() in nwfsinfo and nwfstime. Fixes problems when server is in different timezone than client (on NW3.x old ncp_get_file_server_time is still used). diff -r 093f842dbd98 -r c943b66ae2f6 util/nwfsinfo.c --- a/util/nwfsinfo.c Mon Jul 11 00:44:36 2005 +0100 +++ b/util/nwfsinfo.c Mon Jul 11 02:35:19 2005 +0100 @@ -33,6 +33,7 @@ #include <string.h> #include <ncp/nwcalls.h> #include <ncp/nwfse.h> +#include <ncp/nwnet.h> #include "private/libintl.h" #define _(X) gettext(X) @@ -175,8 +176,14 @@ main(int argc, char **argv) { time_t t; int err2; - - err2 = ncp_get_file_server_time(conn, &t); + nuint32 sec; + + err2 = __NWGetFileServerUTCTime(conn, &sec, NULL, NULL, NULL, NULL, NULL, NULL); + if (err2) { + err2 = ncp_get_file_server_time(conn, &t); + } else { + t = sec; + } if (err2) { fprintf(stderr, "%s: %s\n", _("could not get server time"), strnwerror(err2)); diff -r 093f842dbd98 -r c943b66ae2f6 util/nwfstime.c --- a/util/nwfstime.c Mon Jul 11 00:44:36 2005 +0100 +++ b/util/nwfstime.c Mon Jul 11 02:35:19 2005 +0100 @@ -33,7 +33,7 @@ #include <unistd.h> #include <sys/time.h> -#include <ncp/ncplib.h> +#include <ncp/nwnet.h> #include "private/libintl.h" #define _(X) gettext(X) @@ -124,32 +124,51 @@ main(int argc, char **argv) ncp_close(conn); return 1; } - } else - { int offset; - time_t last; + } else { + unsigned int offset; + nuint32 sec, xsec; - if ((err = ncp_get_file_server_time(conn, &t)) != 0) - { - get_error: com_err(argv[0], err, _("when getting file server time")); - ncp_close(conn); - return 1; + err = __NWGetFileServerUTCTime(conn, &sec, &xsec, NULL, NULL, NULL, NULL, NULL); + if (err != 0) { + if ((err = ncp_get_file_server_time(conn, &t)) != 0) { + get_error: com_err(argv[0], err, _("when getting file server time")); + ncp_close(conn); + return 1; + } + if (accurate) { + time_t last; + + do { + if ((err = ncp_get_file_server_time(conn, &last)) != 0) + goto get_error; + } while (last == t); + t = last; + offset = 0; /* we can read the time 1000s of times a second */ + } else { + offset = 500000; /* if no accurate measure, then assume offset of 500ms */ + } + } else { + if (accurate) { + nuint32 last; + + do { + offset = (xsec * 1000000ULL) >> 32; + if (offset > 100) { + usleep(1000000 - offset); + } + if ((err = __NWGetFileServerUTCTime(conn, &last, &xsec, NULL, NULL, NULL, NULL, NULL)) != 0) { + goto get_error; + } + } while (last == sec); + t = last; + } else { + t = sec; + } + offset = (xsec * 1000000ULL) >> 32; } - - if(accurate) - { - do - { if ((err = ncp_get_file_server_time(conn, &last)) != 0) - goto get_error; - } while(last==t); - t=last; - offset=0; /* we can read the time 1000s of times a second */ - } - else - offset=500; /* if no accurate measure, then assume offset of 500ms */ - - if(get) - { timeval.tv_sec = t; - timeval.tv_usec = offset*1000; + if (get) { + timeval.tv_sec = t; + timeval.tv_usec = offset; settimeofday(&timeval, NULL); } { ++++++ ncpfs-hg-commit-444.patch ++++++ changeset: 444:34ddb26e48fa user: vana(a)ppc.vc.cvut.cz date: Mon Jul 11 02:36:37 2005 +0100 files: lib/ncplib.c description: Fix ncpfs against NW3.x servers. It was not possible to reuse existing connection as connection to NW3.x server was never marked as authenticated. diff -r c943b66ae2f6 -r 34ddb26e48fa lib/ncplib.c --- a/lib/ncplib.c Mon Jul 11 02:35:19 2005 +0100 +++ b/lib/ncplib.c Mon Jul 11 02:36:37 2005 +0100 @@ -1946,9 +1946,14 @@ static int ncp_do_open_fd(int fd, struct #ifdef SIGNATURES ncp_sign_init_perm(result); #endif - if (!ncp_get_private_key(result, NULL, &klen)) { - if (klen > 10) { - result->connState |= CONNECTION_AUTHENTICATED; + if (!ncp_get_private_key(result, NULL, &klen) && klen > 10) { + result->connState |= CONNECTION_AUTHENTICATED; + } else { + nuint8 level; + NWCCODE err = NWGetBinderyAccessLevel(result, &level, NULL); + + if (err == 0 && level != 0) { + result->connState |= CONNECTION_AUTHENTICATED | CONNECTION_LICENSED; } } result->bcast_state = NWCC_BCAST_PERMIT_UNKNOWN; ++++++ ncpfs-hg-commit-445.patch ++++++ changeset: 445:66c5f4287bbb user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat Jul 23 21:58:13 2005 +0100 files: lib/strops.c description: Improve ncp_str_to_perms - now it accepts both [RFA] and RFA, and you can use both nothing, space and '-' for flags which are not set. diff -r 34ddb26e48fa -r 66c5f4287bbb lib/strops.c --- a/lib/strops.c Mon Jul 11 02:36:37 2005 +0100 +++ b/lib/strops.c Sat Jul 23 21:58:13 2005 +0100 @@ -44,6 +44,7 @@ #include <string.h> #include <stdarg.h> +#include <ctype.h> #include "private/libintl.h" #define _(X) dgettext(NCPFS_PACKAGE, (X)) @@ -419,56 +420,79 @@ char* ncp_perms_to_str(char r[11], const } /* The following function converts a rights string of format [SRWCEMFA] - into an integer. It will tolerate spaces, lower case and repeated - letters, even if this takes the length well over 10 characters, but - must be terminated with square brackets. If such a string containing - spaces is given as a command line option it will have to be quoted. */ + or SRWCEMFA into an integer. It will tolerate spaces, lower case and + repeated letters, even if this takes the length well over 10 characters. + For unset rights you can use spaces or dashes. For no rights you can + use either empty string, '-' or '[]' (or their combination, '[-]' or '[ ]'). */ int ncp_str_to_perms(const char *r, u_int16_t *rights) { u_int16_t result = 0; - - if (*r == '[') { - do { - ++r; - switch (*r) { - case ' ' : - case ']' : - break; - case 's' : - case 'S' : - result |= NCP_PERM_SUPER; break; - case 'r' : - case 'R' : - result |= NCP_PERM_READ; break; - case 'w' : - case 'W' : - result |= NCP_PERM_WRITE; break; - case 'c' : - case 'C' : - result |= NCP_PERM_CREATE; break; - case 'e' : - case 'E' : - result |= NCP_PERM_DELETE; break; - case 'm' : - case 'M' : - result |= NCP_PERM_MODIFY; break; - case 'f' : - case 'F' : - result |= NCP_PERM_SEARCH; break; - case 'a' : - case 'A' : - result |= NCP_PERM_OWNER; break; - default : + int state = 0; + + while (*r) { + int c = *r++; + + c = toupper(c); + if (isspace(c)) { + continue; + } + switch (c) { + case '[': + if (state != 0) { return -1; - } - } while (*r != ']'); - /* Now to be generous and ignore trailing spaces */ - do { ++r; } while (*r == ' '); - if (*r == '\0') { - *rights = result; - return 0; + } + state = 2; + continue; + case ']': + if (state != 2 && state != 3) { + return -1; + } + state = 4; + continue; + case '-': + break; + case 'S': + result |= NCP_PERM_SUPER; + break; + case 'R': + result |= NCP_PERM_READ; + break; + case 'W': + result |= NCP_PERM_WRITE; + break; + case 'C': + result |= NCP_PERM_CREATE; + break; + case 'E': + result |= NCP_PERM_DELETE; + break; + case 'M': + result |= NCP_PERM_MODIFY; + break; + case 'F': + result |= NCP_PERM_SEARCH; + break; + case 'A': + result |= NCP_PERM_OWNER; + break; + default: + return -1; } + state |= 1; + } + /* These states are illegal: + state == 2 => [ + state == 3 => [SRWCEMFA + state == 5 => [SRWCEMFA]SRW + These states are allowed: + state == 0 => <whitespaces only> + state == 1 => SRWCEMFA + state == 4 => [SRWCEMFA] + */ + if (state == 0 || state == 1 || state == 4) { + *rights = result; + return 0; } return -1; } ++++++ ncpfs-hg-commit-446.patch ++++++ changeset: 446:07b8031b5209 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat Jul 23 22:22:26 2005 +0100 files: man/nwgrant.8 man/nwrevoke.8 util/nwgrant.c util/nwrevoke.c description: Add ability to specify object by its ID to nwgrant and nwrevoke. To make long story short, upgrade from Netware5 to Netware6 kindly converted all rights granted to [Public] to rights granted to non-existant object with ID 0xFFFFFFFF. And patched nwrevoke was only tool willing to remove them. diff -r 66c5f4287bbb -r 07b8031b5209 man/nwgrant.8 --- a/man/nwgrant.8 Sat Jul 23 21:58:13 2005 +0100 +++ b/man/nwgrant.8 Sat Jul 23 22:22:26 2005 +0100 @@ -2,42 +2,17 @@ .SH NAME nwgrant \- Add Trustee Rights to a directory .SH SYNOPSIS -.B nwgrant -[ -.B -h -] [ -.B -S -.I server -] [ -.B -U -.I user name -] [ -.B -P -.I password -| -.B -n -] [ -.B -C -] [ -.B -o -.I object name -] [ -.B -t -.I type -] [ -.B -r -.I rights -] -.B file/directory +\fBnwgrant\fP [ \fB-h\fP ] [ \fB-S\fP \fIserver\fP ] +[ \fB-U\fP \fIuser name\fP ] [ \fB-P\fP \fIpassword\fP | \fB-n\fP ] +[ \fB-C\fP ] [ \fB-o\fP \fIobject name\fP | \fB-O\fP \fIobject id\fP ] +[ \fB-t\fP \fItype\fP ] [ \fB-r\fP \fIrights\fP ] \fBfile/directory\fP .SH DESCRIPTION .B nwgrant adds the specified bindery object with the corresponding trustee rights to the directory. -.B nwgrant -looks up the file -.I $HOME/.nwclient +\fBnwgrant\fP looks up the file \fI$HOME/.nwclient\fP to find a file server, a user name and possibly a password. See nwclient(5) for more information. Please note that the access permissions of $HOME/.nwclient MUST be 600 for security reasons. @@ -68,10 +43,7 @@ is the user name to use for login. .I password .RS 3 .B password -is the password to use for login. If neither -.B -n -nor -.B -P +is the password to use for login. If neither \fB-n\fP nor \fB-P\fP are given, and the user has no open connection to the server, nwgrant prompts for a password. .RE @@ -96,11 +68,16 @@ The name of the object to be added as tr The name of the object to be added as trustee. .RE +.B -O +.I object id +.RS 3 +The id of the object to be added as trustee. +.RE + .B -t .I object type .RS 3 -The type of the object. -.I Object type +The type of the object. \fIObject type\fP must be specified as a decimal value. Common values are 1 for user objects, 2 for group objects and 3 for print queues. Other values are allowed, but are usually used for specialized applications. If you @@ -111,18 +88,13 @@ NDS name. .B -r .I rights .RS 3 -You must tell -.B nwgrant -which rights it should grant to the bindery object. -The new rights for the object is specified by -.I rights, +You must tell \fBnwgrant\fP which rights it should grant to the bindery +object. The new rights for the object is specified by \fIrights\fP, which can be either a hexadecimal number representing the sum of all the individual rights to be granted or a string containing characters -representing each right. If rights are represented in string format -then the string must be bounded with square brackets. Characters -within the brackets may be in any order and in either case. Spaces are -allowed between the brackets - in which case the entire string should be -quoted. +representing each right. Characters within the brackets may be in +any order and in either case. Spaces are allowed between the +brackets - in which case the entire string should be quoted. Hexadecimal and character values for the rights are shown in this table: 00 = no access diff -r 66c5f4287bbb -r 07b8031b5209 man/nwrevoke.8 --- a/man/nwrevoke.8 Sat Jul 23 21:58:13 2005 +0100 +++ b/man/nwrevoke.8 Sat Jul 23 22:22:26 2005 +0100 @@ -2,33 +2,10 @@ .SH NAME nwrevoke \- Revoke a Trustee Right from a directory .SH SYNOPSIS -.B nwrevoke -[ -.B -h -] [ -.B -S -.I server -] [ -.B -U -.I user name -] [ -.B -P -.I password -| -.B -n -] [ -.B -C -] [ -.B -o -.I object name -] [ -.B -t -.I type -] [ -.B -r -.I rights -] -.B file/directory +\fBnwrevoke\fP [ \fB-h\fP ] [ \fB-S\fP \fIserver\fP ] +[ \fB-U\fP \fIuser name\fP ] [ \fB-P\fP \fIpassword\fP | \fB-n\fP ] +[ \fB-C\fP ] [ \fB-o\fP \fIobject name\fP | \fB-O\fP \fIobject ID\fP ] +[ \fB-t\fP \fItype\fP ] \fBfile/directory\fP .SH DESCRIPTION .B nwrevoke @@ -80,7 +57,12 @@ this conversion by \fB-C\fP. \fB-o\fP \fIobject name\fP .RS 3 -The name of the object to be added as trustee. +The name of the object to be revoked as trustee. +.RE + +\fB-O\fP \fIobject ID\fP +.RS 3 +The ID of the object to be revoked as trustee. .RE \fB-t\fP \fIobject type\fP diff -r 66c5f4287bbb -r 07b8031b5209 util/nwgrant.c --- a/util/nwgrant.c Sat Jul 23 21:58:13 2005 +0100 +++ b/util/nwgrant.c Sat Jul 23 22:22:26 2005 +0100 @@ -46,6 +46,7 @@ #include <unistd.h> #include <stdlib.h> #include <string.h> +#include <ctype.h> #include "private/libintl.h" #define _(X) gettext(X) @@ -73,6 +74,7 @@ help(void) "\n" "-o object_name Name of object added as trustee\n" "-t type Object type (decimal value)\n" + "-O object_id Object identifier\n" "-r rights Rights mask (see manual page)\n" "\n" "directory\n" @@ -85,7 +87,6 @@ main(int argc, char *argv[]) struct ncp_conn *conn; char *object_name = NULL; int object_type = -1; - struct ncp_bindery_object o; u_int16_t rights = ~0; int perr = 0; const char *path = NULL; @@ -98,6 +99,8 @@ main(int argc, char *argv[]) int enclen; TRUSTEE_INFO tstinfo; NWCCODE nwerr; + NWObjectID object_id; + int object_id_valid = 0; setlocale(LC_ALL, ""); bindtextdomain(NCPFS_PACKAGE, LOCALEDIR); @@ -109,10 +112,14 @@ main(int argc, char *argv[]) { useConn = 1; } - while ((opt = getopt(argc, argv, "h?o:t:r:")) != EOF) + while ((opt = getopt(argc, argv, "h?O:o:t:r:")) != EOF) { switch (opt) { + case 'O': + object_id = strtoul(optarg, NULL, 0); + object_id_valid = 1; + break; case 'o': object_name = optarg; str_upper(object_name); @@ -121,10 +128,14 @@ main(int argc, char *argv[]) object_type = atoi(optarg); break; case 'r': - if (*optarg == '[') { - perr = ncp_str_to_perms(optarg, &rights); - } else { - rights = strtol(optarg, NULL, 16); + perr = ncp_str_to_perms(optarg, &rights); + if (perr) { + char* end; + + rights = strtol(optarg, &end, 16); + if (!*end || isspace(*end)) { + perr = 0; + } } break; case 'h': @@ -137,12 +148,6 @@ main(int argc, char *argv[]) } } - if (object_name == NULL) - { - fprintf(stderr, _("%s: You must specify an object name\n"), - argv[0]); - goto finished; - } if (perr < 0) { fprintf(stderr, _("%s: You must give a valid rights string\n"), @@ -181,7 +186,13 @@ main(int argc, char *argv[]) path = volume; } - if (object_type < 0) { + if (object_id_valid) { + /* nothing */ + } else if (object_name == NULL) { + fprintf(stderr, _("%s: You must specify an object name\n"), + argv[0]); + goto finished; + } else if (object_type < 0) { #ifdef NDS_SUPPORT u_int32_t flags; NWDSContextHandle ctx; @@ -201,7 +212,7 @@ failDS:; flags |= DCV_XLATE_STRINGS | DCV_TYPELESS_NAMES; NWDSSetContext(ctx, DCK_FLAGS, &flags); } - nwerr = NWDSMapNameToID(ctx, conn, object_name, &o.object_id); + nwerr = NWDSMapNameToID(ctx, conn, object_name, &object_id); if (nwerr) { goto failDS; } @@ -212,12 +223,15 @@ failDS:; goto finished; #endif } else { + struct ncp_bindery_object o; + if ((nwerr = ncp_get_bindery_object_id(conn, object_type, object_name, &o)) != 0) { fprintf(stderr, _("%s: Could not find object %s: %s\n"), progname, object_name, strnwerror(nwerr)); goto finished; } + object_id = o.object_id; } enclen = ncp_path_to_NW_format(path, encpath, sizeof(encpath)); if (enclen < 0) { @@ -225,7 +239,7 @@ failDS:; progname, strerror(-enclen)); goto finished; } - tstinfo.objectID = o.object_id; + tstinfo.objectID = object_id; tstinfo.objectRights = rights; nwerr = ncp_ns_trustee_add(conn, NW_NS_DOS, SA_ALL, NCP_DIRSTYLE_NOHANDLE, 0, 0, encpath, enclen, &tstinfo, 1, ~0); diff -r 66c5f4287bbb -r 07b8031b5209 util/nwrevoke.c --- a/util/nwrevoke.c Sat Jul 23 21:58:13 2005 +0100 +++ b/util/nwrevoke.c Sat Jul 23 22:22:26 2005 +0100 @@ -65,6 +65,7 @@ help(void) "\n" "-o object_name Name of object removed as trustee\n" "-t type Object type (decimal value)\n" + "-O object_id Object identifier\n" "\n" "file/directory\n" "\n")); @@ -76,7 +77,6 @@ main(int argc, char *argv[]) struct ncp_conn *conn; char *object_name = NULL; int object_type = -1; - struct ncp_bindery_object o; const char *path = NULL; long err; int result = 1; @@ -87,6 +87,8 @@ main(int argc, char *argv[]) TRUSTEE_INFO tstinfo; int useConn = 0; NWDSCCODE nwerr; + NWObjectID object_id; + int object_id_valid = 0; setlocale(LC_ALL, ""); bindtextdomain(NCPFS_PACKAGE, LOCALEDIR); @@ -98,10 +100,14 @@ main(int argc, char *argv[]) { useConn = 1; } - while ((opt = getopt(argc, argv, "h?o:t:")) != EOF) + while ((opt = getopt(argc, argv, "h?o:t:O:")) != EOF) { switch (opt) { + case 'O': + object_id = strtoul(optarg, NULL, 0); + object_id_valid = 1; + break; case 'o': object_name = optarg; str_upper(object_name); @@ -119,12 +125,6 @@ main(int argc, char *argv[]) } } - if (object_name == NULL) - { - fprintf(stderr, _("%s: You must specify an object name\n"), - argv[0]); - goto finished; - } if (!useConn) { if (optind != argc - 1) { @@ -150,7 +150,13 @@ main(int argc, char *argv[]) strcat(volume, directory); path = volume; } - if (object_type < 0) { + if (object_id_valid) { + /* nothing */ + } else if (object_name == NULL) { + fprintf(stderr, _("%s: You must specify an object name\n"), + argv[0]); + goto finished; + } else if (object_type < 0) { #ifdef NDS_SUPPORT u_int32_t flags; NWDSContextHandle ctx; @@ -170,7 +176,7 @@ failDS:; if (!NWDSGetContext(ctx, DCK_FLAGS, &flags)) { flags |= DCV_XLATE_STRINGS | DCV_TYPELESS_NAMES; } - nwerr = NWDSMapNameToID(ctx, conn, object_name, &o.object_id); + nwerr = NWDSMapNameToID(ctx, conn, object_name, &object_id); if (nwerr) { NWDSFreeContext(ctx); goto failDS; @@ -182,19 +188,22 @@ failDS:; goto finished; #endif } else { + struct ncp_bindery_object o; + nwerr = ncp_get_bindery_object_id(conn, object_type, object_name, &o); if (nwerr != 0) { fprintf(stderr, _("%s: Could not find object %s: %s\n"), progname, object_name, strnwerror(nwerr)); goto finished; } + object_id = o.object_id; } enclen = ncp_path_to_NW_format(path, encpath, sizeof(encpath)); if (enclen < 0) { fprintf(stderr, _("%s: Invalid path: %s\n"), progname, strerror(-enclen)); goto finished; } - tstinfo.objectID = o.object_id; + tstinfo.objectID = object_id; tstinfo.objectRights = 0; nwerr = ncp_ns_trustee_del(conn, NW_NS_DOS, 0xFF, 0, 0, encpath, enclen, &tstinfo, 1); ++++++ ncpfs-hg-commit-447.patch ++++++ changeset: 447:3143e61fb504 user: Petr Vandrovec <petr(a)vandrovec.name> date: Thu Sep 29 23:06:24 2005 +0200 files: util/pserver.c description: Store ncp_read's result in ssize_t, otherwise errors returned from ncp_read are treated as large positive integers. Somehow ncp_read returns an error at the end of file on NetWare 6.5SP4. Also log these errors to the syslog. diff -r 07b8031b5209 -r 3143e61fb504 util/pserver.c --- a/util/pserver.c Sat Jul 23 22:22:26 2005 +0100 +++ b/util/pserver.c Thu Sep 29 23:06:24 2005 +0200 @@ -248,7 +248,7 @@ poll_queue(struct nw_queue *q) { /* parent */ char buf[1024]; - size_t result; + ssize_t result; off_t offset = 0; close(fd[0]); /* close read end */ @@ -257,9 +257,16 @@ poll_queue(struct nw_queue *q) sizeof(buf), buf)) > 0) { offset += result; - if (write(fd[1], buf, result) != (int)result) + if (write(fd[1], buf, result) != result) { goto fail; + } + } + if (result < 0) { + if (result == -1) { + syslog(LOG_ERR, _("ncp_read: unknown error\n")); + } else { + syslog(LOG_ERR, _("ncp_read: %m\n")); } } ++++++ ncpfs-hg-commit-448.patch ++++++ ++++ 4136 lines (skipped) ++++++ ncpfs-hg-commit-449.patch ++++++ changeset: 449:20cdebe39580 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sun Oct 16 02:44:08 2005 +0200 files: contrib/ncp_nss_lib/Makefile description: Update 'make clean' rule in ncp_nss_lib to remove all build products. diff -r 1a8455ed3290 -r 20cdebe39580 contrib/ncp_nss_lib/Makefile --- a/contrib/ncp_nss_lib/Makefile Sun Oct 16 02:40:25 2005 +0200 +++ b/contrib/ncp_nss_lib/Makefile Sun Oct 16 02:44:08 2005 +0200 @@ -87,7 +87,7 @@ dep: dep: clean: - rm -f *.o *.do *.to *~ + rm -f *.o *.do *.to $(SHARED_NSSLIB) $(SHARED_NSSLIB_BIN) $(UTILS1) *~ mrproper: clean rm -f $(UTILS) $(DISTFILE) ++++++ ncpfs-hg-commit-450.patch ++++++ changeset: 450:f18f9f05b9b8 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sun Oct 16 02:52:35 2005 +0200 files: .hgignore contrib/ncp_nss_lib/Makefile contrib/ncp_nss_lib/nss_cfgfile.c description: Get ncp_nss_lib to build with gcc4.0. Also fix build process - libnss_ncp.so is needed for development, libnss_ncp.so.2 is soname, and libnss_ncp.so.2.3 is library version. diff -r 20cdebe39580 -r f18f9f05b9b8 .hgignore --- a/.hgignore Sun Oct 16 02:44:08 2005 +0200 +++ b/.hgignore Sun Oct 16 02:52:35 2005 +0200 @@ -10,7 +10,7 @@ ^autom4te.cache/ ^config\.log$ ^config\.status$ -^contrib/ncp_nss_lib/libnss_ncp\.so\.2$ +^contrib/ncp_nss_lib/libnss_ncp\.so\. ^contrib/ncp_nss_lib/test_ncp_nss$ ^contrib/pam/Makefile$ ^contrib/php/Makefile$ diff -r 20cdebe39580 -r f18f9f05b9b8 contrib/ncp_nss_lib/Makefile --- a/contrib/ncp_nss_lib/Makefile Sun Oct 16 02:44:08 2005 +0200 +++ b/contrib/ncp_nss_lib/Makefile Sun Oct 16 02:52:35 2005 +0200 @@ -8,8 +8,8 @@ this_srcdir = ${top_srcdir}/lib include ${top_builddir}/Make.rules -VERSION_SOLIB := 2 -VERSION_SONAME := 2.3 +VERSION_SOLIB := 2.3 +VERSION_SONAME := 2 vpath %.c ${this_srcdir} @@ -80,8 +80,8 @@ install: install_shared $(O_UTILS1) $(O_TMP1): %.o: %.c $(CC) $(CCFLAGS) $(CFLAGS) $(CFLAGS_$@) -o $@ -c $< -$(UTILS1):: %: %.o $(O_TMP1) - $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(OBJS_$@) -L$(top_builddir)/lib -lnss_ncp -lncp $(LDFLAGS_$@) +$(UTILS1):: %: %.o $(O_TMP1) $(SHARED_NSSLIB) + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(OBJS_$@) -L. -lnss_ncp -L$(top_builddir)/lib -lncp $(LDFLAGS_$@) dep: @@ -100,8 +100,11 @@ install_shared: $(SHARED_NCPLIB_BIN) -ldconfig -$(SHARED_NSSLIB): $(SHARED_NSSLIB_BIN) +$(SHARED_NSSLIB): $(SHARED_NSSLIB_SONAME) rm -f $@ + ln -sf $< $@ + +$(SHARED_NSSLIB_SONAME): $(SHARED_NSSLIB_BIN) ln -sf $< $@ $(SHARED_NSSLIB_BIN): $(SHARED_O_OBJ) ${this_srcdir}/libncp.vers diff -r 20cdebe39580 -r f18f9f05b9b8 contrib/ncp_nss_lib/nss_cfgfile.c --- a/contrib/ncp_nss_lib/nss_cfgfile.c Sun Oct 16 02:44:08 2005 +0200 +++ b/contrib/ncp_nss_lib/nss_cfgfile.c Sun Oct 16 02:52:35 2005 +0200 @@ -175,13 +175,13 @@ static int process_line (char* cptr, str } *eptr = 0; if (ptr->isNum) { - (int *)*ptr->value_ptr=strtoul (sptr,&errPtr,0); + *(int**)ptr->value_ptr=strtoul (sptr,&errPtr,0); ptr->found= ((*sptr) && !(*errPtr)); //not empty and no error } else { if (eptr>sptr) { // do not take an empty string value char *v=strdup(sptr); if (v) { - (char*) *ptr->value_ptr=v; + *(char**)ptr->value_ptr=v; ptr->found= TRUE; }else return 1; @@ -201,11 +201,11 @@ static int fix_conf (struct check *resul return 1; } if (ptr->isNum) { - (int *)*ptr->value_ptr=strtoul (ptr->defValue,NULL,0); + *(int**)ptr->value_ptr=strtoul (ptr->defValue,NULL,0); }else { char * v=strdup(ptr->defValue); if (v) - (char*) *ptr->value_ptr=v; + *(char**)ptr->value_ptr=v; else return 1; } ++++++ ncpfs-hg-commit-451.patch ++++++ changeset: 451:4d7bb63d7050 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sun Oct 16 04:07:06 2005 +0200 files: contrib/ncp_nss_lib/nss_cfgfile.c contrib/ncp_nss_lib/nss_cfgfile.h contrib/ncp_nss_lib/nss_ncp.c contrib/ncp_nss_lib/nss_ncp.h contrib/ncp_nss_lib/test_ncp_nss.c description: Fix warnings in the nss module. Tweak some functions to not take useless arguments. Fix some bugs where long ints are printed by %d... diff -r f18f9f05b9b8 -r 4d7bb63d7050 contrib/ncp_nss_lib/nss_cfgfile.c --- a/contrib/ncp_nss_lib/nss_cfgfile.c Sun Oct 16 02:52:35 2005 +0200 +++ b/contrib/ncp_nss_lib/nss_cfgfile.c Sun Oct 16 04:07:06 2005 +0200 @@ -40,6 +40,7 @@ #include <sys/syslog.h> #include "nss_cfgfile.h" +#include "nss_ncp.h" // temporary define (waiting for a better Makefile) #define GLOBALCFGFILE "/etc/ncpfs.conf" #ifndef GLOBALCFGFILE @@ -49,7 +50,7 @@ // #define DEBUG 1 -static struct nss_ncp_conf* alloc_nss_ncp_conf (){ +static struct nss_ncp_conf* alloc_nss_ncp_conf (void){ struct nss_ncp_conf * conf; conf= (struct nss_ncp_conf *)malloc(sizeof(*conf)); @@ -61,7 +62,7 @@ static struct nss_ncp_conf* alloc_nss_nc void free_nss_ncp_conf (struct nss_ncp_conf *conf){ #define FREEFIELD(x) do if (conf->x) {free(conf->x) ; conf->x=NULL;} while (0); - if (conf && conf !=&defConf) { + if (conf) { FREEFIELD(server); FREEFIELD(startCtx); FREEFIELD(ctrlGroup); @@ -107,7 +108,7 @@ struct check { const char *option; /* configuration option */ int mandatory; /* can be empty or null */ int found; /*set to TRUE if found in cfg file */ - void ** value_ptr; /* temporary storage place */ + char ** value_ptr; /* temporary storage place */ int isNum; /* 1 is numeric, 0 is string*/ const char* defValue; }; @@ -120,10 +121,10 @@ void printResults (const char * infos,st for (ptr=results; ptr->option; ptr++) { if (ptr->isNum) printf ("option=%s mandatory=%d found=%d value=%d isNum=%d defvalue=%s\n", - ptr->option,ptr->mandatory,ptr->found,(int*)*ptr->value_ptr,ptr->isNum,ptr->defValue); + ptr->option,ptr->mandatory,ptr->found,*(int**)ptr->value_ptr,ptr->isNum,ptr->defValue); else printf ("option=%s mandatory=%d found=%d value=%s isNum=%d defvalue=%s\n", - ptr->option,ptr->mandatory,ptr->found,(char*)*ptr->value_ptr,ptr->isNum,ptr->defValue); + ptr->option,ptr->mandatory,ptr->found,*ptr->value_ptr,ptr->isNum,ptr->defValue); } } @@ -175,13 +176,13 @@ static int process_line (char* cptr, str } *eptr = 0; if (ptr->isNum) { - *(int**)ptr->value_ptr=strtoul (sptr,&errPtr,0); + *(int*)ptr->value_ptr=strtoul (sptr,&errPtr,0); ptr->found= ((*sptr) && !(*errPtr)); //not empty and no error } else { if (eptr>sptr) { // do not take an empty string value char *v=strdup(sptr); if (v) { - *(char**)ptr->value_ptr=v; + *ptr->value_ptr=v; ptr->found= TRUE; }else return 1; @@ -201,11 +202,11 @@ static int fix_conf (struct check *resul return 1; } if (ptr->isNum) { - *(int**)ptr->value_ptr=strtoul (ptr->defValue,NULL,0); + *(int*)ptr->value_ptr=strtoul (ptr->defValue,NULL,0); }else { char * v=strdup(ptr->defValue); if (v) - *(char**)ptr->value_ptr=v; + *ptr->value_ptr=v; else return 1; } @@ -223,22 +224,21 @@ static struct nss_ncp_conf *read_conf_fi if (!conf) return NULL; { - struct nss_ncp_conf * pconf=conf; struct check check_confs[] = { /*option mandat found value_ptr isNum defValue */ - {"debug", FALSE,FALSE,(void**)&conf->debug, TRUE, "0"}, - {"useTree", FALSE,FALSE,(void**)&conf->useTree, TRUE, "0"}, - {"server", TRUE,FALSE, (void**)&conf->server, FALSE, ""}, - {"startCtx", FALSE,FALSE,(void**)&conf->startCtx, FALSE, ""}, - {"ctrlGroup", FALSE,FALSE,(void**)&conf->ctrlGroup, FALSE, ""}, - {"defGid", FALSE,FALSE,(void**)&conf->defGid, TRUE, "100"}, - {"defShell", FALSE,FALSE,(void**)&conf->defShell, FALSE, "/bin/bash"}, - {"fallbackUid", FALSE,FALSE,(void**)&conf->fallbackUid, TRUE, "-1"}, - {"fallbackGid", FALSE,FALSE,(void**)&conf->fallbackGid, TRUE, "-1"}, - {"doPasswd", FALSE,FALSE,(void**)&conf->doPassword, TRUE, "0"}, - {"doGroup", FALSE,FALSE,(void**)&conf->doGroup, TRUE, "0"}, - {"doShadow", FALSE,FALSE,(void**)&conf->doShadow, TRUE, "0"}, - {NULL , FALSE,FALSE,NULL, FALSE, NULL} + {"debug", FALSE,FALSE,(char**)&conf->debug, TRUE, "0"}, + {"useTree", FALSE,FALSE,(char**)&conf->useTree, TRUE, "0"}, + {"server", TRUE, FALSE, &conf->server, FALSE, ""}, + {"startCtx", FALSE,FALSE, &conf->startCtx, FALSE, ""}, + {"ctrlGroup", FALSE,FALSE, &conf->ctrlGroup, FALSE, ""}, + {"defGid", FALSE,FALSE,(char**)&conf->defGid, TRUE, "100"}, + {"defShell", FALSE,FALSE, &conf->defShell, FALSE, "/bin/bash"}, + {"fallbackUid", FALSE,FALSE,(char**)&conf->fallbackUid, TRUE, "-1"}, + {"fallbackGid", FALSE,FALSE,(char**)&conf->fallbackGid, TRUE, "-1"}, + {"doPasswd", FALSE,FALSE,(char**)&conf->doPassword, TRUE, "0"}, + {"doGroup", FALSE,FALSE,(char**)&conf->doGroup, TRUE, "0"}, + {"doShadow", FALSE,FALSE,(char**)&conf->doShadow, TRUE, "0"}, + {NULL , FALSE,FALSE, NULL, FALSE, NULL} }; char cfgline[16384]; @@ -259,7 +259,6 @@ static struct nss_ncp_conf *read_conf_fi cptr++; if (*cptr != '[') continue; -sstart:; if (strncasecmp(++cptr, mySection, seclen)) continue; if (cptr[seclen] != ']') @@ -299,7 +298,6 @@ ssend: return conf; } -error: #ifdef DEBUG printResults("after reading CFG error",check_confs); #endif @@ -310,14 +308,12 @@ error: } -struct nss_ncp_conf * parse_conf (char * confFile) { - +struct nss_ncp_conf* parse_conf(void) { struct cfgFile *cfg; struct nss_ncp_conf *conf; #ifdef DEBUG printf("entering parse_conf\n"); #endif - //return &defConf; cfg = cfgOpenFile(GLOBALCFGFILE, FALSE); if (!cfg) return NULL; diff -r f18f9f05b9b8 -r 4d7bb63d7050 contrib/ncp_nss_lib/nss_cfgfile.h --- a/contrib/ncp_nss_lib/nss_cfgfile.h Sun Oct 16 02:52:35 2005 +0200 +++ b/contrib/ncp_nss_lib/nss_cfgfile.h Sun Oct 16 04:07:06 2005 +0200 @@ -20,11 +20,7 @@ struct nss_ncp_conf { int doShadow; // if 0, will return immediarly NSS_STATUS_UNAVAILABLE even if ncp is listed in /etc/nsswitch.conf }; - - -static struct nss_ncp_conf defConf ={0,TRUE,"INSA_ROOT","[Root]",NULL,100,"/bin/bash",-1,-1,TRUE,TRUE,TRUE}; - -struct nss_ncp_conf * parse_conf (char * confFile); -void free_nss_ncp_conf (struct nss_ncp_conf *conf); +struct nss_ncp_conf* parse_conf(void); +void free_nss_ncp_conf(struct nss_ncp_conf *conf); #endif diff -r f18f9f05b9b8 -r 4d7bb63d7050 contrib/ncp_nss_lib/nss_ncp.c --- a/contrib/ncp_nss_lib/nss_ncp.c Sun Oct 16 02:52:35 2005 +0200 +++ b/contrib/ncp_nss_lib/nss_ncp.c Sun Oct 16 04:07:06 2005 +0200 @@ -77,7 +77,7 @@ #include "nss_cfgfile.h" // only if logfile has been opened by nss API functions (debug mode) -void trace (int debugMode,int err,const char * format,... ) { +static void trace (int debugMode,int err,const char * format,... ) { va_list args; if (debugMode) { va_start(args,format); @@ -219,7 +219,7 @@ static int fix_nw_user_info (struct nw_u return 1; } }else { - ui->uid== (uid_t)-1; // unable to read CN (NDS browse rights not set) , skip it ! + ui->uid = (uid_t)-1; // unable to read CN (NDS browse rights not set) , skip it ! } return 0; } @@ -343,7 +343,7 @@ static int fix_nw_group_info (struct nw_ } } }else { - gi->gid== (gid_t)-1; // unable to read CN (NDS browse rights not set) , skip it ! + gi->gid = (gid_t)-1; // unable to read CN (NDS browse rights not set) , skip it ! } return 0; } @@ -514,7 +514,7 @@ static int fix_nw_shadow_info (struct nw } }else { - si->uid== (uid_t)-1; // unable to read CN (NDS browse rights not set) , skip it ! + si->uid = (uid_t)-1; // unable to read CN (NDS browse rights not set) , skip it ! } return 0; } @@ -564,7 +564,7 @@ outnomem: static void print_nw_shadow_info (struct nw_shadow_info si){ - printf("%s[%d]:%s:%d:%d:%d:%d:%d:%d:%d\n",si.cn,si.uid,si.passwd,si.lstchg,si.sp_min,si.sp_max,si.sp_warn,si.sp_inact,si.sp_expire,si.sp_flag); + printf("%s[%d]:%s:%ld:%ld:%ld:%ld:%ld:%ld:%ld\n",si.cn,si.uid,si.passwd,si.lstchg,si.sp_min,si.sp_max,si.sp_warn,si.sp_inact,si.sp_expire,si.sp_flag); } static void print_shadow (struct spwd spw){ @@ -579,8 +579,8 @@ struct nw_user_group_info { uid_t uid; gid_t* groups; size_t used; - size_t alloc; - int qflag; + size_t alloc; + int qflag; }; @@ -614,7 +614,7 @@ static int fix_nw_user_group_info (struc if (ui->uid== (uid_t)-1) ui->uid=conf->fallbackUid; }else { - ui->uid== (uid_t)-1; // unable to read CN (NDS browse rights not set) , skip it ! + ui->uid = (uid_t)-1; // unable to read CN (NDS browse rights not set) , skip it ! } return 0; } @@ -628,11 +628,11 @@ static enum nss_status nw_user_group_inf long int *size, gid_t * groups,long int limit,int *errnop,struct nss_ncp_conf * conf) { if (ui.uid != (uid_t)-1) { - int i; - for (i=0; i<ui.used; i++) { + size_t i; + for (i=0; i < ui.used; i++) { gid_t gid=ui.groups[i]; if (gid != group) { // group number to skip - if (*start == *size) + if (*start == *size) { if (limit <=0) { // no more space, realloc if permitted (limit <=0) gid_t* ngroups=realloc(groups, 2* *size * sizeof(*groups)); if (!ngroups) { @@ -642,6 +642,7 @@ static enum nss_status nw_user_group_inf *size *=2; }else // no reallocation permitted, leave returning found groups so far break; + } groups[*start]=gid; *start +=1; if (*start ==limit) { @@ -663,7 +664,7 @@ outnomem: } static void print_nw_user_group_info (struct nw_user_group_info ui){ - int i; + size_t i; printf("%s:%d:%d:%d:",ui.cn,ui.uid,ui.used,ui.alloc); for (i=0;i <ui.used;i++) @@ -672,8 +673,8 @@ static void print_nw_user_group_info (st } static void print_user_groups(gid_t * groups, long int start, long int size){ - int i; - printf("start=%d size=%d\n",start,size); + long int i; + printf("start=%ld size=%ld\n",start,size); for (i=0; i<start; i++) printf("%d ",groups[i]); printf("\n"); @@ -1018,9 +1019,7 @@ static NWDSCCODE nds_user_location2(NWDS static NWDSCCODE nds_user_location2(NWDSContextHandle ctx, const void *val, void *arg){ struct nw_user_info *ui = (struct nw_user_info *) arg; const char *pt = (const char *) val; - char *v; int n; - int err; trace(ui->qflag,LOG_NOTICE, "start of NW location got %s\n ", pt); @@ -1318,9 +1317,7 @@ static NWDSCCODE nds_shadow_location(NWD struct nw_shadow_info *si = (struct nw_shadow_info *) arg; const char *pt = (const char *) val; - char *v; int n; - int err; trace(si->qflag & QF_DEBUG,LOG_NOTICE, "shadow: start of NW location got %s\n ", pt); @@ -1434,10 +1431,7 @@ static NWDSCCODE nds_user_location3(NWDS static NWDSCCODE nds_user_location3(NWDSContextHandle ctx, const void *val, void *arg){ struct nw_user_group_info *ui = (struct nw_user_group_info *) arg; const char *pt = (const char *) val; - char *v; int n; - int err; - trace(ui->qflag & QF_DEBUG,LOG_NOTICE, "start of NW location got %s\n ", pt); @@ -1814,7 +1808,6 @@ getgroupmembers(NWDSContextHandle *conte { ATTR_MEMBERS, nds_get_group_members, SYN_MEMBERS}, { NULL, NULL, SYN_UNKNOWN }}; - NWDSCCODE err; trace(conf->debug, LOG_NOTICE,"entering getgroupmembers for group %s",groupName); ccode=CreateContextAndConn ( context,conn,conf); if (ccode) @@ -1834,12 +1827,12 @@ static struct ObjectList* ndsShadows=NUL // description of a NDS class to be searched by getentbyxx struct class_info { - char * className; - char * nds8Attribute; //name of ID attribute in NDS8 - char * LID1; // markers in L attribute for ID (U: or G:) - char * LID2; // markers in L attribute for ID (u: or g:), may be in lower case - char * LAlias1;// markers in L attribute for alias (N:) - char * LAlias2; // markers in L attribute for alias (n:) may be in lower case + const char * className; + const char * nds8Attribute; // name of ID attribute in NDS8 + const char * LID1; // markers in L attribute for ID (U: or G:) + const char * LID2; // markers in L attribute for ID (u: or g:), may be in lower case + const char * LAlias1; // markers in L attribute for alias (N:) + const char * LAlias2; // markers in L attribute for alias (n:) may be in lower case }; @@ -1879,17 +1872,12 @@ static NWDSCCODE getentbyxx( NWDSContextHandle context; NWCONN_HANDLE conn; NWDSCCODE ccode; - nint32 iterationHandle= NO_MORE_ITERATIONS; // to be set as such at Exit4 - nint32 countObjectsSearched; - nuint32 objCntr,attrCntr,valCntr; + nuint32 iterationHandle = NO_MORE_ITERATIONS; // to be set as such at Exit4 + nuint32 countObjectsSearched; + nuint32 objCntr; nuint32 objCount; nuint32 attrCount; char objectName[MAX_DN_CHARS+1]; - char attrName[MAX_SCHEMA_NAME_CHARS+1]; - nuint32 attrValCount; - nuint32 syntaxID; - nuint32 attrValSize; - char* attrVal; // buffers pBuf_T searchFilter=NULL; // search filter @@ -2259,14 +2247,14 @@ static NWDSCCODE getentbyxx( } } trace(conf->debug, LOG_NOTICE,"callback return OK"); - } while ((nuint32)iterationHandle != NO_MORE_ITERATIONS); + } while (iterationHandle != NO_MORE_ITERATIONS); trace(conf->debug, LOG_NOTICE,"End of iteration attrNamesOK"); Exit4: - if ((nuint32)iterationHandle != NO_MORE_ITERATIONS){ + if (iterationHandle != NO_MORE_ITERATIONS){ NWDSCCODE ccode2; - if (ccode2=NWDSCloseIteration(context,iterationHandle,DSV_SEARCH)) { + if ((ccode2=NWDSCloseIteration(context,iterationHandle,DSV_SEARCH)) != 0) { traceForce(conf->debug,LOG_WARNING,"NWDSCloseIteration returned: %d\n", ccode2); } } @@ -2291,7 +2279,6 @@ Exit3: }else if (retConn) *retConn=conn; -Exit2: if (ccode || !retContext) { NWDSCCODE ccode2=NWDSFreeContext(context); trace(conf->debug, LOG_NOTICE,"Freeing context"); @@ -2300,7 +2287,6 @@ Exit2: }else if (retContext) *retContext=context; -Exit1: trace(conf->debug, LOG_NOTICE,"Leaving ..."); return ccode; } @@ -2417,7 +2403,7 @@ enum nss_status _nss_ncp_initgroups (con struct nw_user_group_info inf; NWDSCCODE err; - struct nss_ncp_conf *conf= parse_conf(CNF_FILE); + struct nss_ncp_conf* conf = parse_conf(); if (!conf || !conf->doGroup) return NSS_STATUS_UNAVAIL; @@ -2460,7 +2446,7 @@ enum nss_status _nss_ncp_getpwnam_r (con struct nw_user_info inf; NWDSCCODE err; - struct nss_ncp_conf *conf= parse_conf(CNF_FILE); + struct nss_ncp_conf* conf = parse_conf(); if (!conf || !conf->doPassword) return NSS_STATUS_UNAVAIL; @@ -2503,7 +2489,7 @@ enum nss_status _nss_ncp_getpwuid_r (uid struct nw_user_info inf; NWDSCCODE err; - struct nss_ncp_conf *conf= parse_conf(CNF_FILE); + struct nss_ncp_conf* conf = parse_conf(); if (!conf || !conf->doPassword) return NSS_STATUS_UNAVAIL; @@ -2546,7 +2532,7 @@ enum nss_status _nss_ncp_getgrnam_r (con struct nw_group_info inf; NWDSCCODE err; - struct nss_ncp_conf *conf= parse_conf(CNF_FILE); + struct nss_ncp_conf* conf = parse_conf(); if (!conf || !conf->doGroup) return NSS_STATUS_UNAVAIL; @@ -2588,7 +2574,7 @@ enum nss_status _nss_ncp_getspnam_r (con char *buffer, size_t buflen,int * errnop) { struct nw_shadow_info inf; NWDSCCODE err; - struct nss_ncp_conf *conf= parse_conf(CNF_FILE); + struct nss_ncp_conf* conf = parse_conf(); if (!conf || !conf->doShadow) return NSS_STATUS_UNAVAIL; @@ -2631,7 +2617,7 @@ enum nss_status _nss_ncp_getgrgid_r (gid char * buffer, size_t buflen, int * errnop) { struct nw_group_info inf; NWDSCCODE err; - struct nss_ncp_conf *conf= parse_conf(CNF_FILE); + struct nss_ncp_conf* conf = parse_conf(); if (!conf || !conf->doGroup) return NSS_STATUS_UNAVAIL; @@ -2673,7 +2659,7 @@ enum nss_status _nss_ncp_setpwent(void) NWDSContextHandle context; NWCONN_HANDLE conn; NWDSCCODE ccode; - struct nss_ncp_conf *conf= parse_conf(CNF_FILE); + struct nss_ncp_conf* conf = parse_conf(); if (!conf || !conf->doPassword) return NSS_STATUS_UNAVAIL; @@ -2715,7 +2701,7 @@ enum nss_status _nss_ncp_setgrent(void) NWDSContextHandle context; NWCONN_HANDLE conn; enum nss_status ccode; - struct nss_ncp_conf *conf= parse_conf(CNF_FILE); + struct nss_ncp_conf* conf = parse_conf(); if (!conf || !conf->doGroup) return NSS_STATUS_UNAVAIL; @@ -2753,7 +2739,7 @@ enum nss_status _nss_ncp_setspent (void) NWDSContextHandle context; NWCONN_HANDLE conn; NWDSCCODE ccode; - struct nss_ncp_conf *conf= parse_conf(CNF_FILE); + struct nss_ncp_conf* conf = parse_conf(); if (!conf || !conf->doShadow) return NSS_STATUS_UNAVAIL; diff -r f18f9f05b9b8 -r 4d7bb63d7050 contrib/ncp_nss_lib/nss_ncp.h --- a/contrib/ncp_nss_lib/nss_ncp.h Sun Oct 16 02:52:35 2005 +0200 +++ b/contrib/ncp_nss_lib/nss_ncp.h Sun Oct 16 04:07:06 2005 +0200 @@ -121,6 +121,7 @@ +void traceForce(int debugMode, int err, const char* format, ...); /******************************* NSS API ***************************************/ diff -r f18f9f05b9b8 -r 4d7bb63d7050 contrib/ncp_nss_lib/test_ncp_nss.c --- a/contrib/ncp_nss_lib/test_ncp_nss.c Sun Oct 16 02:52:35 2005 +0200 +++ b/contrib/ncp_nss_lib/test_ncp_nss.c Sun Oct 16 04:07:06 2005 +0200 @@ -67,6 +67,7 @@ #include "nss_cfgfile.h" +static struct nss_ncp_conf defConf ={0, TRUE, NULL, NULL, NULL, 100, NULL, -1, -1, TRUE, TRUE, TRUE}; /**************** TESTING ******************/ @@ -94,13 +95,13 @@ static void print_shadow (struct spwd sp static void print_user_groups(gid_t * groups, long int start, long int size){ int i; - printf("start=%d size=%d\n",start,size); + printf("start=%ld size=%ld\n",start,size); for (i=0; i<start; i++) printf("%d ",groups[i]); printf("\n"); } -void give_details_on_user_groups(gid_t *groups, long int start){ +static void give_details_on_user_groups(gid_t *groups, long int start){ struct group grp; char buffer[65000]; long int i; @@ -148,11 +149,6 @@ static void help(void) exit (1); } -static void error ( char * s) { - printf (_("\n%s\n"),s); - exit (1); -} - /************************************************************************* ** main */ @@ -174,7 +170,6 @@ int main (int argc, char** argv) { struct passwd pwd; struct group grp; struct spwd spw; - enum nss_status err; progname = argv[0]; while ((opt = getopt(argc, argv, "h?u:n:g:i:s:m:T:B:C:O:f:UGSD2")) != EOF) @@ -263,7 +258,7 @@ int main (int argc, char** argv) { } } - if (userId != -1) { + if (userId != (uid_t)-1) { printf ("searching in passwd for uid %d\n",userId); if ( _nss_ncp_getpwuid_r (userId, &pwd,buffer,sizeof(buffer),&errno)==NSS_STATUS_SUCCESS) print_passwd(pwd); @@ -284,7 +279,7 @@ int main (int argc, char** argv) { } } - if (groupId != -1) { + if (groupId != (gid_t)-1) { printf ("searching in group for gid %d\n",groupId); if ( _nss_ncp_getgrgid_r (groupId, &grp,buffer,sizeof(buffer),&errno)==NSS_STATUS_SUCCESS) print_group(grp); ++++++ ncpfs-hg-commit-452.patch ++++++ changeset: 452:b2ec015c1689 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sun Oct 16 04:14:27 2005 +0200 files: contrib/ncp_nss_lib/nss_ncp.c description: Use %zd format when printing size_t arguments. Revealed on 64bit host. diff -r 4d7bb63d7050 -r b2ec015c1689 contrib/ncp_nss_lib/nss_ncp.c --- a/contrib/ncp_nss_lib/nss_ncp.c Sun Oct 16 04:07:06 2005 +0200 +++ b/contrib/ncp_nss_lib/nss_ncp.c Sun Oct 16 04:14:27 2005 +0200 @@ -666,7 +666,7 @@ static void print_nw_user_group_info (st static void print_nw_user_group_info (struct nw_user_group_info ui){ size_t i; - printf("%s:%d:%d:%d:",ui.cn,ui.uid,ui.used,ui.alloc); + printf("%s:%d:%zd:%zd:",ui.cn,ui.uid,ui.used,ui.alloc); for (i=0;i <ui.used;i++) printf("%d ",ui.groups[i]); printf("\n"); @@ -1754,15 +1754,15 @@ static void print_nodes(struct TreeNode* if (n) { print_nodes(n->left,crlf); if (crlf) - printf ("%s [%d]\n",n->name,n->cnt); + printf ("%s [%zd]\n",n->name,n->cnt); else - printf ("%s [%d]",n->name,n->cnt); + printf ("%s [%zd]",n->name,n->cnt); print_nodes(n->right,crlf); } } static void print_tree(struct ObjectList* t, int crlf) { - printf("total:%d unique:%d\n",t->totalObjects,t->uniqueObjects); + printf("total:%zd unique:%zd\n",t->totalObjects,t->uniqueObjects); print_nodes (t->first,crlf); } ++++++ ncpfs-hg-commit-453.patch ++++++ changeset: 453:329b32c7d8a6 user: Petr Vandrovec <petr(a)vandrovec.name> date: Thu Apr 13 19:59:28 2006 +0200 files: lib/ndslib.c description: Fix nds_beginauth2 on Fedora nds_beginauth2 was aliging pointer to be multiple of 4 bytes, instead of aligning offset from start of buffer to the pointer to be multiple of 4 bytes. This was not problem before, as buffer itself was 4 byte aligned, but Fedora's compiler has options which can misalign it... See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=186683. diff -r b2ec015c1689 -r 329b32c7d8a6 lib/ndslib.c --- a/lib/ndslib.c Sun Oct 16 04:14:27 2005 +0200 +++ b/lib/ndslib.c Thu Apr 13 19:59:28 2006 +0200 @@ -1026,7 +1026,8 @@ static NWDSCCODE nds_beginauth2( goto err_exit; } copyfill(n_temp, n1, p, n3a); - p = (void*)(((unsigned long)k1end + 3) & ~3); + /* align p to the first 4 byte boundary beyond k1end */ + p = k1end + ((p - k1end) & 3); err = modexpkey(s_key, n_temp, n_temp, n1); if (err) { ISRPrint("modexpkey failed\n"); ++++++ ncpfs-hg-commit-454.patch ++++++ changeset: 454:7783da47228e user: Petr Vandrovec <petr(a)vandrovec.name> date: Thu Apr 13 22:53:06 2006 +0200 files: include/ncp/ipxlib.h include/ncp/kernel/ncp.h include/ncp/ncp.h include/ncp/ncplib.h ipx-1.0/ipx_cmd.c lib/ncplib.c description: gcc-4.1 does not like packed characters/character arrays gcc-4.1 does not like when element which itself is aligned at 1 byte is tagged again with __attribute__((packed)). So let's remove this attribute, it should not break older gcc... diff -r 329b32c7d8a6 -r 7783da47228e include/ncp/ipxlib.h --- a/include/ncp/ipxlib.h Thu Apr 13 19:59:28 2006 +0200 +++ b/include/ncp/ipxlib.h Thu Apr 13 22:53:06 2006 +0200 @@ -64,12 +64,12 @@ struct sap_server_ident struct sap_server_ident { u_int16_t server_type __attribute__((packed)); - char server_name[48] __attribute__((packed)); + char server_name[48]; IPXNet server_network __attribute__((packed)); #ifdef SWIG u_int8_t server_node[6] __attribute__((packed)); #else - IPXNode server_node __attribute__((packed)); + IPXNode server_node; #endif IPXPort server_port __attribute__((packed)); u_int16_t intermediate_network __attribute__((packed)); @@ -87,7 +87,7 @@ struct ipx_rip_packet struct ipx_rip_packet { u_int16_t operation __attribute__((packed)); - struct ipx_rt_def rt[1] __attribute__((packed)); + struct ipx_rt_def rt[1]; } __attribute__((packed)); #ifdef SWIG diff -r 329b32c7d8a6 -r 7783da47228e include/ncp/kernel/ncp.h --- a/include/ncp/kernel/ncp.h Thu Apr 13 19:59:28 2006 +0200 +++ b/include/ncp/kernel/ncp.h Thu Apr 13 22:53:06 2006 +0200 @@ -53,12 +53,12 @@ struct ncp_request_header { u_int16_t type __attribute__((packed)); - u_int8_t sequence __attribute__((packed)); - u_int8_t conn_low __attribute__((packed)); - u_int8_t task __attribute__((packed)); - u_int8_t conn_high __attribute__((packed)); - u_int8_t function __attribute__((packed)); - u_int8_t data[0] __attribute__((packed)); + u_int8_t sequence; + u_int8_t conn_low; + u_int8_t task; + u_int8_t conn_high; + u_int8_t function; + u_int8_t data[0]; } __attribute__((packed)); #define NCP_REPLY (0x3333) @@ -66,13 +66,13 @@ struct ncp_request_header { struct ncp_reply_header { u_int16_t type __attribute__((packed)); - u_int8_t sequence __attribute__((packed)); - u_int8_t conn_low __attribute__((packed)); - u_int8_t task __attribute__((packed)); - u_int8_t conn_high __attribute__((packed)); - u_int8_t completion_code __attribute__((packed)); - u_int8_t connection_state __attribute__((packed)); - u_int8_t data[0] __attribute__((packed)); + u_int8_t sequence; + u_int8_t conn_low; + u_int8_t task; + u_int8_t conn_high; + u_int8_t completion_code; + u_int8_t connection_state; + u_int8_t data[0]; } __attribute__((packed)); #define NCP_VOLNAME_LEN (16) @@ -230,8 +230,8 @@ struct nw_info_struct { u_int32_t EAKeyCount __attribute__((packed)); u_int32_t EAKeySize __attribute__((packed)); u_int32_t NSCreator __attribute__((packed)); - u_int8_t nameLen __attribute__((packed)); - u_int8_t entryName[256] __attribute__((packed)); + u_int8_t nameLen; + u_int8_t entryName[256]; } __attribute__((packed)); #endif @@ -282,13 +282,13 @@ struct nw_file_info { int opened; int access; u_int32_t server_file_handle __attribute__((packed)); - u_int8_t open_create_action __attribute__((packed)); - u_int8_t file_handle[6] __attribute__((packed)); + u_int8_t open_create_action; + u_int8_t file_handle[6]; } __attribute__((packed)); #endif struct nw_search_sequence { - u_int8_t volNumber __attribute__((packed)); + u_int8_t volNumber; u_int32_t dirBase __attribute__((packed)); u_int32_t sequence __attribute__((packed)); } __attribute__((packed)); diff -r 329b32c7d8a6 -r 7783da47228e include/ncp/ncp.h --- a/include/ncp/ncp.h Thu Apr 13 19:59:28 2006 +0200 +++ b/include/ncp/ncp.h Thu Apr 13 22:53:06 2006 +0200 @@ -95,7 +95,7 @@ struct prop_net_address { #ifdef SWIG fixedArray node[IPX_NODE_LEN]; #else - u_int8_t node[IPX_NODE_LEN] __attribute__((packed)); + u_int8_t node[IPX_NODE_LEN]; #endif u_int16_t port __attribute__((packed)); }; @@ -163,20 +163,20 @@ struct nw_queue_job_entry { u_int32_t ClientTask __attribute__((packed)); u_int32_t ClientObjectID __attribute__((packed)); u_int32_t TargetServerID __attribute__((packed)); - u_int8_t TargetExecTime[6] __attribute__((packed)); - u_int8_t JobEntryTime[6] __attribute__((packed)); + u_int8_t TargetExecTime[6]; + u_int8_t JobEntryTime[6]; u_int32_t JobNumber __attribute__((packed)); u_int16_t JobType __attribute__((packed)); u_int16_t JobPosition __attribute__((packed)); u_int16_t JobControlFlags __attribute__((packed)); - u_int8_t FileNameLen __attribute__((packed)); - char JobFileName[13] __attribute__((packed)); + u_int8_t FileNameLen; + char JobFileName[13]; u_int32_t JobFileHandle __attribute__((packed)); u_int32_t ServerStation __attribute__((packed)); u_int32_t ServerTaskNumber __attribute__((packed)); u_int32_t ServerObjectID __attribute__((packed)); - char JobTextDescription[50] __attribute__((packed)); - char ClientRecordArea[152] __attribute__((packed)); + char JobTextDescription[50]; + char ClientRecordArea[152]; }; struct queue_job { @@ -217,18 +217,18 @@ struct print_job_record { }; #else struct print_job_record { - u_int8_t Version __attribute__((packed)); - u_int8_t TabSize __attribute__((packed)); + u_int8_t Version; + u_int8_t TabSize; u_int16_t Copies __attribute__((packed)); u_int16_t CtrlFlags __attribute__((packed)); u_int16_t Lines __attribute__((packed)); u_int16_t Rows __attribute__((packed)); - char FormName[16] __attribute__((packed)); - u_int8_t Reserved[6] __attribute__((packed)); - char BannerName[13] __attribute__((packed)); - char FnameBanner[13] __attribute__((packed)); - char FnameHeader[14] __attribute__((packed)); - char Path[80] __attribute__((packed)); + char FormName[16]; + u_int8_t Reserved[6]; + char BannerName[13]; + char FnameBanner[13]; + char FnameHeader[14]; + char Path[80]; }; #endif diff -r 329b32c7d8a6 -r 7783da47228e include/ncp/ncplib.h --- a/include/ncp/ncplib.h Thu Apr 13 19:59:28 2006 +0200 +++ b/include/ncp/ncplib.h Thu Apr 13 22:53:06 2006 +0200 @@ -477,24 +477,24 @@ struct ncp_file_server_info #else struct ncp_file_server_info { - char ServerName[48] __attribute__((packed)); - u_int8_t FileServiceVersion __attribute__((packed)); - u_int8_t FileServiceSubVersion __attribute__((packed)); + char ServerName[48]; + u_int8_t FileServiceVersion; + u_int8_t FileServiceSubVersion; u_int16_t MaximumServiceConnections __attribute__((packed)); u_int16_t ConnectionsInUse __attribute__((packed)); u_int16_t NumberMountedVolumes __attribute__((packed)); - u_int8_t Revision __attribute__((packed)); - u_int8_t SFTLevel __attribute__((packed)); - u_int8_t TTSLevel __attribute__((packed)); + u_int8_t Revision; + u_int8_t SFTLevel; + u_int8_t TTSLevel; u_int16_t MaxConnectionsEverUsed __attribute__((packed)); - u_int8_t AccountVersion __attribute__((packed)); - u_int8_t VAPVersion __attribute__((packed)); - u_int8_t QueueVersion __attribute__((packed)); - u_int8_t PrintVersion __attribute__((packed)); - u_int8_t VirtualConsoleVersion __attribute__((packed)); - u_int8_t RestrictionLevel __attribute__((packed)); - u_int8_t InternetBridge __attribute__((packed)); - u_int8_t Reserved[60] __attribute__((packed)); + u_int8_t AccountVersion; + u_int8_t VAPVersion; + u_int8_t QueueVersion; + u_int8_t PrintVersion; + u_int8_t VirtualConsoleVersion; + u_int8_t RestrictionLevel; + u_int8_t InternetBridge; + u_int8_t Reserved[60]; } __attribute__((packed)); #endif @@ -607,7 +607,7 @@ struct ncp_station_addr #ifdef SWIG fixedArray Node[6]; #else - u_int8_t Node[6] __attribute__((packed)); + u_int8_t Node[6]; #endif u_int16_t Socket __attribute__((packed)); } __attribute__((packed)); @@ -617,32 +617,32 @@ struct ncp_prop_login_control #ifdef SWIG fixedArray AccountExpireDate[3]; #else - u_int8_t AccountExpireDate[3] __attribute__((packed)); + u_int8_t AccountExpireDate[3]; #endif - u_int8_t Disabled __attribute__((packed)); + u_int8_t Disabled; #ifdef SWIG fixedArray PasswordExpireDate[3]; #else - u_int8_t PasswordExpireDate[3] __attribute__((packed)); + u_int8_t PasswordExpireDate[3]; #endif - u_int8_t GraceLogins __attribute__((packed)); + u_int8_t GraceLogins; u_int16_t PasswordExpireInterval __attribute__((packed)); - u_int8_t MaxGraceLogins __attribute__((packed)); - u_int8_t MinPasswordLength __attribute__((packed)); + u_int8_t MaxGraceLogins; + u_int8_t MinPasswordLength; u_int16_t MaxConnections __attribute__((packed)); #ifdef SWIG fixedArray ConnectionTimeMask[42] __attribute__((packed)); fixedArray LastLogin[6] __attribute__((packed)); #else - u_int8_t ConnectionTimeMask[42] __attribute__((packed)); - u_int8_t LastLogin[6] __attribute__((packed)); + u_int8_t ConnectionTimeMask[42]; + u_int8_t LastLogin[6]; #endif - u_int8_t RestrictionMask __attribute__((packed)); - u_int8_t reserved __attribute__((packed)); + u_int8_t RestrictionMask; + u_int8_t reserved; u_int32_t MaxDiskUsage __attribute__((packed)); u_int16_t BadLoginCount __attribute__((packed)); u_int32_t BadLoginCountDown __attribute__((packed)); - struct ncp_station_addr LastIntruder __attribute__((packed)); + struct ncp_station_addr LastIntruder; } __attribute__((packed)); NWCCODE NWReadPropertyValue(NWCONN_HANDLE conn, const char *objName, diff -r 329b32c7d8a6 -r 7783da47228e ipx-1.0/ipx_cmd.c --- a/ipx-1.0/ipx_cmd.c Thu Apr 13 19:59:28 2006 +0200 +++ b/ipx-1.0/ipx_cmd.c Thu Apr 13 22:53:06 2006 +0200 @@ -63,10 +63,10 @@ /* we are doing EthernetII... Any objections? */ struct { u_int16_t unknown __attribute__((packed)); - u_int8_t dst[6] __attribute__((packed)); - u_int8_t src[6] __attribute__((packed)); + u_int8_t dst[6]; + u_int8_t src[6]; u_int16_t type __attribute__((packed)); - u_int8_t ipx[16384] __attribute__((packed)); + u_int8_t ipx[16384]; } __attribute__((packed)) buffer; static int getiflist(int fd, struct ifconf* ifc) { diff -r 329b32c7d8a6 -r 7783da47228e lib/ncplib.c --- a/lib/ncplib.c Thu Apr 13 19:59:28 2006 +0200 +++ b/lib/ncplib.c Thu Apr 13 22:53:06 2006 +0200 @@ -2627,13 +2627,13 @@ ncp_request(struct ncp_conn *conn, int f struct nw_time_buffer { - u_int8_t year __attribute__((packed)); - u_int8_t month __attribute__((packed)); - u_int8_t day __attribute__((packed)); - u_int8_t hour __attribute__((packed)); - u_int8_t minute __attribute__((packed)); - u_int8_t second __attribute__((packed)); - u_int8_t wday __attribute__((packed)); + u_int8_t year; + u_int8_t month; + u_int8_t day; + u_int8_t hour; + u_int8_t minute; + u_int8_t second; + u_int8_t wday; } __attribute__((packed)); static time_t ++++++ ncpfs-hg-commit-455.patch ++++++ changeset: 455:69f23e25cc66 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat Apr 15 04:25:06 2006 +0200 files: lib/ds/filter.c lib/nwnet.c util/nwdir.c description: Fix some more gcc-4.1 warnings gcc-4.1 is even more stupid than gcc-4.0 was when it comes to uninitialized variables - if function either returns an error, or returns success and modifies its argument, you can be almost 100% sure that gcc-4.1 will tag this with warning if you call some other function between this one, before you'll test function's return value. Just crap, probably it is time to disable all warnings, as they are more than useless. diff -r 7783da47228e -r 69f23e25cc66 lib/ds/filter.c --- a/lib/ds/filter.c Thu Apr 13 22:53:06 2006 +0200 +++ b/lib/ds/filter.c Sat Apr 15 04:25:06 2006 +0200 @@ -303,7 +303,7 @@ static void _PutFilterFirstPass( } else { /* different operand: go to next node in created chain */ - last_q = (struct _filter_node**)&q->value; + last_q = (struct _filter_node**)(void*)&q->value; q = q->value; } } diff -r 7783da47228e -r 69f23e25cc66 lib/nwnet.c --- a/lib/nwnet.c Thu Apr 13 22:53:06 2006 +0200 +++ b/lib/nwnet.c Sat Apr 15 04:25:06 2006 +0200 @@ -1696,7 +1696,7 @@ restartLoop:; NWCONN_HANDLE conn = list_entry(current, struct ncp_conn, nds_ring); NWObjectCount connaddresses; nuint8* conndata; - NWCCODE err2; + NWDSCCODE err2; /* compare addresses */ ncpt_mutex_unlock(&nds_ring_lock); @@ -2808,6 +2808,8 @@ static NWDSCCODE NWDSGetAttrVal_OBJECT_A if (err) return err; err = NWDSBufGetLE32(buffer, &priv); + if (err) + return err; oacl->privileges = priv; return err; } @@ -4149,6 +4151,8 @@ NWDSCCODE NWDSGetServerName(NWDSContextH if (err) return err; err = NWDSBufGetLE32(buffer, &le32); + if (err) + return err; if (partcount) *partcount = le32; return 0; diff -r 7783da47228e -r 69f23e25cc66 util/nwdir.c --- a/util/nwdir.c Thu Apr 13 22:53:06 2006 +0200 +++ b/util/nwdir.c Sat Apr 15 04:25:06 2006 +0200 @@ -521,7 +521,9 @@ static void dumpit(NWCONN_HANDLE conn, c err = NWNSGetEffectiveRights(conn, dir.volNumber, dir.DosDirNum, &eff); - eff32 = eff; + if (!err) { + eff32 = eff; + } } printf(_(" Effective: ")); if (err) { ++++++ ncpfs-hg-commit-456.patch ++++++ changeset: 456:260a30abdb81 user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat Apr 15 04:41:06 2006 +0200 files: contrib/ncp_nss_lib/nss_cfgfile.c contrib/ncp_nss_lib/nss_cfgfile.h description: Fix nss_ncp strict aliasing problems It is bad idea to convert pointer to integer to pointer to char pointer, and in addition this is also unnecessary. And removal of this typecast revealed that we believe that 'int' and 'gid_t' and 'uid_t' have same width. This is unreasonable assumption, I personally remember time when uid_t was 16bit, while int was 32bit... diff -r 69f23e25cc66 -r 260a30abdb81 contrib/ncp_nss_lib/nss_cfgfile.c --- a/contrib/ncp_nss_lib/nss_cfgfile.c Sat Apr 15 04:25:06 2006 +0200 +++ b/contrib/ncp_nss_lib/nss_cfgfile.c Sat Apr 15 04:41:06 2006 +0200 @@ -108,9 +108,9 @@ struct check { const char *option; /* configuration option */ int mandatory; /* can be empty or null */ int found; /*set to TRUE if found in cfg file */ - char ** value_ptr; /* temporary storage place */ - int isNum; /* 1 is numeric, 0 is string*/ - const char* defValue; + char ** char_ptr; /* where to store string value */ + int * int_ptr; /* where to store integer value */ + const char* defValue; /* default value */ }; @@ -119,12 +119,12 @@ void printResults (const char * infos,st struct check* ptr; printf ("%s\n",infos); for (ptr=results; ptr->option; ptr++) { - if (ptr->isNum) - printf ("option=%s mandatory=%d found=%d value=%d isNum=%d defvalue=%s\n", - ptr->option,ptr->mandatory,ptr->found,*(int**)ptr->value_ptr,ptr->isNum,ptr->defValue); + if (ptr->int_ptr) + printf ("option=%s mandatory=%d found=%d value=%d defvalue=%s\n", + ptr->option,ptr->mandatory,ptr->found,*ptr->int_ptr,ptr->defValue); else - printf ("option=%s mandatory=%d found=%d value=%s isNum=%d defvalue=%s\n", - ptr->option,ptr->mandatory,ptr->found,*ptr->value_ptr,ptr->isNum,ptr->defValue); + printf ("option=%s mandatory=%d found=%d value=%s defvalue=%s\n", + ptr->option,ptr->mandatory,ptr->found,*ptr->char_ptr,ptr->defValue); } } @@ -175,14 +175,14 @@ static int process_line (char* cptr, str eptr++; } *eptr = 0; - if (ptr->isNum) { - *(int*)ptr->value_ptr=strtoul (sptr,&errPtr,0); + if (ptr->int_ptr) { + *ptr->int_ptr=strtoul (sptr,&errPtr,0); ptr->found= ((*sptr) && !(*errPtr)); //not empty and no error } else { if (eptr>sptr) { // do not take an empty string value char *v=strdup(sptr); if (v) { - *ptr->value_ptr=v; + *ptr->char_ptr=v; ptr->found= TRUE; }else return 1; @@ -201,12 +201,12 @@ static int fix_conf (struct check *resul traceForce(0,LOG_ERR, "ncp_nss aborting :missing mandatory information '%s=' in config file %s ",ptr->option,GLOBALCFGFILE); return 1; } - if (ptr->isNum) { - *(int*)ptr->value_ptr=strtoul (ptr->defValue,NULL,0); + if (ptr->int_ptr) { + *ptr->int_ptr=strtoul (ptr->defValue,NULL,0); }else { char * v=strdup(ptr->defValue); if (v) - *ptr->value_ptr=v; + *ptr->char_ptr=v; else return 1; } @@ -225,20 +225,20 @@ static struct nss_ncp_conf *read_conf_fi return NULL; { struct check check_confs[] = { - /*option mandat found value_ptr isNum defValue */ - {"debug", FALSE,FALSE,(char**)&conf->debug, TRUE, "0"}, - {"useTree", FALSE,FALSE,(char**)&conf->useTree, TRUE, "0"}, - {"server", TRUE, FALSE, &conf->server, FALSE, ""}, - {"startCtx", FALSE,FALSE, &conf->startCtx, FALSE, ""}, - {"ctrlGroup", FALSE,FALSE, &conf->ctrlGroup, FALSE, ""}, - {"defGid", FALSE,FALSE,(char**)&conf->defGid, TRUE, "100"}, - {"defShell", FALSE,FALSE, &conf->defShell, FALSE, "/bin/bash"}, - {"fallbackUid", FALSE,FALSE,(char**)&conf->fallbackUid, TRUE, "-1"}, - {"fallbackGid", FALSE,FALSE,(char**)&conf->fallbackGid, TRUE, "-1"}, - {"doPasswd", FALSE,FALSE,(char**)&conf->doPassword, TRUE, "0"}, - {"doGroup", FALSE,FALSE,(char**)&conf->doGroup, TRUE, "0"}, - {"doShadow", FALSE,FALSE,(char**)&conf->doShadow, TRUE, "0"}, - {NULL , FALSE,FALSE, NULL, FALSE, NULL} + /*option mandat found char_ptr int_ptr defValue */ + {"debug", FALSE,FALSE, NULL, &conf->debug, "0"}, + {"useTree", FALSE,FALSE, NULL, &conf->useTree, "0"}, + {"server", TRUE, FALSE, &conf->server, NULL, ""}, + {"startCtx", FALSE,FALSE, &conf->startCtx, NULL, ""}, + {"ctrlGroup", FALSE,FALSE, &conf->ctrlGroup, NULL, ""}, + {"defGid", FALSE,FALSE, NULL, &conf->defGid, "100"}, + {"defShell", FALSE,FALSE, &conf->defShell, NULL, "/bin/bash"}, + {"fallbackUid", FALSE,FALSE, NULL, &conf->fallbackUid, "-1"}, + {"fallbackGid", FALSE,FALSE, NULL, &conf->fallbackGid, "-1"}, + {"doPasswd", FALSE,FALSE, NULL, &conf->doPassword, "0"}, + {"doGroup", FALSE,FALSE, NULL, &conf->doGroup, "0"}, + {"doShadow", FALSE,FALSE, NULL, &conf->doShadow, "0"}, + {NULL , FALSE,FALSE, NULL, NULL, NULL} }; char cfgline[16384]; diff -r 69f23e25cc66 -r 260a30abdb81 contrib/ncp_nss_lib/nss_cfgfile.h --- a/contrib/ncp_nss_lib/nss_cfgfile.h Sat Apr 15 04:25:06 2006 +0200 +++ b/contrib/ncp_nss_lib/nss_cfgfile.h Sat Apr 15 04:41:06 2006 +0200 @@ -11,10 +11,10 @@ struct nss_ncp_conf { char * server; // name of server or tree char * startCtx; // start searching is this context (and below) char * ctrlGroup; // limit search to members of this NDS group for passwd and shadow - gid_t defGid; // if no primary group found in NDS use this value + int defGid; // if no primary group found in NDS use this value char * defShell; // if no shell found in NDS use this value - uid_t fallbackUid; // if no UID found in NDS use this one (-1= skip user, NFS_NOBODY= use this UID) - gid_t fallbackGid; // if no GID found in NDS use this one (-1= skip group, NFS_NOBODY= use this GID) + int fallbackUid; // if no UID found in NDS use this one (-1= skip user, NFS_NOBODY= use this UID) + int fallbackGid; // if no GID found in NDS use this one (-1= skip group, NFS_NOBODY= use this GID) int doPassword; // if 0, will return immediarly NSS_STATUS_UNAVAILABLE even if ncp is listed in /etc/nsswitch.conf int doGroup; // if 0, will return immediarly NSS_STATUS_UNAVAILABLE even if ncp is listed in /etc/nsswitch.conf int doShadow; // if 0, will return immediarly NSS_STATUS_UNAVAILABLE even if ncp is listed in /etc/nsswitch.conf ++++++ ncpfs-hg-commit-457.patch ++++++ changeset: 457:0e4dca2d0b0d user: Petr Vandrovec <petr(a)vandrovec.name> date: Sat Apr 15 05:02:48 2006 +0200 files: contrib/ncp_nss_lib/nss_cfgfile.c description: Fix nss_cfgfile.c formatting Fix nss_cfgfile.c formatting a bit. And make some constant arguments constant. diff -r 260a30abdb81 -r 0e4dca2d0b0d contrib/ncp_nss_lib/nss_cfgfile.c --- a/contrib/ncp_nss_lib/nss_cfgfile.c Sat Apr 15 04:41:06 2006 +0200 +++ b/contrib/ncp_nss_lib/nss_cfgfile.c Sat Apr 15 05:02:48 2006 +0200 @@ -50,18 +50,22 @@ // #define DEBUG 1 -static struct nss_ncp_conf* alloc_nss_ncp_conf (void){ +static struct nss_ncp_conf* +alloc_nss_ncp_conf(void) +{ struct nss_ncp_conf * conf; - conf= (struct nss_ncp_conf *)malloc(sizeof(*conf)); + conf = malloc(sizeof(*conf)); if (!conf) return NULL; return conf; } -void free_nss_ncp_conf (struct nss_ncp_conf *conf){ -#define FREEFIELD(x) do if (conf->x) {free(conf->x) ; conf->x=NULL;} while (0); +void +free_nss_ncp_conf(struct nss_ncp_conf *conf) +{ +#define FREEFIELD(x) do if (conf->x) { free(conf->x); conf->x = NULL; } while (0); if (conf) { FREEFIELD(server); FREEFIELD(startCtx); @@ -77,12 +81,13 @@ struct cfgFile { FILE* file; }; -static struct cfgFile* cfgOpenFile( - const char* path, - int writeRequired) { +static struct cfgFile* +cfgOpenFile(const char* path, + int writeRequired) +{ struct cfgFile* cfg; - cfg = (struct cfgFile*)malloc(sizeof(*cfg)); + cfg = malloc(sizeof(*cfg)); if (cfg) { cfg->file = fopen(path, writeRequired ? "r+" : "r"); if (cfg->file) { @@ -95,8 +100,9 @@ static struct cfgFile* cfgOpenFile( return cfg; } -static void cfgClose( - struct cfgFile* cfg) { +static void +cfgClose(struct cfgFile* cfg) +{ ncpt_mutex_lock(&cfg->mutex); fclose(cfg->file); ncpt_mutex_destroy(&cfg->mutex); @@ -105,46 +111,52 @@ static void cfgClose( struct check { - const char *option; /* configuration option */ - int mandatory; /* can be empty or null */ - int found; /*set to TRUE if found in cfg file */ - char ** char_ptr; /* where to store string value */ - int * int_ptr; /* where to store integer value */ - const char* defValue; /* default value */ + const char *option; /* configuration option */ + int mandatory; /* can be empty or null */ + int found; /* set to TRUE if found in cfg file */ + char **char_ptr; /* where to store string value */ + int *int_ptr; /* where to store integer value */ + const char *defValue; /* default value */ }; #ifdef DEBUG -void printResults (const char * infos,struct check * results) { - struct check* ptr; - printf ("%s\n",infos); - for (ptr=results; ptr->option; ptr++) { +void +printResults(const char *infos, const struct check *results) +{ + const struct check *ptr; + + printf ("%s\n", infos); + for (ptr = results; ptr->option; ptr++) { if (ptr->int_ptr) printf ("option=%s mandatory=%d found=%d value=%d defvalue=%s\n", - ptr->option,ptr->mandatory,ptr->found,*ptr->int_ptr,ptr->defValue); + ptr->option, ptr->mandatory, ptr->found, *ptr->int_ptr, ptr->defValue); else printf ("option=%s mandatory=%d found=%d value=%s defvalue=%s\n", - ptr->option,ptr->mandatory,ptr->found,*ptr->char_ptr,ptr->defValue); - } - -} - -void printConf (const char* infos,struct nss_ncp_conf * conf) { - printf ("%s\n",infos); - printf ("debug=%d useTree=%d server=%s startCtx=%s ctrlGroup=%s defGid=%d defShell=%s fallbackUid=%d fallbackGid=%d " + ptr->option, ptr->mandatory, ptr->found, *ptr->char_ptr, ptr->defValue); + } + +} + +void +printConf(const char *infos, const struct nss_ncp_conf *conf) +{ + printf ("%s\n", infos); + printf ("debug=%d useTree=%d server=%s startCtx=%s ctrlGroup=%s defGid=%u defShell=%s fallbackUid=%u fallbackGid=%u " "doPassword=%d doGroup=%d doShadow=%d\n", - conf->debug,conf->useTree,conf->server,conf->startCtx, - conf->ctrlGroup,conf->defGid,conf->defShell,conf->fallbackUid,conf->fallbackGid, - conf->doPassword,conf->doGroup,conf->doShadow); -} -#endif - - -static int process_line (char* cptr, struct check *ptr) { - - char* sptr; // start of real value - char* eptr; // end of real value - char* errPtr; // err + conf->debug, conf->useTree, conf->server, conf->startCtx, + conf->ctrlGroup, conf->defGid, conf->defShell, conf->fallbackUid, conf->fallbackGid, + conf->doPassword, conf->doGroup, conf->doShadow); +} +#endif + + +static int +process_line(const char *cptr, struct check *ptr) +{ + + const char* sptr; // start of real value + const char* eptr; // end of real value char ec; char cc; @@ -163,8 +175,8 @@ static int process_line (char* cptr, str ec = *cptr++; else ec = 0; - sptr=cptr; - eptr=cptr; + sptr = cptr; + eptr = cptr; while ((cc = *cptr++) != 0) { if (cc == '\n') break; @@ -174,39 +186,43 @@ static int process_line (char* cptr, str break; eptr++; } - *eptr = 0; - if (ptr->int_ptr) { - *ptr->int_ptr=strtoul (sptr,&errPtr,0); - ptr->found= ((*sptr) && !(*errPtr)); //not empty and no error - } else { - if (eptr>sptr) { // do not take an empty string value - char *v=strdup(sptr); + if (eptr != sptr) { + if (ptr->int_ptr) { + char* errPtr; // err + + *ptr->int_ptr = strtoul(sptr, &errPtr, 0); + ptr->found = errPtr == eptr; + } else { + char *v = malloc(eptr - sptr + 1); if (v) { - *ptr->char_ptr=v; - ptr->found= TRUE; - }else + memcpy(v, sptr, eptr - sptr); + v[eptr - sptr] = 0; + *ptr->char_ptr = v; + ptr->found = TRUE; + } else return 1; } } - return 0; } -static int fix_conf (struct check *results) { +static int +fix_conf(struct check *results) +{ struct check* ptr; - for (ptr=results; ptr->option; ptr++) { - if (! ptr->found) { - if (ptr->mandatory) { - traceForce(0,LOG_ERR, "ncp_nss aborting :missing mandatory information '%s=' in config file %s ",ptr->option,GLOBALCFGFILE); + for (ptr = results; ptr->option; ptr++) { + if (!ptr->found) { + if (ptr->mandatory) { + traceForce(0, LOG_ERR, "ncp_nss aborting :missing mandatory information '%s=' in config file %s", ptr->option, GLOBALCFGFILE); return 1; } if (ptr->int_ptr) { - *ptr->int_ptr=strtoul (ptr->defValue,NULL,0); - }else { - char * v=strdup(ptr->defValue); + *ptr->int_ptr = strtoul(ptr->defValue, NULL, 0); + } else { + char *v = strdup(ptr->defValue); if (v) - *ptr->char_ptr=v; + *ptr->char_ptr = v; else return 1; } @@ -216,38 +232,38 @@ static int fix_conf (struct check *resul } -static struct nss_ncp_conf *read_conf_file( const char * mySection, struct cfgFile *cfg) { - +static struct nss_ncp_conf * +read_conf_file(const char * mySection, struct cfgFile *cfg) +{ struct nss_ncp_conf *conf; - conf=alloc_nss_ncp_conf (); + conf = alloc_nss_ncp_conf(); if (!conf) return NULL; { struct check check_confs[] = { - /*option mandat found char_ptr int_ptr defValue */ - {"debug", FALSE,FALSE, NULL, &conf->debug, "0"}, - {"useTree", FALSE,FALSE, NULL, &conf->useTree, "0"}, - {"server", TRUE, FALSE, &conf->server, NULL, ""}, - {"startCtx", FALSE,FALSE, &conf->startCtx, NULL, ""}, - {"ctrlGroup", FALSE,FALSE, &conf->ctrlGroup, NULL, ""}, - {"defGid", FALSE,FALSE, NULL, &conf->defGid, "100"}, - {"defShell", FALSE,FALSE, &conf->defShell, NULL, "/bin/bash"}, - {"fallbackUid", FALSE,FALSE, NULL, &conf->fallbackUid, "-1"}, - {"fallbackGid", FALSE,FALSE, NULL, &conf->fallbackGid, "-1"}, - {"doPasswd", FALSE,FALSE, NULL, &conf->doPassword, "0"}, - {"doGroup", FALSE,FALSE, NULL, &conf->doGroup, "0"}, - {"doShadow", FALSE,FALSE, NULL, &conf->doShadow, "0"}, - {NULL , FALSE,FALSE, NULL, NULL, NULL} + /*option mandati found char_ptr int_ptr defValue */ + {"debug", FALSE, FALSE, NULL, &conf->debug, "0"}, + {"useTree", FALSE, FALSE, NULL, &conf->useTree, "0"}, + {"server", TRUE, FALSE, &conf->server, NULL, ""}, + {"startCtx", FALSE, FALSE, &conf->startCtx, NULL, ""}, + {"ctrlGroup", FALSE, FALSE, &conf->ctrlGroup, NULL, ""}, + {"defGid", FALSE, FALSE, NULL, &conf->defGid, "100"}, + {"defShell", FALSE, FALSE, &conf->defShell, NULL, "/bin/bash"}, + {"fallbackUid", FALSE, FALSE, NULL, &conf->fallbackUid, "-1"}, + {"fallbackGid", FALSE, FALSE, NULL, &conf->fallbackGid, "-1"}, + {"doPasswd", FALSE, FALSE, NULL, &conf->doPassword, "0"}, + {"doGroup", FALSE, FALSE, NULL, &conf->doGroup, "0"}, + {"doShadow", FALSE, FALSE, NULL, &conf->doShadow, "0"}, + {NULL, FALSE, FALSE, NULL, NULL, NULL} }; char cfgline[16384]; size_t seclen = strlen(mySection); - #ifdef DEBUG // DO NOT DO IT A a second call (using test_ncp_nss -2) coredump !!! -// printResults("before reading CFG",check_confs); +// printResults("before reading CFG", check_confs); #endif ncpt_mutex_lock(&cfg->mutex); //rewind(cfg->file); @@ -270,13 +286,13 @@ static struct nss_ncp_conf *read_conf_fi cptr++; if (!*cptr) continue; //empty line - if (*cptr == '[') // start of another section + if (*cptr == '[') // start of another section goto ssend; - for (ptr=check_confs; ptr->option; ptr++) { - size_t keylen=strlen(ptr->option); - if (!strncasecmp(cptr, ptr->option,keylen)) { + for (ptr = check_confs; ptr->option; ptr++) { + size_t keylen = strlen(ptr->option); + if (!strncasecmp(cptr, ptr->option, keylen)) { cptr += keylen; - process_line (cptr,ptr); + process_line(cptr, ptr); } } } @@ -284,22 +300,22 @@ static struct nss_ncp_conf *read_conf_fi ssend: #ifdef DEBUG - printResults("after reading CFG no error",check_confs); -#endif -#ifdef DEBUG - printConf("before fixing ",conf); -#endif - - if (!fix_conf (check_confs)) { // fill in missing values with default, -#ifdef DEBUG - printConf("after fixing ",conf); + printResults("after reading CFG no error", check_confs); +#endif +#ifdef DEBUG + printConf("before fixing ", conf); +#endif + + if (!fix_conf (check_confs)) { // fill in missing values with default, +#ifdef DEBUG + printConf("after fixing ", conf); #endif ncpt_mutex_unlock(&cfg->mutex); return conf; } #ifdef DEBUG - printResults("after reading CFG error",check_confs); + printResults("after reading CFG error", check_confs); #endif ncpt_mutex_unlock(&cfg->mutex); free_nss_ncp_conf(conf); @@ -308,7 +324,9 @@ ssend: } -struct nss_ncp_conf* parse_conf(void) { +struct nss_ncp_conf* +parse_conf(void) +{ struct cfgFile *cfg; struct nss_ncp_conf *conf; #ifdef DEBUG @@ -317,11 +335,11 @@ struct nss_ncp_conf* parse_conf(void) { cfg = cfgOpenFile(GLOBALCFGFILE, FALSE); if (!cfg) return NULL; - conf=read_conf_file(NSS_SECTION,cfg); + conf = read_conf_file(NSS_SECTION, cfg); cfgClose(cfg); #ifdef DEBUG if (conf) - printConf("final value ",conf); + printConf("final value ", conf); #endif return conf; ++++++ ncpfs-hg-commit-458.patch ++++++ changeset: 458:92f2133262a8 parent: 455:69f23e25cc66 user: Rodrigo Rubira Branco <rrbranco(a)br.ibm.com> date: Wed Jun 21 23:24:15 2006 +0200 files: man/Makefile.in man/ncplogin.8 man/ncpmap.8 description: Add ncpmap and ncplogin manpages Provide manpages for ncpmap and ncplogin. diff -r 69f23e25cc66 -r 92f2133262a8 man/Makefile.in --- a/man/Makefile.in Sat Apr 15 04:25:06 2006 +0200 +++ b/man/Makefile.in Wed Jun 21 23:24:15 2006 +0200 @@ -24,7 +24,7 @@ MAN8 := nwbocreate.8 nwborm.8 nwbpadd.8 nwgrant.8 nwrevoke.8 ifeq ($(USE_KERNEL),1) MAN1 += ncopy.1 -MAN8 += ncpmount.8 ncpumount.8 +MAN8 += ncpmount.8 ncpumount.8 ncplogin.8 ncpmap.8 endif MAN8 += nwmsg.8 diff -r 69f23e25cc66 -r 92f2133262a8 man/ncplogin.8 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/man/ncplogin.8 Wed Jun 21 23:24:15 2006 +0200 @@ -0,0 +1,104 @@ +.\" Copyright (c) International Business Machines Corp., 2006 +.\" +.\" This file is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See +.\" the GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License +.\" along with this file; if not, write to the Free Software +.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, +.\" MA 02111-1307 USA +.\" +.\" HISTORY: +.\" 2006-06-01, created by Rodrigo Rubira Branco <rrbranco(a)br.ibm.com> +.TH ncplogin 8 "Jun, 01 2006" "NCPFS" "NCPFS" +.SH NAME +ncplogin \- establishes identity to the Netware server or tree +.SH SYNOPSIS +.nf +.fam C +\fBncplogin [OPTIONS]\fP +.fam T +.fi +.SH DESCRIPTION +\fBncplogin\fP and \fBncpmap\fP provide a way for you to split the ncpmount operation into halves, with \fBncplogin\fP establishing your identity to the server or tree. \fBncpmap\fP mounts it later. +.SH OPTIONS +.B -T tree +Tree name to be used. + +.B -S server +Server name to be used. The -S and -T options are mutually exclusive. + +\fB-X name_ctx\fP +Default name context to be used. + +\fB-E\fP +Echoes the value of final mount_point. + +\fB-U username\fP +Username sent to server. + +\fB-u uid\fP +Uid given the mounted files. + +\fB-g gid\fP +Gid given the mounted files. + +\fB-c uid\fP +Uid to identify the connection on which to mount. Only appropriate for root. + +\fB-C\fP +Do not convert password to uppercase. + +\fB-P password\fP +Use this password. + +\fB-n\fP +Do not use any password. +If neither -P nor -n is given, you are asked for a password. + +\fB-f mode\fP +Permission given the files, in octal notation. + +\fB-d mode\fP +Permission given the directories, in octal notation. + +\fB-t time_out\fP +Time, in 1/100s of a second, to wait for an answer from the server. Default is 60. + +\fB-r retry_count\fP +Number of retry attempts. Default is 5. + +\fB-s\fP +Enable renaming and deletion of read-only files. + +\fB-h\fP +Print the help text. + +\fB-v\fP +Print ncpfs version number. + +\fB-i level\fP +Signature level. 0 = never, 1 = supported, 2 = preferred, 3 = required. + +\fB-N os2,nfs\fP +Do not use the specified namespaces on mounted volume. + +\fB-y charset\fP +Character set used for input and display. + +\fB-p codepage\fP +Codepage used on volume, including letters "cp." + +\fB-B bcast\fP +Broadcast mode. 0 = all 1 = console 2 = none. Default is all. + +\fB-l\fP +Autocreate mounting point if needed in /mnt/ncp/SERVER/VOLUME. +.SH SECURITY +\fBncplogin\fP must be setuid to permit non-root users use of it. In these cases, mounting ncpfs will enforce nodev and nosetuid mount options. +.SH SEE ALSO +\fBncpmap\fP(1), \fBncpmount\fP(8) +.SH AUTHOR +Manpage written by Rodrigo Rubira Branco <rrbranco(a)br.ibm.com> with help from Petr Vandrovec <petr(a)vandrovec.name>. diff -r 69f23e25cc66 -r 92f2133262a8 man/ncpmap.8 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/man/ncpmap.8 Wed Jun 21 23:24:15 2006 +0200 @@ -0,0 +1,94 @@ +.\" Copyright (c) International Business Machines Corp., 2006 +.\" +.\" This file is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See +.\" the GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License +.\" along with this file; if not, write to the Free Software +.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, +.\" MA 02111-1307 USA +.\" +.\" HISTORY: +.\" 2006-06-01, created by Rodrigo Rubira Branco <rrbranco(a)br.ibm.com> +.TH ncpmap 8 "Jun, 01 2006" "NCPFS" "NCPFS" +.SH NAME +ncpmap \- mounts some resource from Netware server or tree previously connected with ncplogin +.SH SYNOPSIS +.nf +.fam C +\fBncpmap [OPTIONS] [-a] [mount-point]\fP +.fam T +.fi +.SH DESCRIPTION +\fBncplogin\fP and \fBncpmap\fP provide a way to split the ncpmount operation into halves, with \fBncpmap\fP mounting the resource previously authenticated with \fBncplogin\fP. +.SH OPTIONS +\fBmount_point\fP is optional if you specify the -a option. + +\fB-T tree\fP +Tree name to be used. + +\fB-S server\fP +Server name to be used. The -T and -S options are mutually exclusive. + +\fB-X name_ctx\fP +Default name context to be used. + +\fB-E\fP +Echo value of final mount_point. + +\fB-V volume\fP +Volume to mount. This must be in binary format if -S server, or in NDS format if -T tree. + +\fB-R path\fP +Path in volume to "map root." + +\fB-f mode\fP +Permission given the files, in octal notation. + +\fB-d mode\fP +Permission given the directories, in octal notation. + +\fB-t time_out\fP +Waiting time, in 1/100s of a second, to wait for an answer from the server. Default is 60. + +\fB-r retry_count\fP +Number of retry attempts. Default is 5. + +\fB-s\fP +Enable renaming or deletion of read-only files. + +\fB-h\fP +Print help text. + +\fB-v\fP +Print ncpfs version number. + +\fB-i level\fP +Signature level. 0 = never, 1 = supported, 2 = preferred, and 3 = required. + +\fB-N os2,nfs\fP +Do not use specified namespaces on mounted volume. + +\fB-y charset\fP +Character set used for input and display. + +\fB-p codepage\fP +Codepage used on volume, including letters "cp." + +\fB-B bcast\fP +Broadcast mode. 0 = all, 1 = console, and 2 = none. Default is all. + +\fB-a\fP +Autocreate mounting point if needed in ~/ncp/SERVER/VOLUME. + +\fB-l\fP +Autocreate mounting point if needed in /mnt/ncp/SERVER/VOLUME. + +.SH SECURITY +\fBncpmap\fP must be setuid to permit non-root users use of it. In these cases, it will enforce nodev and nosetuid mount options. +.SH SEE ALSO +\fBncplogin\fP(1), \fBncpmount\fP(8) +.SH AUTHOR +Manpage written by Rodrigo Rubira Branco <rrbranco(a)br.ibm.com> with Petr Vandrovec <petr(a)vandrovec.name>. ++++++ ncpfs.LDFLAGS.patch ++++++ --- /var/tmp/diff_new_pack.s15681/_old 2007-05-18 00:01:18.000000000 +0200 +++ /var/tmp/diff_new_pack.s15681/_new 2007-05-18 00:01:18.000000000 +0200 @@ -1,11 +1,10 @@ - sutil/Makefile.in | 3 ++- - 3 files changed, 4 insertions(+), 3 deletions(-) + lib/Makefile.in | 5 +++-- + sutil/Makefile.in | 11 +++++++---- + 2 files changed, 10 insertions(+), 6 deletions(-) -Index: ncpfs-2.2.6/sutil/Makefile.in -================================================================================ ---- ncpfs-2.2.6/lib/Makefile.in +--- ncpfs-2.2.6.orig/lib/Makefile.in +++ ncpfs-2.2.6/lib/Makefile.in -@@ -21,6 +21,7 @@ +@@ -21,6 +21,7 @@ STATIC_NCPLIB := libncp.$(libext) STATIC_NCPLIB_BIN := $(STATIC_NCPLIB) CCFLAGS += -I. @@ -13,7 +12,7 @@ PIC_FLAGS := -fPIC NWCOMPAT := 1 -@@ -57,7 +58,7 @@ +@@ -57,7 +58,7 @@ NDS_CFLAGS := $(BASE_CFLAGS) -DPORTABLE CFLAGS_ncplib.o := -DNWSFIND=\"$(bindir)/nwsfind\" CFLAGS_cfgfile.o := -DGLOBALCFGFILE=\"$(sysconfdir)/ncpfs.conf\" @@ -22,7 +21,7 @@ SHARED_CFLAGS := $(CFLAGS) $(CCFLAGS) $(REENTRANT_CFLAGS) $(PIC_FLAGS) $(SHARED_VLINK_CFLAGS) .PHONY : all dep install install-dev clean mrproper distclean -@@ -122,7 +123,7 @@ +@@ -127,7 +128,7 @@ $(SHARED_NCPLIB): $(SHARED_NCPLIB_BIN) ln -sf $< $@ $(SHARED_NCPLIB_BIN): $(SHARED_O_OBJ) ${this_srcdir}/libncp.vers @@ -31,9 +30,9 @@ install_static: $(STATIC_NCPLIB_BIN) $(INSTALL) -d $(DESTDIR)$(libadir) ---- ncpfs-2.2.6/sutil/Makefile.in +--- ncpfs-2.2.6.orig/sutil/Makefile.in +++ ncpfs-2.2.6/sutil/Makefile.in -@@ -18,6 +18,9 @@ +@@ -18,6 +18,9 @@ LIBS = @INTLLIBS@ @LIBICONV@ @LIBS@ # environ in ncpmount CCFLAGS += -D_GNU_SOURCE @@ -43,7 +42,7 @@ O_UTILS := nwsfind.o ifeq ($(USE_KERNEL),1) O_UTILS += ncpmount.o ncpumount.o -@@ -61,7 +64,7 @@ +@@ -58,7 +61,7 @@ endif install-dev: $(O_UTILS): %.o: %.c @@ -52,8 +51,8 @@ $(O_UTILS:.o=.d): %.d: %.c set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \ -@@ -69,7 +72,7 @@ - [ -s $@ ] || rm -f $@ +@@ -70,7 +73,7 @@ ncplogin: ncpm_common.o mount_login.o + ncpmap: ncpm_common.o ncpmap.o: %.o: ncplogin.c - $(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $< @@ -61,7 +60,7 @@ ncpmap.d: %.d: ncplogin.c set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \ -@@ -77,7 +80,7 @@ +@@ -78,7 +81,7 @@ ncpmap.d: %.d: ncplogin.c [ -s $@ ] || rm -f $@ ncpm_common.o mount_login.o: %.o: %.c @@ -70,12 +69,12 @@ ncpm_common.d mount_login.d: %.d: %.c set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \ -@@ -85,7 +88,7 @@ +@@ -86,7 +89,7 @@ ncpm_common.d mount_login.d: %.d: %.c [ -s $@ ] || rm -f $@ - $(UTILS): %: %.o ../lib/libncp.a ncpm_common.o mount_login.o -- $(CC) @GC_SECTIONS@-o $@ $(addsuffix .o,$@) $(LDFLAGS_$@) ../lib/libncp.a ${LIBS} -+ $(CC) @GC_SECTIONS@-o $@ $(addsuffix .o,$@) $(PIE_LDFLAGS) $(LDFLAGS_$@) ../lib/libncp.a ${LIBS} + $(UTILS): %: %.o ../lib/libncp.$(libext) +- $(CC) @GC_SECTIONS@-o $@ $^ ${LIBS} ++ $(CC) @GC_SECTIONS@-o $@ $^ $(PIE_LDFLAGS) ${LIBS} - ../lib/libncp.a: - make -C ../lib libncp.a + ../lib/libncp.$(libext): + make -C ../lib libncp.$(libext) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdebase3
by root＠Hilbert.suse.de 17 May '07

17 May '07

Hello community, here is the log from the commit of package kdebase3 checked in at Fri May 18 00:01:06 CEST 2007. -------- --- KDE/kdebase3/kdebase3.changes 2007-05-10 14:20:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2007-05-16 09:57:24.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 15 14:06:01 CEST 2007 - dmueller(a)suse.de + +- drop python requirement +- only install kdebase3-beagle when both kdebase3 and beagle + are selected + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.nP9803/_old 2007-05-18 00:00:08.000000000 +0200 +++ /var/tmp/diff_new_pack.nP9803/_new 2007-05-18 00:00:08.000000000 +0200 @@ -38,10 +38,6 @@ Requires: kdebase3-ksysguardd Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Requires: xorg-x11 -%if %suse_version > 1010 -Requires: python -Recommends: kdebase3-beagle -%endif %if %suse_version > 1000 Recommends: kdelibs3_doc Recommends: gdb @@ -58,7 +54,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.6 -Release: 40 +Release: 47 %define kde_version 3.5.6 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -370,6 +366,9 @@ Summary: Beagle dependent plugins for KDE desktop Group: System/GUI/KDE Requires: beagle >= 0.2.4 +%if %suse_version > 1010 +Supplements: packageand(kdebase3:beagle) +%endif %description beagle This package contains kdebase plugins which provide additional search @@ -387,7 +386,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 275 +Release: 282 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -1577,6 +1576,10 @@ %endif %changelog +* Tue May 15 2007 - dmueller(a)suse.de +- drop python requirement +- only install kdebase3-beagle when both kdebase3 and beagle + are selected * Thu May 10 2007 - stbinner(a)suse.de - add audit log support to kdm (#263180) * Thu Apr 26 2007 - dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yacas
by root＠Hilbert.suse.de 17 May '07

17 May '07

Hello community, here is the log from the commit of package yacas checked in at Thu May 17 21:03:35 CEST 2007. -------- --- yacas/yacas.changes 2007-04-19 06:47:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/yacas/yacas.changes 2007-05-17 19:57:15.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 17 19:57:01 CEST 2007 - lrupp(a)suse.de + +- make it build on older distributions again + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yacas.spec ++++++ --- /var/tmp/diff_new_pack.Y28879/_old 2007-05-17 21:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Y28879/_new 2007-05-17 21:03:27.000000000 +0200 @@ -11,35 +11,28 @@ # norootforbuild Name: yacas -BuildRequires: dejagnu fltk-devel gcc-c++ gnuplot gperf gsl-devel libtool readline-devel termcap texlive-latex -# -# Distribution dependend Requires -# -# -# openSUSE -# -%if 0%{?suse_version} +BuildRequires: dejagnu fltk-devel gcc-c++ gnuplot gperf gsl-devel libtool readline-devel BuildRequires: update-desktop-files %if 0%{?suse_version} < 1000 BuildRequires: gcc-mainline-fortran libstdc++-devel %else BuildRequires: gcc-fortran %endif -%endif # needed BuildRequires for proteus BuildRequires: xorg-x11-devel %if 0%{?suse_version} > 1020 -BuildRequires: libbz2 xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-devel xorg-x11-libXt-devel xorg-x11-libs +BuildRequires: libbz2 termcap texlive-latex xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-devel xorg-x11-libXt-devel xorg-x11-libs +%else +BuildRequires: te_ams te_latex %endif # -# URL: http://yacas.sourceforge.net/ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Productivity/Scientific/Math Autoreqprov: on Summary: YACAS is an easy to use, general purpose Computer Algebra System. Version: 1.0.63 -Release: 11 +Release: 26 Source: %{name}-%{version}.tar.bz2 Source2: yacaslogo.xpm Source3: yacas.desktop @@ -149,6 +142,8 @@ %doc %{_defaultdocdir}/%{name} %changelog +* Thu May 17 2007 - lrupp(a)suse.de +- make it build on older distributions again * Thu Apr 19 2007 - aj(a)suse.de - Use texlive for building. * Sun Apr 01 2007 - lrupp(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 opensp
by root＠Hilbert.suse.de 17 May '07

17 May '07

Hello community, here is the log from the commit of package opensp checked in at Thu May 17 19:31:52 CEST 2007. -------- --- opensp/opensp.changes 2007-05-16 16:48:29.000000000 +0200 +++ /mounts/work_users/ro/STABLE/opensp/opensp.changes 2007-05-17 19:31:38.607145000 +0200 @@ -1,0 +2,6 @@ +Thu May 17 19:25:49 CEST 2007 - ro(a)suse.de + +- remove xmlto from buildrequires this causes tons of cycles +- split off opensp-doc package in it's own specfile + +------------------------------------------------------------------- New Changes file: --- /dev/null 2006-06-16 15:54:00.000000000 +0200 +++ /mounts/work_users/ro/STABLE/opensp/opensp-doc.changes 2007-05-17 19:25:46.900060000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Thu May 17 19:25:36 CEST 2007 - ro(a)suse.de + +- created package, split off from opensp + New: ---- opensp-doc.changes opensp-doc.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensp-doc.spec ++++++ # # spec file for package opensp-doc (Version 1.5.2) # # 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://bugs.opensuse.org/ # # norootforbuild Name: opensp-doc %define rname opensp BuildRequires: gcc-c++ xmlto License: X11/MIT Group: Productivity/Publishing/SGML Autoreqprov: on Version: 1.5.2 Release: 1 Source: http://unc.dl.sourceforge.net/sourceforge/openjade/OpenSP-%{version}.tar.gz Patch10: opensp-multilib.patch Patch11: opensp-nodeids.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://openjade.sourceforge.net/ %define regcat /usr/bin/sgml-register-catalog PreReq: %{regcat} Summary: The OpenJade Group's SGML and XML Parsing Tools Provides: sp_libs sp OpenSP Obsoletes: sp_libs sp %description The tools in this package provide the ability to manage SGML and XML documents. This package contains the parser nsgmls and the related programs sgmlnorm, spcat, spam, spent, and sgml2xml (previously known as sx). Sgml2xml is useful as a tool for converting from SGML to XML, the coming WWW standard. This package is a fork from James Clark's SP suite. Authors: -------- Avi Kivity Cees de Groot <cg(a)sgmltools.org> David Megginson <dmeggins(a)microstar.com> Didier PH Martin Henry Thompson Ian Castle <icastle(a)users.sourceforge.net> James Clark <jjc(a)jclark.com> Kathleen Marszalek Matthias Clasen Paul Prescod <papresco(a)calum.csclub.uwaterloo.ca> Peter Newcomb Peter Nilsson Sebastian Rahtz <s.rahtz(a)elsevier.co.uk> Terje Bless <link(a)tss.no> %define INSTALL install -m755 -s %define INSTALL_DIR install -d -m755 %define INSTALL_DATA install -m644 %define sgml_dir %{_datadir}/sgml %define sgml_dir_pkg %{sgml_dir}/%{name} %define sgml_var_dir /var/lib/sgml %prep %setup -q -n OpenSP-%{version} # %patch0 -p1 # %patch1 -p1 %patch11 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" %{?suse_update_config:%{suse_update_config}} aclocal %if %suse_version > 800 automake -f -c libtoolize --copy --force autoconf --force %endif %if %sles_version > 8 automake -f -c libtoolize --copy --force autoconf --force %endif %if %ul_version > 0 automake -f -c libtoolize --copy --force autoconf --force %endif # --datadir=%{sgml_dir}/openjade # set XMLTO or consider --disable-doc-build ./configure --prefix=%{_prefix} \ --libdir=%{_libdir} \ --mandir=%{_mandir} \ --datadir=%{_datadir} \ --disable-nls \ --with-gnu-ld \ --enable-http \ --enable-default-catalog="CATALOG:/etc/sgml/catalog:%{sgml_dir}/CATALOG" make -C docsrc perl -pi -e 's/sx/sgml2xml/g; s/SX/SGML2XML/g;' doc/sx.htm perl -pi -e 's/>sx/>sgml2xml/g; s/>SX/>SGML2XML/g;' doc/{new,index}.htm # make check %install [ "$RPM_BUILD_ROOT" != "" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT %{INSTALL_DIR} $RPM_BUILD_ROOT%{_libdir} # %{INSTALL_DIR} $RPM_BUILD_ROOT%{_includedir}/opensp make -C docsrc install DESTDIR=$RPM_BUILD_ROOT #make install-man DESTDIR=$RPM_BUILD_ROOT # Unwanted doc stuff rm -fr $RPM_BUILD_ROOT%{_datadir}/{OpenSP,doc} \ $RPM_BUILD_ROOT%{_prefix}/doc /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} # pushd $RPM_BUILD_ROOT%{_includedir} # ln -sf OpenSP opensp # ln -sf opensp sp # popd if [ -d $RPM_BUILD_ROOT%{_mandir}/man1 ]; then pushd $RPM_BUILD_ROOT%{_mandir}/man1 cp osx.1 s2x.1 cp osx.1 osgml2xml.1 for b in o*; do ln -sf ${b} ${b#o} done rm -f sx* popd fi %if 0 pushd $RPM_BUILD_ROOT%{_bindir} for b in os* onsgmls; do ln -sf ${b} ${b#o} done # avoid conflict with rzsz package rm -f sx ln -sf osx s2x ln -sf osx sgml2xml ln -sf osx osgml2xml popd %endif # %{INSTALL_DIR} $RPM_BUILD_ROOT/etc/profile.d # %{INSTALL_DATA} sp.sh $RPM_BUILD_ROOT/etc/profile.d %{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_dir_pkg} { for c in opensp-implied.dcl japan.dcl xml.dcl; do %{INSTALL_DATA} pubtext/$c $RPM_BUILD_ROOT%{sgml_dir_pkg}/$c echo "-- SGMLDECL \"%{sgml_dir_pkg}/$c\" --" done } > CATALOG.opensp sed 's|decl|dcl|' pubtext/xml.soc > $RPM_BUILD_ROOT%{sgml_dir_pkg}/xml.soc %{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_var_dir} %{INSTALL_DATA} CATALOG.opensp $RPM_BUILD_ROOT%{sgml_var_dir} ln -sf ../../../%{sgml_var_dir}/CATALOG.opensp \ $RPM_BUILD_ROOT%{sgml_dir}/CATALOG.opensp %{INSTALL_DIR} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ { echo '# Cf. %{_datadir}/doc/packages/opensp/html/charset.htm' echo '# SP_CHARSET_FIXED' echo '# SP_SYSTEM_CHARSET' echo '# SP_ENCODING' echo '# SP_BCTF' } > opensp.sh %{INSTALL_DATA} opensp.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/opensp.sh sed -e 's/$# $/\1setenv /' opensp.sh \ >$RPM_BUILD_ROOT%{_sysconfdir}/profile.d/opensp.csh rm -fr html mkdir html cp doc/catalog doc/*htm html %define DOCFILES COPYING README NEWS AUTHORS ABOUT-NLS { echo "<html><head><title>OpenSP documentation directory</title></head>" echo "<body>" for f in %{DOCFILES}; do [ -f $f ] || continue echo "<a href=\"$f\">$f</a>" done echo "<a href=\"html/index.htm\">OpenSP</a>, official documentation (html)" } >index.html find . -name .cvsignore | xargs rm rm -rf $RPM_BUILD_ROOT/etc rm -rf $RPM_BUILD_ROOT/usr/bin rm -rf $RPM_BUILD_ROOT/usr/include rm -rf $RPM_BUILD_ROOT/usr/lib rm -rf $RPM_BUILD_ROOT/usr/share/doc rm -rf $RPM_BUILD_ROOT/usr/share/locale rm -rf $RPM_BUILD_ROOT/usr/share/sgml rm -rf $RPM_BUILD_ROOT/var %clean rm -fr $RPM_BUILD_ROOT %files %defattr(-, root, root,755) %doc %{DOCFILES} index.html %doc html %doc unicode # pubtext comes with html-dtd # %doc pubtext %{_mandir}/*/*sp* %{_mandir}/*/*s2x* %{_mandir}/*/*sx* %{_mandir}/*/*sgml* %changelog * Thu May 17 2007 - ro(a)suse.de - created package, split off from opensp ++++++ opensp.spec ++++++ --- /var/tmp/diff_new_pack.ORO852/_old 2007-05-17 19:31:44.000000000 +0200 +++ /var/tmp/diff_new_pack.ORO852/_new 2007-05-17 19:31:44.000000000 +0200 @@ -11,12 +11,12 @@ # norootforbuild Name: opensp -BuildRequires: gcc-c++ xmlto +BuildRequires: gcc-c++ License: X11/MIT Group: Productivity/Publishing/SGML Autoreqprov: on Version: 1.5.2 -Release: 1 +Release: 2 Source: http://unc.dl.sourceforge.net/sourceforge/openjade/OpenSP-%{version}.tar.gz Patch10: opensp-multilib.patch Patch11: opensp-nodeids.patch @@ -113,6 +113,7 @@ --disable-nls \ --with-gnu-ld \ --enable-http \ + --disable-doc-build \ --enable-default-catalog="CATALOG:/etc/sgml/catalog:%{sgml_dir}/CATALOG" make perl -pi -e 's/sx/sgml2xml/g; s/SX/SGML2XML/g;' doc/sx.htm @@ -133,6 +134,7 @@ # ln -sf OpenSP opensp # ln -sf opensp sp # popd +%if 0 if [ -d $RPM_BUILD_ROOT%{_mandir}/man1 ]; then pushd $RPM_BUILD_ROOT%{_mandir}/man1 cp osx.1 s2x.1 @@ -143,6 +145,7 @@ rm -f sx* popd fi +%endif pushd $RPM_BUILD_ROOT%{_bindir} for b in os* onsgmls; do ln -sf ${b} ${b#o} @@ -209,11 +212,6 @@ %files %defattr(-, root, root,755) %config %{_sysconfdir}/profile.d/opensp.* -%doc %{DOCFILES} index.html -%doc html -%doc unicode -# pubtext comes with html-dtd -# %doc pubtext %{_bindir}/*nsgmls %{_bindir}/*sgmlnorm %{_bindir}/*spcat @@ -227,10 +225,6 @@ %dir %{sgml_var_dir} %config %{sgml_var_dir}/CATALOG.opensp %{sgml_dir}/CATALOG.opensp -%{_mandir}/*/*sp* -%{_mandir}/*/*s2x* -%{_mandir}/*/*sx* -%{_mandir}/*/*sgml* # %{_datadir}/locale/*/LC_MESSAGES/*.mo %files -n opensp-devel @@ -242,6 +236,9 @@ %{_libdir}/*a %changelog +* Thu May 17 2007 - ro(a)suse.de +- remove xmlto from buildrequires this causes tons of cycles +- split off opensp-doc package in it's own specfile * Wed May 16 2007 - ke(a)suse.de - Update to version 1.5.2 (bug fix release); proposed by Sierk Bornemann [# 273561]. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-add-on-creator
by root＠Hilbert.suse.de 17 May '07

17 May '07

Hello community, here is the log from the commit of package yast2-add-on-creator checked in at Thu May 17 18:24:22 CEST 2007. -------- --- yast2-add-on-creator/yast2-add-on-creator.changes 2007-05-02 13:42:47.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-add-on-creator/yast2-add-on-creator.changes 2007-05-17 17:00:55.339825000 +0200 @@ -1,0 +2,6 @@ +Thu May 17 16:42:33 CEST 2007 - jsuchome(a)suse.cz + +- clear pattern data map before importing next one (#273528) +- 2.15.7 + +------------------------------------------------------------------- Old: ---- yast2-add-on-creator-2.15.6.tar.bz2 New: ---- yast2-add-on-creator-2.15.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on-creator.spec ++++++ --- /var/tmp/diff_new_pack.xR5324/_old 2007-05-17 18:24:19.000000000 +0200 +++ /var/tmp/diff_new_pack.xR5324/_new 2007-05-17 18:24:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-add-on-creator (Version 2.15.6) +# spec file for package yast2-add-on-creator (Version 2.15.7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-add-on-creator -Version: 2.15.6 +Version: 2.15.7 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-add-on-creator-2.15.6.tar.bz2 +Source0: yast2-add-on-creator-2.15.7.tar.bz2 prefix: /usr Requires: yast2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite @@ -33,7 +33,7 @@ Jiř� Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-add-on-creator-2.15.6 +%setup -n yast2-add-on-creator-2.15.7 %build %{prefix}/bin/y2tool y2autoconf @@ -69,6 +69,9 @@ %doc %{prefix}/share/doc/packages/yast2-add-on-creator %changelog +* Thu May 17 2007 - jsuchome(a)suse.cz +- clear pattern data map before importing next one (#273528) +- 2.15.7 * Wed May 02 2007 - jsuchome(a)suse.cz - enable usage of spaces in output path - 2.15.6 ++++++ yast2-add-on-creator-2.15.6.tar.bz2 -> yast2-add-on-creator-2.15.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.6/agents/ag_pattern new/yast2-add-on-creator-2.15.7/agents/ag_pattern --- old/yast2-add-on-creator-2.15.6/agents/ag_pattern 2007-01-31 08:57:52.000000000 +0100 +++ new/yast2-add-on-creator-2.15.7/agents/ag_pattern 2007-05-17 16:35:57.000000000 +0200 @@ -19,6 +19,7 @@ sub parse_file { my $file = shift; + %pattern = (); my $i = open PATTERN, "< $file"; if (!defined $i) { y2error ("$file cannot be opened for reading!"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.6/configure new/yast2-add-on-creator-2.15.7/configure --- old/yast2-add-on-creator-2.15.6/configure 2007-01-31 09:03:28.000000000 +0100 +++ new/yast2-add-on-creator-2.15.7/configure 2007-05-17 16:55:11.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-add-on-creator 2.15.0. +# Generated by GNU Autoconf 2.60 for yast2-add-on-creator 2.15.7. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-add-on-creator' PACKAGE_TARNAME='yast2-add-on-creator' -PACKAGE_VERSION='2.15.0' -PACKAGE_STRING='yast2-add-on-creator 2.15.0' +PACKAGE_VERSION='2.15.7' +PACKAGE_STRING='yast2-add-on-creator 2.15.7' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1181,7 +1181,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-add-on-creator 2.15.0 to adapt to many kinds of systems. +\`configure' configures yast2-add-on-creator 2.15.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1252,7 +1252,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-add-on-creator 2.15.0:";; + short | recursive ) echo "Configuration of yast2-add-on-creator 2.15.7:";; esac cat <<\_ACEOF @@ -1330,7 +1330,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-add-on-creator configure 2.15.0 +yast2-add-on-creator configure 2.15.7 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1344,7 +1344,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-add-on-creator $as_me 2.15.0, which was +It was created by yast2-add-on-creator $as_me 2.15.7, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2145,7 +2145,7 @@ # Define the identity of the package. PACKAGE='yast2-add-on-creator' - VERSION='2.15.0' + VERSION='2.15.7' cat >>confdefs.h <<_ACEOF @@ -2372,7 +2372,7 @@ -VERSION="2.15.0" +VERSION="2.15.7" RPMNAME="yast2-add-on-creator" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" @@ -3258,7 +3258,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-add-on-creator $as_me 2.15.0, which was +This file was extended by yast2-add-on-creator $as_me 2.15.7, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3301,7 +3301,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-add-on-creator config.status 2.15.0 +yast2-add-on-creator config.status 2.15.7 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.6/configure.in new/yast2-add-on-creator-2.15.7/configure.in --- old/yast2-add-on-creator-2.15.6/configure.in 2007-01-31 09:03:22.000000000 +0100 +++ new/yast2-add-on-creator-2.15.7/configure.in 2007-05-17 16:55:07.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-add-on-creator, 2.15.0, http://bugs.opensuse.org/, yast2-add-on-creator) +AC_INIT(yast2-add-on-creator, 2.15.7, http://bugs.opensuse.org/, yast2-add-on-creator) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.0" +VERSION="2.15.7" RPMNAME="yast2-add-on-creator" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.6/src/AddOnCreator.ycp new/yast2-add-on-creator-2.15.7/src/AddOnCreator.ycp --- old/yast2-add-on-creator-2.15.6/src/AddOnCreator.ycp 2007-05-02 13:35:14.000000000 +0200 +++ new/yast2-add-on-creator-2.15.7/src/AddOnCreator.ycp 2007-05-17 16:42:04.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: AddOnCreator settings, input and output functions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: AddOnCreator.ycp 37583 2007-04-19 12:45:25Z jsuchome $ + * $Id: AddOnCreator.ycp 37776 2007-05-02 11:43:20Z jsuchome $ * * Representation of the configuration of add-on-creator. * Input and output routines. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.6/VERSION new/yast2-add-on-creator-2.15.7/VERSION --- old/yast2-add-on-creator-2.15.6/VERSION 2007-05-02 13:35:35.000000000 +0200 +++ new/yast2-add-on-creator-2.15.7/VERSION 2007-05-17 16:51:05.000000000 +0200 @@ -1 +1 @@ -2.15.6 +2.15.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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