November 2010 - openSUSE Commits - openSUSE Mailing Lists

commit rfc for openSUSE:Factory
by root＠hilbert.suse.de 18 Nov '10

18 Nov '10

Hello community, here is the log from the commit of package rfc for openSUSE:Factory checked in at Thu Nov 18 17:57:31 CET 2010. -------- --- AUTO/all/rfc/rfc.changes 2010-11-15 20:45:20.000000000 +0100 +++ rfc/rfc.changes 2010-11-18 14:43:04.000000000 +0100 @@ -2 +2 @@ -Mon Nov 15 20:45:20 CET 2010 - autobuild(a)suse.de +Thu Nov 18 14:43:04 CET 2010 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2010-11-15 +- automated update on 2010-11-18 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfc.spec ++++++ --- /var/tmp/diff_new_pack.n3MZgS/_old 2010-11-18 17:57:21.000000000 +0100 +++ /var/tmp/diff_new_pack.n3MZgS/_new 2010-11-18 17:57:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package rfc (Version 2010.11.15) +# spec file for package rfc (Version 2010.11.18) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Summary: The RFCs (Request For Comments) Source: rfc.tgz BuildArch: noarch -Version: 2010.11.15 +Version: 2010.11.18 Release: 1 Url: ftp://ftp.isi.edu/in-notes BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ rfc.tgz ++++++ AUTO/all/rfc/rfc.tgz rfc/rfc.tgz differ: char 5, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ripit for openSUSE:Factory
by root＠hilbert.suse.de 18 Nov '10

18 Nov '10

Hello community, here is the log from the commit of package ripit for openSUSE:Factory checked in at Thu Nov 18 17:57:10 CET 2010. -------- --- ripit/ripit.changes 2010-04-10 16:23:52.000000000 +0200 +++ ripit/ripit.changes 2010-11-18 17:16:06.000000000 +0100 @@ -1,0 +2,22 @@ +Thu Nov 18 16:13:25 UTC 2010 - hvogel(a)novell.com + +- Update to version 3.9.0 + * Added options --coverart and --coverpath to select + and add coverart to the metadata. + * Added option --copycover to copy a cover from + some place to each directory of encoded files. + * Added option --precmd to execute a command before + ripping starts and e.g. ensure presence of coverart. + * Added option --trackoffset to add a constant + value to the tracknumber in the tracktemplate. + * Added options --vatag and --vastring to detect + various artist style and split artist and track + title. + * Added option --cdcue to create cue-files + (cue-sheets) to burn the (merged) wav. + * Added option --isrc to detect ISRCs in audio + data using icedax. + * Added options --mblogin and --mbpass to submit + detected ISRCs to MusciBrainz. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ripit-3.8.2-ogg.patch ripit-3.8.2.tar.bz2 New: ---- ripit-3.9.0-ogg.patch ripit-3.9.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ripit.spec ++++++ --- /var/tmp/diff_new_pack.x8LvLK/_old 2010-11-18 17:56:32.000000000 +0100 +++ /var/tmp/diff_new_pack.x8LvLK/_new 2010-11-18 17:56:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package ripit (Version 3.8.2) +# spec file for package ripit (Version 3.9.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,22 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: ripit +Summary: Perl Script to Create .ogg or .mp3 Files from an Audio CD Url: http://www.suwald.com/ripit/ License: GPLv2+ Group: Productivity/Multimedia/CD/Grabbers -Requires: cdparanoia vorbis-tools perl perl-CDDB_get perl-libwww-perl -AutoReqProv: on -Version: 3.8.2 +Version: 3.9.0 Release: 1 -Summary: Perl Script to Create .ogg or .mp3 Files from an Audio CD Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-ogg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +Requires: cdparanoia vorbis-tools perl perl-CDDB_get perl-libwww-perl %description This Perl script makes it easy to create MP3 files from an audio CD. It @@ -44,7 +42,7 @@ %prep %setup -q -%patch0 -p1 +%patch0 %build ++++++ ripit-3.8.2-ogg.patch -> ripit-3.9.0-ogg.patch ++++++ --- ripit/ripit-3.8.2-ogg.patch 2010-04-10 16:23:46.000000000 +0200 +++ ripit/ripit-3.9.0-ogg.patch 2010-11-18 17:16:06.000000000 +0100 @@ -1,16 +1,15 @@ -Index: ripit-3.8.2/ripit.pl -=================================================================== ---- ripit-3.8.2.orig/ripit.pl -+++ ripit-3.8.2/ripit.pl -@@ -88,20 +88,20 @@ my $ripopt = ""; # Options fo +--- ripit.pl ++++ ripit.pl +@@ -92,7 +92,7 @@ my $span = ""; # Options for track spans. my $ripper = 1; # 0 - dagrab, 1 - cdparanoia, # 2 - cdda2wav, 3 - tosha, 4 - cdd. -my @coder = (0); # 0 - Lame, 1 - Oggenc, 2 - Flac, +my @coder = (1); # 0 - Lame, 1 - Oggenc, 2 - Flac, # 3 - Faac, 4 - mp4als, 5 - Musepack, + # 6 - Wavpack, 7 - ffmpeg, # comma separated list. - my $bitrate = 128; # Bitrate for lame, if --vbrmode used, +@@ -105,14 +105,14 @@ # bitrate is equal to the -b option. my $maxrate = 0; # Bitrate for lame using --vbrmode, # maxrate is equal to the -B option. @@ -19,7 +18,8 @@ # quality = 0, quality for oggenc (1-10), # best = 10; or compression level for Flac # (0-8), lowest = 0, quality for Faac - # (10-500), best = 500 + # (10-500), best = 500, no values for + # Wavpack and ffmpeg. my $qualame = 5; # Same as above, more intuitive. Use quotes -my $qualoggenc= 3; # if values shall be comma separated lists. +my $qualoggenc= 6; # if values shall be comma separated lists. ++++++ ripit-3.8.2.tar.bz2 -> ripit-3.9.0.tar.bz2 ++++++ ++++ 5848 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit simple-ccsm for openSUSE:Factory
by root＠hilbert.suse.de 18 Nov '10

18 Nov '10

