April 2010 - openSUSE Commits - openSUSE Mailing Lists

commit perl-DBD-Pg for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '10

21 Apr '10

Hello community, here is the log from the commit of package perl-DBD-Pg for openSUSE:Factory checked in at Wed Apr 21 18:25:59 CEST 2010. -------- --- perl-DBD-Pg/perl-DBD-Pg.changes 2010-04-07 21:28:30.000000000 +0200 +++ perl-DBD-Pg/perl-DBD-Pg.changes 2010-04-21 16:19:49.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Apr 21 14:17:52 UTC 2010 - chris(a)computersalat.de + +- update to 2.17.1 + - Only use lo_import_with_oid if Postgres libraries are 8.4 or better + [GSM] (CPAN bug #56363) +- added Buildi-/Req perl(version) +- fix deps for postgresql-devel >= 7.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- DBD-Pg-2.17.0.tar.bz2 New: ---- DBD-Pg-2.17.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-DBD-Pg.spec ++++++ --- /var/tmp/diff_new_pack.NgfP3E/_old 2010-04-21 18:23:55.000000000 +0200 +++ /var/tmp/diff_new_pack.NgfP3E/_new 2010-04-21 18:23:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-DBD-Pg (Version 2.17.0) +# spec file for package perl-DBD-Pg (Version 2.17.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: perl-DBD-Pg Summary: PostgreSQL database driver for the DBI module -Version: 2.17.0 +Version: 2.17.1 Release: 1 License: GPLv2+ Group: Development/Libraries/Perl @@ -31,16 +31,19 @@ ## TestSuite broken for postgresql < 8.4 ## undefined symbol: lo_import_with_oid # https://rt.cpan.org/Public/Bug/Display.html?id=56363 -#BuildRequires: postgresql-devel >= 7.4 -BuildRequires: postgresql-devel >= 8.4 +#BuildRequires: postgresql-devel >= 8.4 +# fixed since 2.17.1 +BuildRequires: postgresql-devel >= 7.4 BuildRequires: perl %if 0%{?suse_version} < 1120 BuildRequires: perl-macros %endif BuildRequires: perl(Test::More) >= 0.61 BuildRequires: perl(DBI) >= 1.52 +BuildRequires: perl(version) Requires: perl = %{perl_version} Requires: perl(DBI) >= 1.52 +Requires: perl(version) %description This driver is needed to access PostgreSQL databases from Perl programs ++++++ DBD-Pg-2.17.0.tar.bz2 -> DBD-Pg-2.17.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-2.17.0/Changes new/DBD-Pg-2.17.1/Changes --- old/DBD-Pg-2.17.0/Changes 2010-04-06 20:51:37.000000000 +0200 +++ new/DBD-Pg-2.17.1/Changes 2010-04-08 17:29:06.000000000 +0200 @@ -1,6 +1,11 @@ 'GSM' is Greg Sabino Mullane, greg(a)turnstep.com) -2.17.0 Released April 6, 2010 +2.17.1 Released April 8, 2010 + + - Only use lo_import_with_oid if Postgres libraries are 8.4 or better + [GSM] (CPAN bug #56363) + +2.17.0 Released April 6, 2010 (subversion r13890) - Do not automatically ROLLBACK on a failed pg_cancel [GSM] (CPAN bug #55188) - Added support for new lo_import_with_oid function. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-2.17.0/META.yml new/DBD-Pg-2.17.1/META.yml --- old/DBD-Pg-2.17.0/META.yml 2010-04-05 21:30:35.000000000 +0200 +++ new/DBD-Pg-2.17.1/META.yml 2010-04-07 22:51:27.000000000 +0200 @@ -1,6 +1,6 @@ --- #YAML:1.0 name : DBD-Pg -version : 2.17.0 +version : 2.17.1 abstract : DBI PostgreSQL interface author: - Greg Sabino Mullane <greg(a)turnstep.com> @@ -39,10 +39,10 @@ provides: DBD::Pg: file : Pg.pm - version : 2.17.0 + version : 2.17.1 Bundle::DBD::Pg: file : lib/Bundle/DBD/Pg.pm - version : 2.17.0 + version : 2.17.1 keywords: - Postgres diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-2.17.0/Makefile.PL new/DBD-Pg-2.17.1/Makefile.PL --- old/DBD-Pg-2.17.0/Makefile.PL 2010-04-05 21:45:10.000000000 +0200 +++ new/DBD-Pg-2.17.1/Makefile.PL 2010-04-07 22:52:55.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile.PL 13885 2010-04-05 19:45:08Z turnstep $ +# $Id: Makefile.PL 13896 2010-04-07 20:52:54Z turnstep $ use ExtUtils::MakeMaker; use Config; @@ -7,7 +7,7 @@ use 5.006001; ## No version.pm for this one, as the prereqs are not loaded yet. -my $VERSION = '2.17.0'; +my $VERSION = '2.17.1'; my $lib; BEGIN { @@ -306,8 +306,6 @@ SDEFINES = -CCFLAGS2 = -D_REENTRANT -D_GNU_SOURCE -DTHREADS_HAVE_PIDS -DDEBIAN -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DPGLIBVERSION=80111 -DPGDEFPORT=5432 - splint: $(H_FILES) $(C_FILES) $(MKPATH) $(SPLINT_TMP) $(SPLINT) $(SPLINTFLAGS) $(SPLINTFLAGS_TEST) $(SDEFINES) -I$(PERL_INC) $(INC) $(C_FILES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-2.17.0/Pg.pm new/DBD-Pg-2.17.1/Pg.pm --- old/DBD-Pg-2.17.0/Pg.pm 2010-04-05 21:45:10.000000000 +0200 +++ new/DBD-Pg-2.17.1/Pg.pm 2010-04-07 22:52:55.000000000 +0200 @@ -1,5 +1,5 @@ # -*-cperl-*- -# $Id: Pg.pm 13885 2010-04-05 19:45:08Z turnstep $ +# $Id: Pg.pm 13896 2010-04-07 20:52:54Z turnstep $ # # Copyright (c) 2002-2010 Greg Sabino Mullane and others: see the Changes file # Portions Copyright (c) 2002 Jeffrey W. Baker @@ -17,7 +17,7 @@ { package DBD::Pg; - use version; our $VERSION = qv('2.17.0'); + use version; our $VERSION = qv('2.17.1'); use DBI (); use DynaLoader (); @@ -1732,7 +1732,7 @@ =head1 VERSION -This documents version 2.17.0 of the DBD::Pg module +This documents version 2.17.1 of the DBD::Pg module =head1 DESCRIPTION @@ -2143,7 +2143,6 @@ =item lo_import - $lobjId = $dbh->pg_lo_import($filename); Imports a Unix file as a large object and returns the object id of the new @@ -2151,7 +2150,6 @@ =item lo_import_with_oid - $lobjId = $dbh->pg_lo_import($filename, $OID); Same as lo_import, but attempts to use the supplied OID as the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-2.17.0/README new/DBD-Pg-2.17.1/README --- old/DBD-Pg-2.17.0/README 2010-04-05 21:45:43.000000000 +0200 +++ new/DBD-Pg-2.17.1/README 2010-04-07 22:51:41.000000000 +0200 @@ -6,7 +6,7 @@ DESCRIPTION: ------------ -This is version 2.17.0 of DBD::Pg, the Perl interface to Postgres using DBI. +This is version 2.17.1 of DBD::Pg, the Perl interface to Postgres using DBI. The web site for this interface, and the latest version, can be found at: http://search.cpan.org/dist/DBD-Pg/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-2.17.0/SIGNATURE new/DBD-Pg-2.17.1/SIGNATURE --- old/DBD-Pg-2.17.0/SIGNATURE 2010-04-06 20:51:54.000000000 +0200 +++ new/DBD-Pg-2.17.1/SIGNATURE 2010-04-08 17:29:45.000000000 +0200 @@ -15,24 +15,24 @@ Hash: RIPEMD160 SHA1 415d25a8628815a50a8f79317de4abff11ac73e8 .perlcriticrc -SHA1 66a7d35804d992c59064d352c730f1b677db6776 Changes +SHA1 9cdb9b0cd283c026f2bb186e44aefb0b9b7d23d1 Changes SHA1 21bc5f3c797d4d5b72285198ffeb1e4e1f0a2902 LICENSES/artistic.txt SHA1 06877624ea5c77efe3b7e39b0f909eda6e25a4ec LICENSES/gpl-2.0.txt SHA1 4025b3973c4a10c37fc7ad2f7a63fd9faa36f599 MANIFEST SHA1 dc863ce481b321833db84c95bbe976e8c65f296e MANIFEST.SKIP -SHA1 3355b6870902376b29abeea2f88f38f1f2cbfaa0 META.yml -SHA1 f8c9acd2062dfab03b9ecc19be4c0c727489c6d6 Makefile.PL +SHA1 7464411288953e5ceac6439342d3fdf75977a32e META.yml +SHA1 a2987d72ba262125871a394e68bc6852841b57a6 Makefile.PL SHA1 85c2b29c21312a022524a730f26b2c4b30fc4211 Pg.h -SHA1 5f1bc482ad0f3dc09fb8e6bea11859ee77d7a798 Pg.pm +SHA1 eaf35f2b3279536708a21367e13743eff716a211 Pg.pm SHA1 4a89e8770e3b1e83cee5150b1b5daa32e099d1b0 Pg.xs -SHA1 b1687af059e33159708c4db10e25ce6664e6d857 README +SHA1 17393c3b0b0bd38b4aa1fb2287f4e0cfc96fffda README SHA1 4078d5452d087f83c7f43915fd329a51e66b0f6a README.dev SHA1 7e213bf90f513595b59c0a2c4ef94fea1592efcf README.win32 SHA1 7330c41dd3a581aee4e1ca862b7403450454ce77 TODO -SHA1 5f9c6d5446e0d7273e0fbb33e57bce5198596492 dbdimp.c +SHA1 86cdf1a5369a98f096205eeb3fc5ef077b8baf1c dbdimp.c SHA1 778794bc7eea7ad15ed3e933eb98f1e1e9875ec4 dbdimp.h SHA1 6c33bcf138e577722283bef02fceb8cbce4d100d dbivport.h -SHA1 f340b6d0c470e615ca608420be039c7b87aa9061 lib/Bundle/DBD/Pg.pm +SHA1 00122f291c761dbaab476547ba36a0e510972794 lib/Bundle/DBD/Pg.pm SHA1 11dc1f05bf7dc7e97d2ffe4796367506a0f86c9d quote.c SHA1 54f10c6d76db2f2bfbaa7f345d7034029b88453c quote.h SHA1 93aa7e8cae0a361d1e6163dea0281ebff41f3c5f t/00-signature.t @@ -63,7 +63,7 @@ SHA1 f07cd5ecaeb854c81ceb9206364979cf607e6546 win32.mak -----BEGIN PGP SIGNATURE----- -iEYEAREDAAYFAku7gsoACgkQvJuQZxSWSsgUZQCeJUNLurguxHoIC2DTtaWYVrMx -qJkAnilHrJtkTLqvdzFMBr28g6XUWfTB -=mZTc +iEYEAREDAAYFAku99mkACgkQvJuQZxSWSsiF3wCdF0ETaog2ugY8PZ9QbBhE9rFi ++vUAoO33Zj+q7bG6JpJ+KhwkOHizawL8 +=zX3/ -----END PGP SIGNATURE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-2.17.0/dbdimp.c new/DBD-Pg-2.17.1/dbdimp.c --- old/DBD-Pg-2.17.0/dbdimp.c 2010-04-05 21:28:39.000000000 +0200 +++ new/DBD-Pg-2.17.1/dbdimp.c 2010-04-07 22:49:52.000000000 +0200 @@ -1,6 +1,6 @@ /* - $Id: dbdimp.c 13883 2010-04-05 19:08:17Z turnstep $ + $Id: dbdimp.c 13895 2010-04-07 20:49:50Z turnstep $ Copyright (c) 2002-2010 Greg Sabino Mullane and others: see the Changes file Portions Copyright (c) 2002 Jeffrey W. Baker @@ -56,6 +56,15 @@ #endif +#if PGLIBVERSION < 80400 + +Oid lo_import_with_oid (PGconn *conn, char *filename, unsigned int lobjId); +Oid lo_import_with_oid (PGconn *conn, char *filename, unsigned int lobjId) { + croak ("Cannot use lo_import_with_oid unless compiled against Postgres 8.4 or later"); +} + +#endif + #ifndef PGErrorVerbosity typedef enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-2.17.0/lib/Bundle/DBD/Pg.pm new/DBD-Pg-2.17.1/lib/Bundle/DBD/Pg.pm --- old/DBD-Pg-2.17.0/lib/Bundle/DBD/Pg.pm 2010-04-05 21:45:37.000000000 +0200 +++ new/DBD-Pg-2.17.1/lib/Bundle/DBD/Pg.pm 2010-04-07 22:51:14.000000000 +0200 @@ -4,7 +4,7 @@ use strict; use warnings; -$VERSION = '2.17.0'; +$VERSION = '2.17.1'; 1; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-gtk for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '10

21 Apr '10

Hello community, here is the log from the commit of package yast2-gtk for openSUSE:Factory checked in at Wed Apr 21 18:23:43 CEST 2010. -------- --- yast2-gtk/yast2-gtk.changes 2010-04-20 16:56:22.000000000 +0200 +++ yast2-gtk/yast2-gtk.changes 2010-04-21 14:13:10.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 21 13:09:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.45 +- online_update: several fixes, that encompassthe list and the +version widgets. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-gtk-2.21.44.tar.bz2 New: ---- yast2-gtk-2.21.45.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-gtk.spec ++++++ --- /var/tmp/diff_new_pack.8C6Z0g/_old 2010-04-21 18:22:37.000000000 +0200 +++ /var/tmp/diff_new_pack.8C6Z0g/_new 2010-04-21 18:22:37.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-gtk (Version 2.21.44) +# spec file for package yast2-gtk (Version 2.21.45) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,11 +18,11 @@ Name: yast2-gtk -Version: 2.21.44 +Version: 2.21.45 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-gtk-2.21.44.tar.bz2 +Source0: yast2-gtk-2.21.45.tar.bz2 Url: http://en.opensuse.org/YaST2-GTK Summary: YaST2 - GTK+ Graphical User Interface Group: System/YaST ++++++ yast2-gtk-2.21.44.tar.bz2 -> yast2-gtk-2.21.45.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.44/ChangeLog new/yast2-gtk-2.21.45/ChangeLog --- old/yast2-gtk-2.21.44/ChangeLog 2010-04-20 16:53:30.000000000 +0200 +++ new/yast2-gtk-2.21.45/ChangeLog 2010-04-21 14:10:40.000000000 +0200 @@ -1,3 +1,15 @@ +2010-04-21 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/yzyppwrapper.h/cc: improved on the API, especially + patches support. + + * src/pkg/ygtkpkgdetailview.cc: several fixes on the version + widget. + + * src/pkg/ygtkpkglistview.cc: fixes can_toggle property and + made clicking on the toggle using the more proper undo() call + when toModify() is true. + 2010-04-20 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/ygtkcellrenderertext.h/c: added renderer: extends diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.44/VERSION new/yast2-gtk-2.21.45/VERSION --- old/yast2-gtk-2.21.44/VERSION 2010-04-20 16:53:30.000000000 +0200 +++ new/yast2-gtk-2.21.45/VERSION 2010-04-21 14:10:40.000000000 +0200 @@ -1 +1 @@ -2.21.44 +2.21.45 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.44/VERSION.cmake new/yast2-gtk-2.21.45/VERSION.cmake --- old/yast2-gtk-2.21.44/VERSION.cmake 2010-04-20 16:53:30.000000000 +0200 +++ new/yast2-gtk-2.21.45/VERSION.cmake 2010-04-21 14:10:40.000000000 +0200 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "44") +SET(VERSION_PATCH "45") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.44/package/yast2-gtk.changes new/yast2-gtk-2.21.45/package/yast2-gtk.changes --- old/yast2-gtk-2.21.44/package/yast2-gtk.changes 2010-04-20 16:53:30.000000000 +0200 +++ new/yast2-gtk-2.21.45/package/yast2-gtk.changes 2010-04-21 14:10:40.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 21 13:09:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.45 +- online_update: several fixes, that encompassthe list and the +version widgets. + +------------------------------------------------------------------- Tue Apr 20 15:53:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.44 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.44/package/yast2-gtk.spec new/yast2-gtk-2.21.45/package/yast2-gtk.spec --- old/yast2-gtk-2.21.44/package/yast2-gtk.spec 2010-04-20 16:53:30.000000000 +0200 +++ new/yast2-gtk-2.21.45/package/yast2-gtk.spec 2010-04-21 14:10:40.000000000 +0200 @@ -1,16 +1,16 @@ # -# spec file for package yast2-gtk (Version 2.21.43) +# spec file for package yast2-gtk (Version 2.21.44) # # norootforbuild;, Name: yast2-gtk -Version: 2.21.43 +Version: 2.21.44 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-gtk-2.21.43.tar.bz2 +Source0: yast2-gtk-2.21.44.tar.bz2 Url: http://en.opensuse.org/YaST2-GTK Summary: YaST2 - GTK+ Graphical User Interface Group: System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.44/src/pkg/ygtkpkgdetailview.cc new/yast2-gtk-2.21.45/src/pkg/ygtkpkgdetailview.cc --- old/yast2-gtk-2.21.44/src/pkg/ygtkpkgdetailview.cc 2010-04-20 16:53:30.000000000 +0200 +++ new/yast2-gtk-2.21.45/src/pkg/ygtkpkgdetailview.cc 2010-04-21 14:10:40.000000000 +0200 @@ -31,6 +31,16 @@ static const char *keywordOpenTag = "<keyword>", *keywordCloseTag = "</keyword>"; #endif +struct BusyOp { + BusyOp() { + YGDialog::currentDialog()->busyCursor(); + while (g_main_context_iteration (NULL, FALSE)) ; + } + ~BusyOp() { + YGDialog::currentDialog()->normalCursor(); + } +}; + struct DetailWidget { virtual ~DetailWidget() {} virtual GtkWidget *getWidget() = 0; @@ -337,6 +347,7 @@ struct VersionExpander : public DetailExpander { GtkWidget *box, *versions_box, *button, *undo_button; + std::list <Ypp::Version> versions; VersionExpander() : DetailExpander (_("Versions"), false) @@ -377,64 +388,105 @@ for (GList *i = children; i; i = i->next) gtk_container_remove (GTK_CONTAINER (versions_box), (GtkWidget *) i->data); g_list_free (children); + versions.clear(); + } + + GtkWidget *addVersion (Ypp::Selectable &sel, Ypp::Version version, GtkWidget *group) + { + GtkWidget *radio = gtk_radio_button_new_with_label_from_widget + (GTK_RADIO_BUTTON (group), ""); + updateRadio (radio, sel, version); + + gtk_box_pack_start (GTK_BOX (versions_box), radio, FALSE, TRUE, 0); + if (version.toModify()) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); + g_signal_connect (G_OBJECT (radio), "toggled", + G_CALLBACK (version_toggled_cb), this); + + if ((versions.size() % 2) == 1) + g_signal_connect (G_OBJECT (radio), "expose-event", + G_CALLBACK (draw_gray_cb), NULL); + versions.push_back (version); + return radio; } - GtkWidget *addVersion (ZyppSelectable zsel, ZyppResObject zobj, GtkWidget *group) + void updateRadio (GtkWidget *radio, Ypp::Selectable &sel, Ypp::Version &version) { - bool modified = false; + bool modified; std::string repo; - if (zobj->isSystem()) { - modified = zsel->toDelete(); + if (version.isInstalled()) { repo = _("Installed"); + modified = sel.toRemove(); } else { - modified = zsel->toInstall() && zsel->candidateObj() == zobj; - repo = zobj->repository().name(); + repo = version.repository().name(); + modified = sel.toInstall(); } + modified = modified && version.toModify(); - - std::string _version (zobj->edition().asString()); - std::string version (YGUtils::truncate (_version, 20, 0)); - std::string arch (zobj->arch().asString()); - char *text = g_strdup_printf ("%s%s (%s)\n%s%s", - modified ? "" : "", version.c_str(), arch.c_str(), repo.c_str(), + std::string number (version.number()); + std::string arch (version.arch()); + char *tooltip = g_strdup_printf ("%s (%s)\n%s", + number.c_str(), arch.c_str(), repo.c_str()); + number = YGUtils::truncate (number, 20, 0); + char *label = g_strdup_printf ("%s%s (%s)\n%s%s", + modified ? "" : "", number.c_str(), arch.c_str(), repo.c_str(), modified ? "" : ""); - GtkWidget *radio = gtk_radio_button_new_with_label_from_widget - (GTK_RADIO_BUTTON (group), text); - g_free (text); - gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (radio)->child), TRUE); - - if (version.size() > 20) { - char *text = g_strdup_printf ("%s (%s)\n%s", - _version.c_str(), arch.c_str(), repo.c_str()); - gtk_widget_set_tooltip_markup (radio, text); - g_free (text); - } - - gtk_box_pack_start (GTK_BOX (versions_box), radio, FALSE, TRUE, 0); - if (zobj->isSystem() || modified) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); - g_object_set_data (G_OBJECT (radio), "zsel", get_pointer (zsel)); - g_object_set_data (G_OBJECT (radio), "zobj", (void *) get_pointer (zobj)); - g_signal_connect (G_OBJECT (radio), "toggled", - G_CALLBACK (version_toggled_cb), this); - return radio; + gtk_label_set_markup (GTK_LABEL (GTK_BIN (radio)->child), label); + if (number.size() > 20) + gtk_widget_set_tooltip_markup (radio, tooltip); + g_free (tooltip); + g_free (label); } - void getSelected (ZyppSelectable *zsel, ZyppResObject *zobj) + Ypp::Version &getSelected() { - GtkWidget *radio = 0; + std::list <Ypp::Version>::iterator it = versions.begin(); GList *children = gtk_container_get_children (GTK_CONTAINER (versions_box)); - for (GList *i = children; i; i = i->next) - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (i->data))) { - radio = (GtkWidget *) i->data; + for (GList *i = children; i; i = i->next, it++) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (i->data))) break; - } g_list_free (children); - if (radio) { - *zsel = (ZyppSelectablePtr) g_object_get_data (G_OBJECT (radio), "zsel"); - *zobj = (ZyppResObjectPtr) g_object_get_data (G_OBJECT (radio), "zobj"); + return *it; + } + + virtual bool onlySingleList() { return false; } + + virtual void showList (Ypp::List list) + { + Ypp::ListProps props (list); + clearVersions(); + + if (list.size() == 1) { + Ypp::Selectable sel = list.get (0); + GtkWidget *radio = 0; + for (int i = 0; i < sel.totalVersions(); i++) + radio = addVersion (sel, sel.version (i), radio); + gtk_widget_show_all (versions_box); + } + + // is locked + if (props.isLocked() || props.isUnlocked()) + gtk_widget_set_sensitive (button, !props.isLocked()); + else + gtk_widget_set_sensitive (button, TRUE); + + updateButton(); + } + + virtual void showRefreshList (Ypp::List list) + { + updateButton(); + + // update radios + if (list.size() == 1) { + Ypp::Selectable &sel = list.get (0); + std::list <Ypp::Version>::iterator it = versions.begin(); + GList *children = gtk_container_get_children (GTK_CONTAINER (versions_box)); + for (GList *i = children; i; i = i->next, it++) + updateRadio ((GtkWidget *) i->data, sel, *it); + g_list_free (children); } } @@ -443,24 +495,23 @@ const char *label = 0, *stock = 0; bool modified = false, can_modify = true; if (list.size() == 1) { - ZyppSelectable zsel; - ZyppResObject zobj; - getSelected (&zsel, &zobj); + Ypp::Selectable sel = list.get (0); + Ypp::Version &version = getSelected(); - if (zobj->isSystem() || zobj->poolItem().isSatisfied()) { + if (version.isInstalled()) { label = _("Remove"); stock = GTK_STOCK_DELETE; - modified = zsel->toDelete(); - can_modify = zobj->kind() != zypp::ResKind::patch; + can_modify = sel.canRemove(); + modified = sel.toRemove(); } else { - ZyppResObject installedObj = zsel->installedObj(); - if (installedObj) { - if (zobj->edition() > installedObj->edition()) { + if (sel.hasInstalledVersion()) { + Ypp::Version installed = sel.installed(); + if (installed < version) { label = _("Upgrade"); stock = GTK_STOCK_GO_UP; } - else if (zobj->edition() < installedObj->edition()) { + else if (installed > version) { label = _("Downgrade"); stock = GTK_STOCK_GO_DOWN; } @@ -473,13 +524,13 @@ label = _("Install"); stock = GTK_STOCK_SAVE; } - modified = zsel->toInstall() && zsel->candidateObj() == zobj; + modified = sel.toInstall(); } + modified = modified && version.toModify(); } else { Ypp::ListProps props (list); - if (props.toModify()) - modified = true; + modified = props.toModify(); if (props.hasUpgrade()) { label = _("Upgrade"); stock = GTK_STOCK_GO_UP; @@ -496,7 +547,7 @@ else if (props.toModify()) { label = _("Undo"); stock = GTK_STOCK_UNDO; - modified = false; + modified = false; // don't show another undo button } } @@ -513,62 +564,34 @@ modified ? gtk_widget_show (undo_button) : gtk_widget_hide (undo_button); } - virtual bool onlySingleList() { return false; } - - virtual void showList (Ypp::List list) + static void version_toggled_cb (GtkToggleButton *button, VersionExpander *pThis) { - Ypp::ListProps props (list); - clearVersions(); - - if (list.size() == 1) { - Ypp::Selectable sel = list.get (0); - ZyppSelectable zsel = sel.zyppSel(); - - GtkWidget *radio = 0; - for (zypp::ui::Selectable::installed_iterator it = zsel->installedBegin(); - it != zsel->installedEnd(); it++) - radio = addVersion (zsel, *it, radio); - for (zypp::ui::Selectable::available_iterator it = zsel->availableBegin(); - it != zsel->availableEnd(); it++) - radio = addVersion (zsel, *it, radio); + if (gtk_toggle_button_get_active (button)) { + Ypp::Selectable sel = pThis->list.get (0); + Ypp::Version &version = pThis->getSelected(); - int n = 0; - GList *children = gtk_container_get_children (GTK_CONTAINER (versions_box)); - for (GList *i = children; i; i = i->next, n++) { - GtkRadioButton *radio = (GtkRadioButton *) i->data; - if ((n % 2) == 1) - g_signal_connect (G_OBJECT (radio), "expose-event", - G_CALLBACK (draw_gray_cb), NULL); - } - g_list_free (children); + // enclosing this within startTransactions() so the button is updated + // before signaling any change, for a snappy feel + Ypp::startTransactions(); + if (!sel.toInstall()) + sel.setCandidate (version); - gtk_widget_show_all (versions_box); + pThis->updateButton(); + while (g_main_context_iteration (NULL, FALSE)) ; + Ypp::finishTransactions(); } - - // is locked - if (props.isLocked() || props.isUnlocked()) - gtk_widget_set_sensitive (button, !props.isLocked()); - else - gtk_widget_set_sensitive (button, TRUE); - - updateButton(); } - virtual void showRefreshList (Ypp::List list) - { updateButton(); } - static void button_clicked_cb (GtkButton *button, VersionExpander *pThis) { + BusyOp op; if (pThis->list.size() == 1) { - ZyppSelectable zsel; - ZyppResObject zobj; - pThis->getSelected (&zsel, &zobj); + Ypp::Selectable sel = pThis->list.get (0); + Ypp::Version &version = pThis->getSelected(); - Ypp::Selectable sel (zsel); - if (zobj->isSystem()) + if (version.isInstalled()) sel.remove(); else { - Ypp::Version version (zobj); sel.setCandidate (version); sel.install(); } @@ -587,26 +610,11 @@ } static void undo_clicked_cb (GtkButton *button, VersionExpander *pThis) - { pThis->list.undo(); } + { BusyOp op; pThis->list.undo(); } static gboolean sel_modified_idle_cb (gpointer data) { Ypp::runSolver(); return FALSE; } - static void version_toggled_cb (GtkToggleButton *button, VersionExpander *pThis) - { - if (gtk_toggle_button_get_active (button)) { - ZyppSelectable zsel; - ZyppResObject zobj; - pThis->getSelected (&zsel, &zobj); - if (!zsel->toInstall()) { - zsel->setCandidate (zobj); // delay sel modified for snappy feel - g_idle_add_full (G_PRIORITY_LOW, sel_modified_idle_cb, pThis, NULL); - } - - pThis->updateButton(); - } - } - static gboolean draw_gray_cb (GtkWidget *widget, GdkEventExpose *event) { GtkAllocation *alloc = &widget->allocation; @@ -727,9 +735,9 @@ clear(); for (int dep = 0; dep < VersionDependencies::total(); dep++) { std::string inst, cand; - if (sel.isInstalled()) + if (sel.hasInstalledVersion()) inst = VersionDependencies (sel.installed()).getText (dep); - if (sel.availableSize()) + if (sel.hasCandidateVersion()) cand = VersionDependencies (sel.candidate()).getText (dep); if (!inst.empty() || !cand.empty()) addLine (VersionDependencies::getLabel (dep), inst, cand, dep); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.44/src/pkg/ygtkpkgfilterview.cc new/yast2-gtk-2.21.45/src/pkg/ygtkpkgfilterview.cc --- old/yast2-gtk-2.21.44/src/pkg/ygtkpkgfilterview.cc 2010-04-20 16:53:30.000000000 +0200 +++ new/yast2-gtk-2.21.45/src/pkg/ygtkpkgfilterview.cc 2010-04-21 14:10:40.000000000 +0200 @@ -357,11 +357,14 @@ if (sel.isInstalled()) count++; } - else for (int a = 0; a < sel.availableSize(); a++) { - Ypp::Repository pkg_repo = sel.available (a).repository(); - if (repo == pkg_repo) { - count++; - break; + else for (int i = 0; i < sel.totalVersions(); i++) { + Ypp::Version version = sel.version (i); + if (!version.isInstalled()) { + Ypp::Repository pkg_repo = version.repository(); + if (repo == pkg_repo) { + count++; + break; + } } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.44/src/pkg/ygtkpkglistview.cc new/yast2-gtk-2.21.45/src/pkg/ygtkpkglistview.cc --- old/yast2-gtk-2.21.44/src/pkg/ygtkpkglistview.cc 2010-04-20 16:53:30.000000000 +0200 +++ new/yast2-gtk-2.21.45/src/pkg/ygtkpkglistview.cc 2010-04-21 14:10:40.000000000 +0200 @@ -121,7 +121,7 @@ } case REPOSITORY_PROP: { std::string str; - if (sel.availableSize() > 0) { + if (sel.hasCandidateVersion()) { Ypp::Repository repo (sel.candidate().repository()); str = getRepositoryLabel (repo); } @@ -136,7 +136,7 @@ } case REPOSITORY_STOCK_PROP: { const char *stock = 0; - if (sel.availableSize() > 0) { + if (sel.hasCandidateVersion()) { Ypp::Repository repo (sel.candidate().repository()); stock = getRepositoryStockIcon (repo); } @@ -150,9 +150,11 @@ break; } case SUPPORT_PROP: { - Ypp::Package pkg (sel); - std::string str (Ypp::Package::supportSummary (pkg.support())); - g_value_set_string (value, str.c_str()); + if (sel.type() == Ypp::Selectable::PACKAGE) { + Ypp::Package pkg (sel); + std::string str (Ypp::Package::supportSummary (pkg.support())); + g_value_set_string (value, str.c_str()); + } break; } case SIZE_PROP: { @@ -164,8 +166,8 @@ std::string str; str.reserve (128); int cmp = 0; - bool hasAvailable = sel.availableSize() > 0; - if (hasAvailable) { + bool hasCandidate = sel.hasCandidateVersion(); + if (hasCandidate) { Ypp::Version candidate = sel.candidate(); if (sel.isInstalled()) { Ypp::Version installed = sel.installed(); @@ -182,10 +184,10 @@ if (cmp == 0) { if (sel.isInstalled()) { - if (!hasAvailable) // red for orphan too + if (!hasCandidate) // red for orphan too str += ""; str += sel.installed().number(); - if (!hasAvailable) + if (!hasCandidate) str += ""; } else @@ -203,7 +205,7 @@ case SINGLE_VERSION_PROP: { std::string str; str.reserve (128); - if (sel.availableSize() && !sel.toRemove()) + if (sel.hasCandidateVersion() && !sel.toRemove()) str = sel.candidate().number(); else str = sel.installed().number(); @@ -228,7 +230,7 @@ g_value_set_boolean (value, sel.hasUpgrade() && sel.toInstall()); break; case CAN_TOGGLE_INSTALL_PROP: - g_value_set_boolean (value, sel.isInstalled() || sel.canRemove()); + g_value_set_boolean (value, !sel.isInstalled() || sel.canRemove()); break; case MANUAL_MODIFY_PROP: g_value_set_boolean (value, sel.toModify() && !sel.toModifyAuto()); @@ -495,7 +497,10 @@ Ypp::Selectable *sel = ygtk_zypp_model_get_sel (model, path_str); gboolean active = gtk_cell_renderer_toggle_get_active (renderer); - active ? sel->remove() : sel->install(); + if (sel->toModify()) + sel->undo(); + else + active ? sel->remove() : sel->install(); YGUI::ui()->normalCursor(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.44/src/pkg/yzyppwrapper.cc new/yast2-gtk-2.21.45/src/pkg/yzyppwrapper.cc --- old/yast2-gtk-2.21.44/src/pkg/yzyppwrapper.cc 2010-04-20 16:53:30.000000000 +0200 +++ new/yast2-gtk-2.21.45/src/pkg/yzyppwrapper.cc 2010-04-21 14:10:40.000000000 +0200 @@ -43,32 +43,52 @@ // Version -Ypp::Version::Version (ZyppResObject obj) -: m_resobj (obj) {} +Ypp::Version::Version (ZyppResObject zobj) +: m_zobj (zobj) {} + +int Ypp::Version::type() +{ return Selectable::asType (m_zobj->kind()); } std::string Ypp::Version::number() -{ return m_resobj->edition().asString(); } +{ return m_zobj->edition().asString(); } std::string Ypp::Version::arch() -{ return m_resobj->arch().asString(); } +{ return m_zobj->arch().asString(); } Ypp::Repository Ypp::Version::repository() -{ return Repository (m_resobj->repository()); } +{ return Repository (m_zobj->repository()); } Size_t Ypp::Version::size() -{ return m_resobj->installSize(); } +{ return m_zobj->installSize(); } Size_t Ypp::Version::downloadSize() -{ return m_resobj->downloadSize(); } +{ return m_zobj->downloadSize(); } + +bool Ypp::Version::isInstalled() +{ + zypp::ResStatus status = m_zobj->poolItem().status(); + switch (type()) { + case Ypp::Selectable::PATCH: + return status.isSatisfied() && !status.isToBeInstalled(); + default: + return status.isInstalled(); + } +} + +bool Ypp::Version::toModify() +{ + zypp::ResStatus status = m_zobj->poolItem().status(); + return status.transacts(); +} bool Ypp::Version::operator < (Ypp::Version &other) -{ return this->m_resobj->edition() < other.m_resobj->edition(); } +{ return this->m_zobj->edition() < other.m_zobj->edition(); } bool Ypp::Version::operator > (Ypp::Version &other) -{ return this->m_resobj->edition() > other.m_resobj->edition(); } +{ return this->m_zobj->edition() > other.m_zobj->edition(); } bool Ypp::Version::operator == (Ypp::Version &other) -{ return this->m_resobj->edition() == other.m_resobj->edition(); } +{ return this->m_zobj->edition() == other.m_zobj->edition(); } // Selectable @@ -189,7 +209,7 @@ return text; } -bool Ypp::Selectable::userVisible() +bool Ypp::Selectable::visible() { switch (m_type) { case PATTERN: { @@ -197,7 +217,7 @@ return pattern->userVisible(); } case PATCH: - if (zyppSel()->candidateObj()) + if (zyppSel()->hasCandidateObj()) if (!zyppSel()->candidateObj().isRelevant()) return false; return true; @@ -213,7 +233,9 @@ return !m_sel->installedEmpty(); case PATTERN: case PATCH: - return m_sel->isSatisfied(); + if (hasCandidateVersion()) + return candidate().isInstalled(); + return true; case LANGUAGE: return _zyppPool().isRequestedLocale (m_locale); case ALL: break; @@ -319,7 +341,10 @@ break; // undo case zypp::ui::S_Del: - status = zypp::ui::S_KeepInstalled; + if (hasInstalledVersion()) + status = zypp::ui::S_Update; + else + status = zypp::ui::S_Install; break; // nothing to do about it case zypp::ui::S_AutoDel: @@ -366,17 +391,13 @@ case zypp::ui::S_NoInst: case zypp::ui::S_Del: break; - // undo - case zypp::ui::S_Install: - status = zypp::ui::S_NoInst; - break; // nothing to do about it case zypp::ui::S_AutoInstall: case zypp::ui::S_AutoUpdate: break; + // undo + case zypp::ui::S_Install: case zypp::ui::S_Update: - status = zypp::ui::S_KeepInstalled; - break; // action case zypp::ui::S_KeepInstalled: case zypp::ui::S_AutoDel: @@ -393,10 +414,35 @@ void Ypp::Selectable::undo() { - if (toInstall()) - remove(); - else if (toRemove()) - install(); + // undo not applicable to language type + + zypp::ui::Status status = m_sel->status(); + zypp::ui::Status prev_status = status; + switch (status) { + // not applicable + case zypp::ui::S_Protected: + case zypp::ui::S_Taboo: + case zypp::ui::S_NoInst: + case zypp::ui::S_KeepInstalled: + break; + // undo + case zypp::ui::S_Install: + case zypp::ui::S_AutoInstall: + status = zypp::ui::S_NoInst; + break; + case zypp::ui::S_AutoUpdate: + case zypp::ui::S_AutoDel: + case zypp::ui::S_Update: + case zypp::ui::S_Del: + status = zypp::ui::S_KeepInstalled; + break; + } + m_sel->setStatus (status); + + if (!runSolver()) { + m_sel->setStatus (prev_status); + runSolver(); + } } void Ypp::Selectable::lock (bool lock) @@ -434,15 +480,27 @@ return false; } -Ypp::Version Ypp::Selectable::installed() +int Ypp::Selectable::totalVersions() +{ return m_sel->installedSize() + m_sel->availableSize(); } + +Ypp::Version Ypp::Selectable::version (int n) { - if (m_type == PATCH || m_type == PATTERN) { - if (m_sel->candidateObj() && m_sel->candidateObj().isSatisfied()) - return Ypp::Version (m_sel->candidateObj()); + if (n < (signed) m_sel->installedSize()) { + zypp::ui::Selectable::installed_iterator it = m_sel->installedBegin(); + for (int i = 0; i < n; i++) it++; + return Version (*it); + } + else { + n -= m_sel->installedSize(); + zypp::ui::Selectable::available_iterator it = m_sel->availableBegin(); + for (int i = 0; i < n; i++) it++; + return Version (*it); } - return Ypp::Version (m_sel->installedObj()); } +bool Ypp::Selectable::hasCandidateVersion() +{ return !m_sel->availableEmpty(); } + Ypp::Version Ypp::Selectable::candidate() { return Version (m_sel->candidateObj()); } @@ -452,15 +510,16 @@ runSolver(); } -int Ypp::Selectable::availableSize() -{ return m_sel->availableSize(); } +bool Ypp::Selectable::hasInstalledVersion() +{ return !m_sel->installedEmpty(); } -Ypp::Version Ypp::Selectable::available (int n) +Ypp::Version Ypp::Selectable::installed() { - zypp::ui::Selectable::available_iterator it = m_sel->availableBegin(); - for (int i = 0; i < n; i++) - it++; - return Version (*it); + if (m_type == PATCH || m_type == PATTERN) { + if (m_sel->candidateObj() && m_sel->candidateObj().isSatisfied()) + return Ypp::Version (m_sel->candidateObj()); + } + return Ypp::Version (m_sel->installedObj()); } Ypp::Version Ypp::Selectable::anyVersion() @@ -907,7 +966,7 @@ case YPKG_GROUP_SUGGESTED: return zypp::PoolItem (pkg).status().isSuggested(); case YPKG_GROUP_ORPHANED: return zypp::PoolItem (pkg).status().isOrphaned(); case YPKG_GROUP_RECENT: - if (sel.availableSize()) { + if (sel.hasCandidateVersion()) { time_t build = static_cast <time_t> (sel.candidate().zyppObj()->buildtime()); time_t now = time (NULL); time_t delta = (now - build) / (60*60*24); // in days @@ -967,7 +1026,7 @@ { // iterates until match -- will return argument if it already matches while (it != query.selectableEnd()) { Ypp::Selectable sel (*it); - if (sel.userVisible() && match (sel)) break; + if (sel.visible() && match (sel)) break; it++; } return it; @@ -1207,7 +1266,7 @@ static std::string get_alias (Ypp::Selectable &a) { - if (a.availableSize() > 0) + if (a.hasCandidateVersion()) return a.candidate().repository().zyppRepo().alias(); return "a"; // system } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.44/src/pkg/yzyppwrapper.h new/yast2-gtk-2.21.45/src/pkg/yzyppwrapper.h --- old/yast2-gtk-2.21.44/src/pkg/yzyppwrapper.h 2010-04-20 16:53:30.000000000 +0200 +++ new/yast2-gtk-2.21.45/src/pkg/yzyppwrapper.h 2010-04-21 14:10:40.000000000 +0200 @@ -113,7 +113,9 @@ // Selectable & related funcs struct Version { - Version (ZyppResObject obj); + Version (ZyppResObject zobj); + + int type(); // Ypp::Selectable::Type std::string number(); std::string arch(); @@ -123,15 +125,16 @@ Size_t downloadSize(); bool isInstalled(); + bool toModify(); bool operator < (Version &other); bool operator > (Version &other); bool operator == (Version &other); - ZyppResObject zyppObj() { return m_resobj; } + ZyppResObject zyppObj() { return m_zobj; } private: - ZyppResObject m_resobj; + ZyppResObject m_zobj; }; struct Selectable { @@ -149,11 +152,12 @@ std::string summary(); std::string description (bool as_html); - bool userVisible(); + bool visible(); bool isInstalled(); bool hasUpgrade(); bool isLocked(); + bool toInstall(); bool toRemove(); bool toModify(); @@ -167,11 +171,15 @@ bool canRemove(); bool canLock(); - Version installed(); + int totalVersions(); + Version version (int n); + + bool hasCandidateVersion(); Version candidate(); void setCandidate (Version &version); - int availableSize(); - Version available (int n); + + bool hasInstalledVersion(); + Version installed(); Version anyVersion(); bool operator == (const Selectable &other) const; @@ -452,7 +460,6 @@ Impl *impl; private: // prevent copy ListProps (const ListProps&); ListProps &operator= (const ListProps&); - }; // Disk ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '10

21 Apr '10

Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at Wed Apr 21 18:22:26 CEST 2010. -------- --- installation-images/installation-images.changes 2010-04-12 11:53:24.000000000 +0200 +++ installation-images/installation-images.changes 2010-04-21 17:23:22.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 21 17:23:12 CEST 2010 - snwint(a)suse.de + +- support wildcard in package name to avoid specifying the package version +- adjust package config + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- installation-images-12.46.tar.bz2 needed_space_in_mb New: ---- installation-images-12.47.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.lr7LU6/_old 2010-04-21 18:21:24.000000000 +0200 +++ /var/tmp/diff_new_pack.lr7LU6/_new 2010-04-21 18:21:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 12.46) +# spec file for package installation-images (Version 12.47) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -103,9 +103,9 @@ Obsoletes: y2image AutoReqProv: off Summary: Installation Image Files -Version: 12.46 +Version: 12.47 Release: 1 -Source: installation-images-12.46.tar.bz2 +Source: installation-images-12.47.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-12.46.tar.bz2 -> installation-images-12.47.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/README new/installation-images-12.47/README --- old/installation-images-12.46/README 2010-02-05 11:43:09.000000000 +0100 +++ new/installation-images-12.47/README 2010-04-21 17:22:59.000000000 +0200 @@ -146,6 +146,9 @@ <package_name> may be empty, which matters only for disk usage accounting. Files are still taken from the last non-empty <package_name>. + <package_name> can contain '*'s. In that case the latest package version + is used. If <package_name> ends in '~' the last but one version is used. + examples: k_delft: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/VERSION new/installation-images-12.47/VERSION --- old/installation-images-12.46/VERSION 2010-04-12 11:53:03.000000000 +0200 +++ new/installation-images-12.47/VERSION 2010-04-21 17:23:05.000000000 +0200 @@ -1 +1 @@ -12.46 +12.47 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/changelog new/installation-images-12.47/changelog --- old/installation-images-12.46/changelog 2010-04-12 11:53:06.000000000 +0200 +++ new/installation-images-12.47/changelog 2010-04-21 17:23:08.000000000 +0200 @@ -1,4 +1,8 @@ -2010-04-12: HEAD +2010-04-21: HEAD + - support wildcard in package name to avoid specifying the package version + - adjust package config + +2010-04-12: 12.46 - added /etc/xorg.conf.d (bnc #595641) 2010-04-09: 12.45 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/data/base/base.file_list new/installation-images-12.47/data/base/base.file_list --- old/installation-images-12.46/data/base/base.file_list 2010-04-06 17:03:00.000000000 +0200 +++ new/installation-images-12.47/data/base/base.file_list 2010-04-21 17:22:59.000000000 +0200 @@ -273,7 +273,7 @@ /usr/lib*/liblber-*.so.* /usr/lib*/libldap-*.so.* -libopenssl0_9_8: +libopenssl*: /usr/lib*/libcrypto.so.* /usr/lib*/libssl.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/data/initrd/biostest.file_list new/installation-images-12.47/data/initrd/biostest.file_list --- old/installation-images-12.46/data/initrd/biostest.file_list 2010-04-06 17:03:00.000000000 +0200 +++ new/installation-images-12.47/data/initrd/biostest.file_list 2010-04-21 17:22:59.000000000 +0200 @@ -56,6 +56,13 @@ /usr/lib*/libopensc.so.* /usr/lib*/libscconf.so.* +# FIXME +if exists(libopenssl*~) + libopenssl*~: + /usr/lib*/libcrypto.so.* + /usr/lib*/libssl.so.* +endif + krb5: /etc /usr/lib*/libkrb5.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/data/initrd/initrd.file_list new/installation-images-12.47/data/initrd/initrd.file_list --- old/installation-images-12.46/data/initrd/initrd.file_list 2010-04-12 11:40:19.000000000 +0200 +++ new/installation-images-12.47/data/initrd/initrd.file_list 2010-04-21 17:22:59.000000000 +0200 @@ -424,7 +424,7 @@ endif # i386/x86_64/ppc -libopenssl0_9_8: +libopenssl*: /usr/lib*/libcrypto.so.* /usr/lib*/libssl.so.* @@ -669,9 +669,10 @@ bind-libs: /usr/lib* +endif + libcap2: /lib* -endif strace: /usr/bin/strace @@ -705,11 +706,13 @@ /var/run/nscd if exists(xorg-x11-driver-input) - /lib/udev/rules.d + xorg-x11-driver-input: + /lib/udev/rules.d endif if exists(xorg-x11-server) - /etc/modprobe.d + xorg-x11-server: + /etc/modprobe.d endif if 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/data/rescue/rescue.file_list new/installation-images-12.47/data/rescue/rescue.file_list --- old/installation-images-12.46/data/rescue/rescue.file_list 2010-04-06 17:03:00.000000000 +0200 +++ new/installation-images-12.47/data/rescue/rescue.file_list 2010-04-21 17:22:59.000000000 +0200 @@ -467,10 +467,17 @@ /usr/lib*/liblber-*.so.* /usr/lib*/libldap-*.so.* -libopenssl0_9_8: +libopenssl*: /usr/lib*/libcrypto.so.* /usr/lib*/libssl.so.* +# FIXME +if exists(libopenssl*~) + libopenssl*~: + /usr/lib*/libcrypto.so.* + /usr/lib*/libssl.so.* +endif + cyrus-sasl: /usr/lib*/libsasl2.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/data/root/machbunt.file_list new/installation-images-12.47/data/root/machbunt.file_list --- old/installation-images-12.46/data/root/machbunt.file_list 2010-04-12 11:39:42.000000000 +0200 +++ new/installation-images-12.47/data/root/machbunt.file_list 2010-04-21 17:22:59.000000000 +0200 @@ -37,7 +37,6 @@ xorg-x11-driver-input: /etc/X11/xorg.conf.d /usr/lib*/xorg/modules/input - /usr/share/hal xorg-x11-driver-video: /usr/lib*/xorg/modules/drivers/ati_drv.so @@ -65,7 +64,6 @@ xorg-x11-driver-virtualbox-ose: /etc/X11/xorg.conf.d /usr/lib*/xorg/modules - /usr/share/hal endif xterm: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/data/root/root.file_list new/installation-images-12.47/data/root/root.file_list --- old/installation-images-12.46/data/root/root.file_list 2010-04-06 17:03:00.000000000 +0200 +++ new/installation-images-12.47/data/root/root.file_list 2010-04-21 17:22:59.000000000 +0200 @@ -753,9 +753,15 @@ /etc /usr/bin -libopenssl0_9_8: +libopenssl*: /usr/lib* +# FIXME +if exists(libopenssl*~) + libopenssl*~: + /usr/lib* +endif + openssl: /usr/share/ssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/data/root/zenroot.file_list new/installation-images-12.47/data/root/zenroot.file_list --- old/installation-images-12.46/data/root/zenroot.file_list 2010-04-06 17:03:00.000000000 +0200 +++ new/installation-images-12.47/data/root/zenroot.file_list 2010-04-21 17:22:59.000000000 +0200 @@ -371,7 +371,7 @@ /usr/sbin /usr/lib* -libopenssl0_9_8: +libopenssl*: /usr/lib*/libcrypto.so.* /usr/lib*/libssl.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/etc/module.config new/installation-images-12.47/etc/module.config --- old/installation-images-12.46/etc/module.config 2010-04-06 17:03:00.000000000 +0200 +++ new/installation-images-12.47/etc/module.config 2010-04-21 17:22:59.000000000 +0200 @@ -708,6 +708,7 @@ cxgb3,"Chelsio T3 10Gb Ethernet" cxgb3i,"Chelsio S3xx iSCSI" cxgb3i_ddp,,- +cxgb4,"Chelsio T4" tlan,"Compaq Netelligent 10/100/NetFlex 3",,,,,0 cs89x0,"CS89x0" de600,"D-Link DE600 pocket adaptor",,,,,0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/lib/AddFiles.pm new/installation-images-12.47/lib/AddFiles.pm --- old/installation-images-12.46/lib/AddFiles.pm 2010-04-06 17:03:00.000000000 +0200 +++ new/installation-images-12.47/lib/AddFiles.pm 2010-04-21 17:23:00.000000000 +0200 @@ -277,6 +277,11 @@ undef $rc; undef $r; + + $r = RealRPM $p; + warn("$Script: no such package: $p"), next unless $r; + $p = $r; + if($p =~ /^\//) { $r = $p; warn("$Script: no such package: $r"), next unless -f $r; @@ -747,7 +752,7 @@ substr($re, length($2), length($3)) = $val; } - $re =~ s/\bexists$([^)]*)$/-f(RPMFileName($1)) ? 1 : 0/eg; + $re =~ s/\bexists$([^)]*)$/RealRPM($1) ? 1 : 0/eg; return $re; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/lib/ReadConfig.pm new/installation-images-12.47/lib/ReadConfig.pm --- old/installation-images-12.46/lib/ReadConfig.pm 2010-02-05 11:43:09.000000000 +0100 +++ new/installation-images-12.47/lib/ReadConfig.pm 2010-04-21 17:23:00.000000000 +0200 @@ -165,7 +165,7 @@ @ISA = qw ( Exporter ); @EXPORT = qw ( $Script $BasePath $LibPath $BinPath $CfgPath $ImagePath $DataPath - $TmpBase %ConfigData RPMFileName $SUBinary SUSystem Print2File $MToolsCfg $AutoBuild + $TmpBase %ConfigData RPMFileName RealRPM $SUBinary SUSystem Print2File $MToolsCfg $AutoBuild ); use strict 'vars'; @@ -270,6 +270,32 @@ } +sub RealRPM +{ + my $rpm = shift; + my ($f, @f, $p, $back); + local $_; + + my $dir = $ConfigData{'suse_base'}; + + $back = 1 if $rpm =~ s/~$//; + + @f = <$dir/$rpm.rpm>; + s#^.*/|\.rpm$##g for @f; + # @f = grep { !/(-32bit|-debuginfo|-debugsource|-devel)$/ } @f; + $p = $rpm; + $p = "\Q$p"; + $p =~ s/\\\*/([0-9_]+)/g; + @f = grep { /^$p$/ } @f; + @f = sort @f; + # for (@f) { print ">$_<\n"; } + $f = pop @f; + $f = pop @f if $back; + + return $f; +} + + # # execute string as root # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libservicelog for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '10

