February 2010 - openSUSE Commits - openSUSE Mailing Lists

commit telepathy-glib for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package telepathy-glib for openSUSE:Factory checked in at Thu Feb 11 19:29:37 CET 2010. -------- --- telepathy-glib/telepathy-glib.changes 2009-12-04 19:47:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/telepathy-glib/telepathy-glib.changes 2010-01-22 17:55:55.000000000 +0100 @@ -1,0 +2,27 @@ +Fri Jan 22 17:52:27 CET 2010 - vuntz(a)opensuse.org + +- Update to version 0.10.0: + + Enhancements: + - Add compile-time warnings if the results of functions that + allocate memory are ignored. + - Add compile-time warnings if the results of certain functions + with no side-effects are ignored. + - Improve lcov.am, syncing with telepathy-gabble + + Fixes: + - fdo#23848: when making a release, make the build system check + for files that indicate unreleased status; correct a few such + comments + - fdo#25149: when a TpAccount is invalidated (deleted), signal + connection disconnection first + - Exit the main loop gracefully when CMs are disconnected from + the session bus + - fdo#14603: don't set fatal criticals in + tp_run_connection_manager, CMs are now responsible for doing + this + - fdo#25600: fix inadvertant GLib 2.20 dependency + - In code generation tools (glib-ginterface-gen.py), allow + D-Bus methods whose names are C keywords + - Fix with-session-bus.sh dbus-monitor logging when /bin/sh is + not bash + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- telepathy-glib-0.9.2.tar.bz2 New: ---- telepathy-glib-0.10.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-glib.spec ++++++ --- /var/tmp/diff_new_pack.S60sQv/_old 2010-02-11 19:29:11.000000000 +0100 +++ /var/tmp/diff_new_pack.S60sQv/_new 2010-02-11 19:29:11.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package telepathy-glib (Version 0.9.2) +# spec file for package telepathy-glib (Version 0.10.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: telepathy-glib -Version: 0.9.2 +Version: 0.10.0 Release: 1 License: LGPLv2.1+ %define debug_package_requires libtelepathy-glib0 = %{version}-%{release} ++++++ telepathy-glib-0.9.2.tar.bz2 -> telepathy-glib-0.10.0.tar.bz2 ++++++ ++++ 194336 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 telepathy-gabble for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package telepathy-gabble for openSUSE:Factory checked in at Thu Feb 11 19:29:00 CET 2010. -------- --- GNOME/telepathy-gabble/telepathy-gabble.changes 2009-12-23 11:20:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/telepathy-gabble/telepathy-gabble.changes 2010-01-29 01:04:16.000000000 +0100 @@ -1,0 +2,35 @@ +Fri Jan 29 01:01:01 CET 2010 - vuntz(a)opensuse.org + +- Update to version 0.9.4: + + Enhancements: + - Added an --enable-is-a-phone configure switch, which makes + Gabble identify itself as a "phone" (rather than a "pc") in + XEP-0115 disco replies. + - Added preliminary support for the Channel.Type.Call draft. By + default, incoming Jingle calls are exposed as + Channel.Type.Call if a handler is available. + - One-to-one text channels can now be upgraded to multi-user + conferences using the draft Conference interface. This will + use a PMUC room on Google's conference server if at least one + participant is using a Google Talk client, or an instant room + on your own conference server (XEP-0045 §10.1.2) otherwise. + - Implements XEP-0276, to permit calling contacts whose + presence you are not subscribed to (controlled by a simple + Gabble-specific connection interface). + - Plugins may now specify their own version number, for + improved debug logs. + - Added a simple sidecar, implemented as a plugin, to support + registering to gateways which require nothing more than a + username and password. + + Fixes: + - We can now accept calls from, and place calls to, bare JIDs + (that is, contacts with no resource). This is required for + calling XEP-0100-compliant SIP gateways. + - We now deal correctly with setting a vCard if there's no + existing vCard on the server. (fdo#25987) + - ignore-ssl-errors is now implied by require-encryption being + false. + - ContactCapabilities are now exposed on the Contacts interface + with the correct attribute name. (fdo#26210) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- telepathy-gabble-0.9.3.tar.bz2 New: ---- telepathy-gabble-0.9.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-gabble.spec ++++++ --- /var/tmp/diff_new_pack.zWaCsv/_old 2010-02-11 19:28:52.000000000 +0100 +++ /var/tmp/diff_new_pack.zWaCsv/_new 2010-02-11 19:28:52.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package telepathy-gabble (Version 0.9.3) +# spec file for package telepathy-gabble (Version 0.9.4) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: telepathy-gabble -Version: 0.9.3 +Version: 0.9.4 Release: 1 # FIXME: switch to libgnutls-devel once we have a recent enough version of gnutls License: LGPLv2.1+ @@ -64,11 +64,14 @@ %endif %build -%configure --docdir=%{_docdir}/%{name} +%configure \ + --disable-static \ + --docdir=%{_docdir}/%{name} make %{?jobs:-j %jobs} %install %makeinstall +find %{buildroot} -type f -name "*.la" -delete -print cp AUTHORS ChangeLog COPYING %{buildroot}%{_docdir}/%{name} %clean @@ -82,6 +85,8 @@ %defattr (-,root,root) %dir %{_datadir}/telepathy %dir %{_datadir}/telepathy/managers +%dir %{_libdir}/telepathy +%{_libdir}/telepathy/gabble-0/ %{_libexecdir}/telepathy-gabble %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.gabble.service %{_datadir}/telepathy/managers/gabble.manager ++++++ telepathy-gabble-0.9.3.tar.bz2 -> telepathy-gabble-0.9.4.tar.bz2 ++++++ ++++ 164268 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 ghostscript-library for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package ghostscript-library for openSUSE:Factory checked in at Thu Feb 11 19:28:42 CET 2010. -------- --- ghostscript-library/ghostscript-library.changes 2010-01-19 16:08:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/ghostscript-library/ghostscript-library.changes 2010-02-09 12:41:07.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 9 11:40:44 UTC 2010 - coolo(a)novell.com + +- fix patches so they apply + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghostscript-library.spec ++++++ --- /var/tmp/diff_new_pack.RswF1c/_old 2010-02-11 19:20:15.000000000 +0100 +++ /var/tmp/diff_new_pack.RswF1c/_new 2010-02-11 19:20:15.000000000 +0100 @@ -64,7 +64,7 @@ Summary: Necessary Files for Running Ghostscript %endif Version: 8.70 -Release: 1 +Release: 2 License: GPLv3 Source0: ghostscript-8.70.tar.bz2 Source1: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/current/ghostscript-fonts-st… @@ -325,7 +325,7 @@ %package -n libgimpprint License: GPLv2+ Version: 4.2.7 -Release: 316 +Release: 317 Summary: Gimp-Print libraries Group: Development/Libraries/C and C++ @@ -341,7 +341,7 @@ %package -n libgimpprint-devel License: GPLv2+ Version: 4.2.7 -Release: 316 +Release: 317 PreReq: %install_info_prereq Requires: libgimpprint = %{version} Requires: glibc-devel ghostscript-mini.spec: same change ++++++ ghostscript-8.70-manpages.patch ++++++ --- /var/tmp/diff_new_pack.RswF1c/_old 2010-02-11 19:20:16.000000000 +0100 +++ /var/tmp/diff_new_pack.RswF1c/_new 2010-02-11 19:20:16.000000000 +0100 @@ -9,7 +9,7 @@ .BR dvips (1) mit dem .B -q --Parameter auf und leitet die Ausgabe �ber eine Pipe an +-Parameter auf und leitet die Ausgabe �ber eine Pipe an +Parameter auf und leitet die Ausgabe über eine Pipe an .BR gs (1) weiter, das mit den folgenden Paramtern aufgerufen wird: @@ -18,7 +18,7 @@ .SH SIEHE AUCH gs(1), dvips(1) .SH VERSION --Dieses Dokument wurde zuletzt f�r Ghostscript Version 7.21 durchgesehen. +-Dieses Dokument wurde zuletzt f�r Ghostscript Version 7.21 durchgesehen. +Dieses Dokument wurde zuletzt für Ghostscript Version 7.21 durchgesehen. .SH AUTOR Artifex Software, Inc. sind die @@ -34,12 +34,12 @@ .B -q -dNODISPLAY -dWRITESYSTEMDICT gefolgt von den Argumenten der Kommandozeile. Dies schreibt eine --PostScript-Type-0 oder Type-1-Schrift als C-Quelltext, so da� sie mit dem Interpreter gelinkt werden kann. +-PostScript-Type-0 oder Type-1-Schrift als C-Quelltext, so da� sie mit dem Interpreter gelinkt werden kann. +PostScript-Type-0 oder Type-1-Schrift als C-Quelltext, so daß sie mit dem Interpreter gelinkt werden kann. .SH SIEHE AUCH gs(1) .SH VERSION --Dieses Dokument wurde zuletzt f�r Ghostscript Version 7.21 durchfgesehen. +-Dieses Dokument wurde zuletzt f�r Ghostscript Version 7.21 durchfgesehen. +Dieses Dokument wurde zuletzt für Ghostscript Version 7.21 durchfgesehen. .SH AUTHOR Artifex Software, Inc. sind die @@ -55,7 +55,7 @@ .SH SIEHE AUCH gs(1) .SH VERSION --Dieses Dokument wurde zuletzt f�r Ghostscript Version 7.21 durchgesehen. +-Dieses Dokument wurde zuletzt f�r Ghostscript Version 7.21 durchgesehen. +Dieses Dokument wurde zuletzt für Ghostscript Version 7.21 durchgesehen. .SH AUTHOR Artifex Software, Inc. sind die @@ -78,13 +78,13 @@ in die Datei "Ausgabe.ps" im \fBPostScript\fR(tm)-Format zu konvertieren. Normalerweise darf die Ausgabe PostScript-Level-2-Konstrukte (nicht jedoch PostScript LanguageLevel 3) benutzen; die \fB-dLanguageLevel=1\fR Option erzwingt --Level 1, w�hrend \fB-dLanguageLevel=3\fR LanguageLevel-3-Konstrukte f�r die Ausgabe erlaubt. +-Level 1, w�hrend \fB-dLanguageLevel=3\fR LanguageLevel-3-Konstrukte f�r die Ausgabe erlaubt. +Level 1, während \fB-dLanguageLevel=3\fR LanguageLevel-3-Konstrukte für die Ausgabe erlaubt. .SH DATEIEN Starten Sie "\fBgs -h\fR" um den Ort der Ghostscript-Dokumentation auf Ihrem System zu ermitteln, wo Sie weitere Datails finden. .SH VERSION --Dieses Dokument wurde zuletzt f�r Ghostscript Version 7.21 durchgesehen. +-Dieses Dokument wurde zuletzt f�r Ghostscript Version 7.21 durchgesehen. +Dieses Dokument wurde zuletzt für Ghostscript Version 7.21 durchgesehen. .SH AUTOR Artifex Software, Inc. sind die @@ -100,15 +100,15 @@ \fBpdfopt\fR benutzt \fBgs\fR(1), um die Adobe \fBPortable Document Format\fR (PDF) Datei "Eingabe.pdf" in sogenannter optimierter Form nach "Ausgabe.pdf" zu schreiben. Optimierung platziert die Elemente der Datei in eine linearere --Reihenfolge und f�gt Verweiszeiger hinzu, die es Adobes +-Reihenfolge und f�gt Verweiszeiger hinzu, die es Adobes +Reihenfolge und fügt Verweiszeiger hinzu, die es Adobes Acrobat(TM) Produkten erlaubt, einzelne Seiten der Datei schneller --darzustellen, wenn auf die Datei �ber ein Netzwerk zugegriffen wird. +-darzustellen, wenn auf die Datei �ber ein Netzwerk zugegriffen wird. +darzustellen, wenn auf die Datei über ein Netzwerk zugegriffen wird. .PP --Hinweis: Eingabe.pdf und Ausgabe.pdf d�rfen nicht gleich sein. Falls Sie es --sind, wird die Datei vermutlich zerst�rt. \fBpdfopt\fR verhindert dies --gegenw�rtig nicht. +-Hinweis: Eingabe.pdf und Ausgabe.pdf d�rfen nicht gleich sein. Falls Sie es +-sind, wird die Datei vermutlich zerst�rt. \fBpdfopt\fR verhindert dies +-gegenw�rtig nicht. +Hinweis: Eingabe.pdf und Ausgabe.pdf dürfen nicht gleich sein. Falls Sie es +sind, wird die Datei vermutlich zerstört. \fBpdfopt\fR verhindert dies +gegenwärtig nicht. @@ -119,7 +119,7 @@ "Linearized PDF" in Adobes PDF-Referenzhandbuch http://partners.adobe.com/asn/developer/acrosdk/DOCS/pdfspec.pdf .SH VERSION --Dies Dokument wurde zuletzt f�r Ghostscript version 7.21 durchgesehen. +-Dies Dokument wurde zuletzt f�r Ghostscript version 7.21 durchgesehen. +Dies Dokument wurde zuletzt für Ghostscript version 7.21 durchgesehen. .SH AUTOR Artifex Software, Inc. sind die @@ -135,7 +135,7 @@ .SH SIEHE AUCH gs(1) .SH VERSION --Das Dokument wurde zuletzt f�r Ghostscript Version 7.21 durchgesehen. +-Das Dokument wurde zuletzt f�r Ghostscript Version 7.21 durchgesehen. +Das Dokument wurde zuletzt für Ghostscript Version 7.21 durchgesehen. .SH AUTOR Artifex Software, Inc. sind die @@ -149,22 +149,22 @@ .\" Translation by Tobias Burnus <burnus(a)gmx.de> and Thomas Hoffmann .TH PS2ASCII 1 "8.Juli 2002" 7.21 "Ghostscript-Werkzeuge" \" -*- nroff -*- .SH NAME --ps2ascii \- Ghostscript-�bersetzer von PostScript oder PDF nach ASCII +-ps2ascii \- Ghostscript-�bersetzer von PostScript oder PDF nach ASCII +ps2ascii \- Ghostscript-Übersetzer von PostScript oder PDF nach ASCII .SH SYNTAX \fBps2ascii\fR [ \fIEingabe.ps\fR [ \fIAusgabe.txt\fR ] ] .br -@@ -13,19 +14,19 @@ ps2ascii \- Ghostscript-�bersetzer von P +@@ -13,19 +13,19 @@ ps2ascii \- Ghostscript-�bersetzer von P \fBPostScript\fR(tm)- oder Adobe \fBPortable-Document-Format\fR-(PDF-)Datei zu extrahieren. Falls keine Dateien in der Kommandozeile angegeben werden, liest \fBgs\fR von der Standardeingabe; bei PDF-Dateien wird ein expliziter --Dateiname ben�tigt, keine Standardeingabe. Falls keine Ausgabedatei angegeben +-Dateiname ben�tigt, keine Standardeingabe. Falls keine Ausgabedatei angegeben +Dateiname benötigt, keine Standardeingabe. Falls keine Ausgabedatei angegeben ist, wird zur Standardausgabe geschrieben. .PP \fBps2ascii\fR ignoriert die Schriftkodierung und kommt nicht sonderlich --gut mit Unterscheidung (Kerning) zurecht. Somit sollten Sie f�r PostScript --(aber gegenw�rtig nicht f�r PDF) \fBpstotext\fR benutzen (siehe unten). +-gut mit Unterscheidung (Kerning) zurecht. Somit sollten Sie f�r PostScript +-(aber gegenw�rtig nicht f�r PDF) \fBpstotext\fR benutzen (siehe unten). +gut mit Unterscheidung (Kerning) zurecht. Somit sollten Sie für PostScript +(aber gegenwärtig nicht für PDF) \fBpstotext\fR benutzen (siehe unten). .SH DATEIEN @@ -173,7 +173,7 @@ .SH SIEHE AUCH pstotext(1), http://www.research.digital.com/SRC/virtualpaper/pstotext.html .SH VERSION --Dies Dokument wurde zuletzt f�r Ghostscript version 7.21 durchgesehen. +-Dies Dokument wurde zuletzt f�r Ghostscript version 7.21 durchgesehen. +Dies Dokument wurde zuletzt für Ghostscript version 7.21 durchgesehen. .SH AUTOR Artifex Software, Inc. sind die @@ -189,10 +189,10 @@ .SH NAME ps2pdf \- konvertiert PostScript nach PDF mittels ghostscript .br --ps2pdf12 \- konvertiert PostScript nach PDF\ 1.2 (kompatibel zu Acrobat\ 3 und sp�ter) mittels ghostscript +-ps2pdf12 \- konvertiert PostScript nach PDF\ 1.2 (kompatibel zu Acrobat\ 3 und sp�ter) mittels ghostscript +ps2pdf12 \- konvertiert PostScript nach PDF\ 1.2 (kompatibel zu Acrobat\ 3 und später) mittels ghostscript .br --ps2pdf13 \- konvertiert PostScript nach PDF\ 1.3 (kompatibel zu Acrobat\ 4 und sp�ter) mittels ghostscript +-ps2pdf13 \- konvertiert PostScript nach PDF\ 1.3 (kompatibel zu Acrobat\ 4 und sp�ter) mittels ghostscript +ps2pdf13 \- konvertiert PostScript nach PDF\ 1.3 (kompatibel zu Acrobat\ 4 und später) mittels ghostscript .SH SYNTAX \fBps2pdf\fR [Optionen...] {Eingabe.[e]ps|-} [Ausgabe.pdf|-] @@ -201,10 +201,10 @@ .br \fBps2pdf13\fR [Optionen...] {Eingabe.[e]ps|-} [Ausgabe.pdf|-] .SH BESCHREIBUNG --Au�er in der Benutzerschnittstelle sind die +-Au�er in der Benutzerschnittstelle sind die +Außer in der Benutzerschnittstelle sind die .B ps2pdf\-Skripte --nahezu in allen Funktionen �quivalent zu Adobe Acrobat Distiller: Sie konvertieren +-nahezu in allen Funktionen �quivalent zu Adobe Acrobat Distiller: Sie konvertieren +nahezu in allen Funktionen äquivalent zu Adobe Acrobat Distiller: Sie konvertieren PostScript-Dateien in das Portable Document Format (PDF). @@ -212,15 +212,15 @@ Die drei Skripte unterscheiden sich wie folgt: .IP - .B ps2pdf12 --produziert immer PDF-1.2-Dateien (kompatibel zu Acrobat 3 und sp�ter). +-produziert immer PDF-1.2-Dateien (kompatibel zu Acrobat 3 und sp�ter). +produziert immer PDF-1.2-Dateien (kompatibel zu Acrobat 3 und später). .IP - .B ps2pdf13 --produziert immer PDF-1.3-Dateien (kompatibel zu Acrobat 4 und sp�ter). +-produziert immer PDF-1.3-Dateien (kompatibel zu Acrobat 4 und sp�ter). +produziert immer PDF-1.3-Dateien (kompatibel zu Acrobat 4 und später). .IP - .B ps2pdf --selbst produziert standardgem�� PDF-1.2-Dateien (kompatibel zu Acrobat 3 und sp�ter); In sp�teren Versionen kann sich das jedoch �ndern. Falls Sie eine bestimmte PDF-Version ben�tigen, sollten Sie +-selbst produziert standardgem�� PDF-1.2-Dateien (kompatibel zu Acrobat 3 und sp�ter); In sp�teren Versionen kann sich das jedoch �ndern. Falls Sie eine bestimmte PDF-Version ben�tigen, sollten Sie +selbst produziert standardgemäß PDF-1.2-Dateien (kompatibel zu Acrobat 3 und später); In späteren Versionen kann sich das jedoch ändern. Falls Sie eine bestimmte PDF-Version benötigen, sollten Sie .B ps2pdf12, .BR ps2pdf13 @@ -229,17 +229,17 @@ .PP Die Konvertierung mittels .BR ps2pdf --unterliegt einigen Beschr�nkungen. Ausf�hrlichere Informationen dazu stehen in der HTML-Dokumentation. +-unterliegt einigen Beschr�nkungen. Ausf�hrlichere Informationen dazu stehen in der HTML-Dokumentation. +unterliegt einigen Beschränkungen. Ausführlichere Informationen dazu stehen in der HTML-Dokumentation. .SH OPTIONEN --F�r ps2pdf gelten die gleichen Optionen wie f�r gs(1). +-F�r ps2pdf gelten die gleichen Optionen wie f�r gs(1). +Für ps2pdf gelten die gleichen Optionen wie für gs(1). .SH SIEHE AUCH gs(1), ps2pdfwr(1), .br Ps2pdf.htm in der Ghostscript-Dokumentation .SH VERSION --Dieses Dokument wurde zuletzt f�r Ghostscript Version 7.21 durchgesehen. +-Dieses Dokument wurde zuletzt f�r Ghostscript Version 7.21 durchgesehen. +Dieses Dokument wurde zuletzt für Ghostscript Version 7.21 durchgesehen. .SH AUTOR Artifex Software, Inc. sind die @@ -255,14 +255,14 @@ PostScript-Level-2-Konstrukte benutzen, aber \fB\-dLanguageLevel=1\fR erzwingt die Ausgabe von Level 1. .PP --\fBeps2eps\fR f�hrt analoge Optimierungen bei Encapsulated +-\fBeps2eps\fR f�hrt analoge Optimierungen bei Encapsulated +\fBeps2eps\fR führt analoge Optimierungen bei Encapsulated PostScript (EPS) Dateien durch. .SH DATEIEN Rufen Sie "\fBgs -h\fR" auf, um den Ort der Ghostscript-Dokumentation auf Ihrem System zu ermitteln, wo Sie weitere Informationen finden. .SH VERSION --Dieses Document wurde zuletzt f�r Ghostscript Version 7.21 �berarbeitet. +-Dieses Document wurde zuletzt f�r Ghostscript Version 7.21 �berarbeitet. +Dieses Document wurde zuletzt für Ghostscript Version 7.21 überarbeitet. .SH AUTOR Artifex Software, Inc. sind die @@ -278,7 +278,7 @@ .SH SIEHE AUCH gs(1) .SH VERSION --Das Dokument wurde zuletzt f�r Ghostscript Version 7.21 durchgesehen. +-Das Dokument wurde zuletzt f�r Ghostscript Version 7.21 durchgesehen. +Das Dokument wurde zuletzt für Ghostscript Version 7.21 durchgesehen. .SH AUTOR Artifex Software, Inc. sind die ++++++ ghostscript-8.70.dif ++++++ --- /var/tmp/diff_new_pack.RswF1c/_old 2010-02-11 19:20:16.000000000 +0100 +++ /var/tmp/diff_new_pack.RswF1c/_new 2010-02-11 19:20:16.000000000 +0100 @@ -1208,94 +1208,6 @@ (umask 077 && mkdir "$tmpdir") if test ! -d "$tmpdir"; then echo "failed: could not create temporary file" ---- man/de/pdf2dsc.1 -+++ man/de/pdf2dsc.1 2008-04-02 12:06:08.000000000 +0000 -@@ -1,3 +1,4 @@ -+'\" -*- coding: UTF-8 -*- - .\" $Id: pdf2dsc.1 8482 2008-01-09 00:36:30Z marcos $ - .TH PDF2DSC 1 "6. Januar 2008" 8.61 "Ghostscript-Werkzeuge" \" -*- nroff -*- - .SH NAME ---- man/de/pdf2ps.1 -+++ man/de/pdf2ps.1 2008-04-02 12:06:11.000000000 +0000 -@@ -1,3 +1,4 @@ -+'\" -*- coding: UTF-8 -*- - .\" $Id: pdf2ps.1 8022 2007-06-05 22:23:38Z giles $ - .\" Using encoding of the German (de_DE) translation: ISO-8859-1 - .\" Translation by Tobias Burnus <burnus(a)gmx.de> and Thomas Hoffmann ---- man/de/pdfopt.1 -+++ man/de/pdfopt.1 2008-04-02 12:06:14.000000000 +0000 -@@ -1,3 +1,4 @@ -+'\" -*- coding: UTF-8 -*- - .\" $Id: pdfopt.1 8022 2007-06-05 22:23:38Z giles $ - .\" Using encoding of the German (de_DE) translation: ISO-8859-1 - .\" Translation by Tobias Burnus <burnus(a)gmx.de> and Thomas Hoffmann ---- man/de/printafm.1 -+++ man/de/printafm.1 2008-04-02 12:06:17.000000000 +0000 -@@ -1,3 +1,4 @@ -+'\" -*- coding: UTF-8 -*- - .\" $Id: printafm.1 8022 2007-06-05 22:23:38Z giles $ - .\" Using encoding of the German (de_DE) translation: ISO-8859-1 - .\" Translation by Tobias Burnus <burnus(a)gmx.de> and Thomas Hoffmann ---- man/de/ps2pdf.1 -+++ man/de/ps2pdf.1 2009-06-16 12:56:26.257902241 +0000 -@@ -1,3 +1,4 @@ -+'\" -*- coding: UTF-8 -*- - .\" $Id: ps2pdf.1 9322 2009-01-04 20:15:19Z till $ - .\" Using encoding of the German (de_DE) translation: ISO-8859-1 - .\" Translation by Tobias Burnus <burnus(a)gmx.de> and Thomas Hoffmann ---- man/de/ps2ps.1 -+++ man/de/ps2ps.1 2008-04-02 12:06:26.000000000 +0000 -@@ -1,3 +1,4 @@ -+'\" -*- coding: UTF-8 -*- - .\" $Id: ps2ps.1 8022 2007-06-05 22:23:38Z giles $ - .\" Using encoding of the German (de_DE) translation: ISO-8859-1 - .\" Translation by Tobias Burnus <burnus(a)gmx.de> and Thomas Hoffmann ---- man/de/wftopfa.1 -+++ man/de/wftopfa.1 2008-04-02 12:06:29.000000000 +0000 -@@ -1,3 +1,4 @@ -+'\" -*- coding: UTF-8 -*- - .\" $Id: wftopfa.1 8022 2007-06-05 22:23:38Z giles $ - .\" Using encoding of the German (de_DE) translation: ISO-8859-1 - .\" Translation by Tobias Burnus <burnus(a)gmx.de> and Thomas Hoffmann ---- man/gs.1 -+++ man/gs.1 2008-04-01 10:41:27.000000000 +0000 -@@ -291,22 +291,22 @@ device, as described above. - .PP - The locations of many Ghostscript run-time files are compiled into the - executable when it is built. On Unix these are typically based in --\fB/usr/local\fR, but this may be different on your system. Under DOS they -+\fB/usr\fR, but this may be different on your system. Under DOS they - are typically based in \fBC:\\GS\fR, but may be elsewhere, especially if - you install Ghostscript with \fBGSview\fR. Run "\fBgs -h\fR" to find the - location of Ghostscript documentation on your system, from which you can - get more details. - .TP --.B /usr/local/share/ghostscript/#.##/* -+.B /usr/share/ghostscript/#.##/* - Startup files, utilities, and basic font definitions - .TP --.B /usr/local/share/ghostscript/fonts/* -+.B /usr/share/ghostscript/fonts/* - More font definitions - .TP --.B /usr/local/share/ghostscript/#.##/examples/* -+.B /usr/share/ghostscript/#.##/examples/* - Ghostscript demonstration files - .TP --.B /usr/local/share/ghostscript/#.##/doc/* -+.B /usr/share/ghostscript/#.##/doc/* - Diverse document files - .SH "INITIALIZATION FILES" - When looking for the initialization files "gs_*.ps", the files related to -@@ -329,7 +329,7 @@ if any; - the directories specified by the \fBGS_LIB_DEFAULT\fR macro in the - Ghostscript makefile when the executable was built. When \fBgs\fR is built - on Unix, \fBGS_LIB_DEFAULT\fR is usually --"/usr/local/share/ghostscript/#.##:/usr/local/share/ghostscript/fonts" -+"/usr/share/ghostscript/#.##:/usr/share/ghostscript/fonts" - where "#.##" represents the Ghostscript version number. - .PP - Each of these (\fBGS_LIB_DEFAULT\fR, \fBGS_LIB\fR, and \fB\-I\fR parameter) --- psi/iinit.c +++ psi/iinit.c 2008-02-21 14:55:33.000000000 +0000 @@ -44,29 +44,29 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Thu Feb 11 19:28:27 CET 2010. -------- --- kiwi/kiwi.changes 2010-02-05 16:13:27.000000000 +0100 +++ kiwi/kiwi.changes 2010-02-11 14:21:37.000000000 +0100 @@ -1,0 +2,20 @@ +Wed Feb 10 16:49:28 CET 2010 - ms(a)suse.de + +- v4.15 +- fixed name resolution inside chroot if curl backend is used + zypper uses libcurl for ftp transfers (bnc #578687) +- moved EC2 options into a new ec2config section (bnc #577883) +- handle reboot request only if we are not in recovery mode (bnc #573403) +- fixed default split section usage for iso type + +------------------------------------------------------------------- +Wed Feb 10 16:24:45 CET 2010 - mbarriner(a)suse.de + +- A minor imagewriter text modification. + +------------------------------------------------------------------- +Tue Feb 9 13:16:19 UTC 2010 - prusnak(a)suse.cz + +- enable noarch subpackages + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.JJsTK5/_old 2010-02-11 19:27:48.000000000 +0100 +++ /var/tmp/diff_new_pack.JJsTK5/_new 2010-02-11 19:27:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 4.14) +# spec file for package kiwi (Version 4.15) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -60,7 +60,7 @@ Requires: clicfs %endif Summary: OpenSuSE - KIWI Image System -Version: 4.14 +Version: 4.15 Release: 1 Group: System/Management License: GPLv2+ @@ -84,6 +84,9 @@ Requires: inst-source-utils createrepo Summary: Installation Source creation Group: System/Management +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description -n kiwi-instsource This package contains modules used for installation source creation. @@ -101,6 +104,9 @@ License: LGPLv2.0+ Summary: OpenSuSE - KIWI Image System Documentation Group: Documentation/Howto +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description -n kiwi-doc This package contains the documentation and manual pages for the KIWI @@ -146,6 +152,9 @@ Requires: syslinux Summary: OpenSuSE - KIWI Image System PXE boot structure Group: System/Management +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description -n kiwi-pxeboot PXE basic directory structure and pre-build boot images @@ -161,6 +170,9 @@ Requires: syslinux Summary: OpenSuSE - KIWI TFTP prebuild boot images Group: System/Management +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description -n kiwi-pxeboot-prebuild This package contains the OpenSuSE - KIWI TFTP prebuild boot images @@ -182,6 +194,9 @@ %endif Summary: OpenSuSE - KIWI Image System ISO boot Group: System/Management +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description -n kiwi-desc-isoboot kiwi boot (initrd) image for activating system images on ISO media @@ -197,6 +212,9 @@ Requires: kiwi = %{version} Summary: OpenSuSE - KIWI Image System USB boot Group: System/Management +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description -n kiwi-desc-usbboot kiwi boot (initrd) image for activating system images on USB stick @@ -213,6 +231,9 @@ Requires: qemu multipath-tools Summary: OpenSuSE - KIWI Image System Virtual Machine boot Group: System/Management +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description -n kiwi-desc-vmxboot kiwi boot (initrd) image for activating system images on virtual disk @@ -228,6 +249,9 @@ Requires: kiwi = %{version} Summary: OpenSuSE - KIWI Image System PXE network boot Group: System/Management +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description -n kiwi-desc-netboot kiwi boot (initrd) image for activating system images via TFTP @@ -243,6 +267,9 @@ Requires: kiwi = %{version} Summary: OpenSuSE - KIWI Image System Xen Virtual Machine boot Group: System/Management +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description -n kiwi-desc-xenboot kiwi boot (initrd) image for activating a Xen image by xm @@ -264,6 +291,9 @@ %endif Summary: OpenSuSE - KIWI image descriptions Group: System/Management +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description -n kiwi-desc-oemboot This package contains the OpenSuSE - KIWI image descriptions. Each @@ -281,6 +311,9 @@ Requires: kiwi-desc-vmxboot = %{version} Summary: OpenSuSE - KIWI JeOS system image templates Group: System/Management +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description -n kiwi-templates This package contains system image templates to easily build ++++++ kiwi.tar.bz2 ++++++ kiwi/kiwi.tar.bz2 kiwi/kiwi.tar.bz2 differ: char 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 samba for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at Thu Feb 11 19:28:09 CET 2010. -------- --- samba/samba.changes 2010-01-19 12:32:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/samba/samba.changes 2010-02-09 23:29:01.000000000 +0100 @@ -1,0 +2,34 @@ +Tue Feb 9 22:10:44 UTC 2010 - lmuelle(a)suse.de + +- Take extra care that a mount point of mount.cifs isn't changed during mount + and don't allow it to be run as setuid root program; CVE-2009-3638; + (bnc#550002). + +------------------------------------------------------------------- +Tue Feb 9 17:10:55 UTC 2010 - lmuelle(a)suse.de + +- Check in mount.cifs for invalid characters in device name and mountpoint; + CVE-2010-0547; (brc#562156); (bnc#577925). + +------------------------------------------------------------------- +Mon Feb 8 11:44:54 UTC 2010 - lmuelle(a)suse.de + +- Change parameter "wide links" to default to "no"; it's also incompatible + with "unix extensions"; (bso#7104); (bnc#577868). + +------------------------------------------------------------------- +Sun Feb 7 08:35:14 CET 2010 - boyang(a)suse.de + +- Fix enumerate domain local groups for primary domain; (bnc#573813). + +------------------------------------------------------------------- +Sun Feb 7 07:48:06 CET 2010 - boyang(a)suse.de + +- Fix malformed require_membership_of_sid; (bnc#525123); (bso#7106). + +------------------------------------------------------------------- +Fri Feb 5 17:12:24 UTC 2010 - lmuelle(a)suse.de + +- Normalize "Changing password for" msg IDs and STRs; (bnc#499233). + +------------------------------------------------------------------- @@ -5 +39 @@ - + Fix memory in leak in smbd (bug #7020). + + Fix memory leak in smbd (bug #7020). @@ -58,0 +93,6 @@ + +------------------------------------------------------------------- +Wed Jan 6 17:17:58 UTC 2010 - lmuelle(a)suse.de + +- Readjust the _libdir/cups/backend/smb sym link only on uninstall of the + samba-krb-printing package; (bnc#568603). calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.VaFh0n/_old 2010-02-11 19:18:34.000000000 +0100 +++ /var/tmp/diff_new_pack.VaFh0n/_new 2010-02-11 19:18:34.000000000 +0100 @@ -58,7 +58,7 @@ %endif Url: http://www.samba.org/ Version: 3.4.5 -Release: 1 +Release: 2 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -370,10 +370,10 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.VaFh0n/_old 2010-02-11 19:18:34.000000000 +0100 +++ /var/tmp/diff_new_pack.VaFh0n/_new 2010-02-11 19:18:34.000000000 +0100 @@ -63,7 +63,7 @@ Url: http://www.samba.org/ AutoReqProv: on Version: 3.4.5 -Release: 1 +Release: 2 %ifarch ppc64 Obsoletes: samba-64bit %endif @@ -158,10 +158,10 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %package client @@ -201,10 +201,10 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -229,10 +229,10 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %endif @@ -260,10 +260,10 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %endif @@ -290,10 +290,10 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %if %{make_utils} @@ -342,10 +342,10 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -369,10 +369,10 @@ %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %else @@ -414,10 +414,10 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %package -n libnetapi0 @@ -436,10 +436,10 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %package -n libnetapi-devel @@ -459,10 +459,10 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -481,10 +481,10 @@ %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %else @@ -518,10 +518,10 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %if %{make_ldapsmb} @@ -542,10 +542,10 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %package -n libtalloc-devel @@ -565,10 +565,10 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %package -n libtdb1 @@ -587,10 +587,10 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %package -n libtdb-devel @@ -610,10 +610,10 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %package -n libwbclient0 @@ -632,10 +632,10 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %package -n libwbclient-devel @@ -655,10 +655,10 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %package -n ldapsmb @@ -667,7 +667,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 276 +Release: 277 Requires: perl-ldap %description -n ldapsmb @@ -680,10 +680,10 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %endif @@ -706,10 +706,10 @@ -------- Steve French <sfrench at Samba dot org> -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 -Source Timestamp: 2280 +Source Timestamp: 2306 Branch : 3.4.5 %endif @@ -1308,7 +1308,7 @@ %{?run_permissions:%{run_permissions}} %postun krb-printing -if test -e %{_bindir}/smbspool -a -d %{_libdir}/cups/backend; then +if test ${1:-0} -eq 0 -a -e %{_bindir}/smbspool -a -d %{_libdir}/cups/backend; then ln -fs %{_bindir}/smbspool %{_libdir}/cups/backend/smb fi %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000 ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.VaFh0n/_old 2010-02-11 19:18:34.000000000 +0100 +++ /var/tmp/diff_new_pack.VaFh0n/_new 2010-02-11 19:18:34.000000000 +0100 @@ -1,2 +1,2 @@ -2280 +2306 Branch : 3.4.5 ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/381593a6cb1ff0ccbc560ee9329b0d2e59938264 new/patches/samba.org/381593a6cb1ff0ccbc560ee9329b0d2e59938264 --- old/patches/samba.org/381593a6cb1ff0ccbc560ee9329b0d2e59938264 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/381593a6cb1ff0ccbc560ee9329b0d2e59938264 2010-02-07 20:41:41.000000000 +0100 @@ -0,0 +1,41 @@ +From 381593a6cb1ff0ccbc560ee9329b0d2e59938264 Mon Sep 17 00:00:00 2001 +From: Bo Yang <boyang(a)samba.org> +Date: Sun, 7 Feb 2010 14:45:42 +0800 +Subject: [PATCH] s3: Fix malformed require_membership_of_sid. + +Signed-off-by: Bo Yang <boyang(a)samba.org> +(cherry picked from commit 913a9f4e420c7a4177e6a7874e8ec2703f447918) +--- + nsswitch/pam_winbind.c | 12 ++++++++++++ + 1 files changed, 12 insertions(+), 0 deletions(-) + +Index: nsswitch/pam_winbind.c +=================================================================== +--- nsswitch/pam_winbind.c.orig ++++ nsswitch/pam_winbind.c +@@ -1133,6 +1133,7 @@ static bool winbind_name_list_to_sid_str + char *current_name = NULL; + const char *search_location; + const char *comma; ++ int len; + + if (sid_list_buffer_size > 0) { + sid_list_buffer[0] = 0; +@@ -1188,6 +1189,17 @@ static bool winbind_name_list_to_sid_str + _make_remark_format(ctx, PAM_TEXT_INFO, _("Cannot convert group %s " + "to sid, please contact your administrator to see " + "if group %s is valid."), search_location, search_location); ++ /* ++ * The lookup of the last name failed.. ++ * It results in require_member_of_sid ends with ',' ++ * It is malformated parameter here, overwrite the last ','. ++ */ ++ len = strlen(sid_list_buffer); ++ if (len) { ++ if (sid_list_buffer[len - 1] == ',') { ++ sid_list_buffer[len - 1] = '\0'; ++ } ++ } + } + + result = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/3ae5dac462c4ed0fb2cd94553583c56fce2f9d80 new/patches/samba.org/3ae5dac462c4ed0fb2cd94553583c56fce2f9d80 --- old/patches/samba.org/3ae5dac462c4ed0fb2cd94553583c56fce2f9d80 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/3ae5dac462c4ed0fb2cd94553583c56fce2f9d80 2010-02-09 22:59:45.000000000 +0100 @@ -0,0 +1,83 @@ +commit 3ae5dac462c4ed0fb2cd94553583c56fce2f9d80 +Author: Jeff Layton <jlayton(a)redhat.com> +Date: Tue Jan 26 08:15:41 2010 -0500 + + mount.cifs: take extra care that mountpoint isn't changed during mount + + It's possible to trick mount.cifs into mounting onto the wrong directory + by replacing the mountpoint with a symlink to a directory. mount.cifs + attempts to check the validity of the mountpoint, but there's still a + possible race between those checks and the mount(2) syscall. + + To guard against this, chdir to the mountpoint very early, and only deal + with it as "." from then on out. + + Signed-off-by: Jeff Layton <jlayton(a)redhat.com> + +Index: source3/client/mount.cifs.c +=================================================================== +--- source3/client/mount.cifs.c.orig ++++ source3/client/mount.cifs.c +@@ -179,7 +179,7 @@ check_mountpoint(const char *progname, c + struct stat statbuf; + + /* does mountpoint exist and is it a directory? */ +- err = stat(mountpoint, &statbuf); ++ err = stat(".", &statbuf); + if (err) { + fprintf(stderr, "%s: failed to stat %s: %s\n", progname, + mountpoint, strerror(errno)); +@@ -1383,6 +1383,14 @@ int main(int argc, char ** argv) + } + + /* make sure mountpoint is legit */ ++ rc = chdir(mountpoint); ++ if (rc) { ++ fprintf(stderr, "Couldn't chdir to %s: %s\n", mountpoint, ++ strerror(errno)); ++ rc = EX_USAGE; ++ goto mount_exit; ++ } ++ + rc = check_mountpoint(thisprogram, mountpoint); + if (rc) + goto mount_exit; +@@ -1445,13 +1453,23 @@ int main(int argc, char ** argv) + + /* BB save off path and pop after mount returns? */ + resolved_path = (char *)malloc(PATH_MAX+1); +- if(resolved_path) { +- /* Note that if we can not canonicalize the name, we get +- another chance to see if it is valid when we chdir to it */ +- if (realpath(mountpoint, resolved_path)) { +- mountpoint = resolved_path; +- } ++ if (!resolved_path) { ++ fprintf(stderr, "Unable to allocate memory.\n"); ++ rc = EX_SYSERR; ++ goto mount_exit; + } ++ ++ /* Note that if we can not canonicalize the name, we get ++ another chance to see if it is valid when we chdir to it */ ++ if(!realpath(".", resolved_path)) { ++ fprintf(stderr, "Unable to resolve %s to canonical path: %s\n", ++ mountpoint, strerror(errno)); ++ rc = EX_SYSERR; ++ goto mount_exit; ++ } ++ ++ mountpoint = resolved_path; ++ + if(got_user == 0) { + /* Note that the password will not be retrieved from the + USER env variable (ie user%password form) as there is +@@ -1585,7 +1603,7 @@ mount_retry: + if (verboseflag) + fprintf(stderr, "\n"); + +- if (!fakemnt && mount(dev_name, mountpoint, "cifs", flags, options)) { ++ if (!fakemnt && mount(dev_name, ".", "cifs", flags, options)) { + switch (errno) { + case ECONNREFUSED: + case EHOSTUNREACH: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/a065c177dfc8f968775593ba00dffafeebb2e054 new/patches/samba.org/a065c177dfc8f968775593ba00dffafeebb2e054 --- old/patches/samba.org/a065c177dfc8f968775593ba00dffafeebb2e054 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/a065c177dfc8f968775593ba00dffafeebb2e054 2010-02-09 23:02:19.000000000 +0100 @@ -0,0 +1,68 @@ +commit a065c177dfc8f968775593ba00dffafeebb2e054 +Author: Jeff Layton <jlayton(a)redhat.com> +Date: Tue Jan 26 08:15:41 2010 -0500 + + mount.cifs: check for invalid characters in device name and mountpoint + + It's apparently possible to corrupt the mtab if you pass embedded + newlines to addmntent. Apparently tabs are also a problem with certain + earlier glibc versions. Backslashes are also a minor issue apparently, + but we can't reasonably filter those. + + Make sure that neither the devname or mountpoint contain any problematic + characters before allowing the mount to proceed. + + Signed-off-by: Jeff Layton <jlayton(a)redhat.com> + +Index: source3/client/mount.cifs.c +=================================================================== +--- source3/client/mount.cifs.c.orig ++++ source3/client/mount.cifs.c +@@ -1160,6 +1160,36 @@ static void print_cifs_mount_version(voi + MOUNT_CIFS_VENDOR_SUFFIX); + } + ++/* ++ * This function borrowed from fuse-utils... ++ * ++ * glibc's addmntent (at least as of 2.10 or so) doesn't properly encode ++ * newlines embedded within the text fields. To make sure no one corrupts ++ * the mtab, fail the mount if there are embedded newlines. ++ */ ++static int check_newline(const char *progname, const char *name) ++{ ++ char *s; ++ for (s = "\n"; *s; s++) { ++ if (strchr(name, *s)) { ++ fprintf(stderr, "%s: illegal character 0x%02x in mount entry\n", ++ progname, *s); ++ return EX_USAGE; ++ } ++ } ++ return 0; ++} ++ ++static int check_mtab(const char *progname, const char *devname, ++ const char *dir) ++{ ++ if (check_newline(progname, devname) == -1 || ++ check_newline(progname, dir) == -1) ++ return EX_USAGE; ++ return 0; ++} ++ ++ + int main(int argc, char ** argv) + { + int c; +@@ -1603,6 +1633,10 @@ mount_retry: + if (verboseflag) + fprintf(stderr, "\n"); + ++ rc = check_mtab(thisprogram, dev_name, mountpoint); ++ if (rc) ++ goto mount_exit; ++ + if (!fakemnt && mount(dev_name, ".", "cifs", flags, options)) { + switch (errno) { + case ECONNREFUSED: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/a0c31ec1c8d1220a5884e40d9ba6b191a04a24d5 new/patches/samba.org/a0c31ec1c8d1220a5884e40d9ba6b191a04a24d5 --- old/patches/samba.org/a0c31ec1c8d1220a5884e40d9ba6b191a04a24d5 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/a0c31ec1c8d1220a5884e40d9ba6b191a04a24d5 2010-02-09 23:03:29.000000000 +0100 @@ -0,0 +1,92 @@ +commit a0c31ec1c8d1220a5884e40d9ba6b191a04a24d5 +Author: Jeff Layton <jlayton(a)redhat.com> +Date: Tue Jan 26 08:15:41 2010 -0500 + + mount.cifs: don't allow it to be run as setuid root program + + mount.cifs has been the subject of several "security" fire drills due to + distributions installing it as a setuid root program. This program has + not been properly audited for security and the Samba team highly + recommends that it not be installed as a setuid root program at this + time. + + To make that abundantly clear, this patch forcibly disables the ability + for mount.cifs to run as a setuid root program. People are welcome to + trivially patch this out, but they do so at their own peril. + + A security audit and redesign of this program is in progress and we hope + that we'll be able to remove this in the near future. + + Signed-off-by: Jeff Layton <jlayton(a)redhat.com> + +Index: source3/client/mount.cifs.c +=================================================================== +--- source3/client/mount.cifs.c.orig ++++ source3/client/mount.cifs.c +@@ -43,7 +43,7 @@ + #include "mount.h" + + #define MOUNT_CIFS_VERSION_MAJOR "1" +-#define MOUNT_CIFS_VERSION_MINOR "13" ++#define MOUNT_CIFS_VERSION_MINOR "14" + + #ifndef MOUNT_CIFS_VENDOR_SUFFIX + #ifdef _SAMBA_BUILD_ +@@ -89,6 +89,17 @@ + #define MAX_ADDRESS_LEN INET6_ADDRSTRLEN + + /* ++ * mount.cifs has been the subject of many "security" bugs that have arisen ++ * because of users and distributions installing it as a setuid root program. ++ * mount.cifs has not been audited for security. Thus, we strongly recommend ++ * that it not be installed setuid root. To make that abundantly clear, ++ * mount.cifs now check whether it's running setuid root and exit with an ++ * error if it is. If you wish to disable this check, then set the following ++ * #define to 1, but please realize that you do so at your own peril. ++ */ ++#define CIFS_DISABLE_SETUID_CHECK 0 ++ ++/* + * By default, mount.cifs follows the conventions set forth by /bin/mount + * for user mounts. That is, it requires that the mount be listed in + * /etc/fstab with the "user" option when run as an unprivileged user and +@@ -213,6 +224,29 @@ check_mountpoint(const char *progname, c + return 0; + } + ++#if CIFS_DISABLE_SETUID_CHECK ++static int ++check_setuid(void) ++{ ++ return 0; ++} ++#else /* CIFS_DISABLE_SETUID_CHECK */ ++static int ++check_setuid(void) ++{ ++ if (getuid() && !geteuid()) { ++ printf("This mount.cifs program has been built with the " ++ "ability to run as a setuid root program disabled.\n" ++ "mount.cifs has not been well audited for security " ++ "holes. Therefore the Samba team does not recommend " ++ "installing it as a setuid root program.\n"); ++ return 1; ++ } ++ ++ return 0; ++} ++#endif /* CIFS_DISABLE_SETUID_CHECK */ ++ + #if CIFS_LEGACY_SETUID_CHECK + static int + check_fstab(const char *progname, char *mountpoint, char *devname, +@@ -1222,6 +1256,9 @@ int main(int argc, char ** argv) + struct sockaddr_in6 *addr6; + FILE * pmntfile; + ++ if (check_setuid()) ++ return EX_USAGE; ++ + /* setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/bd269443e311d96ef495a9db47d1b95eb83bb8f4 new/patches/samba.org/bd269443e311d96ef495a9db47d1b95eb83bb8f4 --- old/patches/samba.org/bd269443e311d96ef495a9db47d1b95eb83bb8f4 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/bd269443e311d96ef495a9db47d1b95eb83bb8f4 2010-02-08 19:30:09.000000000 +0100 @@ -0,0 +1,149 @@ +commit bd269443e311d96ef495a9db47d1b95eb83bb8f4 +Author: Jeremy Allison <jra(a)samba.org> +Date: Fri Feb 5 15:20:18 2010 -0800 + + Fix bug 7104 - "wide links" and "unix extensions" are incompatible. + + Change parameter "wide links" to default to "no". + Ensure "wide links = no" if "unix extensions = yes" on a share. + Fix man pages to refect this. + + Remove "within share" checks for a UNIX symlink set - even if + widelinks = no. The server will not follow that link anyway. + + Correct DEBUG message in check_reduced_name() to add missing "\n" + so it's really clear when a path is being denied as it's outside + the enclosing share path. + + Jeremy. + +Index: docs-xml/smbdotconf/misc/widelinks.xml +=================================================================== +--- docs-xml/smbdotconf/misc/widelinks.xml.orig ++++ docs-xml/smbdotconf/misc/widelinks.xml +@@ -9,10 +9,15 @@ + server are always allowed; this parameter controls access only + to areas that are outside the directory tree being exported.</para> + +- <para>Note that setting this parameter can have a negative +- effect on your server performance due to the extra system calls +- that Samba has to do in order to perform the link checks.</para> ++ <para>Note: Turning this parameter on when UNIX extensions are enabled ++ will allow UNIX clients to create symbolic links on the share that ++ can point to files or directories outside restricted path exported ++ by the share definition. This can cause access to areas outside of ++ the share. Due to this problem, this parameter will be automatically ++ disabled (with a message in the log file) if the ++ <smbconfoption name="unix extensions"/> option is on. ++ </para> + </description> + +-<value type="default">yes</value> ++<value type="default">no</value> + </samba:parameter> +Index: docs-xml/smbdotconf/protocol/unixextensions.xml +=================================================================== +--- docs-xml/smbdotconf/protocol/unixextensions.xml.orig ++++ docs-xml/smbdotconf/protocol/unixextensions.xml +@@ -10,6 +10,9 @@ + by supporting features such as symbolic links, hard links, etc... + These extensions require a similarly enabled client, and are of + no current use to Windows clients.</para> ++ <para> ++ Note if this parameter is turned on, the <smbconfoption name="wide links"/> ++ parameter will automatically be disabled. + </description> + + <value type="default">yes</value> +Index: source3/param/loadparm.c +=================================================================== +--- source3/param/loadparm.c.orig ++++ source3/param/loadparm.c +@@ -598,7 +598,7 @@ static struct service sDefault = { + True, /* bLevel2OpLocks */ + False, /* bOnlyUser */ + True, /* bMangledNames */ +- True, /* bWidelinks */ ++ false, /* bWidelinks */ + True, /* bSymlinks */ + False, /* bSyncAlways */ + False, /* bStrictAllocate */ +Index: source3/smbd/service.c +=================================================================== +--- source3/smbd/service.c.orig ++++ source3/smbd/service.c +@@ -1031,6 +1031,14 @@ static connection_struct *make_connectio + } + #endif + ++ if (lp_unix_extensions() && lp_widelinks(snum)) { ++ DEBUG(0,("Share '%s' has wide links and unix extensions enabled. " ++ "These parameters are incompatible. " ++ "Disabling wide links for this share.\n", ++ lp_servicename(snum) )); ++ lp_do_parameter(snum, "wide links", "False"); ++ } ++ + /* Figure out the characteristics of the underlying filesystem. This + * assumes that all the filesystem mounted withing a share path have + * the same characteristics, which is likely but not guaranteed. +Index: source3/smbd/trans2.c +=================================================================== +--- source3/smbd/trans2.c.orig ++++ source3/smbd/trans2.c +@@ -5292,42 +5292,6 @@ static NTSTATUS smb_set_file_unix_link(c + return NT_STATUS_INVALID_PARAMETER; + } + +- /* !widelinks forces the target path to be within the share. */ +- /* This means we can interpret the target as a pathname. */ +- if (!lp_widelinks(SNUM(conn))) { +- char *rel_name = NULL; +- char *last_dirp = NULL; +- +- if (*link_target == '/') { +- /* No absolute paths allowed. */ +- return NT_STATUS_ACCESS_DENIED; +- } +- rel_name = talloc_strdup(ctx,newname); +- if (!rel_name) { +- return NT_STATUS_NO_MEMORY; +- } +- last_dirp = strrchr_m(rel_name, '/'); +- if (last_dirp) { +- last_dirp[1] = '\0'; +- } else { +- rel_name = talloc_strdup(ctx,"./"); +- if (!rel_name) { +- return NT_STATUS_NO_MEMORY; +- } +- } +- rel_name = talloc_asprintf_append(rel_name, +- "%s", +- link_target); +- if (!rel_name) { +- return NT_STATUS_NO_MEMORY; +- } +- +- status = check_name(conn, rel_name); +- if (!NT_STATUS_IS_OK(status)) { +- return status; +- } +- } +- + DEBUG(10,("smb_set_file_unix_link: SMB_SET_FILE_UNIX_LINK doing symlink %s -> %s\n", + newname, link_target )); + +Index: source3/smbd/vfs.c +=================================================================== +--- source3/smbd/vfs.c.orig ++++ source3/smbd/vfs.c +@@ -946,7 +946,7 @@ NTSTATUS check_reduced_name(connection_s + + /* Check for widelinks allowed. */ + if (!lp_widelinks(SNUM(conn)) && (strncmp(conn->connectpath, resolved_name, con_path_len) != 0)) { +- DEBUG(2, ("reduce_name: Bad access attempt: %s is a symlink outside the share path", fname)); ++ DEBUG(2, ("reduce_name: Bad access attempt: %s is a symlink outside the share path\n", fname)); + if (free_resolved_name) { + SAFE_FREE(resolved_name); + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/cc7b62269e4a90859dd93b8d6896390857ba17d7 new/patches/samba.org/cc7b62269e4a90859dd93b8d6896390857ba17d7 --- old/patches/samba.org/cc7b62269e4a90859dd93b8d6896390857ba17d7 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/cc7b62269e4a90859dd93b8d6896390857ba17d7 2010-02-09 22:59:40.000000000 +0100 @@ -0,0 +1,336 @@ +commit cc7b62269e4a90859dd93b8d6896390857ba17d7 +Author: Jeff Layton <jlayton(a)redhat.com> +Date: Sat Jun 6 19:46:24 2009 -0400 + + mount.cifs: properly check for mount being in fstab when running setuid root (try#3) + + This is the third attempt to clean up the checks when a setuid + mount.cifs is run by an unprivileged user. The main difference in this + patch from the last one is that it fixes a bug where the mount might + have failed if unnecessarily if CIFS_LEGACY_SETUID_CHECK was set. + + When mount.cifs is installed setuid root and run as an unprivileged + user, it does some checks to limit how the mount is used. It checks that + the mountpoint is owned by the user doing the mount. + + These checks however do not match those that /bin/mount does when it is + called by an unprivileged user. When /bin/mount is called by an + unprivileged user to do a mount, it checks that the mount in question is + in /etc/fstab, that it has the "user" option set, etc. + + This means that it's currently not possible to set up user mounts the + standard way (by the admin, in /etc/fstab) and simultaneously protect + from an unprivileged user calling mount.cifs directly to mount a share + on any directory that that user owns. + + Fix this by making the checks in mount.cifs match those of /bin/mount + itself. This is a necessary step to make mount.cifs safe to be installed + as a setuid binary, but not sufficient. For that, we'd need to give + mount.cifs a proper security audit. + + Since some users may be depending on the legacy behavior, this patch + also adds the ability to build mount.cifs with the older behavior. + + Signed-off-by: Jeff Layton <jlayton(a)redhat.com> + +Index: source3/client/mount.cifs.c +=================================================================== +--- source3/client/mount.cifs.c.orig ++++ source3/client/mount.cifs.c +@@ -39,10 +39,11 @@ + #include <mntent.h> + #include <fcntl.h> + #include <limits.h> ++#include <fstab.h> + #include "mount.h" + + #define MOUNT_CIFS_VERSION_MAJOR "1" +-#define MOUNT_CIFS_VERSION_MINOR "12" ++#define MOUNT_CIFS_VERSION_MINOR "13" + + #ifndef MOUNT_CIFS_VENDOR_SUFFIX + #ifdef _SAMBA_BUILD_ +@@ -69,6 +70,10 @@ + #define MS_BIND 4096 + #endif + ++/* private flags - clear these before passing to kernel */ ++#define MS_USERS 0x40000000 ++#define MS_USER 0x80000000 ++ + #define MAX_UNC_LEN 1024 + + #define CONST_DISCARD(type, ptr) ((type) ((void *) (ptr))) +@@ -83,6 +88,27 @@ + /* currently maximum length of IPv6 address string */ + #define MAX_ADDRESS_LEN INET6_ADDRSTRLEN + ++/* ++ * By default, mount.cifs follows the conventions set forth by /bin/mount ++ * for user mounts. That is, it requires that the mount be listed in ++ * /etc/fstab with the "user" option when run as an unprivileged user and ++ * mount.cifs is setuid root. ++ * ++ * Older versions of mount.cifs however were "looser" in this regard. When ++ * made setuid root, a user could run mount.cifs directly and mount any share ++ * on a directory owned by that user. ++ * ++ * The legacy behavior is now disabled by default. To reenable it, set the ++ * following #define to true. ++ */ ++#define CIFS_LEGACY_SETUID_CHECK 0 ++ ++/* ++ * When an unprivileged user runs a setuid mount.cifs, we set certain mount ++ * flags by default. These defaults can be changed here. ++ */ ++#define CIFS_SETUID_FLAGS (MS_NOSUID|MS_NODEV) ++ + const char *thisprogram; + int verboseflag = 0; + int fakemnt = 0; +@@ -142,6 +168,99 @@ static size_t strlcat(char *d, const cha + } + #endif + ++/* ++ * If an unprivileged user is doing the mounting then we need to ensure ++ * that the entry is in /etc/fstab. ++ */ ++static int ++check_mountpoint(const char *progname, char *mountpoint) ++{ ++ int err; ++ struct stat statbuf; ++ ++ /* does mountpoint exist and is it a directory? */ ++ err = stat(mountpoint, &statbuf); ++ if (err) { ++ fprintf(stderr, "%s: failed to stat %s: %s\n", progname, ++ mountpoint, strerror(errno)); ++ return EX_USAGE; ++ } ++ ++ if (!S_ISDIR(statbuf.st_mode)) { ++ fprintf(stderr, "%s: %s is not a directory!", progname, ++ mountpoint); ++ return EX_USAGE; ++ } ++ ++#if CIFS_LEGACY_SETUID_CHECK ++ /* do extra checks on mountpoint for legacy setuid behavior */ ++ if (!getuid() || geteuid()) ++ return 0; ++ ++ if (statbuf.st_uid != getuid()) { ++ fprintf(stderr, "%s: %s is not owned by user\n", progname, ++ mountpoint); ++ return EX_USAGE; ++ } ++ ++ if ((statbuf.st_mode & S_IRWXU) != S_IRWXU) { ++ fprintf(stderr, "%s: invalid permissions on %s\n", progname, ++ mountpoint); ++ return EX_USAGE; ++ } ++#endif /* CIFS_LEGACY_SETUID_CHECK */ ++ ++ return 0; ++} ++ ++#if CIFS_LEGACY_SETUID_CHECK ++static int ++check_fstab(const char *progname, char *mountpoint, char *devname, ++ char **options) ++{ ++ return 0; ++} ++#else /* CIFS_LEGACY_SETUID_CHECK */ ++static int ++check_fstab(const char *progname, char *mountpoint, char *devname, ++ char **options) ++{ ++ FILE *fstab; ++ struct mntent *mnt; ++ ++ /* make sure this mount is listed in /etc/fstab */ ++ fstab = setmntent(_PATH_FSTAB, "r"); ++ if (!fstab) { ++ fprintf(stderr, "Couldn't open %s for reading!\n", ++ _PATH_FSTAB); ++ return EX_FILEIO; ++ } ++ ++ while((mnt = getmntent(fstab))) { ++ if (!strcmp(mountpoint, mnt->mnt_dir)) ++ break; ++ } ++ endmntent(fstab); ++ ++ if (mnt == NULL || strcmp(mnt->mnt_fsname, devname)) { ++ fprintf(stderr, "%s: permission denied: no match for " ++ "%s found in %s\n", progname, mountpoint, ++ _PATH_FSTAB); ++ return EX_USAGE; ++ } ++ ++ /* ++ * 'mount' munges the options from fstab before passing them ++ * to us. It is non-trivial to test that we have the correct ++ * set of options. We don't want to trust what the user ++ * gave us, so just take whatever is in /etc/fstab. ++ */ ++ free(*options); ++ *options = strdup(mnt->mnt_opts); ++ return 0; ++} ++#endif /* CIFS_LEGACY_SETUID_CHECK */ ++ + /* BB finish BB + + cifs_umount +@@ -373,7 +492,7 @@ static int get_password_from_file(int fi + return rc; + } + +-static int parse_options(char ** optionsp, int * filesys_flags) ++static int parse_options(char ** optionsp, unsigned long * filesys_flags) + { + const char * data; + char * percent_char = NULL; +@@ -423,6 +542,7 @@ static int parse_options(char ** options + + if (strncmp(data, "users",5) == 0) { + if(!value || !*value) { ++ *filesys_flags |= MS_USERS; + goto nocopy; + } + } else if (strncmp(data, "user_xattr",10) == 0) { +@@ -431,10 +551,7 @@ static int parse_options(char ** options + + if (!value || !*value) { + if(data[4] == '\0') { +- if(verboseflag) +- printf("\nskipping empty user mount parameter\n"); +- /* remove the parm since it would otherwise be confusing +- to the kernel code which would think it was a real username */ ++ *filesys_flags |= MS_USER; + goto nocopy; + } else { + printf("username specified with no parameter\n"); +@@ -1046,7 +1163,7 @@ static void print_cifs_mount_version(voi + int main(int argc, char ** argv) + { + int c; +- int flags = MS_MANDLOCK; /* no need to set legacy MS_MGC_VAL */ ++ unsigned long flags = MS_MANDLOCK; + char * orgoptions = NULL; + char * share_name = NULL; + const char * ipaddr = NULL; +@@ -1069,7 +1186,6 @@ int main(int argc, char ** argv) + size_t current_len; + int retry = 0; /* set when we have to retry mount with uppercase */ + struct addrinfo *addrhead = NULL, *addr; +- struct stat statbuf; + struct utsname sysinfo; + struct mntent mountent; + struct sockaddr_in *addr4; +@@ -1127,8 +1243,8 @@ int main(int argc, char ** argv) + exit(EX_USAGE); + } + +- /* add sharename in opts string as unc= parm */ + ++ /* add sharename in opts string as unc= parm */ + while ((c = getopt_long (argc, argv, "afFhilL:no:O:rsSU:vVwt:", + longopts, NULL)) != -1) { + switch (c) { +@@ -1266,6 +1382,22 @@ int main(int argc, char ** argv) + exit(EX_USAGE); + } + ++ /* make sure mountpoint is legit */ ++ rc = check_mountpoint(thisprogram, mountpoint); ++ if (rc) ++ goto mount_exit; ++ ++ /* sanity check for unprivileged mounts */ ++ if (getuid()) { ++ rc = check_fstab(thisprogram, mountpoint, dev_name, ++ &orgoptions); ++ if (rc) ++ goto mount_exit; ++ ++ /* enable any default user mount flags */ ++ flags |= CIFS_SETUID_FLAGS; ++ } ++ + if (getenv("PASSWD")) { + if(mountpassword == NULL) + mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1); +@@ -1283,6 +1415,27 @@ int main(int argc, char ** argv) + rc = EX_USAGE; + goto mount_exit; + } ++ ++ if (getuid()) { ++#if !CIFS_LEGACY_SETUID_CHECK ++ if (!(flags & (MS_USERS|MS_USER))) { ++ fprintf(stderr, "%s: permission denied\n", thisprogram); ++ rc = EX_USAGE; ++ goto mount_exit; ++ } ++#endif /* !CIFS_LEGACY_SETUID_CHECK */ ++ ++ if (geteuid()) { ++ fprintf(stderr, "%s: not installed setuid - \"user\" " ++ "CIFS mounts not supported.", ++ thisprogram); ++ rc = EX_FAIL; ++ goto mount_exit; ++ } ++ } ++ ++ flags &= ~(MS_USERS|MS_USER); ++ + addrhead = addr = parse_server(&share_name); + if((addrhead == NULL) && (got_ip == 0)) { + printf("No ip address specified and hostname not found\n"); +@@ -1299,37 +1452,6 @@ int main(int argc, char ** argv) + mountpoint = resolved_path; + } + } +- if(chdir(mountpoint)) { +- printf("mount error: can not change directory into mount target %s\n",mountpoint); +- rc = EX_USAGE; +- goto mount_exit; +- } +- +- if(stat (".", &statbuf)) { +- printf("mount error: mount point %s does not exist\n",mountpoint); +- rc = EX_USAGE; +- goto mount_exit; +- } +- +- if (S_ISDIR(statbuf.st_mode) == 0) { +- printf("mount error: mount point %s is not a directory\n",mountpoint); +- rc = EX_USAGE; +- goto mount_exit; +- } +- +- if((getuid() != 0) && (geteuid() == 0)) { +- if((statbuf.st_uid == getuid()) && (S_IRWXU == (statbuf.st_mode & S_IRWXU))) { +-#ifndef CIFS_ALLOW_USR_SUID +- /* Do not allow user mounts to control suid flag +- for mount unless explicitly built that way */ +- flags |= MS_NOSUID | MS_NODEV; +-#endif +- } else { +- printf("mount error: permission denied or not superuser and mount.cifs not installed SUID\n"); +- exit(EX_USAGE); +- } +- } +- + if(got_user == 0) { + /* Note that the password will not be retrieved from the + USER env variable (ie user%password form) as there is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/f9f1db18834648da73b7b1f6d9472523941e8277 new/patches/samba.org/f9f1db18834648da73b7b1f6d9472523941e8277 --- old/patches/samba.org/f9f1db18834648da73b7b1f6d9472523941e8277 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/f9f1db18834648da73b7b1f6d9472523941e8277 2010-02-05 18:24:55.000000000 +0100 @@ -0,0 +1,267 @@ +commit f9f1db18834648da73b7b1f6d9472523941e8277 +Author: Lars Müller <lars(a)samba.org> +Date: Fri Feb 5 17:38:04 2010 +0100 + + s3: normalize "Changing password for" msg IDs and STRs + + An additional space at the end of the "Changing password for" msgid lead + to untranslated pam_winnind messages. + +Index: source3/locale/pam_winbind/ar.po +=================================================================== +--- source3/locale/pam_winbind/ar.po.orig ++++ source3/locale/pam_winbind/ar.po +@@ -136,8 +136,8 @@ msgid "Password: " + msgstr "كلمة السر: " + + #: pam_winbind.c:2013 +-msgid "Changing password for " +-msgstr "تغيير كلمة السر لـ " ++msgid "Changing password for" ++msgstr "تغيير كلمة السر لـ" + + #: pam_winbind.c:2027 + msgid "(current) NT password: " +Index: source3/locale/pam_winbind/cs.po +=================================================================== +--- source3/locale/pam_winbind/cs.po.orig ++++ source3/locale/pam_winbind/cs.po +@@ -136,7 +136,7 @@ msgid "Password: " + msgstr "Heslo:" + + #: pam_winbind.c:2013 +-msgid "Changing password for " ++msgid "Changing password for" + msgstr "Měním heslo pro" + + #: pam_winbind.c:2027 +Index: source3/locale/pam_winbind/da.po +=================================================================== +--- source3/locale/pam_winbind/da.po.orig ++++ source3/locale/pam_winbind/da.po +@@ -153,7 +153,7 @@ msgstr "Brugernavn: " + + #. instruct user what is happening + #: ../../nsswitch/pam_winbind.c:2589 +-msgid "Changing password for " ++msgid "Changing password for" + msgstr "Ændrer adgangskode for" + + #: ../../nsswitch/pam_winbind.c:2604 +Index: source3/locale/pam_winbind/es.po +=================================================================== +--- source3/locale/pam_winbind/es.po.orig ++++ source3/locale/pam_winbind/es.po +@@ -136,8 +136,8 @@ msgid "Password: " + msgstr "Contraseña:" + + #: pam_winbind.c:2013 +-msgid "Changing password for " +-msgstr "Cambiando la contraseña para " ++msgid "Changing password for" ++msgstr "Cambiando la contraseña para" + + #: pam_winbind.c:2027 + msgid "(current) NT password: " +Index: source3/locale/pam_winbind/fi.po +=================================================================== +--- source3/locale/pam_winbind/fi.po.orig ++++ source3/locale/pam_winbind/fi.po +@@ -156,8 +156,8 @@ msgstr "Käyttäjänimi: " + + #. instruct user what is happening + #: ../../nsswitch/pam_winbind.c:2589 +-msgid "Changing password for " +-msgstr "Vaihdetaan salasana käyttäjälle " ++msgid "Changing password for" ++msgstr "Vaihdetaan salasana käyttäjälle" + + #: ../../nsswitch/pam_winbind.c:2604 + msgid "(current) NT password: " +Index: source3/locale/pam_winbind/fr.po +=================================================================== +--- source3/locale/pam_winbind/fr.po.orig ++++ source3/locale/pam_winbind/fr.po +@@ -136,8 +136,8 @@ msgid "Password: " + msgstr "Mot de passe : " + + #: pam_winbind.c:2013 +-msgid "Changing password for " +-msgstr "Changement du mot de passe pour " ++msgid "Changing password for" ++msgstr "Changement du mot de passe pour" + + #: pam_winbind.c:2027 + msgid "(current) NT password: " +Index: source3/locale/pam_winbind/hu.po +=================================================================== +--- source3/locale/pam_winbind/hu.po.orig ++++ source3/locale/pam_winbind/hu.po +@@ -150,7 +150,7 @@ msgid "Password: " + msgstr "Jelszó: " + + #: pam_winbind.c:2013 +-msgid "Changing password for " ++msgid "Changing password for" + msgstr "Jelszómódosítás" + + #: pam_winbind.c:2027 +Index: source3/locale/pam_winbind/it.po +=================================================================== +--- source3/locale/pam_winbind/it.po.orig ++++ source3/locale/pam_winbind/it.po +@@ -136,8 +136,8 @@ msgid "Password: " + msgstr "Password: " + + #: pam_winbind.c:2013 +-msgid "Changing password for " +-msgstr "Modifica la password per " ++msgid "Changing password for" ++msgstr "Modifica la password per" + + #: pam_winbind.c:2027 + msgid "(current) NT password: " +Index: source3/locale/pam_winbind/ja.po +=================================================================== +--- source3/locale/pam_winbind/ja.po.orig ++++ source3/locale/pam_winbind/ja.po +@@ -136,8 +136,8 @@ msgid "Password: " + msgstr "パスワード:" + + #: pam_winbind.c:2013 +-msgid "Changing password for " +-msgstr "下記に対するパスワードを変更しています " ++msgid "Changing password for" ++msgstr "下記に対するパスワードを変更しています" + + #: pam_winbind.c:2027 + msgid "(current) NT password: " +Index: source3/locale/pam_winbind/ko.po +=================================================================== +--- source3/locale/pam_winbind/ko.po.orig ++++ source3/locale/pam_winbind/ko.po +@@ -136,7 +136,7 @@ msgid "Password: " + msgstr "비밀번호:" + + #: pam_winbind.c:2013 +-msgid "Changing password for " ++msgid "Changing password for" + msgstr "비밀번호 변경" + + #: pam_winbind.c:2027 +Index: source3/locale/pam_winbind/nb.po +=================================================================== +--- source3/locale/pam_winbind/nb.po.orig ++++ source3/locale/pam_winbind/nb.po +@@ -158,8 +158,8 @@ msgstr "Brukernavn: " + + #. instruct user what is happening + #: ../../nsswitch/pam_winbind.c:2589 +-msgid "Changing password for " +-msgstr "Endrer passord for " ++msgid "Changing password for" ++msgstr "Endrer passord for" + + #: ../../nsswitch/pam_winbind.c:2604 + msgid "(current) NT password: " +Index: source3/locale/pam_winbind/nl.po +=================================================================== +--- source3/locale/pam_winbind/nl.po.orig ++++ source3/locale/pam_winbind/nl.po +@@ -136,8 +136,8 @@ msgid "Password: " + msgstr "Wachtwoord:" + + #: pam_winbind.c:2013 +-msgid "Changing password for " +-msgstr "Wachtwoord wijzigen voor " ++msgid "Changing password for" ++msgstr "Wachtwoord wijzigen voor" + + #: pam_winbind.c:2027 + msgid "(current) NT password: " +Index: source3/locale/pam_winbind/pl.po +=================================================================== +--- source3/locale/pam_winbind/pl.po.orig ++++ source3/locale/pam_winbind/pl.po +@@ -136,8 +136,8 @@ msgid "Password: " + msgstr "Hasło: " + + #: pam_winbind.c:2013 +-msgid "Changing password for " +-msgstr "Zmiana hasła dla " ++msgid "Changing password for" ++msgstr "Zmiana hasła dla" + + #: pam_winbind.c:2027 + msgid "(current) NT password: " +Index: source3/locale/pam_winbind/pt_BR.po +=================================================================== +--- source3/locale/pam_winbind/pt_BR.po.orig ++++ source3/locale/pam_winbind/pt_BR.po +@@ -136,7 +136,7 @@ msgid "Password: " + msgstr "Senha:" + + #: pam_winbind.c:2013 +-msgid "Changing password for " ++msgid "Changing password for" + msgstr "Alterando a senha para" + + #: pam_winbind.c:2027 +Index: source3/locale/pam_winbind/ru.po +=================================================================== +--- source3/locale/pam_winbind/ru.po.orig ++++ source3/locale/pam_winbind/ru.po +@@ -136,8 +136,8 @@ msgid "Password: " + msgstr "Пароль:" + + #: pam_winbind.c:2013 +-msgid "Changing password for " +-msgstr "Изменение пароля для " ++msgid "Changing password for" ++msgstr "Изменение пароля для" + + #: pam_winbind.c:2027 + msgid "(current) NT password: " +Index: source3/locale/pam_winbind/sv.po +=================================================================== +--- source3/locale/pam_winbind/sv.po.orig ++++ source3/locale/pam_winbind/sv.po +@@ -136,8 +136,8 @@ msgid "Password: " + msgstr "Lösenord:" + + #: pam_winbind.c:2013 +-msgid "Changing password for " +-msgstr "Ändrar lösenord för " ++msgid "Changing password for" ++msgstr "Ändrar lösenord för" + + #: pam_winbind.c:2027 + msgid "(current) NT password: " +Index: source3/locale/pam_winbind/zh_CN.po +=================================================================== +--- source3/locale/pam_winbind/zh_CN.po.orig ++++ source3/locale/pam_winbind/zh_CN.po +@@ -136,8 +136,8 @@ msgid "Password: " + msgstr "密码：" + + #: pam_winbind.c:2013 +-msgid "Changing password for " +-msgstr "更改密码 " ++msgid "Changing password for" ++msgstr "更改密码" + + #: pam_winbind.c:2027 + msgid "(current) NT password: " +Index: source3/locale/pam_winbind/zh_TW.po +=================================================================== +--- source3/locale/pam_winbind/zh_TW.po.orig ++++ source3/locale/pam_winbind/zh_TW.po +@@ -136,7 +136,7 @@ msgid "Password: " + msgstr "密碼：" + + #: pam_winbind.c:2013 +-msgid "Changing password for " ++msgid "Changing password for" + msgstr "變更密碼 -" + + #: pam_winbind.c:2027 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2010-01-19 12:29:33.000000000 +0100 +++ new/patches/series 2010-02-09 23:05:48.000000000 +0100 @@ -9,6 +9,13 @@ samba.org/2d063d077aed01f020352e859b766415fe094fa5 -p0 # FATE 302414. Backported from 3.5.x(master). samba.org/e171c09c3bae678db68c3ded5765d602c8438e25 -p0 # FATE 302414. Backported from 3.5.x(master). samba.org/3d72c96d125a9dd048cc9c358b01aa354a5afa66 -p0 # FATE 302414. Backported from 3.5.x(master). +samba.org/f9f1db18834648da73b7b1f6d9472523941e8277 -p0 # bnc 499233 +samba.org/381593a6cb1ff0ccbc560ee9329b0d2e59938264 -p0 # bnc 525123, bso 7106 +samba.org/bd269443e311d96ef495a9db47d1b95eb83bb8f4 -p0 # bso 7104, bnc 577868 +samba.org/cc7b62269e4a90859dd93b8d6896390857ba17d7 -p0 # mount.cifs check req by bnc 550002 +samba.org/3ae5dac462c4ed0fb2cd94553583c56fce2f9d80 -p0 # bnc 550002 +samba.org/a065c177dfc8f968775593ba00dffafeebb2e054 -p0 # brc 562156, bnc 577925 +samba.org/a0c31ec1c8d1220a5884e40d9ba6b191a04a24d5 -p0 # bnc 550002 # SuSE specific changes # disabled -> WIP lmuelle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/Makefile.in-libwbclient_static.diff new/patches/suse/Makefile.in-libwbclient_static.diff --- old/patches/suse/Makefile.in-libwbclient_static.diff 2010-01-19 12:29:33.000000000 +0100 +++ new/patches/suse/Makefile.in-libwbclient_static.diff 2010-01-28 00:47:00.000000000 +0100 @@ -1,7 +1,8 @@ Author: Lars Mueller <lmuelle at suse dot de> Subject: Create a static lib too Reported upstream: no -Fixed upstream: no +Fixed upstream: yes +commit 2f9eb6bff5faa2c00c901fdf7b7c3489b473a1d3 Index: source3/Makefile.in =================================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/testsuite_libsmbclient.diff new/patches/suse/testsuite_libsmbclient.diff --- old/patches/suse/testsuite_libsmbclient.diff 2010-01-19 12:29:33.000000000 +0100 +++ new/patches/suse/testsuite_libsmbclient.diff 2010-01-28 00:51:04.000000000 +0100 @@ -1,5 +1,7 @@ Author: Lars Mueller <lmuelle at suse dot de> Subject: link all required libs +Fixed upstream: yes +commit 97c4c63990fceb01fd1110d4fcc97b70f623b201 Index: testsuite/libsmbclient/src/Makefile =================================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/testsuite_libsmbclient_src_Makefile.diff new/patches/suse/testsuite_libsmbclient_src_Makefile.diff --- old/patches/suse/testsuite_libsmbclient_src_Makefile.diff 2010-01-19 12:29:33.000000000 +0100 +++ new/patches/suse/testsuite_libsmbclient_src_Makefile.diff 2010-01-28 00:51:04.000000000 +0100 @@ -1,5 +1,7 @@ Author: Lars Mueller <lars at samba dot org> Subject: use source3 as sub dir name +Fixed upstream: yes +commit 8e26aa3d7cec968584283634fe3dce5553387c8c Index: testsuite/libsmbclient/src/Makefile =================================================================== ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2010-01-19 12:31:42.000000000 +0100 +++ new/vendor-files/tools/package-data 2010-02-09 23:27:31.000000000 +0100 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2280" +SAMBA_PACKAGE_SVN_VERSION="2306" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 skelcd-control-openSUSE for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package skelcd-control-openSUSE for openSUSE:Factory checked in at Thu Feb 11 19:27:28 CET 2010. -------- --- skelcd-control-openSUSE/skelcd-control-openSUSE.changes 2010-02-02 11:10:46.000000000 +0100 +++ skelcd-control-openSUSE/skelcd-control-openSUSE.changes 2010-02-09 17:31:02.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 9 17:06:15 CET 2010 - locilka(a)suse.cz + +- Steps 'user' and 'auth' enabled again in Live mode (BNC #547931). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.ukRw5b/_old 2010-02-11 19:26:10.000000000 +0100 +++ /var/tmp/diff_new_pack.ukRw5b/_new 2010-02-11 19:26:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-control-openSUSE (Version 2010.2.2) +# spec file for package skelcd-control-openSUSE (Version 2010.2.9) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ License: YaST Group: Metapackages AutoReqProv: off -Version: 2010.2.2 +Version: 2010.2.9 Release: 1 Summary: SuSE Linux Professional Control file BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ control.xml ++++++ --- skelcd-control-openSUSE/control.xml 2010-02-02 11:10:45.000000000 +0100 +++ skelcd-control-openSUSE/control.xml 2010-02-09 17:30:57.000000000 +0100 @@ -1303,17 +1303,15 @@ <enable_back>no</enable_back> <enable_next>no</enable_next> </module> - +  + <module> + <label>Users</label> + <name>auth</name> + </module> + <module> + <label>Users</label> + <name>user</name> + </module> <module> <name>user_non_interactive</name>  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pth for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package pth for openSUSE:Factory checked in at Thu Feb 11 19:23:56 CET 2010. -------- --- pth/pth.changes 2009-12-15 02:04:26.000000000 +0100 +++ pth/pth.changes 2010-02-05 16:12:20.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 5 15:11:59 UTC 2010 - puzel(a)novell.com + +- use proper RPM group + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pth.spec ++++++ --- /var/tmp/diff_new_pack.euCS38/_old 2010-02-11 19:23:07.000000000 +0100 +++ /var/tmp/diff_new_pack.euCS38/_new 2010-02-11 19:23:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pth (Version 2.0.7) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,9 +21,9 @@ Name: pth Url: http://www.gnu.org/software/pth/ License: LGPLv2.1+ -Group: System/Libraries +Group: Development/Libraries/C and C++ Version: 2.0.7 -Release: 116 +Release: 117 AutoReqProv: on Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf @@ -49,7 +49,7 @@ %package -n libpth20 License: LGPLv2.1+ Summary: GNU Portable Threads -Group: System/Libraries +Group: Development/Libraries/C and C++ Provides: pth Obsoletes: pth %define library_name libpth20 @@ -72,7 +72,7 @@ %package -n libpth-devel License: LGPLv2.1+ Summary: GNU Portable Threads -Group: System/Libraries +Group: Development/Libraries/C and C++ Requires: %{library_name} = %{version} # pth-devel was last used in openSUSE 11.1 Provides: pth-devel = %{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 quilt for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package quilt for openSUSE:Factory checked in at Thu Feb 11 19:19:51 CET 2010. -------- --- quilt/quilt.changes 2009-11-27 14:11:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/quilt/quilt.changes 2009-12-08 00:34:12.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 8 00:34:00 CET 2009 - jengelh(a)medozas.de + +- enable parallel building + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quilt.spec ++++++ --- /var/tmp/diff_new_pack.79kgZE/_old 2010-02-11 19:18:39.000000000 +0100 +++ /var/tmp/diff_new_pack.79kgZE/_new 2010-02-11 19:18:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package quilt (Version 0.48) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ License: GPLv2+ Group: Productivity/Text/Utilities Version: 0.48 -Release: 4 +Release: 5 Requires: coreutils diffutils patch gzip bzip2 perl mktemp diffstat file %if %{suse_version} > 910 Recommends: procmail @@ -79,7 +79,7 @@ --with-patch-wrapper \ --with-patch=/usr/bin/patch \ --with-rpmbuild=/usr/lib/rpm/rpmb -make BUILD_ROOT=$RPM_BUILD_ROOT RELEASE=%release +make %{?jobs:-j%jobs} BUILD_ROOT=$RPM_BUILD_ROOT RELEASE=%release %check make check ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 qt3 for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package qt3 for openSUSE:Factory checked in at Thu Feb 11 19:18:01 CET 2010. -------- --- KDE/qt3/qt3-devel-doc.changes 2009-12-18 17:05:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/qt3/qt3-devel-doc.changes 2010-01-21 14:24:40.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 21 14:24:13 CET 2010 - dmueller(a)suse.de + +- recommend kdelibs3-default-style (bnc#544581) + +------------------------------------------------------------------- qt3-extensions.changes: same change qt3.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.Nu74cN/_old 2010-02-11 19:17:47.000000000 +0100 +++ /var/tmp/diff_new_pack.Nu74cN/_new 2010-02-11 19:17:47.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qt3-devel-doc (Version 3.3.8b) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ Summary: Documentation for the Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.8b -Release: 95 +Release: 96 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.Nu74cN/_old 2010-02-11 19:17:47.000000000 +0100 +++ /var/tmp/diff_new_pack.Nu74cN/_new 2010-02-11 19:17:47.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qt3-extensions (Version 3.3.8b) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ %endif License: GPL, QPL Version: 3.3.8b -Release: 98 +Release: 99 AutoReqProv: on Requires: qt3 = %version Group: Development/Tools/Other ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.Nu74cN/_old 2010-02-11 19:17:47.000000000 +0100 +++ /var/tmp/diff_new_pack.Nu74cN/_new 2010-02-11 19:17:47.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qt3 (Version 3.3.8b) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,8 +32,9 @@ # Summary: A library for developing applications with graphical user interfaces Version: 3.3.8b -Release: 95 +Release: 96 Provides: qt_library_%version +Recommends: kdelibs3-default-style PreReq: /bin/grep %define x11_free -x11-free- %define rversion %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 translation-update-upstream for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package translation-update-upstream for openSUSE:Factory checked in at Thu Feb 11 19:17:00 CET 2010. -------- --- translation-update-upstream/translation-update-upstream.changes 2009-10-27 16:25:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/translation-update-upstream/translation-update-upstream.changes 2010-02-02 18:46:43.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Feb 2 18:35:28 CET 2010 - sbrabec(a)suse.cz + +- Use dummy tarball before version freeze. +- Migration of servers from Novell Forge to Berlios. +- Supports newer version of cgit. +- Support for multiple osc sources. +- Support for extracting new and changed strings for review. +- Never overwrite strings by po file with older time stamp. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- translation-update-upstream-20091026.tar.bz2 New: ---- translation-update-upstream-20100202.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ translation-update-upstream.spec ++++++ --- /var/tmp/diff_new_pack.EScQ4K/_old 2010-02-11 19:14:34.000000000 +0100 +++ /var/tmp/diff_new_pack.EScQ4K/_new 2010-02-11 19:14:34.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package translation-update-upstream (Version 20091026) +# spec file for package translation-update-upstream (Version 20100202) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,9 +19,9 @@ Name: translation-update-upstream -License: GPL v2 or later +License: GPLv2+ Group: System/Localization -Version: 20091026 +Version: 20100202 Release: 1 Summary: Tool for Translation Update from Upstream Source: %{name}-%{version}.tar.bz2 ++++++ create-tlst-step2-create-gnome_gtp.sh ++++++ --- /var/tmp/diff_new_pack.EScQ4K/_old 2010-02-11 19:14:34.000000000 +0100 +++ /var/tmp/diff_new_pack.EScQ4K/_new 2010-02-11 19:14:34.000000000 +0100 @@ -12,12 +12,12 @@ source ${0%create-tlst-step2-create-gnome_gtp.sh}upstream-collect.conf -osc ${OSC_APIURL:+--apisrv=$OSC_APIURL} list $OSC_REPOSITORY >create-tlst-temp-osc-projects.lst +osc ${OSC_APIURL:+--apiurl=$OSC_APIURL} list $OSC_REPOSITORY >create-tlst-temp-osc-projects.lst # branches tried for all apps: KNOWN_BRANCHES="gnome-2-28" # branches tried apps with the same name base: -APP_BRANCHES="|gimp-2-6|gtk-2-18|glib-2-22" +APP_BRANCHES="|gimp-2-6|gtk-2-18|gtk-2-90|glib-2-22" # FIXME: support for libgda:release-3-0-branch gnome-background:gnome-2-22 echo "# This file was generated $(LANG=C LC_ALL=C date) by create-tlst-step2-create-gnome_gtp.sh." >upstream-gnome_gtp.tlst ++++++ msgheadermerge ++++++ --- /var/tmp/diff_new_pack.EScQ4K/_old 2010-02-11 19:14:34.000000000 +0100 +++ /var/tmp/diff_new_pack.EScQ4K/_new 2010-02-11 19:14:34.000000000 +0100 @@ -7,6 +7,8 @@ rm -rf {${1%.po},${2%.po}}-msgheadermerge-temp.{merge-dir,order} trap "rm -rf {${1%.po},${2%.po}}-msgheadermerge-temp.{merge-dir,order} ${2%.po}-msgheadermerge-tempheader.po" 0 +RC=0 + # Broken pipe is an expected behavior. Redirect stderr to /dev/null. msgexec -i $1 $0-parse ${1%.po}-msgheadermerge-temp 2>/dev/null msgexec -i $2 $0-parse ${2%.po}-msgheadermerge-temp 2>/dev/null @@ -15,7 +17,11 @@ if test "$4" = --mergemode ; then rm ${2%.po}-msgheadermerge-temp.merge-dir/POT-Creation-Date if test ${2%.po}-msgheadermerge-temp.merge-dir/PO-Revision-Date -ot ${1%.po}-msgheadermerge-temp.merge-dir/PO-Revision-Date ; then - exit 1 + if test "$5" = --continue ; then + RC=1 + else + exit 1 + fi fi else if test "$4" = --newdate ; then @@ -40,3 +46,5 @@ msgmerge --quiet --force-po $2 $0-empty.pot -o ${2%.po}-msgheadermerge-tempheader.po sed -i '/^#~/,$d' ${2%.po}-msgheadermerge-tempheader.po msgfilter --force-po -i ${2%.po}-msgheadermerge-tempheader.po -o $3 $0-compose ${1%.po}-msgheadermerge-temp.merge-dir ${2%.po}-msgheadermerge-temp.order + +exit $RC ++++++ translation-update-upstream-20091026.tar.bz2 -> translation-update-upstream-20100202.tar.bz2 ++++++ ++++ 268297 lines of diff (skipped) ++++++ translation-update-upstream-HOWTO ++++++ --- /var/tmp/diff_new_pack.EScQ4K/_old 2010-02-11 19:14:34.000000000 +0100 +++ /var/tmp/diff_new_pack.EScQ4K/_new 2010-02-11 19:14:34.000000000 +0100 @@ -50,7 +50,7 @@ Run following command in unpacked sources directory: -./upstream-collect.sh +bash ./upstream-collect.sh It creates a tarball with translations updated by upstream using all existing *.tlst filůes (configuration of packages) and @@ -80,8 +80,8 @@ Then you can run following command in unpacked sources directory: # collect possible po domains from rpm packages -./create-tlst-step1-list-all-po-projects.sh +bash ./create-tlst-step1-list-all-po-projects.sh # scan upstream branches -./create-tlst-step2-create-gnome_gtp.sh +bash ./create-tlst-step2-create-gnome_gtp.sh Then continue as above. ++++++ upstream-collect.sh ++++++ --- /var/tmp/diff_new_pack.EScQ4K/_old 2010-02-11 19:14:35.000000000 +0100 +++ /var/tmp/diff_new_pack.EScQ4K/_new 2010-02-11 19:14:35.000000000 +0100 @@ -51,7 +51,7 @@ rm -rf UPSTREAM mkdir UPSTREAM if ! test -d STAMPS ; then - mkdir PACKAGES UPDATE STAMPS + mkdir OSC PACKAGES UPDATE STAMPS pot rm -f upstream-collect.log fi @@ -68,6 +68,9 @@ EOF chmod +x ~/.upstream-collect.tmp/translation-update-upstream +# executable flag does not survive some build systems +chmod +x msgheadermerge msgheadermerge-compose msgheadermerge-parse upstream-collect.sh create-tlst-step*.sh + # Strings in installed instance of gnome-patch-translation may interfere # with upstream-collect.sh. Use of dummies allows to import upstream # strings, that are part of openSUSE patches. @@ -165,19 +168,32 @@ fi fi - cd $WORK_DIR/PACKAGES + cd $WORK_DIR/OSC - RPMPKGDIR=$(echo $WORK_DIR/PACKAGES/$OSC_REPOSITORY/$PACKAGE) + RPMPKGDIR=$(echo $WORK_DIR/PACKAGES/$PACKAGE) if ! test -f $WORK_DIR/STAMPS/$PACKAGE/.builddir_ok ; then if ! test -d "$RPMPKGDIR" ; then - osc ${OSC_APIURL:+--apisrv=$OSC_APIURL} checkout --expand-link $OSC_REPOSITORY $PACKAGE + for OSC_REPOSITORY in "${OSC_REPOSITORIES[@]}" ; do + echo "Trying to check-out PACKAGES $PACKAGE from $OSC_REPOSITORY..." + if osc ${OSC_APIURL:+--apiurl=$OSC_APIURL} checkout --expand-link $OSC_REPOSITORY $PACKAGE >gnome-patch-translation-collect-tmp.log 2>&1 ; then + mv $OSC_REPOSITORY/$PACKAGE $WORK_DIR/PACKAGES/ + break + fi + if ! grep -q "HTTP Error 404" gnome-patch-translation-collect-tmp.log ; then + cat gnome-patch-translation-collect-tmp.log + rm gnome-patch-translation-collect-tmp.log + echo "ERROR: Checkout failed!" + exit 1 + fi + done + rm gnome-patch-translation-collect-tmp.log else rm -rf "$RPMPKGDIR" $WORK_DIR/STAMPS/$PACKAGE echo "$(tput setf 4)Removed possibly incorrect temporary files from previous runs. Please re-run $0 now.$(tput init)" exit 1 fi - RPMPKGDIR=$(echo $WORK_DIR/PACKAGES/$OSC_REPOSITORY/$PACKAGE) + RPMPKGDIR=$(echo $WORK_DIR/PACKAGES/$PACKAGE) cd $RPMPKGDIR rpmprep $PACKAGE.spec else @@ -196,9 +212,12 @@ echo "$RPMPODIR: Missing or incorrect translation-update-upstream in the spec file." echo >>$WORK_DIR/upstream-collect.log "package=$PACKAGE gettext-package=$DOMAIN method=$METHOD repository=$REPO directory=$DIR branch=${BRANCH:(default)}: packaging error, package does not call translation-update-upstream properly" fi - if ! intltool-update --gettext-package=$DOMAIN --pot ; then + if intltool-update --gettext-package=$DOMAIN --pot ; then + cp -a $DOMAIN.pot $WORK_DIR/pot/ + else if test -f $DOMAIN.pot ; then echo >>$WORK_DIR/upstream-collect.log "package=$PACKAGE gettext-package=$DOMAIN method=$METHOD repository=$REPO directory=$DIR branch=${BRANCH:(default)}: intltool-update error, continuing with original $DOMAIN.pot" + cp -a $DOMAIN.pot $WORK_DIR/pot/ else echo >>$WORK_DIR/upstream-collect.log "package=$PACKAGE gettext-package=$DOMAIN method=$METHOD repository=$REPO directory=$DIR branch=${BRANCH:(default)}: intltool-update error, no way to update" mkdir -p $WORK_DIR/STAMPS/$PACKAGE/$DOMAIN/$METHOD/${REPO//[\/:.]/_}/$REPODIR/${BRANCH:-__HEAD__} @@ -248,7 +267,7 @@ CGIT_BRANCH=${BRANCH:+?id=$BRANCH} CGIT_SERVER=${CGIT_URI#http://} CGIT_SERVER=${CGIT_SERVER%%/*} - curl $CGIT_URI/tree/${REPODIR#*/}$CGIT_BRANCH | sed -n 's:^.*class='\''ls-blob'\'' href='\''$[^'\'']*$'\''.*$:\1:p' | + curl $CGIT_URI/tree/${REPODIR#*/}$CGIT_BRANCH | sed -n 's:^.*class='\''ls-blob[^'\'']*'\'' href='\''$[^'\'']*$'\''.*$:\1:p' | while read ; do wget -N http://$CGIT_SERVER${REPLY/\/tree\///plain/} done @@ -298,6 +317,25 @@ ;; esac +# +# Files created in this section: +# +# upstream dir: +# foo-backport.po: raw upstream translation backported to the downstream +# foo-uheader.po: header with the upstream date from the branch modified as last +# foo-upstream.po: backport + updates from all upstreams processed before (date from the branch modified as last) +# foo-allfz.po: downstream + joined updates. Strings that were modified create fuzzy multi-match. +# foo-all.po: downstream + joined updates. Strings that were modified use the last processed instance. +# foo-fixes.po: Strings that are different while comparing downstream and joined updates. +# foo-additions.po: Strings that are newly introduced in joined updates while comparing with downstream. +# foo-header.po: header with the lastest date, either upstream date from the branch modified as last or the downstream date +# foo-fixes-clean.po: fixes with a nice header. +# +# downstream dir: +# foo-downstream.po: cleaned and complete downstream po file +# foo-updatesraw.po: fixes + additions in a single file, raw form +# foo-updates.po: fixes + additions in a single file, clean form with an useful header (this file will be copied to UPDATE/) +# for PO in *.po ; do # step 0: Merge new po file into old project. Removes unused (too new) translations. if ! msgmerge --no-fuzzy-matching $PO $RPMPODIR/$DOMAIN.pot -o ${PO%.po}-backport.po ; then @@ -305,45 +343,95 @@ continue fi if test -f $RPMPODIR/$PO ; then - # step 1: Clean the po file to be safe. - if ! msgmerge --no-fuzzy-matching $RPMPODIR/$PO $RPMPODIR/$DOMAIN.pot -o $RPMPODIR/${PO%.po}-clean.po ; then + # step 1: Clean the RPM po file to be safe. + if ! msgmerge --no-fuzzy-matching $RPMPODIR/$PO $RPMPODIR/$DOMAIN.pot -o $RPMPODIR/${PO%.po}-downstream.po ; then echo >>$WORK_DIR/upstream-collect.log "package=$PACKAGE gettext-package=$DOMAIN directory=$RPMPODIR po=$PO: package msgmerge error" # Failed initial msgmerge is fatal. There is no way to update. Build may fail. continue fi # Do the magic: - # step 2: Merge new po and previous updates (if any). + # step 2: Merge new upstream po and previous upstream updates to RPM po (if any). + OLD_UPDATE=false if test -f $WORK_DIR/UPDATE/po/$DOMAIN/$PO ; then - $WORK_DIR/msgheadermerge $WORK_DIR/UPDATE/po/$DOMAIN/$PO $PO ${PO%.po}-uheader.po - msgcat --force-po --use-first ${PO%.po}-uheader.po ${PO%.po}-backport.po $WORK_DIR/UPDATE/po/$DOMAIN/$PO -o ${PO%.po}-join.po + if $WORK_DIR/msgheadermerge $WORK_DIR/UPDATE/po/$DOMAIN/$PO $PO ${PO%.po}-uheader.po --mergemode --continue ; then + echo >>$WORK_DIR/upstream-collect.log "package=$PACKAGE gettext-package=$DOMAIN directory=$RPMPODIR po=$PO: old po file, skipping fixes" + OLD_UPDATE=true + fi + msgcat --force-po --use-first ${PO%.po}-uheader.po ${PO%.po}-backport.po $WORK_DIR/UPDATE/po/$DOMAIN/$PO -o ${PO%.po}-upstream.po else - cp -a ${PO%.po}-backport.po ${PO%.po}-join.po + cp -a ${PO%.po}-backport.po ${PO%.po}-upstream.po fi # step 3: Join both translations, without --use-first string changes will disappear as fuzzy. - msgcat --force-po ${PO%.po}-join.po $RPMPODIR/${PO%.po}-clean.po -o ${PO%.po}-allfz.po - msgcat --use-first --force-po ${PO%.po}-join.po $RPMPODIR/${PO%.po}-clean.po -o ${PO%.po}-all.po + msgcat --force-po ${PO%.po}-upstream.po $RPMPODIR/${PO%.po}-downstream.po -o ${PO%.po}-allfz.po + msgcat --use-first --force-po ${PO%.po}-upstream.po $RPMPODIR/${PO%.po}-downstream.po -o ${PO%.po}-all.po # step 4: Find string fixes (existed before, now different). msgcat --force-po --unique ${PO%.po}-all.po ${PO%.po}-allfz.po -o ${PO%.po}-fixes.po # step 5: Find newly translated strings (translation removal is not supported). - msgcat --force-po --unique $RPMPODIR/${PO%.po}-clean.po ${PO%.po}-all.po -o ${PO%.po}-additions.po + msgcat --force-po --unique $RPMPODIR/${PO%.po}-downstream.po ${PO%.po}-all.po -o ${PO%.po}-additions.po # step 6: Join both to collect all known fixes. - msgcat ${PO%.po}-fixes.po ${PO%.po}-additions.po -o $RPMPODIR/${PO%.po}-updatesraw.po + if $OLD_UPDATE ; then + # If the update has an old time stamp, don't include fixes. Use just additions. + msgcat ${PO%.po}-additions.po -o $RPMPODIR/${PO%.po}-updatesraw.po + else + msgcat ${PO%.po}-fixes.po ${PO%.po}-additions.po -o $RPMPODIR/${PO%.po}-updatesraw.po + fi # Are there any updated? If no, game over. if test -f $RPMPODIR/${PO%.po}-updatesraw.po ; then # step 7: Compose the best po file header. - $WORK_DIR/msgheadermerge $RPMPODIR/$PO ${PO%.po}-join.po ${PO%.po}-header.po --newdate - # step 8: And yet another ugly game to get rid commented out dust. + $WORK_DIR/msgheadermerge $RPMPODIR/$PO ${PO%.po}-upstream.po ${PO%.po}-header.po --newdate + # step 8: And yet another ugly game to get rid commented out garbage. sed '/#~/d' <$RPMPODIR/${PO%.po}-updatesraw.po >$RPMPODIR/${PO%.po}-updates.po~ # step 9: Merge correct header to the updates file. msgcat --no-location --use-first ${PO%.po}-header.po $RPMPODIR/${PO%.po}-updates.po~ -o $RPMPODIR/${PO%.po}-updates.po fi + # step 10: Prepare texts for review. We created them in previous steps, but files need cleanup. + if test -f ${PO%.po}-header.po ; then + if test -f ${PO%.po}-additions.po ; then + sed -i '/#~/d' ${PO%.po}-additions.po + mkdir -p $WORK_DIR/po-review/${PO%.po}/additions + msgcat --use-first ${PO%.po}-header.po ${PO%.po}-additions.po -o $WORK_DIR/po-review/${PO%.po}/additions/$DOMAIN.po + rmdir --ignore-fail-on-non-empty --parents $WORK_DIR/po-review/${PO%.po}/additions + fi + if test -f ${PO%.po}-fixes.po ; then + sed -i '/#~/d' ${PO%.po}-fixes.po + msgcat --use-first ${PO%.po}-header.po ${PO%.po}-fixes.po -o ${PO%.po}-fixes-clean.po + fi + if test -f ${PO%.po}-fixes-clean.po ; then + msgmerge ${PO%.po}-allfz.po ${PO%.po}-fixes-clean.po -o ${PO%.po}-fixes-review.po~ + sed -i '/#~/d' ${PO%.po}-fixes-review.po~ + msgcat ${PO%.po}-fixes-review.po~ -o ${PO%.po}-fixes-review.po + if $OLD_UPDATE ; then + mkdir -p $WORK_DIR/po-review/${PO%.po}/excluded-changes/${REPO//[\/:.]/_}/$REPODIR + cp -a ${PO%.po}-fixes-clean.po $WORK_DIR/po-review/${PO%.po}/excluded-changes/${REPO//[\/:.]/_}/$REPODIR/$DOMAIN.po + cp -a ${PO%.po}-fixes-review.po $WORK_DIR/po-review/${PO%.po}/excluded-changes/${REPO//[\/:.]/_}/$REPODIR/$DOMAIN-review.po + rmdir --ignore-fail-on-non-empty --parents $WORK_DIR/po-review/${PO%.po}/excluded-changes/${REPO//[\/:.]/_}/$REPODIR + if test -d $WORK_DIR/po-review/${PO%.po}/excluded-changes ; then + echo -e "Excluded changes contains changes introduced by upstream po files with\ntime stamp older than our package." >$WORK_DIR/po-review/${PO%.po}/excluded-changes/README + fi + else + mkdir -p $WORK_DIR/po-review/${PO%.po}/changes + cp -a ${PO%.po}-fixes-clean.po $WORK_DIR/po-review/${PO%.po}/changes/$DOMAIN.po + cp -a ${PO%.po}-fixes-review.po $WORK_DIR/po-review/${PO%.po}/changes/$DOMAIN-review.po + rmdir --ignore-fail-on-non-empty --parents $WORK_DIR/po-review/${PO%.po}/changes + fi + fi + fi else - # step 1: Merge new po and previous updates (if any). - if test -f ${PO%.po}-updates.po ; then - msgcat --force-po --use-first ${PO%.po}-backport.po $RPMPODIR/${PO%.po}-updates.po -o ${PO%.po}-updates.po~ - mv ${PO%.po}-updates.po~ ${PO%.po}-updates.po - else - cp -a ${PO%.po}-backport.po ${PO%.po}-updates.po + # If backport was empty, no file was generated. + if test -f ${PO%.po}-backport.po ; then + # step 1: Merge new po and previous updates (if any). + sed -i '/#~/d' ${PO%.po}-backport.po + if test -f ${PO%.po}-updates.po ; then + msgcat --force-po --use-first ${PO%.po}-backport.po $RPMPODIR/${PO%.po}-updates.po -o ${PO%.po}-updates.po~ + mv ${PO%.po}-updates.po~ ${PO%.po}-updates.po + else + # To get surely a valid po file, use msgcat instead of cp. + msgcat ${PO%.po}-backport.po -o ${PO%.po}-updates.po + fi + # step 2: Prepare texts for review. + mkdir -p $WORK_DIR/po-review/${PO%.po}/new-files + cp -a ${PO%.po}-updates.po $WORK_DIR/po-review/${PO%.po}/new-files/$DOMAIN.po + rmdir --ignore-fail-on-non-empty --parents $WORK_DIR/po-review/${PO%.po}/new-files fi fi done @@ -377,7 +465,7 @@ cd $WORK_DIR if ! $DEBUG ; then - rm -rf UPSTREAM PACKAGES UPDATE UPDATE_OLD STAMPS BIN + rm -rf UPSTREAM OSC PACKAGES UPDATE UPDATE_OLD STAMPS BIN fi rm -rf ~/.upstream-collect.tmp ++++++ upstream-gnome-generic.tlst ++++++ --- /var/tmp/diff_new_pack.EScQ4K/_old 2010-02-11 19:14:35.000000000 +0100 +++ /var/tmp/diff_new_pack.EScQ4K/_new 2010-02-11 19:14:35.000000000 +0100 @@ -4,4 +4,3 @@ gstreamer-0_10-plugins-good gst-plugins-good-0.10 cgit git://anongit.freedesktop.org/gstreamer/gst-plugins-good gst-plugins-good/po gstreamer-0_10-plugins-bad gst-plugins-bad-0.10 cgit git://anongit.freedesktop.org/gstreamer/gst-plugins-bad gst-plugins-bad/po gstreamer-0_10-plugins-ugly gst-plugins-ugly-0.10 cgit git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly gst-plugins-ugly/po -pidgin pidgin tbz http://downloads.sourceforge.net/pidgin/pidgin-2.6.3.tar.bz2 pidgin-2.6.3/po ++++++ upstream-gnome_gtp.tlst ++++++ --- /var/tmp/diff_new_pack.EScQ4K/_old 2010-02-11 19:14:35.000000000 +0100 +++ /var/tmp/diff_new_pack.EScQ4K/_new 2010-02-11 19:14:35.000000000 +0100 @@ -1,3 +1,4 @@ +# Manually added new items on Fri Jan 8 17:31:43 CET 2010. # This file was generated Tue Oct 27 15:31:01 CET 2009 by create-tlst-step2-create-gnome_gtp.sh. # package domain method repository dir branch NetworkManager NetworkManager gtp l10n.gnome.org/POT NetworkManager/po @@ -27,6 +28,7 @@ # broken: #conglomerate conglomerate gtp l10n.gnome.org/POT conglomerate/po contact-lookup-applet contact-lookup-applet gtp l10n.gnome.org/POT contact-lookup-applet/po +dasher dasher gtp l10n.gnome.org/POT dasher/po gnome-2-28 dasher dasher gtp l10n.gnome.org/POT dasher/po deskbar-applet deskbar-applet gtp l10n.gnome.org/POT deskbar-applet/po devhelp devhelp gtp l10n.gnome.org/POT devhelp/po gnome-2-28 @@ -61,6 +63,7 @@ gconf-editor gconf-editor gtp l10n.gnome.org/POT gconf-editor/po gnome-2-28 gconf-editor gconf-editor gtp l10n.gnome.org/POT gconf-editor/po gconf2 GConf2 gtp l10n.gnome.org/POT gconf/po gnome-2-28 +gconf2 GConf2 gtp l10n.gnome.org/POT gconf/po gdl gdl-1 gtp l10n.gnome.org/POT gdl/po gnome-2-28 gdl gdl-1 gtp l10n.gnome.org/POT gdl/po gdm gdm gtp l10n.gnome.org/POT gdm/po gnome-2-28 @@ -95,11 +98,13 @@ gnome-commander gnome-commander gtp l10n.gnome.org/POT gnome-commander/po gnome-control-center gnome-control-center-2.0 gtp l10n.gnome.org/POT gnome-control-center/po gnome-2-28 gnome-control-center gnome-control-center-2.0 gtp l10n.gnome.org/POT gnome-control-center/po +gnome-desktop gnome-desktop-2.0 gtp l10n.gnome.org/POT gnome-desktop/po gnome-2-28 gnome-desktop gnome-desktop-2.0 gtp l10n.gnome.org/POT gnome-desktop/po gnome-doc-utils gnome-doc-utils gtp l10n.gnome.org/POT gnome-doc-utils/po gnome-2-28 gnome-doc-utils gnome-doc-utils gtp l10n.gnome.org/POT gnome-doc-utils/po gnome-games gnome-games gtp l10n.gnome.org/POT gnome-games/po gnome-2-28 gnome-games gnome-games gtp l10n.gnome.org/POT gnome-games/po +gnome-keyring gnome-keyring gtp l10n.gnome.org/POT gnome-keyring/po gnome-2-28 gnome-keyring gnome-keyring gtp l10n.gnome.org/POT gnome-keyring/po gnome-mag gnome-mag gtp l10n.gnome.org/POT gnome-mag/po gnome-2-28 gnome-mag gnome-mag gtp l10n.gnome.org/POT gnome-mag/po @@ -115,8 +120,10 @@ gnome-pilot-conduits gnome-pilot-conduits gtp l10n.gnome.org/POT gnome-pilot-conduits/po gnome-power-manager gnome-power-manager gtp l10n.gnome.org/POT gnome-power-manager/po gnome-2-28 gnome-power-manager gnome-power-manager gtp l10n.gnome.org/POT gnome-power-manager/po +gnome-screensaver gnome-screensaver gtp l10n.gnome.org/POT gnome-screensaver/po gnome-2-28 gnome-screensaver gnome-screensaver gtp l10n.gnome.org/POT gnome-screensaver/po gnome-session gnome-session-2.0 gtp l10n.gnome.org/POT gnome-session/po +gnome-settings-daemon gnome-settings-daemon gtp l10n.gnome.org/POT gnome-settings-daemon/po gnome-2-28 gnome-settings-daemon gnome-settings-daemon gtp l10n.gnome.org/POT gnome-settings-daemon/po gnome-shell gnome-shell gtp l10n.gnome.org/POT gnome-shell/po gnome-system-monitor gnome-system-monitor gtp l10n.gnome.org/POT gnome-system-monitor/po @@ -164,6 +171,7 @@ libbonoboui libbonoboui-2.0 gtp l10n.gnome.org/POT libbonoboui/po libgda libgda-4.0 gtp l10n.gnome.org/POT libgda/po libgdata gdata gtp l10n.gnome.org/POT libgdata/po +libgnome libgnome-2.0 gtp l10n.gnome.org/POT libgnome/po gnome-2-28 libgnome libgnome-2.0 gtp l10n.gnome.org/POT libgnome/po libgnomecanvas libgnomecanvas-2.0 gtp l10n.gnome.org/POT libgnomecanvas/po libgnomecups libgnomecups gtp l10n.gnome.org/POT libgnomecups/po @@ -174,6 +182,7 @@ libgnomeui libgnomeui-2.0 gtp l10n.gnome.org/POT libgnomeui/po libgsf libgsf gtp l10n.gnome.org/POT libgsf/po libgtop libgtop-2.0 gtp l10n.gnome.org/POT libgtop/po +libgweather libgweather gtp l10n.gnome.org/POT libgweather/po gnome-2-28 libgweather libgweather gtp l10n.gnome.org/POT libgweather/po libslab libslab gtp l10n.gnome.org/POT libslab/po libwnck libwnck gtp l10n.gnome.org/POT libwnck/po @@ -201,6 +210,7 @@ rhythmbox rhythmbox gtp l10n.gnome.org/POT rhythmbox/po sabayon sabayon gtp l10n.gnome.org/POT sabayon/po gnome-2-28 sabayon sabayon gtp l10n.gnome.org/POT sabayon/po +seahorse seahorse gtp l10n.gnome.org/POT seahorse/po gnome-2-28 seahorse seahorse gtp l10n.gnome.org/POT seahorse/po seahorse-plugins seahorse-plugins gtp l10n.gnome.org/POT seahorse-plugins/po shared-mime-info shared-mime-info gtp l10n.gnome.org/POT shared-mime-info/po @@ -220,6 +230,7 @@ xdg-user-dirs xdg-user-dirs gtp l10n.gnome.org/POT xdg-user-dirs/po xdg-user-dirs-gtk xdg-user-dirs-gtk gtp l10n.gnome.org/POT xdg-user-dirs-gtk/po xkeyboard-config xkeyboard-config gtp l10n.gnome.org/POT xkeyboard-config/po +yelp yelp gtp l10n.gnome.org/POT yelp/po gnome-2-28 yelp yelp gtp l10n.gnome.org/POT yelp/po zenity zenity gtp l10n.gnome.org/POT zenity/po gnome-2-28 zenity zenity gtp l10n.gnome.org/POT zenity/po ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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