Hello community, here is the log from the commit of package simple-ccsm for openSUSE:Factory checked in at Thu Nov 18 17:56:21 CET 2010. -------- --- simple-ccsm/simple-ccsm.changes 2010-05-27 22:38:07.000000000 +0200 +++ simple-ccsm/simple-ccsm.changes 2010-11-17 22:39:34.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Nov 17 20:32:00 UTC 2010 - dimstar(a)opensuse.org + +- Update to version 0.9.2.1: + + Track changes in libcompizconfig: + - Remove Multi-Screen and Display capabilities +- Drop patches: + + simple-ccsm-cm-dry.patch + + simple-ccsm-default-plugins.patch + + simple-ccsm-explicitly-disable-compiz.patch + + simple-ccsm-compiz-manager-cmd.diff: merged + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- simple-ccsm-0.8.4.tar.bz2 simple-ccsm-cm-dry.patch simple-ccsm-compiz-manager-cmd.diff simple-ccsm-default-plugins.patch simple-ccsm-explicitly-disable-compiz.patch New: ---- simple-ccsm.tar.bz2 update.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ simple-ccsm.spec ++++++ --- /var/tmp/diff_new_pack.mkWqiD/_old 2010-11-18 17:55:36.000000000 +0100 +++ /var/tmp/diff_new_pack.mkWqiD/_new 2010-11-18 17:55:36.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package simple-ccsm (Version 0.8.4) +# spec file for package simple-ccsm (Version 0.9.2.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,21 +18,15 @@ Name: simple-ccsm -Version: 0.8.4 -Release: 3 +Version: 0.9.2.1 +Release: 1 License: GPLv2+ Summary: Simple Settings Manager for Compiz Url: http://opencompositing.org Group: System/X11/Utilities -Source: simple-ccsm-%{version}.tar.bz2 -# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches -Patch: simple-ccsm-compiz-manager-cmd.diff -# PATCH-FEATURE-OPENSUSE simple-ccsm-default-plugins.patch bnc #432301 -- include glx -Patch2: simple-ccsm-default-plugins.patch -# PATCH-FIX-OPENSUSE simple-ccsm-explicitly-disable-compiz.patch -Patch4: simple-ccsm-explicitly-disable-compiz.patch -# PATCH-FIX-UPSTREAM simple-ccsm-cm-dry.patch bnc#407729 rodrigo(a)novell.com -- Use os.system to run CM_DRY command -Patch5: simple-ccsm-cm-dry.patch +Source: simple-ccsm.tar.bz2 +# Helper script to track upstream git changes. +Source99: update.sh BuildRequires: compiz-devel BuildRequires: compiz-gnome BuildRequires: gtk2-devel @@ -63,11 +57,7 @@ Compiz settings manager focused on simplicity and aimed at end users. %prep -%setup -q -n simple-ccsm-%{version} -%patch -p1 -%patch2 -p1 -%patch4 -p1 -%patch5 -p0 +%setup -q -n simple-ccsm %build ./setup.py --prefix=%{_prefix} --enableDesktopEffects ++++++ simple-ccsm-0.8.4.tar.bz2 -> simple-ccsm.tar.bz2 ++++++ ++++ 2245 lines of diff (skipped) ++++++ update.sh ++++++ #!/bin/sh oscmodule=$(basename $PWD) if [ ! -d $oscmodule ]; then echo "git checkout folder $oscmodule does not exist. Aborting..." exit 1 fi pushd $oscmodule; status=$(git pull); git submodule update; commitid=$(git log | head -n1); popd if [ "$status" != "Already up-to-date." ]; then if [ -n "$(head -n4 $oscmodule.changes | tail -n1 | grep commit)" ]; then # The last changelog entry already was an automatic forward... let's not pullute too much. sed -i 1,5d $oscmodule.changes fi tar cjf $oscmodule.tar.bz2 $oscmodule osc vc -m "Forward to $commitid" osc ci -m "Forward to $commitid" --skip-validation fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 freefont for openSUSE:Factory
by root＠hilbert.suse.de 18 Nov '10

18 Nov '10

Hello community, here is the log from the commit of package freefont for openSUSE:Factory checked in at Thu Nov 18 17:55:19 CET 2010. -------- --- freefont/freefont.changes 2010-04-08 15:54:10.000000000 +0200 +++ freefont/freefont.changes 2010-11-18 16:22:03.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 18 16:17:29 CET 2010 - pgajdos(a)suse.cz + +- updated to 0.20101118 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- freefont-0.20091208.tar.bz2 New: ---- freefont-0.20101118.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freefont.spec ++++++ --- /var/tmp/diff_new_pack.OIPLqw/_old 2010-11-18 17:54:31.000000000 +0100 +++ /var/tmp/diff_new_pack.OIPLqw/_new 2010-11-18 17:54:31.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package freefont (Version 0.20091208) +# spec file for package freefont (Version 0.20101118) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,8 +27,8 @@ AutoReqProv: on PreReq: %suseconfig_fonts_prereq Provides: locale(bg;el;he;ru;vi) -Version: 0.20091208 -Release: 2 +Version: 0.20101118 +Release: 1 Url: http://savannah.nongnu.org/projects/freefont/ # cvs -z3 -d:pserver:anonymous@cvs.savannah.nongnu.org:/sources/freefont login # (hit Enter) ++++++ freefont-0.20091208.tar.bz2 -> freefont-0.20101118.tar.bz2 ++++++ ++++ 399294 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Apache-DBI for openSUSE:Factory
by root＠hilbert.suse.de 18 Nov '10

18 Nov '10