21 Apr '10

Hello community, here is the log from the commit of package libservicelog for openSUSE:Factory checked in at Wed Apr 21 18:21:08 CEST 2010. -------- --- libservicelog/libservicelog.changes 2010-04-19 12:50:56.000000000 +0200 +++ libservicelog/libservicelog.changes 2010-04-20 22:42:03.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 20 20:41:19 UTC 2010 - dimstar(a)opensuse.org + +- Fix build: use %__rm instead of %rm. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libservicelog.spec ++++++ --- /var/tmp/diff_new_pack.fLzP7i/_old 2010-04-21 18:18:46.000000000 +0200 +++ /var/tmp/diff_new_pack.fLzP7i/_new 2010-04-21 18:18:46.000000000 +0200 @@ -19,7 +19,7 @@ Name: libservicelog Version: 1.0.1 -Release: 8 +Release: 9 Summary: Servicelog Database and Library Requires: libservicelog-library BuildRequires: sqlite-devel @@ -104,7 +104,7 @@ %install %{makeinstall} -%rm -f %{buildroot}%{_libdir}/*.la +%__rm -f %{buildroot}%{_libdir}/*.la %clean ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yp-tools for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '10

21 Apr '10

Hello community, here is the log from the commit of package yp-tools for openSUSE:Factory checked in at Wed Apr 21 18:12:29 CEST 2010. -------- --- yp-tools/yp-tools.changes 2010-04-20 16:26:46.000000000 +0200 +++ yp-tools/yp-tools.changes 2010-04-21 12:06:35.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 21 11:55:01 CEST 2010 - kukuk(a)suse.de + +- Update to 2.12: Documentation fixes, fix detection of passwd, chsh + and chfn. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yp-tools-2.11.tar.bz2 New: ---- yp-tools-2.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yp-tools.spec ++++++ --- /var/tmp/diff_new_pack.55KEZE/_old 2010-04-21 18:10:40.000000000 +0200 +++ /var/tmp/diff_new_pack.55KEZE/_new 2010-04-21 18:10:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yp-tools (Version 2.11) +# spec file for package yp-tools (Version 2.12) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Provides: ypclient:/usr/bin/ypwhich AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 2.11 +Version: 2.12 Release: 1 Summary: Network Information Service (YP) client utilities Source: yp-tools-%{version}.tar.bz2 ++++++ yp-tools-2.11.tar.bz2 -> yp-tools-2.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/ChangeLog new/yp-tools-2.12/ChangeLog --- old/yp-tools-2.11/ChangeLog 2010-04-20 15:30:56.000000000 +0200 +++ new/yp-tools-2.12/ChangeLog 2010-04-21 11:44:43.000000000 +0200 @@ -1,3 +1,17 @@ +2010-04-21 Thorsten Kukuk <kukuk(a)suse.de> + + * release version 2.12 + + * src/yppasswd.c (main): Remove obsolete check for /etc/SuSE-release. + + * man/domainname.8.in: Fix typos. + * man/ypcat.1.in: Fix typos. + * man/ypmatch.1.in: Fix typos. + * man/yppoll.8.in: Fix typos. + * man/ypwhich.1.in: Fix typos. + * man/ypset.8.in: Fix typos. + * man/yptest.8.in: Fix typos. + 2010-04-20 Thorsten Kukuk <kukuk(a)suse.de> * release version 2.11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/NEWS new/yp-tools-2.12/NEWS --- old/yp-tools-2.11/NEWS 2010-04-20 15:31:46.000000000 +0200 +++ new/yp-tools-2.12/NEWS 2010-04-21 11:25:46.000000000 +0200 @@ -4,6 +4,9 @@ Please send bug reports, questions and suggestions to <kukuk(a)linux-nis.org>. +Version 2.12 +* Remove obsolete checks for /etc/SuSE-release + Version 2.11 * Add support for MD5, SHA-256, SHA-512 to yppasswd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/configure new/yp-tools-2.12/configure --- old/yp-tools-2.11/configure 2010-04-20 15:16:31.000000000 +0200 +++ new/yp-tools-2.12/configure 2010-04-21 11:57:38.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yp-tools 2.11. +# Generated by GNU Autoconf 2.63 for yp-tools 2.12. # # Report bugs to <kukuk(a)linux-nis.org>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yp-tools' PACKAGE_TARNAME='yp-tools' -PACKAGE_VERSION='2.11' -PACKAGE_STRING='yp-tools 2.11' +PACKAGE_VERSION='2.12' +PACKAGE_STRING='yp-tools 2.12' PACKAGE_BUGREPORT='kukuk(a)linux-nis.org' ac_unique_file="src/ypcat.c" @@ -1326,7 +1326,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yp-tools 2.11 to adapt to many kinds of systems. +\`configure' configures yp-tools 2.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1396,7 +1396,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yp-tools 2.11:";; + short | recursive ) echo "Configuration of yp-tools 2.12:";; esac cat <<\_ACEOF @@ -1498,7 +1498,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yp-tools configure 2.11 +yp-tools configure 2.12 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1512,7 +1512,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yp-tools $as_me 2.11, which was +It was created by yp-tools $as_me 2.12, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2228,7 +2228,7 @@ # Define the identity of the package. PACKAGE='yp-tools' - VERSION='2.11' + VERSION='2.12' cat >>confdefs.h <<_ACEOF @@ -4231,6 +4231,7 @@ done IFS=$as_save_IFS + test -z "$ac_cv_path_PASSWD_PROG" && ac_cv_path_PASSWD_PROG="/usr/bin/passwd" ;; esac fi @@ -4271,6 +4272,7 @@ done IFS=$as_save_IFS + test -z "$ac_cv_path_CHFN_PROG" && ac_cv_path_CHFN_PROG="/usr/bin/chfn" ;; esac fi @@ -4311,6 +4313,7 @@ done IFS=$as_save_IFS + test -z "$ac_cv_path_CHSH_PROG" && ac_cv_path_CHSH_PROG="/usr/bin/chsh" ;; esac fi @@ -8894,7 +8897,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yp-tools $as_me 2.11, which was +This file was extended by yp-tools $as_me 2.12, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8957,7 +8960,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yp-tools config.status 2.11 +yp-tools config.status 2.12 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/configure.in new/yp-tools-2.12/configure.in --- old/yp-tools-2.11/configure.in 2010-04-20 15:14:38.000000000 +0200 +++ new/yp-tools-2.12/configure.in 2010-04-21 11:57:29.000000000 +0200 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(yp-tools, 2.11, kukuk(a)linux-nis.org) +AC_INIT(yp-tools, 2.12, kukuk(a)linux-nis.org) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src/ypcat.c]) AM_CONFIG_HEADER(config.h) @@ -64,9 +64,9 @@ AC_PROG_RANLIB if test "${YPPASSWD_IS_DEPRECATED}" = "1"; then - AC_PATH_PROG(PASSWD_PROG, passwd) - AC_PATH_PROG(CHFN_PROG, chfn) - AC_PATH_PROG(CHSH_PROG, chsh) + AC_PATH_PROG([PASSWD_PROG], [passwd], [/usr/bin/passwd]) + AC_PATH_PROG([CHFN_PROG], [chfn], [/usr/bin/chfn]) + AC_PATH_PROG([CHSH_PROG], [chsh], [/usr/bin/chsh]) fi dnl Checks for libraries. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/etc/Makefile.in new/yp-tools-2.12/etc/Makefile.in --- old/yp-tools-2.11/etc/Makefile.in 2010-04-20 15:16:27.000000000 +0200 +++ new/yp-tools-2.12/etc/Makefile.in 2010-04-21 11:57:37.000000000 +0200 @@ -197,9 +197,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu etc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits etc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu etc/Makefile + $(AUTOMAKE) --gnits etc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/lib/Makefile.in new/yp-tools-2.12/lib/Makefile.in --- old/yp-tools-2.11/lib/Makefile.in 2010-04-20 15:16:27.000000000 +0200 +++ new/yp-tools-2.12/lib/Makefile.in 2010-04-21 11:57:37.000000000 +0200 @@ -216,9 +216,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu lib/Makefile + $(AUTOMAKE) --gnits lib/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/man/Makefile.am new/yp-tools-2.12/man/Makefile.am --- old/yp-tools-2.11/man/Makefile.am 2006-11-28 21:14:38.000000000 +0100 +++ new/yp-tools-2.12/man/Makefile.am 2010-04-21 11:40:39.000000000 +0200 @@ -1,7 +1,7 @@ # -# Copyright (c) 1997, 1998, 1999, 2001, 2006 Thorsten Kukuk, Germany +# Copyright (c) 1997, 1998, 1999, 2001, 2006, 2010 Thorsten Kukuk, Germany # -# Author: Thorsten Kukuk <kukuk(a)thkukuk.de> +# Author: Thorsten Kukuk <kukuk(a)linux-nis.org> # CLEANFILES = *~ sedscript domainname.8 ypcat.1 ypmatch.1 yppasswd.1\ yppoll.8 ypset.8 yptest.8 ypwhich.1 nicknames.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/man/Makefile.in new/yp-tools-2.12/man/Makefile.in --- old/yp-tools-2.11/man/Makefile.in 2010-04-20 15:16:27.000000000 +0200 +++ new/yp-tools-2.12/man/Makefile.in 2010-04-21 11:57:37.000000000 +0200 @@ -180,9 +180,9 @@ top_srcdir = @top_srcdir@ # -# Copyright (c) 1997, 1998, 1999, 2001, 2006 Thorsten Kukuk, Germany +# Copyright (c) 1997, 1998, 1999, 2001, 2006, 2010 Thorsten Kukuk, Germany # -# Author: Thorsten Kukuk <kukuk(a)thkukuk.de> +# Author: Thorsten Kukuk <kukuk(a)linux-nis.org> # CLEANFILES = *~ sedscript domainname.8 ypcat.1 ypmatch.1 yppasswd.1\ yppoll.8 ypset.8 yptest.8 ypwhich.1 nicknames.5 @@ -206,9 +206,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits man/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/Makefile + $(AUTOMAKE) --gnits man/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/man/domainname.8.in new/yp-tools-2.12/man/domainname.8.in --- old/yp-tools-2.11/man/domainname.8.in 2007-01-24 14:16:28.000000000 +0100 +++ new/yp-tools-2.12/man/domainname.8.in 2010-04-21 11:40:04.000000000 +0200 @@ -1,7 +1,7 @@ .\" -*- nroff -*- -.\" Copyright (C) 1998, 1999, 2001, 2007 Thorsten Kukuk +.\" Copyright (C) 1998, 1999, 2001, 2007, 2010 Thorsten Kukuk .\" This file is part of the yp-tools. -.\" Author: Thorsten Kukuk <kukuk(a)thkukuk.de> +.\" Author: Thorsten Kukuk <kukuk(a)linux-nis.org> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License version 2 as @@ -16,7 +16,7 @@ .\" along with this program; if not, write to the Free Software Foundation, .\" Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. .\" -.TH domainname 8 "January 2007" "YP Tools @VERSION@" +.TH domainname 8 "April 2010" "YP Tools @VERSION@" .SH NAME domainname - set or display name of current domain .br @@ -69,10 +69,10 @@ .BR ypwhich (1), .BR yppoll (8), .BR ypserv (8), -.BR yset (8) +.BR ypset (8) .LP .SH AUTHOR .B domainname is part of the .B yp-tools -package, which was written by Thorsten Kukuk <kukuk(a)thkukuk.de>. +package, which was written by Thorsten Kukuk <kukuk(a)linux-nis.org>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/man/nicknames.5.in new/yp-tools-2.12/man/nicknames.5.in --- old/yp-tools-2.11/man/nicknames.5.in 2007-01-24 14:15:26.000000000 +0100 +++ new/yp-tools-2.12/man/nicknames.5.in 2010-04-21 11:37:10.000000000 +0200 @@ -1,7 +1,7 @@ .\" -*- nroff -*- -.\" Copyright (C) 1998, 1999, 2001, 2007 Thorsten Kukuk +.\" Copyright (C) 1998, 1999, 2001, 2007, 2010 Thorsten Kukuk .\" This file is part of the yp-tools. -.\" Author: Thorsten Kukuk <kukuk(a)suse.de> +.\" Author: Thorsten Kukuk <kukuk(a)linux-nis.org> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License version 2 as @@ -16,7 +16,7 @@ .\" along with this program; if not, write to the Free Software Foundation, .\" Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. .\" -.TH nicknames 5 "January 2007" "YP Tools @VERSION@" +.TH nicknames 5 "April 2010" "YP Tools @VERSION@" .SH NAME /var/yp/nicknames - nickname translation table for NIS maps .SH DESCRIPTION @@ -62,4 +62,4 @@ .SH AUTHOR The .B yp-tools -package was written by Thorsten Kukuk <kukuk(a)thkukuk.de>. +package was written by Thorsten Kukuk <kukuk(a)linux-nis.org>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/man/ypcat.1.in new/yp-tools-2.12/man/ypcat.1.in --- old/yp-tools-2.11/man/ypcat.1.in 2007-01-24 14:14:39.000000000 +0100 +++ new/yp-tools-2.12/man/ypcat.1.in 2010-04-21 11:37:30.000000000 +0200 @@ -1,7 +1,7 @@ .\" -*- nroff -*- -.\" Copyright (C) 1998, 1999, 2001, 2007 Thorsten Kukuk +.\" Copyright (C) 1998, 1999, 2001, 2007, 2010 Thorsten Kukuk .\" This file is part of the yp-tools. -.\" Author: Thorsten Kukuk <kukuk(a)thkukuk.de> +.\" Author: Thorsten Kukuk <kukuk(a)linux-nis.org> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License version 2 as @@ -16,7 +16,7 @@ .\" along with this program; if not, write to the Free Software Foundation, .\" Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. .\" -.TH ypcat 1 "January 2007" "YP Tools @VERSION@" +.TH ypcat 1 "April 2010" "YP Tools @VERSION@" .SH NAME ypcat - print values of all keys in a NIS database .SH SYNOPSIS @@ -44,7 +44,7 @@ .TP .BI \-d " domain" Specify a domain other than the default domain as returned by -.BR domainname (1). +.BR domainname (8). .TP .BI \-h " hostname" Specify a hostname other than the default one as found by @@ -77,4 +77,4 @@ .B ypcat is part of the .B yp-tools -package, which was written by Thorsten Kukuk <kukuk(a)thkukuk.de>. +package, which was written by Thorsten Kukuk <kukuk(a)linux-nis.org>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/man/ypmatch.1.in new/yp-tools-2.12/man/ypmatch.1.in --- old/yp-tools-2.11/man/ypmatch.1.in 2007-01-24 14:14:11.000000000 +0100 +++ new/yp-tools-2.12/man/ypmatch.1.in 2010-04-21 11:42:12.000000000 +0200 @@ -1,7 +1,7 @@ .\" -*- nroff -*- -.\" Copyright (C) 1998, 1999, 2001, 2007 Thorsten Kukuk +.\" Copyright (C) 1998, 1999, 2001, 2007, 2010 Thorsten Kukuk .\" This file is part of the yp-tools. -.\" Author: Thorsten Kukuk <kukuk(a)thkukuk.de> +.\" Author: Thorsten Kukuk <kukuk(a)linux-nis.org> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License version 2 as @@ -16,7 +16,7 @@ .\" along with this program; if not, write to the Free Software Foundation, .\" Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. .\" -.TH ypmatch 1 "January 2007" "YP Tools @VERSION@" +.TH ypmatch 1 "April 2010" "YP Tools @VERSION@" .SH NAME ypmatch - print the values of one or more keys from a NIS map .SH SYNOPSIS @@ -40,7 +40,7 @@ .TP .BI \-d " domain" Specify a domain other than the default domain as returned by -.BR domainname (1). +.BR domainname (8). .TP .B \-k Display map keys. This option is useful with maps in which the @@ -62,11 +62,11 @@ .BR ypcat (1), .BR yppoll (8), .BR ypserv (8), -.BR yset (8), +.BR ypset (8), .BR ypwhich (1) .LP .SH AUTHOR .B ypmatch is part of the .B yp-tools -package, which was written by Thorsten Kukuk <kukuk(a)thkukuk.de>. +package, which was written by Thorsten Kukuk <kukuk(a)linux-nis.org>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/man/yppasswd.1.in new/yp-tools-2.12/man/yppasswd.1.in --- old/yp-tools-2.11/man/yppasswd.1.in 2007-01-24 14:12:23.000000000 +0100 +++ new/yp-tools-2.12/man/yppasswd.1.in 2010-04-21 11:38:00.000000000 +0200 @@ -1,7 +1,7 @@ .\" -*- nroff -*- -.\" Copyright (C) 1998, 1999, 2001, 2004, 2007 Thorsten Kukuk +.\" Copyright (C) 1998, 1999, 2001, 2004, 2007, 2010 Thorsten Kukuk .\" This file is part of the yp-tools. -.\" Author: Thorsten Kukuk <kukuk(a)thkukuk.de> +.\" Author: Thorsten Kukuk <kukuk(a)linux-nis.org> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License version 2 as @@ -16,7 +16,7 @@ .\" along with this program; if not, write to the Free Software Foundation, .\" Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. .\" -.TH yppasswd 1 "January 2007" "YP Tools @VERSION@" +.TH yppasswd 1 "April 2010" "YP Tools @VERSION@" .SH NAME yppasswd, ypchfn, ypchsh \- change your password in the NIS database .SH SYNOPSIS @@ -154,4 +154,4 @@ .B yppasswd is part of the .B yp-tools -package, which was written by Thorsten Kukuk <kukuk(a)thkukuk.de>. +package, which was written by Thorsten Kukuk <kukuk(a)linux-nis.org>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/man/yppoll.8.in new/yp-tools-2.12/man/yppoll.8.in --- old/yp-tools-2.11/man/yppoll.8.in 2007-01-24 14:11:46.000000000 +0100 +++ new/yp-tools-2.12/man/yppoll.8.in 2010-04-21 11:43:21.000000000 +0200 @@ -1,7 +1,7 @@ .\" -*- nroff -*- -.\" Copyright (C) 1998, 1999, 2001, 2007 Thorsten Kukuk +.\" Copyright (C) 1998, 1999, 2001, 2007, 2010 Thorsten Kukuk .\" This file is part of the yp-tools. -.\" Author: Thorsten Kukuk <kukuk(a)thkukuk.de> +.\" Author: Thorsten Kukuk <kukuk(a)linux-nis.org> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License version 2 as @@ -16,7 +16,7 @@ .\" along with this program; if not, write to the Free Software Foundation, .\" Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. .\" -.TH yppoll 8 "January 2007" "YP Tools @VERSION@" +.TH yppoll 8 "April 2010" "YP Tools @VERSION@" .SH NAME yppoll - return version and master server of a NIS map .SH SYNOPSIS @@ -42,22 +42,22 @@ If .I host is not specified, the server polled is the default server returned by -.BR ypwhich(1). +.BR ypwhich (1). .TP .BI \-d " domain" Specify a domain other than the default domain as returned by -.BR domainname (1). +.BR domainname (8). .SH "SEE ALSO" .BR domainname (8), .BR ypbind (8), .BR ypcat (8), .BR ypmatch (1), .BR ypserv (8), -.BR yset (8), +.BR ypset (8), .BR ypwhich (1) .LP .SH AUTHOR .B yppoll is part of the .B yp-tools -package, which was written by Thorsten Kukuk <kukuk(a)thkukuk.de>. +package, which was written by Thorsten Kukuk <kukuk(a)linux-nis.org>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/man/ypset.8.in new/yp-tools-2.12/man/ypset.8.in --- old/yp-tools-2.11/man/ypset.8.in 2007-01-24 14:10:34.000000000 +0100 +++ new/yp-tools-2.12/man/ypset.8.in 2010-04-21 11:43:58.000000000 +0200 @@ -1,7 +1,7 @@ .\" -*- nroff -*- -.\" Copyright (C) 1998, 1999, 2001, 2002, 2007 Thorsten Kukuk +.\" Copyright (C) 1998, 1999, 2001, 2002, 2007, 2010 Thorsten Kukuk .\" This file is part of the yp-tools. -.\" Author: Thorsten Kukuk <kukuk(a)thkukuk.de> +.\" Author: Thorsten Kukuk <kukuk(a)linux-nis.org> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License version 2 as @@ -16,7 +16,7 @@ .\" along with this program; if not, write to the Free Software Foundation, .\" Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. .\" -.TH ypset 8 "January 2007" "YP Tools @VERSION@" +.TH ypset 8 "April 2010" "YP Tools @VERSION@" .SH NAME ypset - bind ypbind to a particular NIS server .SH SYNOPSIS @@ -31,7 +31,7 @@ .LP .SH DESCRIPTION In order to run -.BR ypset, +.BR ypset , .B ypbind must be initiated with the .B -ypset @@ -77,7 +77,7 @@ binding for the domain in question, and .B ypbind has been set to allow use of -.BR ypset. +.BR ypset . In most cases, .I server should be specified as an IP address. @@ -86,7 +86,7 @@ .TP .BI \-d " domain" Specify a domain other than the default domain as returned by -.BR domainname (1). +.BR domainname (8). .TP .BI \-h " hostname" Set the NIS binding on host @@ -105,4 +105,4 @@ .B ypset is part of the .B yp-tools -package, which was written by Thorsten Kukuk <kukuk(a)thkukuk.de>. +package, which was written by Thorsten Kukuk <kukuk(a)linux-nis.org>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/man/yptest.8.in new/yp-tools-2.12/man/yptest.8.in --- old/yp-tools-2.11/man/yptest.8.in 2007-01-24 14:10:52.000000000 +0100 +++ new/yp-tools-2.12/man/yptest.8.in 2010-04-21 11:42:43.000000000 +0200 @@ -1,7 +1,7 @@ .\" -*- nroff -*- -.\" Copyright (C) 2002, 2007 Thorsten Kukuk +.\" Copyright (C) 2002, 2007, 2010 Thorsten Kukuk .\" This file is part of the yp-tools. -.\" Author: Thorsten Kukuk <kukuk(a)thkukuk.de> +.\" Author: Thorsten Kukuk <kukuk(a)linux-nis.org> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License version 2 as @@ -16,7 +16,7 @@ .\" along with this program; if not, write to the Free Software Foundation, .\" Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. .\" -.TH yptest 8 "January 2007" "YP Tools @VERSION@" +.TH yptest 8 "April 2010" "YP Tools @VERSION@" .SH NAME yptest - test NIS configuration .SH SYNOPSIS @@ -34,7 +34,7 @@ .TP .BI \-d " domainname" Specify a domain other than the default domain as returned by -.BR domainname (1). +.BR domainname (8). This option is not supported by all tests. .TP .BI \-h " hostname" @@ -75,4 +75,4 @@ .B yptest is part of the .B yp-tools -package, which was written by Thorsten Kukuk <kukuk(a)thkukuk.de>. +package, which was written by Thorsten Kukuk <kukuk(a)linux-nis.org>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/man/ypwhich.1.in new/yp-tools-2.12/man/ypwhich.1.in --- old/yp-tools-2.11/man/ypwhich.1.in 2007-01-24 14:11:05.000000000 +0100 +++ new/yp-tools-2.12/man/ypwhich.1.in 2010-04-21 11:35:30.000000000 +0200 @@ -1,7 +1,7 @@ .\" -*- nroff -*- -.\" Copyright (C) 1998, 1999, 2007 Thorsten Kukuk +.\" Copyright (C) 1998, 1999, 2007, 2010 Thorsten Kukuk .\" This file is part of the yp-tools. -.\" Author: Thorsten Kukuk <kukuk(a)thkukuk.de> +.\" Author: Thorsten Kukuk <kukuk(a)linux-nis.org> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License version 2 as @@ -16,7 +16,7 @@ .\" along with this program; if not, write to the Free Software Foundation, .\" Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. .\" -.TH ypwhich 1 "January 2007" "YP Tools @VERSION@" +.TH ypwhich 1 "April 2010" "YP Tools @VERSION@" .SH NAME ypwhich - return name of NIS server or map master .SH SYNOPSIS @@ -98,10 +98,10 @@ .BR ypmatch (1), .BR yppoll (8), .BR ypserv (8), -.BR yset (8) +.BR ypset (8) .LP .SH AUTHOR .B ypwhich is part of the .B yp-tools -package, which was written by Thorsten Kukuk <kukuk(a)thkukuk.de>. +package, which was written by Thorsten Kukuk <kukuk(a)linux-nis.org>. Files old/yp-tools-2.11/po/de.gmo and new/yp-tools-2.12/po/de.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/po/de.po new/yp-tools-2.12/po/de.po --- old/yp-tools-2.11/po/de.po 2010-04-20 15:32:03.000000000 +0200 +++ new/yp-tools-2.12/po/de.po 2010-04-21 11:26:00.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: yp-tools 2.5\n" "Report-Msgid-Bugs-To: kukuk(a)thkukuk.de\n" -"POT-Creation-Date: 2010-04-20 15:32+0200\n" +"POT-Creation-Date: 2010-04-21 11:26+0200\n" "PO-Revision-Date: 2004-06-21 14:24+02:00\n" "Last-Translator: Thorsten Kukuk <kukuk(a)suse.de>\n" "Language-Team: No Language-Team in the moment\n" @@ -149,7 +149,7 @@ msgstr " -x Zeige die Nickname �bersetzungstabelle an\n" # , c-format -#: src/ypcat.c:209 src/ypmatch.c:174 src/yppasswd.c:666 src/yppoll.c:163 +#: src/ypcat.c:209 src/ypmatch.c:174 src/yppasswd.c:663 src/yppoll.c:163 #: src/ypset.c:224 src/ypwhich.c:263 #, c-format msgid "%s: can't get local yp domain: %s\n" @@ -316,26 +316,26 @@ msgid "Please don't use something like your username as password.\n" msgstr "Bitten benutzen Sie etwas anderes als Ihren Usernamen als Passwort.\n" -#: src/yppasswd.c:626 +#: src/yppasswd.c:625 #, c-format msgid "" "yppasswd is deprecated, use %s instead\n" "\n" msgstr "Anstelle von yppasswd sollte %s direkt aufgerufen werden\n" -#: src/yppasswd.c:629 src/yppasswd.c:643 src/yppasswd.c:658 +#: src/yppasswd.c:628 src/yppasswd.c:641 src/yppasswd.c:655 #, c-format msgid "Calling %s failed: %s\n" msgstr "Der Aufruf von %s schlug fehl: %s\n" -#: src/yppasswd.c:640 +#: src/yppasswd.c:638 #, c-format msgid "" "ypchsh is deprecated, use %s instead\n" "\n" msgstr "Anstelle von ypchsh sollte %s direkt aufgerufen werden\n" -#: src/yppasswd.c:654 +#: src/yppasswd.c:651 #, c-format msgid "" "ypchfn is deprecated, use %s instead\n" @@ -343,50 +343,50 @@ msgstr "Anstelle von ypchfn sollte %s direkt aufgerufen werden\n" # , c-format -#: src/yppasswd.c:679 +#: src/yppasswd.c:676 #, c-format msgid "%s: unknown user (uid=%ld).\n" msgstr "%s: unbekannter Benutzer (uid=%ld).\n" # , c-format -#: src/yppasswd.c:689 +#: src/yppasswd.c:686 #, c-format msgid "%s: Only root may change account information for others\n" msgstr "%s: Nur root darf Account Informationen f�r andere �ndern\n" # , c-format -#: src/yppasswd.c:706 +#: src/yppasswd.c:703 #, c-format msgid "Changing NIS account information for %s on %s.\n" msgstr "�ndere NIS Account Informationen f�r %s auf %s.\n" -#: src/yppasswd.c:717 +#: src/yppasswd.c:714 #, c-format msgid "Please enter root password:" msgstr "Geben Sie bitte das root Password ein:" # , c-format -#: src/yppasswd.c:719 +#: src/yppasswd.c:716 #, c-format msgid "Please enter %spassword:" msgstr "Geben Sie bitte Ihr %sPasswort ein:" -#: src/yppasswd.c:720 +#: src/yppasswd.c:717 msgid "old " msgstr "altes " -#: src/yppasswd.c:746 +#: src/yppasswd.c:743 #, c-format msgid "Sorry.\n" msgstr "Falsches Password.\n" # , c-format -#: src/yppasswd.c:763 +#: src/yppasswd.c:760 #, c-format msgid "Changing NIS password for %s on %s.\n" msgstr "�ndere NIS Passwort f�r %s auf %s\n" -#: src/yppasswd.c:771 +#: src/yppasswd.c:768 msgid "" "Too many tries. Aborted.\n" "Password unchanged.\n" @@ -394,31 +394,31 @@ "Zu viele Versuche.\n" "Passwort wurde nicht ge�ndert.\n" -#: src/yppasswd.c:776 +#: src/yppasswd.c:773 msgid "Please enter new password:" msgstr "Geben Sie bitte ein neues Passwort ein:" -#: src/yppasswd.c:779 +#: src/yppasswd.c:776 #, c-format msgid "Password unchanged.\n" msgstr "Passwort wurde nicht ge�ndert.\n" -#: src/yppasswd.c:790 +#: src/yppasswd.c:787 #, c-format msgid "Not a valid password: %s.\n" msgstr "Kein g�ltiges Passwort: %s.\n" -#: src/yppasswd.c:800 +#: src/yppasswd.c:797 msgid "Please retype new password:" msgstr "Bitte geben sie das neue Passwort erneut ein:" -#: src/yppasswd.c:805 +#: src/yppasswd.c:802 #, c-format msgid "Mismatch - password unchanged.\n" msgstr "Verschieden - Passwort wurde nicht ge�ndert.\n" # , c-format -#: src/yppasswd.c:848 +#: src/yppasswd.c:845 #, c-format msgid "" "\n" @@ -431,24 +431,24 @@ "Zum akzeptieren, einfach return dr�cken. Zum l�schen, tippen\n" "Sie \"none\" ein.\n" -#: src/yppasswd.c:856 +#: src/yppasswd.c:853 msgid "Name" msgstr "Name" -#: src/yppasswd.c:860 +#: src/yppasswd.c:857 msgid "Location" msgstr "B�ro" -#: src/yppasswd.c:864 +#: src/yppasswd.c:861 msgid "Office Phone" msgstr "Dienst. Telefon" -#: src/yppasswd.c:868 +#: src/yppasswd.c:865 msgid "Home Phone" msgstr "Privat. Telefon" # , c-format -#: src/yppasswd.c:882 +#: src/yppasswd.c:879 #, c-format msgid "" "\n" @@ -461,17 +461,17 @@ "Um den default Wert zu akzeptieren, dr�cken Sie einfach <RETURN>. Um die\n" "default Shell des Systems zu benutzen, tippen Sie das Wort \"none\".\n" -#: src/yppasswd.c:887 +#: src/yppasswd.c:884 msgid "Login shell" msgstr "Login Shell" # , c-format -#: src/yppasswd.c:909 +#: src/yppasswd.c:906 msgid "Error while changing the NIS password." msgstr "Fehler w�hrend des �nderns vom NIS Passwort." # , c-format -#: src/yppasswd.c:911 +#: src/yppasswd.c:908 #, c-format msgid "" "\n" @@ -483,7 +483,7 @@ "\n" # , c-format -#: src/yppasswd.c:915 +#: src/yppasswd.c:912 #, c-format msgid "" "\n" @@ -495,12 +495,12 @@ "\n" # , c-format -#: src/yppasswd.c:924 +#: src/yppasswd.c:921 msgid "Error while changing the GECOS information." msgstr "Fehler w�hrend des �nders der GECOS Informationen." # , c-format -#: src/yppasswd.c:926 +#: src/yppasswd.c:923 #, c-format msgid "" "\n" @@ -512,7 +512,7 @@ "\n" # , c-format -#: src/yppasswd.c:931 +#: src/yppasswd.c:928 #, c-format msgid "" "\n" @@ -524,12 +524,12 @@ "\n" # , c-format -#: src/yppasswd.c:940 +#: src/yppasswd.c:937 msgid "Error while changing the login shell." msgstr "Fehler w�hrend des �nderns der Login Shell." # , c-format -#: src/yppasswd.c:942 +#: src/yppasswd.c:939 #, c-format msgid "" "\n" @@ -541,7 +541,7 @@ "\n" # , c-format -#: src/yppasswd.c:947 +#: src/yppasswd.c:944 #, c-format msgid "" "\n" @@ -553,12 +553,12 @@ "\n" # , c-format -#: src/yppasswd.c:955 +#: src/yppasswd.c:952 msgid "Error while changing the NIS account information." msgstr "Fehler w�hrend des �nderns der NIS Account Informationen." # , c-format -#: src/yppasswd.c:958 +#: src/yppasswd.c:955 #, c-format msgid "" "\n" @@ -570,7 +570,7 @@ "\n" # , c-format -#: src/yppasswd.c:963 +#: src/yppasswd.c:960 #, c-format msgid "" "\n" Files old/yp-tools-2.11/po/sv.gmo and new/yp-tools-2.12/po/sv.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/po/sv.po new/yp-tools-2.12/po/sv.po --- old/yp-tools-2.11/po/sv.po 2010-04-20 15:32:03.000000000 +0200 +++ new/yp-tools-2.12/po/sv.po 2010-04-21 11:26:01.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: yp-tools 2.9\n" "Report-Msgid-Bugs-To: kukuk(a)thkukuk.de\n" -"POT-Creation-Date: 2010-04-20 15:32+0200\n" +"POT-Creation-Date: 2010-04-21 11:26+0200\n" "PO-Revision-Date: 2006-11-12 17:34+0100\n" "Last-Translator: Daniel Nylander <po(a)danielnylander.se>\n" "Language-Team: Swedish <tp-sv(a)listor.tp-sv.se>\n" @@ -149,7 +149,7 @@ msgid " -x Display the map nickname translation table\n" msgstr " -x Visa kartans översättningstabell för smeknamn\n" -#: src/ypcat.c:209 src/ypmatch.c:174 src/yppasswd.c:666 src/yppoll.c:163 +#: src/ypcat.c:209 src/ypmatch.c:174 src/yppasswd.c:663 src/yppoll.c:163 #: src/ypset.c:224 src/ypwhich.c:263 #, c-format msgid "%s: can't get local yp domain: %s\n" @@ -308,7 +308,7 @@ msgid "Please don't use something like your username as password.\n" msgstr "Använd inte någonting liknande ditt användarnamn som lösenord.\n" -#: src/yppasswd.c:626 +#: src/yppasswd.c:625 #, c-format msgid "" "yppasswd is deprecated, use %s instead\n" @@ -317,12 +317,12 @@ "yppasswd är föråldrat, använd %s istället\n" "\n" -#: src/yppasswd.c:629 src/yppasswd.c:643 src/yppasswd.c:658 +#: src/yppasswd.c:628 src/yppasswd.c:641 src/yppasswd.c:655 #, c-format msgid "Calling %s failed: %s\n" msgstr "Anrop av %s misslyckades: %s\n" -#: src/yppasswd.c:640 +#: src/yppasswd.c:638 #, c-format msgid "" "ypchsh is deprecated, use %s instead\n" @@ -331,7 +331,7 @@ "ypchsh är föråldrat, använd %s istället\n" "\n" -#: src/yppasswd.c:654 +#: src/yppasswd.c:651 #, c-format msgid "" "ypchfn is deprecated, use %s instead\n" @@ -340,46 +340,46 @@ "ypchfn är föråldrat, använd %s istället\n" "\n" -#: src/yppasswd.c:679 +#: src/yppasswd.c:676 #, c-format msgid "%s: unknown user (uid=%ld).\n" msgstr "%s: okänd användare (uid=%ld).\n" -#: src/yppasswd.c:689 +#: src/yppasswd.c:686 #, c-format msgid "%s: Only root may change account information for others\n" msgstr "%s: Endast root får ändra kontoinformation för andra\n" -#: src/yppasswd.c:706 +#: src/yppasswd.c:703 #, c-format msgid "Changing NIS account information for %s on %s.\n" msgstr "Ändrar NIS-kontoinformation för %s på %s.\n" -#: src/yppasswd.c:717 +#: src/yppasswd.c:714 #, c-format msgid "Please enter root password:" msgstr "Ange root-lösenordet:" -#: src/yppasswd.c:719 +#: src/yppasswd.c:716 #, c-format msgid "Please enter %spassword:" msgstr "Ange %s-lösenordet:" -#: src/yppasswd.c:720 +#: src/yppasswd.c:717 msgid "old " msgstr "gammal" -#: src/yppasswd.c:746 +#: src/yppasswd.c:743 #, c-format msgid "Sorry.\n" msgstr "Tyvärr.\n" -#: src/yppasswd.c:763 +#: src/yppasswd.c:760 #, c-format msgid "Changing NIS password for %s on %s.\n" msgstr "Ändrar NIS-lösenord för %s på %s.\n" -#: src/yppasswd.c:771 +#: src/yppasswd.c:768 msgid "" "Too many tries. Aborted.\n" "Password unchanged.\n" @@ -387,30 +387,30 @@ "För många försök. Avbröts.\n" "Lösenordet oförändrat.\n" -#: src/yppasswd.c:776 +#: src/yppasswd.c:773 msgid "Please enter new password:" msgstr "Ange det nya lösenordet:" -#: src/yppasswd.c:779 +#: src/yppasswd.c:776 #, c-format msgid "Password unchanged.\n" msgstr "Lösenordet oförändrat.\n" -#: src/yppasswd.c:790 +#: src/yppasswd.c:787 #, c-format msgid "Not a valid password: %s.\n" msgstr "Inte ett giltigt lösenord: %s.\n" -#: src/yppasswd.c:800 +#: src/yppasswd.c:797 msgid "Please retype new password:" msgstr "Ange det nya lösenordet igen:" -#: src/yppasswd.c:805 +#: src/yppasswd.c:802 #, c-format msgid "Mismatch - password unchanged.\n" msgstr "Stämmer inte - lösenordet oförändrat.\n" -#: src/yppasswd.c:848 +#: src/yppasswd.c:845 #, c-format msgid "" "\n" @@ -423,23 +423,23 @@ "För att acceptera standardvärdet, tryck Return. För att ange ett\n" "tomt fält, skriv ordet \"none\".\n" -#: src/yppasswd.c:856 +#: src/yppasswd.c:853 msgid "Name" msgstr "Namn" -#: src/yppasswd.c:860 +#: src/yppasswd.c:857 msgid "Location" msgstr "Plats" -#: src/yppasswd.c:864 +#: src/yppasswd.c:861 msgid "Office Phone" msgstr "Arbetstelefon" -#: src/yppasswd.c:868 +#: src/yppasswd.c:865 msgid "Home Phone" msgstr "Hemtelefon" -#: src/yppasswd.c:882 +#: src/yppasswd.c:879 #, c-format msgid "" "\n" @@ -452,15 +452,15 @@ "För att acceptera standardvärdet, tryck Return. För att använda\n" "systemets standardskal, skriv in ordet \"none\".\n" -#: src/yppasswd.c:887 +#: src/yppasswd.c:884 msgid "Login shell" msgstr "Inloggningsskal" -#: src/yppasswd.c:909 +#: src/yppasswd.c:906 msgid "Error while changing the NIS password." msgstr "Fel vid ändring av NIS-lösenordet." -#: src/yppasswd.c:911 +#: src/yppasswd.c:908 #, c-format msgid "" "\n" @@ -471,7 +471,7 @@ "NIS-lösenordet kan inte ändrats på %s.\n" "\n" -#: src/yppasswd.c:915 +#: src/yppasswd.c:912 #, c-format msgid "" "\n" @@ -482,11 +482,11 @@ "NIS-lösenordet har ändrats på %s.\n" "\n" -#: src/yppasswd.c:924 +#: src/yppasswd.c:921 msgid "Error while changing the GECOS information." msgstr "Fel vid ändring av GECOS-informationen." -#: src/yppasswd.c:926 +#: src/yppasswd.c:923 #, c-format msgid "" "\n" @@ -497,7 +497,7 @@ "GECOS-informationen har inte ändrats på %s.\n" "\n" -#: src/yppasswd.c:931 +#: src/yppasswd.c:928 #, c-format msgid "" "\n" @@ -508,11 +508,11 @@ "GECOS-informationen har ändrats på %s.\n" "\n" -#: src/yppasswd.c:940 +#: src/yppasswd.c:937 msgid "Error while changing the login shell." msgstr "Fel vid ändring av inloggningsskalet." -#: src/yppasswd.c:942 +#: src/yppasswd.c:939 #, c-format msgid "" "\n" @@ -523,7 +523,7 @@ "Inloggningsskalet har inte ändrats på %s.\n" "\n" -#: src/yppasswd.c:947 +#: src/yppasswd.c:944 #, c-format msgid "" "\n" @@ -534,11 +534,11 @@ "Inloggningsskalet har ändrats på %s.\n" "\n" -#: src/yppasswd.c:955 +#: src/yppasswd.c:952 msgid "Error while changing the NIS account information." msgstr "Fel vid ändring av NIS-kontoinformationen." -#: src/yppasswd.c:958 +#: src/yppasswd.c:955 #, c-format msgid "" "\n" @@ -549,7 +549,7 @@ "NIS-kontoinformationen har inte ändrats på %s.\n" "\n" -#: src/yppasswd.c:963 +#: src/yppasswd.c:960 #, c-format msgid "" "\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/po/yp-tools.pot new/yp-tools-2.12/po/yp-tools.pot --- old/yp-tools-2.11/po/yp-tools.pot 2010-04-20 15:32:03.000000000 +0200 +++ new/yp-tools-2.12/po/yp-tools.pot 2010-04-21 11:26:00.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: kukuk(a)thkukuk.de\n" -"POT-Creation-Date: 2010-04-20 15:32+0200\n" +"POT-Creation-Date: 2010-04-21 11:26+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -137,7 +137,7 @@ msgid " -x Display the map nickname translation table\n" msgstr "" -#: src/ypcat.c:209 src/ypmatch.c:174 src/yppasswd.c:666 src/yppoll.c:163 +#: src/ypcat.c:209 src/ypmatch.c:174 src/yppasswd.c:663 src/yppoll.c:163 #: src/ypset.c:224 src/ypwhich.c:263 #, c-format msgid "%s: can't get local yp domain: %s\n" @@ -287,101 +287,101 @@ msgid "Please don't use something like your username as password.\n" msgstr "" -#: src/yppasswd.c:626 +#: src/yppasswd.c:625 #, c-format msgid "" "yppasswd is deprecated, use %s instead\n" "\n" msgstr "" -#: src/yppasswd.c:629 src/yppasswd.c:643 src/yppasswd.c:658 +#: src/yppasswd.c:628 src/yppasswd.c:641 src/yppasswd.c:655 #, c-format msgid "Calling %s failed: %s\n" msgstr "" -#: src/yppasswd.c:640 +#: src/yppasswd.c:638 #, c-format msgid "" "ypchsh is deprecated, use %s instead\n" "\n" msgstr "" -#: src/yppasswd.c:654 +#: src/yppasswd.c:651 #, c-format msgid "" "ypchfn is deprecated, use %s instead\n" "\n" msgstr "" -#: src/yppasswd.c:679 +#: src/yppasswd.c:676 #, c-format msgid "%s: unknown user (uid=%ld).\n" msgstr "" -#: src/yppasswd.c:689 +#: src/yppasswd.c:686 #, c-format msgid "%s: Only root may change account information for others\n" msgstr "" -#: src/yppasswd.c:706 +#: src/yppasswd.c:703 #, c-format msgid "Changing NIS account information for %s on %s.\n" msgstr "" -#: src/yppasswd.c:717 +#: src/yppasswd.c:714 #, c-format msgid "Please enter root password:" msgstr "" -#: src/yppasswd.c:719 +#: src/yppasswd.c:716 #, c-format msgid "Please enter %spassword:" msgstr "" -#: src/yppasswd.c:720 +#: src/yppasswd.c:717 msgid "old " msgstr "" -#: src/yppasswd.c:746 +#: src/yppasswd.c:743 #, c-format msgid "Sorry.\n" msgstr "" -#: src/yppasswd.c:763 +#: src/yppasswd.c:760 #, c-format msgid "Changing NIS password for %s on %s.\n" msgstr "" -#: src/yppasswd.c:771 +#: src/yppasswd.c:768 msgid "" "Too many tries. Aborted.\n" "Password unchanged.\n" msgstr "" -#: src/yppasswd.c:776 +#: src/yppasswd.c:773 msgid "Please enter new password:" msgstr "" -#: src/yppasswd.c:779 +#: src/yppasswd.c:776 #, c-format msgid "Password unchanged.\n" msgstr "" -#: src/yppasswd.c:790 +#: src/yppasswd.c:787 #, c-format msgid "Not a valid password: %s.\n" msgstr "" -#: src/yppasswd.c:800 +#: src/yppasswd.c:797 msgid "Please retype new password:" msgstr "" -#: src/yppasswd.c:805 +#: src/yppasswd.c:802 #, c-format msgid "Mismatch - password unchanged.\n" msgstr "" -#: src/yppasswd.c:848 +#: src/yppasswd.c:845 #, c-format msgid "" "\n" @@ -390,23 +390,23 @@ "field, type the word \"none\".\n" msgstr "" -#: src/yppasswd.c:856 +#: src/yppasswd.c:853 msgid "Name" msgstr "" -#: src/yppasswd.c:860 +#: src/yppasswd.c:857 msgid "Location" msgstr "" -#: src/yppasswd.c:864 +#: src/yppasswd.c:861 msgid "Office Phone" msgstr "" -#: src/yppasswd.c:868 +#: src/yppasswd.c:865 msgid "Home Phone" msgstr "" -#: src/yppasswd.c:882 +#: src/yppasswd.c:879 #, c-format msgid "" "\n" @@ -415,15 +415,15 @@ "system's default shell, type the word \"none\".\n" msgstr "" -#: src/yppasswd.c:887 +#: src/yppasswd.c:884 msgid "Login shell" msgstr "" -#: src/yppasswd.c:909 +#: src/yppasswd.c:906 msgid "Error while changing the NIS password." msgstr "" -#: src/yppasswd.c:911 +#: src/yppasswd.c:908 #, c-format msgid "" "\n" @@ -431,7 +431,7 @@ "\n" msgstr "" -#: src/yppasswd.c:915 +#: src/yppasswd.c:912 #, c-format msgid "" "\n" @@ -439,11 +439,11 @@ "\n" msgstr "" -#: src/yppasswd.c:924 +#: src/yppasswd.c:921 msgid "Error while changing the GECOS information." msgstr "" -#: src/yppasswd.c:926 +#: src/yppasswd.c:923 #, c-format msgid "" "\n" @@ -451,7 +451,7 @@ "\n" msgstr "" -#: src/yppasswd.c:931 +#: src/yppasswd.c:928 #, c-format msgid "" "\n" @@ -459,11 +459,11 @@ "\n" msgstr "" -#: src/yppasswd.c:940 +#: src/yppasswd.c:937 msgid "Error while changing the login shell." msgstr "" -#: src/yppasswd.c:942 +#: src/yppasswd.c:939 #, c-format msgid "" "\n" @@ -471,7 +471,7 @@ "\n" msgstr "" -#: src/yppasswd.c:947 +#: src/yppasswd.c:944 #, c-format msgid "" "\n" @@ -479,11 +479,11 @@ "\n" msgstr "" -#: src/yppasswd.c:955 +#: src/yppasswd.c:952 msgid "Error while changing the NIS account information." msgstr "" -#: src/yppasswd.c:958 +#: src/yppasswd.c:955 #, c-format msgid "" "\n" @@ -491,7 +491,7 @@ "\n" msgstr "" -#: src/yppasswd.c:963 +#: src/yppasswd.c:960 #, c-format msgid "" "\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/src/Makefile.in new/yp-tools-2.12/src/Makefile.in --- old/yp-tools-2.11/src/Makefile.in 2010-04-20 15:16:27.000000000 +0200 +++ new/yp-tools-2.12/src/Makefile.in 2010-04-21 11:57:37.000000000 +0200 @@ -249,9 +249,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + $(AUTOMAKE) --gnits src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -292,6 +292,22 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + +installcheck-binPROGRAMS: $(bin_PROGRAMS) + bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ + case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ + *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ + esac; \ + f=`echo "$$p" | \ + sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + for opt in --help --version; do \ + if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ + 2>c$${pid}_.err </dev/null \ + && test -n "`cat c$${pid}_.out`" \ + && test -z "`cat c$${pid}_.err`"; then :; \ + else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ + done; \ + done; rm -f c$${pid}_.???; exit $$bad install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @@ -315,6 +331,22 @@ clean-sbinPROGRAMS: -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) + +installcheck-sbinPROGRAMS: $(sbin_PROGRAMS) + bad=0; pid=$$$$; list="$(sbin_PROGRAMS)"; for p in $$list; do \ + case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ + *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ + esac; \ + f=`echo "$$p" | \ + sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + for opt in --help --version; do \ + if "$(DESTDIR)$(sbindir)/$$f" $$opt >c$${pid}_.out \ + 2>c$${pid}_.err </dev/null \ + && test -n "`cat c$${pid}_.out`" \ + && test -z "`cat c$${pid}_.err`"; then :; \ + else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ + done; \ + done; rm -f c$${pid}_.???; exit $$bad domainname$(EXEEXT): $(domainname_OBJECTS) $(domainname_DEPENDENCIES) @rm -f domainname$(EXEEXT) $(LINK) $(domainname_OBJECTS) $(domainname_LDADD) $(LIBS) @@ -543,7 +575,7 @@ install-ps: install-ps-am -installcheck-am: +installcheck-am: installcheck-binPROGRAMS installcheck-sbinPROGRAMS maintainer-clean: maintainer-clean-am -rm -rf ./$(DEPDIR) @@ -575,7 +607,8 @@ install-html install-html-am install-info install-info-am \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-sbinPROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + installcheck-am installcheck-binPROGRAMS \ + installcheck-sbinPROGRAMS installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-binPROGRAMS uninstall-sbinPROGRAMS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yp-tools-2.11/src/yppasswd.c new/yp-tools-2.12/src/yppasswd.c --- old/yp-tools-2.11/src/yppasswd.c 2010-04-20 15:31:59.000000000 +0200 +++ new/yp-tools-2.12/src/yppasswd.c 2010-04-21 11:24:15.000000000 +0200 @@ -391,7 +391,7 @@ static int get_passwd_len (const char *passwd) { - static const char *allowed_chars = + static const char *allowed_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./"; int passwdlen = strlen (passwd); int hash_id = get_hash_id (passwd); @@ -400,7 +400,7 @@ * the password (with a comma to separate it). To support * this we cut the password after the first invalid char * after the normal 13 ones - in the case of MD5 and DES. - * We can't cut at the first invalid char, since MD5 + * We can't cut at the first invalid char, since MD5 * uses $ in the first char. In case of SHA-2 we are looking * for first invalid char after the 38 ones. */ @@ -620,8 +620,7 @@ if (p_flag) { struct stat st; - if (stat ("/etc/SuSE-release", &st) == 0 && - stat (PASSWD_PROG, &st) == 0) + if (stat (PASSWD_PROG, &st) == 0) { printf (_("yppasswd is deprecated, use %s instead\n\n"), PASSWD_PROG); @@ -634,8 +633,7 @@ if (l_flag) { struct stat st; - if (stat ("/etc/SuSE-release", &st) == 0 && - stat (CHSH_PROG, &st) == 0) + if (stat (CHSH_PROG, &st) == 0) { printf (_("ypchsh is deprecated, use %s instead\n\n"), CHSH_PROG); @@ -648,8 +646,7 @@ if (f_flag) { struct stat st; - if (stat ("/etc/SuSE-release", &st) == 0 && - stat (CHFN_PROG, &st) == 0) + if (stat (CHFN_PROG, &st) == 0) { printf (_("ypchfn is deprecated, use %s instead\n\n"), CHFN_PROG); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-registration for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '10

21 Apr '10

Hello community, here is the log from the commit of package yast2-registration for openSUSE:Factory checked in at Wed Apr 21 18:10:24 CEST 2010. -------- --- yast2-registration/yast2-registration.changes 2010-02-18 11:51:14.000000000 +0100 +++ yast2-registration/yast2-registration.changes 2010-04-21 15:50:36.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 21 13:46:58 UTC 2010 - coolo(a)novell.com + +- buildrequire PolicyKit-devel to fix build + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.D5bHwi/_old 2010-04-21 18:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.D5bHwi/_new 2010-04-21 18:09:33.000000000 +0200 @@ -20,7 +20,7 @@ Name: yast2-registration Version: 2.18.3 -Release: 1 +Release: 2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-registration-2.18.3.tar.bz2 Prefix: /usr @@ -38,6 +38,7 @@ BuildRequires: limal limal-ca-mgm-perl limal-perl perl-TimeDate BuildRequires: yast2-pkg-bindings >= 2.17.20 BuildRequires: suseRegister +BuildRequires: PolicyKit-devel BuildArch: noarch Summary: YaST2 - Registration Module Source1: org.opensuse.yast.modules.ysr.policy @@ -151,4 +152,5 @@ %files branding-openSUSE %defattr(-,root,root) %{prefix}/share/applications/YaST2/suse_register.desktop + %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-input for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '10

21 Apr '10

Hello community, here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory checked in at Wed Apr 21 18:09:20 CEST 2010. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-04-16 11:54:53.000000000 +0200 +++ xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-04-21 16:45:05.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 21 16:36:42 CEST 2010 - tiwai(a)suse.de + +- xf86-input-synaptics-add-clickpad-support, + xf86-input-synaptics-add-led-support: Add Clickpad support + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xf86-input-synaptics-add-clickpad-support xf86-input-synaptics-add-led-support ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.O0Hv0t/_old 2010-04-21 18:09:02.000000000 +0200 +++ /var/tmp/diff_new_pack.O0Hv0t/_new 2010-04-21 18:09:02.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel pkgconfig udev xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 4 +Release: 5 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -62,6 +62,8 @@ Patch40: xf86-input-hyperpen.diff Patch41: xf86-input-mutouch.diff Patch43: xf86-input-synaptics-retry-serial-open.diff +Patch44: xf86-input-synaptics-add-clickpad-support +Patch45: xf86-input-synaptics-add-led-support %description This package contains X.Org input drivers. @@ -78,6 +80,8 @@ %patch23 -p0 %patch24 -p0 %patch43 -p1 +%patch44 -p1 +%patch45 -p1 popd pushd xf86-input-elographics-* %patch38 -p1 ++++++ xf86-input-synaptics-add-clickpad-support ++++++ >From 0b3698b3a34c8e250512df6c0ba434da2d8ae0d5 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai(a)suse.de> Date: Tue, 13 Apr 2010 17:25:23 +0200 Subject: [PATCH] Add Clickpad support This patch adds the support for Synaptics Clickpad devices. It requires the change in Linux kernel synaptics input driver, found in https://patchwork.kernel.org/patch/92435/ When the kernel driver sets only the left-button bit evbit, Clickpad mode is activated. In this mode, the bottom touch area is used as button emulations. Clicking at the bottom-left, bottom-center and bottom-right zone corresponds to a left, center and right click. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- src/eventcomm.c | 6 ++++++ src/synaptics.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/synapticsstr.h | 2 ++ 3 files changed, 58 insertions(+), 0 deletions(-) diff --git a/src/eventcomm.c b/src/eventcomm.c index d00d810..10d183d 100644 --- a/src/eventcomm.c +++ b/src/eventcomm.c @@ -252,6 +252,12 @@ event_query_axis_ranges(LocalDevicePtr local) if ((priv->has_triple = (TEST_BIT(BTN_TOOL_TRIPLETAP, keybits) != 0))) strcat(buf, " triple"); xf86Msg(X_INFO, "%s: buttons:%s\n", local->name, buf); + + /* clickpad device reports only the single left button mask */ + if (priv->has_left && !priv->has_right && !priv->has_middle) { + priv->is_clickpad = TRUE; + xf86Msg(X_INFO, "%s: is Clickpad device\n", local->name); + } } } diff --git a/src/synaptics.c b/src/synaptics.c index 091dbe1..0c63f8b 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -457,6 +457,14 @@ static void set_default_parameters(LocalDevicePtr local) vertResolution = priv->resy; } + /* Clickpad mode -- bottom area is used as buttons */ + if (priv->is_clickpad) { + int button_bottom; + button_bottom = priv->maxy - (abs(priv->maxy - priv->miny) * 20) / 100; + if (button_bottom = t) + b = button_bottom; + } + /* set the parameters */ pars->left_edge = xf86SetIntOption(opts, "LeftEdge", l); pars->right_edge = xf86SetIntOption(opts, "RightEdge", r); @@ -2052,6 +2060,44 @@ HandleClickWithFingers(SynapticsParameters *para, struct SynapticsHwState *hw) } } +/* clickpad event handling */ +static void +HandleClickpad(LocalDevicePtr local, struct SynapticsHwState *hw) +{ + SynapticsPrivate *priv = (SynapticsPrivate *) (local->private); + + if (priv->prev_hw.left || priv->prev_hw.middle || priv->prev_hw.right) { + /* dragging */ + if (hw->left) { + hw->left = priv->prev_hw.left; + hw->right = priv->prev_hw.right; + hw->middle = priv->prev_hw.middle; + } + } else { + int width = priv->maxx - priv->minx; + int left_button_x, right_button_x; + + /* left and right clickpad button ranges; + * the gap between them is interpreted as a middle-button click + */ + left_button_x = width * 2/ 5 + priv->minx; + right_button_x = width * 3 / 5 + priv->minx; + + /* clickpad reports only one button, and we need + * to fake left/right buttons depending on the touch position + */ + if (hw->left) { /* clicked? */ + hw->left = 0; + if (hw->x < left_button_x) + hw->left = 1; + else if (hw->x > right_button_x) + hw->right = 1; + else + hw->middle = 1; + } + } + priv->prev_hw = *hw; +} /* * React on changes in the hardware state. This function is called every time @@ -2102,6 +2148,10 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState *hw) if (para->touchpad_off == 1) return delay; + /* Clickpad handling for button area */ + if (priv->is_clickpad) + HandleClickpad(local, hw); + /* Treat the first two multi buttons as up/down for now. */ hw->up |= hw->multi[0]; hw->down |= hw->multi[1]; diff --git a/src/synapticsstr.h b/src/synapticsstr.h index bd19c79..05e43d3 100644 --- a/src/synapticsstr.h +++ b/src/synapticsstr.h @@ -232,6 +232,8 @@ typedef struct _SynapticsPrivateRec Bool has_double; /* double click detected for this device */ Bool has_triple; /* triple click detected for this device */ Bool has_pressure; /* device reports pressure */ + Bool is_clickpad; /* is Clickpad device (one-button) */ + struct SynapticsHwState prev_hw; /* previous h/w state (for clickpad) */ enum TouchpadModel model; /* The detected model */ } SynapticsPrivate; -- 1.7.0.4 ++++++ xf86-input-synaptics-add-led-support ++++++ >From ee7ad89ecbe365a6a9705b34a4c4b697cbff333e Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai(a)suse.de> Date: Wed, 21 Apr 2010 13:33:41 +0200 Subject: [PATCH 2/2] Support LED and tap-on-LED feature This patch adds the control of the embedded LED on the top-left corner of new Synaptics devices. For LED control, it requires the patch to Linux synaptics input driver, https://patchwork.kernel.org/patch/93858/ When a sysfs file /sys/class/leds/psmouse::synaptics exists, the driver assumes it supports the embeded LED control. This corresponds to the touchpad-off state. When touchpad is disabled, LED is turned on. For linking between the touchpad state and the LED state, a new callback UpdateHardware is introduced. Only eventcomm.c supports this (naturally). A new feature for the LED-equipped device is that user can double-tap on the LED to toggle the touchpad state on the fly. This is also linked with the touchpad-off state. There is a new parameter for controlling the LED double-tap behavior, too. It specifies the double-tap time. Passing zero disables the double-tap feature. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/synaptics-properties.h | 3 + man/synaptics.man | 13 ++++++ src/eventcomm.c | 29 ++++++++++++++ src/properties.c | 26 +++++++++++++ src/synaptics.c | 80 +++++++++++++++++++++++++++++++++++++++++ src/synapticsstr.h | 6 +++ src/synproto.h | 1 tools/synclient.c | 1 8 files changed, 158 insertions(+), 1 deletion(-) --- a/include/synaptics-properties.h +++ b/include/synaptics-properties.h @@ -155,4 +155,7 @@ /* 32 bit, 4 values, left, right, top, bottom */ #define SYNAPTICS_PROP_AREA "Synaptics Area" +/* 32 bit */ +#define SYNAPTICS_PROP_LED_DOUBLE_TAP "Synaptics LED Double Tap" + #endif /* _SYNAPTICS_PROPERTIES_H_ */ --- a/man/synaptics.man +++ b/man/synaptics.man @@ -509,6 +509,19 @@ The option is disabled by default and can be enabled by setting the AreaBottomEdge option to any integer value other than zero. Property: "Synaptics Area" . +.TP +.BI "Option \*qLEDDoubleTap\*q \*q" integer \*q +. +The double-tap time for toggling the touchpad-control on the top-left +corner LED. +. +Some devices have an LED on the top-left corner to indicate the +touchpad state. User can double-tap on the LED to toggle the touchpad +state. This option controls the double-tap time in milli-seconds. +When it's zero, the LED-tapping feature is disabled. The default +value is 400. +Property: "Synaptics LED Double Tap" +. .LP A tap event happens when the finger is touched and released in a time interval shorter than MaxTapTime, and the touch and release --- a/src/eventcomm.c +++ b/src/eventcomm.c @@ -51,6 +51,8 @@ #define LONG(x) ((x) / LONG_BITS) #define TEST_BIT(bit, array) (array[LONG(bit)] & (1 << OFF(bit))) +#define SYNAPTICS_LED_SYS_FILE "/sys/class/leds/psmouse::synaptics/brightness" + /***************************************************************************** * Function Definitions ****************************************************************************/ @@ -166,6 +168,29 @@ } } +static void +event_query_led(LocalDevicePtr local) +{ + SynapticsPrivate *priv = (SynapticsPrivate *)local->private; + + priv->has_led = !access(SYNAPTICS_LED_SYS_FILE, W_OK); +} + +static void EventUpdateHardware(LocalDevicePtr local) +{ + SynapticsPrivate *priv = (SynapticsPrivate *)local->private; + + if (priv->has_led) { + char *val = priv->synpara.touchpad_off ? "255" : "0"; + int fd = open(SYNAPTICS_LED_SYS_FILE, O_WRONLY); + if (fd < 0) + return; + if (write(fd, val, strlen(val)) < 0) + return; + close(fd); + } +} + /* Query device for axis ranges */ static void event_query_axis_ranges(LocalDevicePtr local) @@ -430,6 +455,7 @@ if (event_query_is_touchpad(local->fd, (need_grab) ? *need_grab : TRUE)) event_query_axis_ranges(local); event_query_info(local); + event_query_led(local); } static Bool @@ -499,5 +525,6 @@ EventQueryHardware, EventReadHwState, EventAutoDevProbe, - EventReadDevDimensions + EventReadDevDimensions, + EventUpdateHardware, }; --- a/src/properties.c +++ b/src/properties.c @@ -84,6 +84,7 @@ Atom prop_capabilities = 0; Atom prop_resolution = 0; Atom prop_area = 0; +Atom prop_led_double_tap = 0; static Atom InitAtom(DeviceIntPtr dev, char *name, int format, int nvalues, int *values) @@ -274,6 +275,9 @@ values[2] = para->area_top_edge; values[3] = para->area_bottom_edge; prop_area = InitAtom(local->dev, SYNAPTICS_PROP_AREA, 32, 4, values); + + prop_led_double_tap = InitAtom(local->dev, SYNAPTICS_PROP_LED_DOUBLE_TAP, 32, 1, &para->led_double_tap); + } int @@ -490,6 +494,11 @@ return BadValue; para->touchpad_off = off; + if (!checkonly) { + if (priv->proto_ops && priv->proto_ops->UpdateHardware) + priv->proto_ops->UpdateHardware(local); + } + } else if (property == prop_guestmouse) { if (prop->size != 1 || prop->format != 8 || prop->type != XA_INTEGER) @@ -642,10 +651,27 @@ para->area_right_edge = area[1]; para->area_top_edge = area[2]; para->area_bottom_edge = area[3]; + } else if (property == prop_led_double_tap) + { + if (prop->size != 1 || prop->format != 32 || prop->type != XA_INTEGER) + return BadMatch; + + para->led_double_tap = *(INT32*)prop->data; } return Success; } +void SynapticsToggleOffProperty(DeviceIntPtr dev, Bool off) +{ + uint8_t val; + + if (!prop_off) + return; + val = off; + XIChangeDeviceProperty(dev, prop_off, XA_INTEGER, 8, + PropModeReplace, 1, &val, FALSE); +} + #endif --- a/src/synaptics.c +++ b/src/synaptics.c @@ -138,6 +138,7 @@ void InitDeviceProperties(LocalDevicePtr local); int SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop, BOOL checkonly); +void SynapticsToggleOffProperty(DeviceIntPtr dev, Bool off); #endif InputDriverRec SYNAPTICS = { @@ -549,6 +550,7 @@ pars->tap_and_drag_gesture = xf86SetBoolOption(opts, "TapAndDragGesture", TRUE); pars->resolution_horiz = xf86SetIntOption(opts, "HorizResolution", horizResolution); pars->resolution_vert = xf86SetIntOption(opts, "VertResolution", vertResolution); + pars->led_double_tap = xf86SetIntOption(opts, "LEDDoubleTap", 400); /* Warn about (and fix) incorrectly configured TopEdge/BottomEdge parameters */ if (pars->top_edge > pars->bottom_edge) { @@ -805,6 +807,10 @@ xf86AddEnabledDevice(local); + /* update LED */ + if (priv->proto_ops && priv->proto_ops->UpdateHardware) + priv->proto_ops->UpdateHardware(local); + return Success; } @@ -2120,6 +2126,72 @@ } } +#define LED_TOGGLE_X_AREA 0.10 +#define LED_TOGGLE_Y_AREA 0.08 + +static int +in_led_toggle_area(LocalDevicePtr local, struct SynapticsHwState *hw) +{ + SynapticsPrivate *priv = (SynapticsPrivate *) (local->private); + int click_led_x, click_led_y; + + click_led_x = (priv->maxx - priv->minx) * LED_TOGGLE_X_AREA + priv->minx; + click_led_y = (priv->maxy - priv->miny) * LED_TOGGLE_Y_AREA + priv->miny; + return (hw->x < click_led_x && hw->y < click_led_y); +} + +/* clicpad button toggle point: + * some devices have a LED at the upper-left corner, and double-tapping it + * toggles the touchpad enable/disable + */ +static int +HandleToggleLED(LocalDevicePtr local, struct SynapticsHwState *hw, int finger) +{ + SynapticsPrivate *priv = (SynapticsPrivate *) (local->private); + SynapticsParameters *para = &priv->synpara; + int diff; + + if (finger) { + if (!in_led_toggle_area(local, hw)) { + /* outside the toggle area */ + priv->led_touch_state = FALSE; + priv->led_tapped = FALSE; + return finger; + } + if (!priv->led_touch_state) { + /* touch start */ + priv->led_touch_millis = hw->millis; + priv->led_touch_state = TRUE; + } + return 0; /* already processed; ignore this finger event */ + } + + if (!priv->led_touch_state) + return finger; /* nothing happened */ + + /* touch-released */ + priv->led_touch_state = FALSE; + diff = TIME_DIFF(priv->led_touch_millis + para->tap_time, hw->millis); + if (diff < 0) /* non-tap? */ + return finger; + if (priv->led_tapped) { + /* double-tapped? */ + diff = TIME_DIFF(priv->led_tap_millis + para->led_double_tap, hw->millis); + if (diff >= 0) { + para->touchpad_off = !para->touchpad_off; + if (priv->proto_ops && priv->proto_ops->UpdateHardware) + priv->proto_ops->UpdateHardware(local); /* update LED */ +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3 + SynapticsToggleOffProperty(local->dev, para->touchpad_off); +#endif + priv->led_tapped = FALSE; + } + } else + priv->led_tapped = TRUE; + priv->led_tap_millis = hw->millis; + return 0; /* already processed; ignore this finger event */ +} + /* clickpad event handling */ static void HandleClickpad(LocalDevicePtr local, struct SynapticsHwState *hw) @@ -2267,6 +2339,14 @@ finger = SynapticsDetectFinger(priv, hw); + if (priv->has_led && para->led_double_tap) { + finger = HandleToggleLED(local, hw, finger); + if (para->touchpad_off == 1) { + priv->finger_state = finger; + return delay; + } + } + /* tap and drag detection */ timeleft = HandleTapProcessing(priv, hw, edge, finger, inside_active_area); if (timeleft > 0) --- a/src/synapticsstr.h +++ b/src/synapticsstr.h @@ -149,6 +149,7 @@ unsigned int resolution_horiz; /* horizontal resolution of touchpad in units/mm */ unsigned int resolution_vert; /* vertical resolution of touchpad in units/mm */ int area_left_edge, area_right_edge, area_top_edge, area_bottom_edge; /* area coordinates absolute */ + int led_double_tap; /* double-tap period in ms for touchpad LED control */ } SynapticsParameters; @@ -223,6 +224,11 @@ Bool has_pressure; /* device reports pressure */ Bool is_clickpad; /* is Clickpad device (one-button) */ struct SynapticsHwState prev_hw; /* previous h/w state (for clickpad) */ + Bool has_led; /* has LED indicator */ + Bool led_touch_state; + Bool led_tapped; + int led_touch_millis; + int led_tap_millis; enum TouchpadModel model; /* The detected model */ } SynapticsPrivate; --- a/src/synproto.h +++ b/src/synproto.h @@ -97,6 +97,7 @@ struct CommData *comm, struct SynapticsHwState *hwRet); Bool (*AutoDevProbe)(LocalDevicePtr local); void (*ReadDevDimensions)(LocalDevicePtr local); + void (*UpdateHardware)(LocalDevicePtr local); }; extern struct SynapticsProtocolOperations psaux_proto_operations; --- a/tools/synclient.c +++ b/tools/synclient.c @@ -143,6 +143,7 @@ {"AreaRightEdge", PT_INT, 0, 10000, SYNAPTICS_PROP_AREA, 32, 1}, {"AreaTopEdge", PT_INT, 0, 10000, SYNAPTICS_PROP_AREA, 32, 2}, {"AreaBottomEdge", PT_INT, 0, 10000, SYNAPTICS_PROP_AREA, 32, 3}, + {"LEDDoubleTap", PT_INT, 0, 1000, SYNAPTICS_PROP_LED_DOUBLE_TAP, 32, 0}, { NULL, 0, 0, 0, 0 } }; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ntp-client for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '10

21 Apr '10

Hello community, here is the log from the commit of package yast2-ntp-client for openSUSE:Factory checked in at Wed Apr 21 18:08:50 CEST 2010. -------- --- yast2-ntp-client/yast2-ntp-client.changes 2010-04-09 17:29:06.000000000 +0200 +++ yast2-ntp-client/yast2-ntp-client.changes 2010-04-21 16:54:33.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 21 16:39:38 CEST 2010 - varkoly(a)suse.de + +- Remove missleading depracated input field + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ntp-client.spec ++++++ --- /var/tmp/diff_new_pack.qhjjH7/_old 2010-04-21 18:06:28.000000000 +0200 +++ /var/tmp/diff_new_pack.qhjjH7/_new 2010-04-21 18:06:28.000000000 +0200 @@ -20,7 +20,7 @@ Name: yast2-ntp-client Version: 2.18.1 -Release: 1 +Release: 2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-ntp-client-2.18.1.tar.bz2 @@ -84,4 +84,5 @@ /usr/share/YaST2/data/ntp_servers.ycp %doc %{prefix}/share/doc/packages/yast2-ntp-client /usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc + %changelog ++++++ yast2-ntp-client-2.18.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-2.18.1/src/dialogs.ycp new/yast2-ntp-client-2.18.1/src/dialogs.ycp --- old/yast2-ntp-client-2.18.1/src/dialogs.ycp 2010-04-08 16:56:06.000000000 +0200 +++ new/yast2-ntp-client-2.18.1/src/dialogs.ycp 2010-04-21 16:37:59.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: dialogs.ycp 61623 2010-04-08 14:56:04Z varkoly $ + * $Id: dialogs.ycp 61806 2010-04-21 14:38:02Z varkoly $ */ { @@ -264,8 +264,6 @@ `VBox ( "server_address", `VSpacing (0.5), - `Left ("init_sync"), - `VSpacing (0.5), "options", `VSpacing(0.5), "ac_options", @@ -278,7 +276,7 @@ string caption = _("NTP Server"); return CWM::ShowAndRun ($[ - "widget_names" : ["server_address", "init_sync", "options", "ac_options"], + "widget_names" : ["server_address", "options", "ac_options"], "widget_descr" : GetWidgets (), "contents" : contents, "caption" : caption, @@ -389,8 +387,6 @@ `VSpacing (3), "paddress", `VSpacing (1), - `Left ("init_sync"), - `VSpacing (1), "options", `VSpacing (3) ), `HStretch ()); @@ -399,7 +395,7 @@ string caption = _("NTP Peer"); return CWM::ShowAndRun ($[ - "widget_names" : ["paddress", "init_sync", "options"], + "widget_names" : ["paddress", "options"], "widget_descr" : GetWidgets (), "contents" : contents, "caption" : caption, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '10

21 Apr '10

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Wed Apr 21 17:58:36 CEST 2010. -------- --- xorg-x11-server/xorg-x11-server.changes 2010-04-10 20:59:42.000000000 +0200 +++ xorg-x11-server/xorg-x11-server.changes 2010-04-21 16:15:12.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Apr 21 16:03:07 CEST 2010 - eich(a)suse.de + +- Prevent XSync Alarms from senslessly calling CheckTrigger() when inactive. + If an XSync Alarm is set to inactive there is no need to check if a trigger + needs to fire. Doing so if the counter is the IdleCounter will put the + server on 100 percent CPU load since the select timeout is set to 0 + (bnc #584919). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.pqD8ul/_old 2010-04-21 17:43:39.000000000 +0200 +++ /var/tmp/diff_new_pack.pqD8ul/_new 2010-04-21 17:43:39.000000000 +0200 @@ -32,7 +32,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.5_%{dirsuffix} -Release: 4 +Release: 5 License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -112,6 +112,7 @@ Patch208: xorg-evdev-conf.diff Patch209: sw_cursor_on_randr.patch Patch210: pio_ia64.diff +Patch211: 0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch %if %moblin Patch300: moblin-use_preferred_mode_for_all_outputs.diff %endif @@ -234,6 +235,7 @@ %patch208 -p0 %patch209 -p1 %patch210 -p1 +%patch211 -p1 %if %moblin %patch300 -p1 %endif ++++++ 0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch ++++++ >From d1d9d4e5f8f9ac1d22e1258759d6ee9e49c7fe90 Mon Sep 17 00:00:00 2001 From: Egbert Eich <eich(a)freedesktop.org> Date: Fri, 9 Apr 2010 15:10:32 +0200 Subject: [PATCH] Prevent XSync Alarms from senslessly calling CheckTrigger() when inactive. If an XSync Alarm is set to inactive there is no need to check if a trigger needs to fire. Doing so if the counter is the IdleCounter will put the server on 100 percent CPU load since the select timeout is set to 0. --- xorg-server-1.8.0/Xext/sync.c | 11 +++++++++-- xorg-server-1.8.0/Xext/syncsrv.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xorg-server-1.8.0/Xext/sync.c b/xorg-server-1.8.0/Xext/sync.c index fd7b1ad..4c45399 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -518,6 +518,10 @@ SyncAlarmTriggerFired(SyncTrigger *pTrigger) pAlarm->state = XSyncAlarmInactive; } } + /* Stop server from looping! */ + if (pAlarm->state == XSyncAlarmInactive) + SyncDeleteTriggerFromCounter(&pAlarm->trigger); + /* The AlarmNotify event has to have the "new state of the alarm" * which we can't be sure of until this point. However, it has * to have the "old" trigger test value. That's the reason for @@ -730,7 +734,7 @@ SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm *pAlarm, Mask mask, XSyncCounter counter; Mask origmask = mask; - counter = pAlarm->trigger.pCounter ? pAlarm->trigger.pCounter->id : None; + counter = pAlarm->counter_id; while (mask) { @@ -741,7 +745,7 @@ SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm *pAlarm, Mask mask, case XSyncCACounter: mask &= ~XSyncCACounter; /* sanity check in SyncInitTrigger */ - counter = *values++; + counter = pAlarm->counter_id = *values++; break; case XSyncCAValueType: @@ -815,6 +819,7 @@ SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm *pAlarm, Mask mask, return status; /* XXX spec does not really say to do this - needs clarification */ + /* It's the only place where it is set to XSyncAlarmActive! */ pAlarm->state = XSyncAlarmActive; return Success; } @@ -1617,8 +1622,10 @@ ProcSyncCreateAlarm(ClientPtr client) pAlarm->client = client; pAlarm->alarm_id = stuff->id; + pAlarm->counter_id = None; XSyncIntToValue(&pAlarm->delta, 1L); pAlarm->events = TRUE; + /* SyncChangeAlarmAttributes() changes this - no need to set this here! */ pAlarm->state = XSyncAlarmInactive; pAlarm->pEventClients = NULL; status = SyncChangeAlarmAttributes(client, pAlarm, vmask, diff --git a/xorg-server-1.8.0/Xext/syncsrv.h b/xorg-server-1.8.0/Xext/syncsrv.h index 6d0e3d6..527729d 100644 --- a/Xext/syncsrv.h +++ b/Xext/syncsrv.h @@ -129,6 +129,7 @@ typedef struct _SyncAlarm { int events; int state; SyncAlarmClientList *pEventClients; + XSyncCounter counter_id; } SyncAlarm; typedef struct { -- 1.6.4.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xinetd for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '10

21 Apr '10

Hello community, here is the log from the commit of package xinetd for openSUSE:Factory checked in at Wed Apr 21 17:43:17 CEST 2010. -------- --- xinetd/xinetd.changes 2010-01-26 22:56:05.000000000 +0100 +++ xinetd/xinetd.changes 2010-04-21 09:05:58.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Apr 21 08:55:03 UTC 2010 - mseben(a)novell.com + +- added ident-bind.patch : use right size of addresses in bind() call. + Also use getpeername addresses when connecting to ident service to + prevent address family mismatch between socket(), + bind() and connect() calls. (bnc#598305) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xinetd-2.3.14-ident-bind.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xinetd.spec ++++++ --- /var/tmp/diff_new_pack.VS0mml/_old 2010-04-21 17:42:35.000000000 +0200 +++ /var/tmp/diff_new_pack.VS0mml/_new 2010-04-21 17:42:35.000000000 +0200 @@ -27,7 +27,7 @@ Requires: logrotate AutoReqProv: on Version: 2.3.14 -Release: 144 +Release: 145 Url: http://www.xinetd.org/ Summary: An 'inetd' with Expanded Functionality Source0: %{name}-%{version}.tar.bz2 @@ -44,6 +44,7 @@ Patch8: %{name}-%{version}-pie.patch Patch9: %{name}-%{version}-ipv6-ipv4-fallback.patch Patch10: %{name}-%{version}-honour_disable.patch +Patch11: %{name}-%{version}-ident-bind.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -76,6 +77,7 @@ %patch8 %patch9 %patch10 +%patch11 -p1 %build %{suse_update_config} ++++++ xinetd-2.3.14-ident-bind.patch ++++++ 448069: xinetd: socket bind: Invalid argument (errno = 22) when using USERID on ipv6 Use right size of addresses in bind() call. Also use getpeername addresses when connecting to ident service to prevent address family mismatch between socket(), bind() and connect() calls. Author: Jan Safranek <jsafrane(a)redhat.com> Reviewed-By: Adam Tkac <atkac(a)redhat.com> diff -up xinetd-2.3.14/xinetd/ident.c.orig xinetd-2.3.14/xinetd/ident.c --- xinetd-2.3.14/xinetd/ident.c.orig 2008-05-29 16:30:19.000000000 +0200 +++ xinetd-2.3.14/xinetd/ident.c 2008-05-29 16:29:57.000000000 +0200 @@ -97,7 +98,13 @@ idresult_e log_remote_user( const struct } CLEAR( sin_contact ); - sin_remote = *CONN_XADDRESS( SERVER_CONNECTION( serp ) ) ; + + sin_len = sizeof( sin_remote ); + if ( getpeername( SERVER_FD( serp ), &sin_remote.sa, &sin_len ) == -1 ) + { + msg( LOG_ERR, func, "(%d) getpeername: %m", getpid() ) ; + return( IDR_ERROR ) ; + } sin_contact = sin_remote; memcpy( &sin_bind, &sin_local, sizeof(sin_bind) ) ; local_port = 0; @@ -121,7 +128,13 @@ idresult_e log_remote_user( const struct msg( LOG_ERR, func, "socket creation: %m" ) ; return( IDR_ERROR ) ; } - if ( bind(sd, &sin_bind.sa, sizeof(sin_bind.sa)) == -1 ) + + if ( sin_bind.sa.sa_family == AF_INET ) + sin_len = sizeof( sin_bind.sa_in ) ; + else + sin_len = sizeof( sin_bind.sa_in6 ) ; + + if ( bind(sd, &sin_bind.sa, sin_len) == -1 ) { msg( LOG_ERR, func, "socket bind: %m" ) ; (void) Sclose( sd ) ; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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