Hello community, here is the log from the commit of package perl-Apache-DBI for openSUSE:Factory checked in at Thu Nov 18 17:54:20 CET 2010. -------- --- perl-Apache-DBI/perl-Apache-DBI.changes 2010-02-23 16:35:51.000000000 +0100 +++ perl-Apache-DBI/perl-Apache-DBI.changes 2010-11-18 17:03:32.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 18 17:02:41 CET 2010 - anicka(a)suse.cz + +- update to 1.09 + * Fix pod errors + * Adds PerlChildExitHandler to disconnect existing connections + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Apache-DBI-1.08-path.diff Apache-DBI-1.08.tar.bz2 New: ---- Apache-DBI-1.09-path.diff Apache-DBI-1.09.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Apache-DBI.spec ++++++ --- /var/tmp/diff_new_pack.8tlGlL/_old 2010-11-18 17:54:03.000000000 +0100 +++ /var/tmp/diff_new_pack.8tlGlL/_new 2010-11-18 17:54:03.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package perl-Apache-DBI (Version 1.08) +# spec file for package perl-Apache-DBI (Version 1.09) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: perl-Apache-DBI BuildRequires: apache2-devel apache2-mod_perl libapr-util1-devel pcre-devel perl-DBI -Version: 1.08 +Version: 1.09 Release: 1 Provides: ApacheDBI perl-ApacheDBI Obsoletes: perl-ApacheDBI ++++++ Apache-DBI-1.08-path.diff -> Apache-DBI-1.09-path.diff ++++++ ++++++ Apache-DBI-1.08.tar.bz2 -> Apache-DBI-1.09.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-DBI-1.08/Changes new/Apache-DBI-1.09/Changes --- old/Apache-DBI-1.08/Changes 2010-02-03 23:58:55.000000000 +0100 +++ new/Apache-DBI-1.09/Changes 2010-11-12 04:17:24.000000000 +0100 @@ -1,5 +1,12 @@ Revision history for ApacheDBI. +1.09 November 11, 2010 + - Fix pod errors + Submitted by: Damyan Ivanov <dmn(a)debian.org> + + - Adds PerlChildExitHandler to disconnect existing connections + Submitted by: Nick Wellnhoffer <wellnhofer(a)aevum.de> + 1.08 February 3rd, 2010 - Fix bug to allow DBI in startup.pl etc again Bug report from Adam Prime, patch from Lubomir Rintel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-DBI-1.08/META.yml new/Apache-DBI-1.09/META.yml --- old/Apache-DBI-1.08/META.yml 2010-02-04 00:00:01.000000000 +0100 +++ new/Apache-DBI-1.09/META.yml 2010-11-12 04:18:08.000000000 +0100 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: Apache-DBI -version: 1.08 +version: 1.09 abstract: ~ author: [] license: unknown @@ -18,7 +18,7 @@ directory: - t - inc -generated_by: ExtUtils::MakeMaker version 6.55_02 +generated_by: ExtUtils::MakeMaker version 6.56 meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html version: 1.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-DBI-1.08/README new/Apache-DBI-1.09/README --- old/Apache-DBI-1.08/README 2010-02-03 23:58:39.000000000 +0100 +++ new/Apache-DBI-1.09/README 2010-11-12 04:17:24.000000000 +0100 @@ -1,7 +1,7 @@ DESCRIPTION: ------------ -This is version 1.08 of Apache::AuthDBI and Apache::DBI. +This is version 1.09 of Apache::AuthDBI and Apache::DBI. These modules are supposed to be used with the Apache server together with an embedded perl interpreter like mod_perl. They provide support for basic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-DBI-1.08/lib/Apache/AuthDBI.pm new/Apache-DBI-1.09/lib/Apache/AuthDBI.pm --- old/Apache-DBI-1.08/lib/Apache/AuthDBI.pm 2010-02-03 23:58:39.000000000 +0100 +++ new/Apache-DBI-1.09/lib/Apache/AuthDBI.pm 2010-11-12 04:17:24.000000000 +0100 @@ -1,7 +1,7 @@ -# $Id$ +# $Id: AuthDBI.pm 907307 2010-02-06 20:55:46Z phred $ package Apache::AuthDBI; -$Apache::AuthDBI::VERSION = '1.08'; +$Apache::AuthDBI::VERSION = '1.09'; # 1: report about cache miss # 2: full debug output @@ -1356,6 +1356,8 @@ =head1 LIST OF TOKENS +=over + =item * Auth_DBI_data_source (Authentication and Authorization) The data_source value has the syntax 'dbi:driver:dsn'. This parameter is @@ -1470,6 +1472,8 @@ placeholder for the username. This may result in improved performance for databases supporting this method. +=back + =head1 CONFIGURATION The module should be loaded upon startup of the Apache daemon. @@ -1549,6 +1553,7 @@ mod_perl versions less then 2.0.0 are NO longer supported. =head2 MOD_PERL 1.0 + Note that this module needs mod_perl-1.08 or higher, apache_1.3.0 or higher and that mod_perl needs to be configured with the appropriate call-back hooks: @@ -1580,6 +1585,8 @@ =head1 AUTHORS +=over + =item * Apache::AuthDBI by Edmund Mergl; now maintained and supported by the modperl mailinglist, subscribe by sending mail to @@ -1591,6 +1598,8 @@ =item * DBI by Tim Bunce <dbi-users-subscribe(a)perl.org> +=back + =head1 COPYRIGHT The Apache::AuthDBI module is free software; you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-DBI-1.08/lib/Apache/DBI.pm new/Apache-DBI-1.09/lib/Apache/DBI.pm --- old/Apache-DBI-1.08/lib/Apache/DBI.pm 2010-02-03 23:58:39.000000000 +0100 +++ new/Apache-DBI-1.09/lib/Apache/DBI.pm 2010-11-12 04:17:24.000000000 +0100 @@ -1,4 +1,4 @@ -# $Id$ +# $Id: DBI.pm 907307 2010-02-06 20:55:46Z phred $ package Apache::DBI; use strict; @@ -22,7 +22,7 @@ require_version DBI 1.00; -$Apache::DBI::VERSION = '1.08'; +$Apache::DBI::VERSION = '1.09'; # 1: report about new connect # 2: full debug output @@ -39,6 +39,9 @@ # a negative value de-activates ping, # default = 0 my %LastPingTime; # keeps track of last ping per data_source +my $ChildExitHandlerInstalled; # set to true on installation of + # PerlChildExitHandler +my $InChild; # Check to see if we need to reset TaintIn and TaintOut my $TaintInOut = ($DBI::VERSION >= 1.31) ? 1 : 0; @@ -134,6 +137,23 @@ } } + # this PerlChildExitHandler is supposed to disconnect all open + # connections to the database + if (!$ChildExitHandlerInstalled) { + $ChildExitHandlerInstalled = 1; + my $s; + if (MP2) { + $s = Apache2::ServerUtil->server; + } + elsif (Apache->can('push_handlers')) { + $s = 'Apache'; + } + if ($s) { + debug(2, "$prefix push PerlChildExitHandler"); + $s->push_handlers(PerlChildExitHandler => \&childexit); + } + } + # this PerlCleanupHandler is supposed to initiate a rollback after the # script has finished if AutoCommit is off. however, cleanup can only # be determined at end of handle life as begin_work may have been called @@ -218,6 +238,22 @@ 1; } +# The PerlChildExitHandler disconnects all open connections +sub childexit { + + my $prefix = "$$ Apache::DBI "; + debug(2, "$prefix PerlChildExitHandler"); + + foreach my $dbh (values(%Connected)) { + eval { DBI::db::disconnect($dbh) }; + if ($@) { + debug(2, "$prefix DBI::db::disconnect failed - $@"); + } + } + + 1; +} + # The PerlCleanupHandler is supposed to initiate a rollback after the script # has finished if AutoCommit is off. # Note: the PerlCleanupHandler runs after the response has been sent to @@ -517,7 +553,7 @@ PERL_CHILD_INIT=1 PERL_STACKED_HANDLERS=1 Apache::DBI v0.94 was the last version before dual mod_perl 2.x support was begun. -It still recommened that you use the latest version of Apache::DBI because Apache::DBI +It still recommended that you use the latest version of Apache::DBI because Apache::DBI versions less than 1.00 are NO longer supported. =head1 DO YOU NEED THIS MODULE? @@ -537,6 +573,8 @@ =head1 AUTHORS +=over + =item * Philip M. Gollucci <pgollucci(a)p6m7g8.com> is currently packaging new releases. @@ -553,6 +591,8 @@ =item * DBI by Tim Bunce <dbi-users-subscribe(a)perl.org> +=back + =head1 COPYRIGHT The Apache::DBI module is free software; you can redistribute it and/or ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rpmlint for openSUSE:Factory
by root＠hilbert.suse.de 18 Nov '10

18 Nov '10

Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at Thu Nov 18 17:53:51 CET 2010. -------- --- rpmlint/rpmlint.changes 2010-11-15 17:15:31.000000000 +0100 +++ rpmlint/rpmlint.changes 2010-11-18 11:46:40.000000000 +0100 @@ -1,0 +2,16 @@ +Thu Nov 18 10:46:19 UTC 2010 - lnussel(a)suse.de + +- also check ghost files for permission violations + +------------------------------------------------------------------- +Wed Nov 17 10:10:29 UTC 2010 - lnussel(a)suse.de + +- add check for %set_permissions + +------------------------------------------------------------------- +Tue Nov 16 15:19:41 UTC 2010 - lnussel(a)suse.de + +- modify match in CheckSUIDPermissions to work with new macros +- allow info messages even if badness scoring is used + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- rpmlint-badness-info.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.YTgWLA/_old 2010-11-18 17:52:58.000000000 +0100 +++ /var/tmp/diff_new_pack.YTgWLA/_new 2010-11-18 17:52:58.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: rpm-python Summary: Rpm correctness checker Version: 1.0 -Release: 3 +Release: 4 Source0: %{name}-%{version}.tar.bz2 Source1: config Source1001: config.in @@ -120,6 +120,7 @@ Patch79: rpmlint-fscaps.diff Patch80: remove-expand-macros.diff Patch81: suse-whitelist-opensuse.diff +Patch82: rpmlint-badness-info.diff %py_requires %description @@ -196,6 +197,7 @@ %patch79 -p1 %patch80 %patch81 +%patch82 -p1 cp -p %{SOURCE1} . cp -p %{SOURCE2} . cp -p %{SOURCE3} . ++++++ CheckSUIDPermissions.py ++++++ --- /var/tmp/diff_new_pack.YTgWLA/_old 2010-11-18 17:52:59.000000000 +0100 +++ /var/tmp/diff_new_pack.YTgWLA/_new 2010-11-18 17:52:59.000000000 +0100 @@ -98,11 +98,10 @@ else: self._parsefile(f) - need_run_permissions = False + need_set_permissions = False + found_suseconfig = False # second pass, find permissions violations for f, pkgfile in files.items(): - if f in pkg.ghostFiles(): - continue if pkgfile.filecaps: printError(pkg, 'permissions-fscaps', '%(file)s has fscaps "%(caps)s"' % \ @@ -168,22 +167,46 @@ if need_verifyscript and \ (not f in self.perms or not 'static' in self.perms[f]): - need_run_permissions = True + need_set_permissions = True script = pkg[rpm.RPMTAG_VERIFYSCRIPT] or pkg[rpm.RPMTAG_VERIFYSCRIPTPROG] - if not script or not "chkstat -n -e %s"%f in script: - printError(pkg, 'permissions-missing-verifyscript', \ + + found = False + if script: + for line in script.split("\n"): + if "/chkstat" in line and f in line: + found = True + break + + if not script or not found: + printWarning(pkg, 'permissions-missing-verifyscript', \ "missing %%verify_permissions -e %s" % f) - if need_run_permissions: - postin = pkg[rpm.RPMTAG_POSTIN] or pkg[rpm.RPMTAG_POSTINPROG] - if not postin or not "SuSEconfig --module permissions" in postin: - printError(pkg, 'permissions-missing-postin', \ - "missing %run_permissions in %post") + script = pkg[rpm.RPMTAG_POSTIN] or pkg[rpm.RPMTAG_POSTINPROG] + found = False + if script: + for line in script.split("\n"): + if "chkstat -n" in line and f in line: + found = True + break + + if "SuSEconfig --module permissions" in line: + found = True + found_suseconfig = True + break + + if not script and not found: + printError(pkg, 'permissions-missing-postin', \ + "missing %%set_permissions %s in %%post" % f) + + if need_set_permissions: if not 'permissions' in map(lambda x: x[0], pkg.prereq()): printError(pkg, 'permissions-missing-requires', \ "missing 'permissions' in PreReq") + if found_suseconfig: + printInfo(pkg, 'permissions-suseconfig-obsolete', \ + "%run_permissions is obsolete") check=SUIDCheck() @@ -226,9 +249,13 @@ request an entry that sets capabilities in /etc/permissions instead.""", 'permissions-missing-postin', -"""Please add %run_permissions to %post""", +"""Please add an appropriate %post section""", 'permissions-missing-requires', """Please add \"PreReq: permissions\"""", 'permissions-missing-verifyscript', """Please add a %verifyscript section""", +'permissions-suseconfig-obsolete', +"""The %run_permissions macro calls SuSEconfig which sets permissions for all +files in the system. Please use %set_permissions <filename> instead +to only set permissions for files contained in this package""", ) ++++++ rpmlint-badness-info.diff ++++++ >From c887ed177b551186dc30f7528cd23c018ca2b69d Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel(a)suse.de> Date: Thu, 4 Nov 2010 17:25:35 +0100 Subject: [PATCH] allow info messages even if badness scoring is used --- Filter.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/Filter.py b/Filter.py index 4b5ca1e..baaee45 100644 --- a/Filter.py +++ b/Filter.py @@ -47,7 +47,12 @@ def _print(msgtype, pkg, reason, details): badness = 0 if threshold >= 0: badness = Config.badness(reason) - msgtype = badness and "E" or "W" + # anything with badness is an error + if badness: + msgtype == 'E' + # errors without badness become warnings + elif msgtype == 'E': + msgtype = 'W' ln = "" if pkg.current_linenum is not None: -- 1.7.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 wdiff for openSUSE:Factory
by root＠hilbert.suse.de 18 Nov '10

18 Nov '10

Hello community, here is the log from the commit of package wdiff for openSUSE:Factory checked in at Thu Nov 18 17:52:47 CET 2010. -------- --- wdiff/wdiff.changes 2010-08-24 15:03:17.000000000 +0200 +++ wdiff/wdiff.changes 2010-11-18 15:39:14.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 18 15:38:20 CET 2010 - pgajdos(a)suse.cz + +- updated to 0.6.4: + * Updated Catalan translations + * Updated gnulib + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- wdiff-0.6.3.tar.bz2 New: ---- wdiff-0.6.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wdiff.spec ++++++ --- /var/tmp/diff_new_pack.V03MSc/_old 2010-11-18 17:52:32.000000000 +0100 +++ /var/tmp/diff_new_pack.V03MSc/_new 2010-11-18 17:52:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package wdiff (Version 0.6.3) +# spec file for package wdiff (Version 0.6.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ License: GPLv2+ Group: Productivity/Text/Utilities AutoReqProv: on -Version: 0.6.3 +Version: 0.6.4 Release: 1 Summary: Display Word Differences Between Text Files Source: http://alpha.gnu.org/gnu/wdiff/wdiff-%{version}.tar.bz2 ++++++ wdiff-0.6.3.tar.bz2 -> wdiff-0.6.4.tar.bz2 ++++++ ++++ 13222 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation for openSUSE:Factory
by root＠hilbert.suse.de 18 Nov '10

18 Nov '10

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at Thu Nov 18 17:52:17 CET 2010. -------- --- yast2-installation/yast2-installation.changes 2010-09-30 20:12:03.000000000 +0200 +++ yast2-installation/yast2-installation.changes 2010-11-18 16:18:43.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Nov 16 16:13:48 UTC 2010 - jsrain(a)suse.cz + +- fixed behavior of window closing in installation proposal + (bnc#636980) +- use df for estimating partition size for live installer + (bnc#555288) +- 2.20.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-installation-2.20.0.tar.bz2 New: ---- yast2-installation-2.20.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.Popy7F/_old 2010-11-18 17:52:04.000000000 +0100 +++ /var/tmp/diff_new_pack.Popy7F/_new 2010-11-18 17:52:04.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.20.0) +# spec file for package yast2-installation (Version 2.20.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-installation -Version: 2.20.0 +Version: 2.20.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.20.0.tar.bz2 +Source0: yast2-installation-2.20.1.tar.bz2 Prefix: /usr @@ -136,7 +136,7 @@ System installation code as present on installation media. %prep -%setup -n yast2-installation-2.20.0 +%setup -n yast2-installation-2.20.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-installation-2.20.0.tar.bz2 -> yast2-installation-2.20.1.tar.bz2 ++++++ ++++ 17600 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.20.0/VERSION new/yast2-installation-2.20.1/VERSION --- old/yast2-installation-2.20.0/VERSION 2010-09-30 19:34:19.000000000 +0200 +++ new/yast2-installation-2.20.1/VERSION 2010-11-18 17:14:00.000000000 +0100 @@ -1 +1 @@ -2.20.0 +2.20.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.20.0/configure.in new/yast2-installation-2.20.1/configure.in --- old/yast2-installation-2.20.0/configure.in 2009-04-28 18:15:57.000000000 +0200 +++ new/yast2-installation-2.20.1/configure.in 2010-11-18 17:17:14.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.18.13, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.20.1, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.13" +VERSION="2.20.1" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.20.0/missing new/yast2-installation-2.20.1/missing --- old/yast2-installation-2.20.0/missing 2009-04-28 18:16:03.000000000 +0200 +++ new/yast2-installation-2.20.1/missing 2010-11-18 17:17:18.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.20.0/src/clients/inst_prepareprogress.ycp new/yast2-installation-2.20.1/src/clients/inst_prepareprogress.ycp --- old/yast2-installation-2.20.0/src/clients/inst_prepareprogress.ycp 2009-06-16 15:21:14.000000000 +0200 +++ new/yast2-installation-2.20.1/src/clients/inst_prepareprogress.ycp 2010-11-18 16:44:53.000000000 +0100 @@ -36,12 +36,25 @@ integer live_size = 0; if (Mode::live_installation()) { + + string cmd = sformat ("df -P -k %1", "/"); + y2milestone ("Executing %1", cmd); + map out = (map)SCR::Execute (.target.bash_output, cmd); + y2milestone ("Output: %1", out); + string total_str = out["stdout"]:""; + total_str = splitstring(total_str, "\n")[1]:""; + live_size = tointeger (filter (string s, splitstring (total_str, " "), {return s != "";})[2]:"0"); + +/* Using df-based progress estimation, is rather faster + may be less precise + see bnc#555288 string cmd = sformat ("du -x -B 1024 -s %1", "/"); y2milestone ("Executing %1", cmd); map out = (map)SCR::Execute (.target.bash_output, cmd); y2milestone ("Output: %1", out); string total_str = out["stdout"]:""; live_size = tointeger (total_str); +*/ if (live_size == 0) live_size = 1024*1024; // 1 GB is a good approximation } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.20.0/src/clients/inst_proposal.ycp new/yast2-installation-2.20.1/src/clients/inst_proposal.ycp --- old/yast2-installation-2.20.0/src/clients/inst_proposal.ycp 2009-01-23 15:16:12.000000000 +0100 +++ new/yast2-installation-2.20.1/src/clients/inst_proposal.ycp 2010-11-18 12:42:59.000000000 +0100 @@ -7,7 +7,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Lukas Ocilka <locilka(a)suse.cz> * - * $Id: inst_proposal.ycp 54862 2009-01-21 14:29:42Z locilka $ + * $Id: inst_proposal.ycp 62866 2010-11-18 10:42:59Z jsrain $ * * Create and display reasonable proposal for basic * installation and call sub-workflows as required @@ -1167,7 +1167,11 @@ // Some proposal module can change it while called SetNextButton(); - input = Wizard::UserInput(); + input = UI::UserInput(); + + if ( input == `accept ) return `next; + if ( input == `cancel ) return `abort; + y2milestone("Proposal - UserInput: '%1'", input); richtext_busy_cursor(`id(`proposal ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.20.0/src/modules/ImageInstallation.ycp new/yast2-installation-2.20.1/src/modules/ImageInstallation.ycp --- old/yast2-installation-2.20.0/src/modules/ImageInstallation.ycp 2010-09-30 18:20:26.000000000 +0200 +++ new/yast2-installation-2.20.1/src/modules/ImageInstallation.ycp 2010-11-18 16:44:10.000000000 +0100 @@ -892,12 +892,24 @@ integer progress_start, integer progress_finish) { + string cmd = sformat ("df -P -k %1", from); + y2milestone ("Executing %1", cmd); + map out = (map)SCR::Execute (.target.bash_output, cmd); + y2milestone ("Output: %1", out); + string total_str = out["stdout"]:""; + total_str = splitstring(total_str, "\n")[1]:""; + integer total_mb = tointeger (filter (string s, splitstring (total_str, " "), {return s != "";})[2]:"0"); + +/* Using df-based progress estimation, is rather faster + may be less precise + see bnc#555288 string cmd = sformat ("du -x -B 1048576 -s %1", from); y2milestone ("Executing %1", cmd); map out = (map)SCR::Execute (.target.bash_output, cmd); y2milestone ("Output: %1", out); string total_str = out["stdout"]:""; integer total_mb = tointeger (total_str); +*/ if (total_mb == 0) total_mb = 1024*1024*1024; // should be big enough ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 openssh for openSUSE:Factory
by root＠hilbert.suse.de 18 Nov '10

18 Nov '10

Hello community, here is the log from the commit of package openssh for openSUSE:Factory checked in at Thu Nov 18 17:45:04 CET 2010. -------- --- openssh/openssh.changes 2010-11-02 14:29:50.000000000 +0100 +++ openssh/openssh.changes 2010-11-16 15:46:19.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 16 14:45:14 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Use upstream oom_adj is deprecated patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- openssh-deprecated-oom_adj.patch New: ---- openssh-linux-new-oomkill.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssh-askpass-gnome.spec ++++++ --- /var/tmp/diff_new_pack.9hlh2b/_old 2010-11-18 17:44:18.000000000 +0100 +++ /var/tmp/diff_new_pack.9hlh2b/_new 2010-11-18 17:44:18.000000000 +0100 @@ -23,7 +23,7 @@ License: BSD3c(or similar) Group: Productivity/Networking/SSH Version: 5.6p1 -Release: 5 +Release: 6 Requires: openssh = %{version} openssh-askpass = %{version} AutoReqProv: on Summary: A GNOME-Based Passphrase Dialog for OpenSSH ++++++ openssh.spec ++++++ --- /var/tmp/diff_new_pack.9hlh2b/_old 2010-11-18 17:44:18.000000000 +0100 +++ /var/tmp/diff_new_pack.9hlh2b/_new 2010-11-18 17:44:18.000000000 +0100 @@ -30,7 +30,7 @@ Conflicts: nonfreessh AutoReqProv: on Version: 5.6p1 -Release: 5 +Release: 6 %define xversion 1.2.4.1 Summary: Secure Shell Client and Server (Remote Login Program) Url: http://www.openssh.com/ @@ -63,7 +63,7 @@ Patch17: %{name}-%{version}-homechroot.patch Patch18: %{name}-%{version}-sshconfig-knownhostschanges.diff Patch19: %{name}-%{version}-host_ident.diff -Patch20: openssh-deprecated-oom_adj.patch +Patch20: openssh-linux-new-oomkill.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package askpass ++++++ openssh-linux-new-oomkill.patch ++++++ Index: openbsd-compat/port-linux.c =================================================================== RCS file: /home/dtucker/openssh/cvs/openssh/openbsd-compat/port-linux.c,v retrieving revision 1.9 diff -u -p -r1.9 port-linux.c --- openbsd-compat/port-linux.c 10 Sep 2010 00:30:25 -0000 1.9 +++ openbsd-compat/port-linux.c 16 Nov 2010 05:10:13 -0000 @@ -208,14 +208,21 @@ ssh_selinux_change_context(const char *n #endif /* WITH_SELINUX */ #ifdef LINUX_OOM_ADJUST -#define OOM_ADJ_PATH "/proc/self/oom_adj" /* - * The magic "don't kill me", as documented in eg: + * The magic "don't kill me" values, old and new, as documented in eg: * http://lxr.linux.no/#linux+v2.6.32/Documentation/filesystems/proc.txt + * http://lxr.linux.no/#linux+v2.6.36/Documentation/filesystems/proc.txt */ -#define OOM_ADJ_NOKILL -17 static int oom_adj_save = INT_MIN; +static char *oom_adj_path = NULL; +struct { + char *path; + int value; +} oom_adjust[] = { + {"/proc/self/oom_score_adj", -1000}, /* new values, 2.6.36 and up */ + {"/proc/self/oom_adj", -17}, /* old values, 2.6.35 and down */ +}; /* * Tell the kernel's out-of-memory killer to avoid sshd. @@ -224,23 +231,31 @@ static int oom_adj_save = INT_MIN; void oom_adjust_setup(void) { + int i, value; FILE *fp; debug3("%s", __func__); - if ((fp = fopen(OOM_ADJ_PATH, "r+")) != NULL) { - if (fscanf(fp, "%d", &oom_adj_save) != 1) - verbose("error reading %s: %s", OOM_ADJ_PATH, strerror(errno)); - else { - rewind(fp); - if (fprintf(fp, "%d\n", OOM_ADJ_NOKILL) <= 0) - verbose("error writing %s: %s", - OOM_ADJ_PATH, strerror(errno)); - else - verbose("Set %s from %d to %d", - OOM_ADJ_PATH, oom_adj_save, OOM_ADJ_NOKILL); + for (i = 0; i < 2; i++) { + oom_adj_path = oom_adjust[i].path; + value = oom_adjust[i].value; + if ((fp = fopen(oom_adj_path, "r+")) != NULL) { + if (fscanf(fp, "%d", &oom_adj_save) != 1) + verbose("error reading %s: %s", oom_adj_path, + strerror(errno)); + else { + rewind(fp); + if (fprintf(fp, "%d\n", value) <= 0) + verbose("error writing %s: %s", + oom_adj_path, strerror(errno)); + else + verbose("Set %s from %d to %d", + oom_adj_path, oom_adj_save, value); + } + fclose(fp); + return; } - fclose(fp); } + oom_adj_path = NULL; } /* Restore the saved OOM adjustment */ @@ -250,13 +265,14 @@ oom_adjust_restore(void) FILE *fp; debug3("%s", __func__); - if (oom_adj_save == INT_MIN || (fp = fopen(OOM_ADJ_PATH, "w")) == NULL) + if (oom_adj_save == INT_MIN || oom_adj_save == NULL || + (fp = fopen(oom_adj_path, "w")) == NULL) return; if (fprintf(fp, "%d\n", oom_adj_save) <= 0) - verbose("error writing %s: %s", OOM_ADJ_PATH, strerror(errno)); + verbose("error writing %s: %s", oom_adj_path, strerror(errno)); else - verbose("Set %s to %d", OOM_ADJ_PATH, oom_adj_save); + verbose("Set %s to %d", oom_adj_path, oom_adj_save); fclose(fp); return; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 cpanspec for openSUSE:Factory
by root＠hilbert.suse.de 18 Nov '10

18 Nov '10

Hello community, here is the log from the commit of package cpanspec for openSUSE:Factory checked in at Thu Nov 18 17:43:08 CET 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ cpanspec/cpanspec.changes 2010-11-18 11:27:29.000000000 +0100 @@ -0,0 +1,87 @@ +------------------------------------------------------------------- +Thu Nov 18 10:26:58 UTC 2010 - chris(a)computersalat.de + +- removed suse-version patch + +------------------------------------------------------------------- +Thu Nov 11 23:33:51 UTC 2010 - chris(a)computersalat.de + +- added doc-ignore patch + +------------------------------------------------------------------- +Thu Oct 21 20:23:56 UTC 2010 - chris(a)computersalat.de + +- stick on version 1.78 + o removed .02suse from version (Summary is telling the whole truth) + o disabled suse-version patch + +------------------------------------------------------------------- +Thu Aug 26 18:11:43 UTC 2010 - jw(a)novell.com + +- bumped version number to 1.78.2suse + Second patch release, specific to SUSE. + Not sure if this still works for fedora. + +- recognize .bz2 files too. + And made tar, ZIP, gz, bz2 suffix case insensitive. + +- call 'osc vc' with specfile basename, to avoid errors + when current dir has two. + +------------------------------------------------------------------- +Mon Aug 9 08:24:37 UTC 2010 - chris(a)computersalat.de + +- reworked patch + o added parallel build for Build.PL build flags=... + +------------------------------------------------------------------- +Thu Jul 15 08:48:14 UTC 2010 - chris(a)computersalat.de + +- fix noarch stuff + +------------------------------------------------------------------- +Tue Jul 13 11:55:20 UTC 2010 - chris(a)computersalat.de + +- added cpan_name +- fixed Module::Build if usebuildpl + +------------------------------------------------------------------- +Thu Jun 3 20:34:08 UTC 2010 - chris(a)computersalat.de + +- reworked patch + o if usebuildpl > BuildReq perl(Module::Build) +- fix Url + +------------------------------------------------------------------- +Sun Apr 4 15:27:30 UTC 2010 - chris(a)computersalat.de + +- reworked patch + o if we "Require perl = perl_version" then + we should have "BuildRequires perl" every time, cause changing + perl version will then initiate a rebuild + +------------------------------------------------------------------- +Fri Mar 5 23:40:48 UTC 2010 - chris(a)computersalat.de + +- reworked cpanspec-suse patch + +------------------------------------------------------------------- +Wed Feb 10 12:14:34 UTC 2010 - coolo(a)novell.com + +- generate the file list also for Build.PL + +------------------------------------------------------------------- +Wed Feb 10 10:36:36 UTC 2010 - coolo(a)novell.com + +- do not use epoches, suse doesn't use them + +------------------------------------------------------------------- +Tue Feb 9 16:18:35 UTC 2010 - coolo(a)novell.com + +- adapt to suse policies + +------------------------------------------------------------------- +Tue Feb 9 13:39:20 UTC 2010 - coolo(a)novell.com + +- initial package created by cpanspec + calling whatdependson for head-i586 New: ---- cpanspec-1.78.tar.gz cpanspec-suse.patch cpanspec.changes cpanspec.spec doc-ignore.patch osc-vc-spec.patch suffix-match.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cpanspec.spec ++++++ # # spec file for package cpanspec (Version 1.78) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: cpanspec Version: 1.78 Release: 2 %define tar_version 1.78 Summary: Generate a SUSE spec file for a CPAN module License: GPL+ or Artistic Group: Development/Languages/Perl Url: http://sourceforge.net/projects/cpanspec/ Source0: http://www.cpan.org/modules/by-module/cpanspec/cpanspec-%{tar_version}.tar.… Patch0: cpanspec-suse.patch Patch2: suffix-match.patch Patch3: osc-vc-spec.patch Patch4: doc-ignore.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: perl(Archive::Zip) BuildRequires: perl(File::Basename) BuildRequires: perl(FileHandle) BuildRequires: perl(Getopt::Long) BuildRequires: perl(locale) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(Parse::CPAN::Packages) BuildRequires: perl(POSIX) BuildRequires: perl(Text::Autoformat) BuildRequires: perl(YAML) Requires: perl(Archive::Zip) Requires: perl(File::Basename) Requires: perl(FileHandle) Requires: perl(Getopt::Long) Recommends: perl(IO::Uncompress::Bunzip2) Requires: perl(locale) Requires: perl(LWP::UserAgent) Requires: perl(Parse::CPAN::Packages) Requires: perl(POSIX) Requires: perl(Text::Autoformat) Requires: perl(YAML) %description cpanspec will generate a SUSE spec file to build a rpm from a CPAN-style Perl module distribution. %prep %setup -q -n cpanspec-%{tar_version} %patch0 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %build %{__perl} Build.PL installdirs=vendor ./Build %check ./Build test %install ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Artistic BUGS Changes COPYING TODO %_bindir/cpanget %_bindir/cpanspec %_mandir/man1/cpanspec.1.gz %changelog ++++++ cpanspec-suse.patch ++++++ --- cpanspec | 151 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 84 insertions(+), 67 deletions(-) Index: cpanspec-1.78/cpanspec =================================================================== --- cpanspec-1.78.orig/cpanspec +++ cpanspec-1.78/cpanspec @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/perl # # cpanspec - Generate a spec file for a CPAN module # @@ -554,13 +554,6 @@ my $prefix=$noprefix ? "" : "perl-"; $packager=$packager || `rpm --eval '\%packager'`; -chomp $packager; - -if (!$packager or $packager eq "\%packager") { - die "\%packager not defined in ~/.rpmmacros." - . " Please add or use --packager option.\n"; -} - our %corelist; my $rpm=new FileHandle "rpm -q --provides perl|" @@ -635,9 +628,9 @@ for my $file (@args) { if ($type eq 'tar') { my $f=$file; if ($file=~/\.bz2$/) { - eval { - use IO::Uncompress::Bunzip2; - }; + #eval { + # use IO::Uncompress::Bunzip2; + #}; if ($@) { warn "Failed to load IO::Uncompress::Bunzip2: $@\n"; @@ -947,36 +940,64 @@ for my $file (@args) { } print $spec <<END; +# +# spec file for package $prefix$name (Version $version) +# +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +END + + print $spec <<END; Name: $prefix$name +%define cpan_name $name +Summary: $summary Version: $version -Release: $release$disttag +Release: $release END print $spec "Epoch: $epoch\n" if (defined($epoch)); print $spec <<END; -Summary: $summary License: $license -Group: Development/Libraries -URL: $url -Source0: $source -BuildRoot: \%{_tmppath}/\%{name}-\%{version}-\%{release}-root-\%(\%{__id_u} -n) +Group: Development/Libraries/Perl +Url: $url +#Source: $source +Source: \%{cpan_name}-\%{version}.tar.bz2 END printf $spec "%-16s%s\n", "BuildArch:", "noarch" if ($noarch); - if (defined($requires{perl})) { - $build_requires{perl}=$build_requires{perl} || $requires{perl}; - delete $requires{perl}; - } + print $spec <<END; +BuildRoot: \%{_tmppath}/\%{name}-\%{version}-build +BuildRequires: perl +END - if (defined($build_requires{perl})) { - printf $spec "%-16s%s >= %s\n", "BuildRequires:", "perl", - (($build_requires{perl} lt "5.6.0" ? "0:" : "1:") - . $build_requires{perl}) if $build_requires{perl}; - delete $build_requires{perl}; + if ($usebuildpl) { + print $spec <<END; +BuildRequires: perl(Module::Build) +END } + print $spec <<END; +%if 0%{?suse_version} < 1120 +BuildRequires: perl-macros +%endif +END + for my $dep (keys(%requires)) { $build_requires{$dep}=$build_requires{$dep} || $requires{$dep}; } @@ -1004,6 +1025,10 @@ END printf $spec "%-16s%s\n", "BuildRequires:", $dep; } + print $spec <<END; +Requires: perl = %{perl_version} +END + for my $dep (sort(keys(%requires))) { next if (!$compat and exists($corelist{$dep})); printf $spec "%-16s%s", "Requires:", "perl($dep)"; @@ -1015,11 +1040,6 @@ END printf $spec "%-16s%s\n", "Requires:", $dep; } - if (!$compat) { - print $spec <<END; -Requires: perl(:MODULE_COMPAT_\%(eval "`\%{__perl} -V:version`"; echo \$version)) -END - } for my $prov (@add_provides) { printf $spec "%-16s%s\n", "Provides:", $prov; @@ -1044,6 +1064,7 @@ END } my $buildpath=$path; + $buildpath=~s/$name/\%{cpan_name}/; $buildpath=~s/$version/\%{version}/; print $spec <<END; @@ -1085,7 +1106,8 @@ END if ($usebuildpl) { print $spec <<END; \%{__perl} Build.PL installdirs=vendor@{[$noarch ? '' : qq{ optimize="$macro{optimize}"} ]} -./Build +./Build build flags=\%{?_smp_mflags} + END } else { print $spec <<END; @@ -1097,39 +1119,49 @@ END if ($compat and !$noarch); print $spec <<END; -make \%{?_smp_mflags} +\%{__make} \%{?_smp_mflags} + +END + } + + print $spec <<END; +\%check@{[($compat ? ' || :' : '')]} END + if ($usebuildpl) { + print $spec "./Build test\n"; + } else { + print $spec "\%{__make} test\n"; } + print $spec <<END; \%install -rm -rf $macro{buildroot} - END if ($usebuildpl) { print $spec "./Build install destdir=$macro{buildroot} create_packlist=0\n"; } else { + if ($noarch) { print $spec <<END; -make pure_install PERL_INSTALL_ROOT=$macro{buildroot} - -find $macro{buildroot} -type f -name .packlist -exec rm -f {} \\; +%perl_make_install +# do not perl_process_packlist (noarch) +# remove .packlist file +%{__rm} -rf \$RPM_BUILD_ROOT%perl_vendorarch +# remove perllocal.pod file +%{__rm} -rf \$RPM_BUILD_ROOT%perl_archlib END - } - - if (!$noarch) { + } else { print $spec <<END; -find $macro{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \\; +%perl_make_install +%perl_process_packlist END -} + } + } print $spec <<END; -find $macro{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \\; - -\%{_fixperms} $macro{buildroot}/* - +%perl_gen_filelist END if ($addlicense and !grep /copying|artistic|copyright|license/i, @doc) { @@ -1143,22 +1175,13 @@ END } print $spec <<END; -\%check@{[($compat ? ' || :' : '')]} -END - if ($usebuildpl) { - print $spec "./Build test\n"; - } else { - print $spec "make test\n"; - } - - print $spec <<END; \%clean -rm -rf $macro{buildroot}@{[ +\%{__rm} -rf $macro{buildroot}@{[ (@filter_requires ? ' %{__perl_requires}' : '') . (@filter_provides ? ' %{__perl_provides}' : '')]} -\%files +\%files -f \%{name}.files \%defattr(-,root,root,-) \%doc @doc END @@ -1168,18 +1191,9 @@ END # FIXME - How do we auto-detect man pages? } - if ($noarch) { - print $spec "$lib/*\n"; - } else { - print $spec "$lib/auto/*\n$lib/" . (split /::/, $module)[0] . "*\n"; - } - print $spec <<END; -\%{_mandir}/man3/* \%changelog -* $date $packager $version-$release -- Specfile autogenerated by $NAME $VERSION. END $spec->close(); @@ -1187,6 +1201,9 @@ END build_rpm($specfile) if ($buildsrpm or $buildrpm); push(@processed, $module); + + system("osc vc -m 'initial package $version + * created by $NAME $VERSION'"); } # vi: set ai et: ++++++ doc-ignore.patch ++++++ diff -ruN cpanspec-1.78-orig/cpanspec cpanspec-1.78/cpanspec --- cpanspec-1.78-orig/cpanspec 2009-01-16 21:35:55.000000000 +0100 +++ cpanspec-1.78/cpanspec 2010-11-12 00:31:28.000000000 +0100 @@ -722,6 +722,7 @@ and $_ ne "MANIFEST.SKIP" and $_ ne "INSTALL" and $_ ne "SIGNATURE" + and $_ ne "META.json" and $_ ne "META.yml" and $_ ne "NINJA" and $_ ne "configure" @@ -733,6 +734,8 @@ and $_ ne "t" and $_ ne "inc" and $_ ne "autobuild.sh" + and $_ ne "perlcriticrc" + and $_ ne "perltidyrc" and $_ ne "pm_to_blib" and $_ ne "install.sh" } @files; ++++++ osc-vc-spec.patch ++++++ --- cpanspec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: cpanspec-1.78/cpanspec =================================================================== --- cpanspec-1.78.orig/cpanspec +++ cpanspec-1.78/cpanspec @@ -1202,8 +1202,10 @@ END push(@processed, $module); + (my $basename = $specfile) =~ s{\.spec$}{}; + verbose "Writing $basename.changes"; system("osc vc -m 'initial package $version - * created by $NAME $VERSION'"); + * created by $NAME $VERSION' $basename"); } # vi: set ai et: ++++++ suffix-match.patch ++++++ --- cpanspec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) Index: cpanspec-1.78/cpanspec =================================================================== --- cpanspec-1.78.orig/cpanspec +++ cpanspec-1.78/cpanspec @@ -573,15 +573,15 @@ my @processed=(); for my $file (@args) { my ($name,$version,$type); - if ($file =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.(tar)\.(?:gz|bz2)$/) { + if ($file =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.(tar)\.(?:gz|bz2)$/i) { $name=$1; $version=$2; $type=$3; - } elsif ($file =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.tgz$/) { + } elsif ($file =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.tgz$/i) { $name=$1; $version=$2; $type = 'tar'; - } elsif ($file =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.(zip)$/) { + } elsif ($file =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.(zip)$/i) { $name=$1; $version=$2; $type=$3; @@ -604,11 +604,11 @@ for my $file (@args) { $name=$d->dist(); $version=$d->version(); $version=~s/^v\.?//; - if ($file =~ /\.(tar)\.gz$/) { + if ($file =~ /\.(tar)\.(?:gz|bz2)$/i) { $type=$1; - } elsif ($file =~ /\.tgz$/) { + } elsif ($file =~ /\.tgz$/i) { $type='tar'; - } elsif ($file =~ /\.(zip)$/) { + } elsif ($file =~ /\.(zip)$/i) { $type=$1; } else { warn "Failed to parse '$file', skipping...\n"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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