November 2010 - openSUSE Commits - openSUSE Mailing Lists

commit perl-XML-Simple for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '10

30 Nov '10

Hello community, here is the log from the commit of package perl-XML-Simple for openSUSE:Factory checked in at Tue Nov 30 15:43:32 CET 2010. -------- --- perl-XML-Simple/perl-XML-Simple.changes 2007-10-08 10:01:01.000000000 +0200 +++ perl-XML-Simple/perl-XML-Simple.changes 2010-11-29 20:01:02.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 29 18:32:29 UTC 2010 - coolo(a)novell.com + +- remove /var/adm/perl-modules + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-XML-Simple.spec ++++++ --- /var/tmp/diff_new_pack.X9XWvK/_old 2010-11-30 15:43:10.000000000 +0100 +++ /var/tmp/diff_new_pack.X9XWvK/_new 2010-11-30 15:43:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-XML-Simple (Version 2.18) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,12 +21,12 @@ Name: perl-XML-Simple BuildRequires: perl-XML-Parser Version: 2.18 -Release: 63 +Release: 71 Requires: perl-XML-Parser Requires: perl = %{perl_version} AutoReqProv: on Group: Development/Libraries/Perl -License: Artistic License +License: Artistic Url: http://cpan.org/modules/by-module/XML/ Summary: Easy API to read/write XML (Perl module) Source: http://www.cpan.org/authors/id/G/GR/GRANTM/XML-Simple-%{version}.tar.bz2 @@ -64,6 +64,5 @@ %doc %{_mandir}/man?/* %{perl_vendorlib}/XML %{perl_vendorarch}/auto/XML -/var/adm/perl-modules/%{name} %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 perl-Clone for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '10

30 Nov '10

Hello community, here is the log from the commit of package perl-Clone for openSUSE:Factory checked in at Tue Nov 30 15:42:57 CET 2010. -------- --- perl-Clone/perl-Clone.changes 2010-10-19 10:45:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Clone/perl-Clone.changes 2010-11-26 17:45:28.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 26 16:44:33 UTC 2010 - chris(a)computersalat.de + +- recreated by cpanspec 1.78 +- bzipped Source + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Clone-0.31.tar.gz New: ---- Clone-0.31.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Clone.spec ++++++ --- /var/tmp/diff_new_pack.fUd6oR/_old 2010-11-30 15:42:35.000000000 +0100 +++ /var/tmp/diff_new_pack.fUd6oR/_new 2010-11-30 15:42:35.000000000 +0100 @@ -19,55 +19,63 @@ Name: perl-Clone -License: Artistic -Group: Development/Libraries/Perl -Url: http://cpan.org/ -Requires: perl = %{perl_version} -AutoReqProv: on +%define cpan_name Clone Summary: Recursively copy Perl datatypes Version: 0.31 -Release: 6 -Source: http://cpan.org/modules/by-module/Clone/Clone-%{version}.tar.gz +Release: 7 +License: GPL+ or Artistic +Group: Development/Libraries/Perl +Url: http://search.cpan.org/dist/Clone/ +#Source: http://www.cpan.org/authors/id/R/RD/RDF/Clone-0.31.tar.gz +Source: %{cpan_name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl +%if 0%{?suse_version} < 1120 +BuildRequires: perl-macros +%endif +Requires: perl = %{perl_version} %description This module provides a clone() method which makes recursive copies of -nested hash, array, scalar and reference types, including tied -variables and objects. - - +nested hash, array, scalar and reference types, including tied variables +and objects. -Authors: --------- - Ray Finch <rdf at cpan dot org> +For a slower, but more flexible solution see Storable's dclone(). %prep -%setup -q -n Clone-%{version} +%setup -q -n %{cpan_name}-%{version} +### rpmlint: +# spurious-executable-perm +# script-without-shebang +%{__chmod} 0644 Changes *.{xs,pm} %build -chmod 644 Changes -perl Makefile.PL +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags} %check -make test +%{__make} test %install %perl_make_install +### since 11.4 perl_process_packlist +### removes .packlist, perllocal.pod files +%if 0%{?suse_version} > 1130 %perl_process_packlist +%else +# do not perl_process_packlist +# remove .packlist file +%{__rm} -f $RPM_BUILD_ROOT%perl_vendorarch/auto/Clone/.packlist +# remove perllocal.pod file +%{__rm} -f $RPM_BUILD_ROOT%perl_archlib/perllocal.pod +%endif +%perl_gen_filelist %clean -rm -rf ${RPM_BUILD_ROOT} +%{__rm} -rf $RPM_BUILD_ROOT -%files -%defattr(-, root, root) +%files -f %{name}.files +%defattr(-,root,root,-) %doc Changes -%{perl_vendorarch}/Clone.pm -%dir %{perl_vendorarch}/auto/Clone -%{perl_vendorarch}/auto/Clone/.packlist -%{perl_vendorarch}/auto/Clone/* -%{_mandir}/man3/Clone.3pm.gz -/var/adm/perl-modules/%{name} %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 for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '10

30 Nov '10

Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Tue Nov 30 15:42:51 CET 2010. -------- --- xorg-x11/xorg-x11.changes 2010-11-25 18:43:12.000000000 +0100 +++ xorg-x11/xorg-x11.changes 2010-11-27 03:41:30.000000000 +0100 @@ -1,0 +2,8 @@ +Sat Nov 27 02:28:46 UTC 2010 - sndirsch(a)novell.com + +- xcalc 1.0.4.1 + * This brown-paper-bag release just rebuilds the tarballs to + include the correct install-sh from the autotools instead of + the broken one in the 1.0.4 tarballs. Sorry about that. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xcalc-1.0.4.tar.bz2 New: ---- xcalc-1.0.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.qxZAlX/_old 2010-11-30 15:42:30.000000000 +0100 +++ /var/tmp/diff_new_pack.qxZAlX/_new 2010-11-30 15:42:30.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: bison Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 34 +Release: 35 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -62,7 +62,7 @@ Source27: x11perf-1.5.2.tar.bz2 Source28: xauth-1.0.5.tar.bz2 Source29: xbiff-1.0.2.tar.bz2 -Source30: xcalc-1.0.4.tar.bz2 +Source30: xcalc-1.0.4.1.tar.bz2 Source31: xclipboard-1.1.1.tar.bz2 Source32: xclock-1.0.5.tar.bz2 Source33: xcmsdb-1.0.3.tar.bz2 ++++++ xcalc-1.0.4.tar.bz2 -> xcalc-1.0.4.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.0.4/ChangeLog new/xcalc-1.0.4.1/ChangeLog --- old/xcalc-1.0.4/ChangeLog 2010-11-25 00:58:39.000000000 +0100 +++ new/xcalc-1.0.4.1/ChangeLog 2010-11-26 22:56:02.000000000 +0100 @@ -1,3 +1,14 @@ +commit 2755eae3be5fc239da792c46a10426281ee77b85 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Nov 26 13:53:42 2010 -0800 + + xcalc 1.0.4.1 + + Just respinning the tarballs with the correct install-sh instead of the + broken copy accidentally included in the 1.0.4 tarballs. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + commit 8245b9f8451b92a1aaa7a3520114a4afdd37c2e8 Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> Date: Wed Nov 24 15:58:04 2010 -0800 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.0.4/configure new/xcalc-1.0.4.1/configure --- old/xcalc-1.0.4/configure 2010-11-25 00:58:26.000000000 +0100 +++ new/xcalc-1.0.4.1/configure 2010-11-26 22:55:29.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for xcalc 1.0.4. +# Generated by GNU Autoconf 2.68 for xcalc 1.0.4.1. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -561,8 +561,8 @@ # Identity of this package. PACKAGE_NAME='xcalc' PACKAGE_TARNAME='xcalc' -PACKAGE_VERSION='1.0.4' -PACKAGE_STRING='xcalc 1.0.4' +PACKAGE_VERSION='1.0.4.1' +PACKAGE_STRING='xcalc 1.0.4.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1289,7 +1289,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 xcalc 1.0.4 to adapt to many kinds of systems. +\`configure' configures xcalc 1.0.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1359,7 +1359,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xcalc 1.0.4:";; + short | recursive ) echo "Configuration of xcalc 1.0.4.1:";; esac cat <<\_ACEOF @@ -1468,7 +1468,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xcalc configure 1.0.4 +xcalc configure 1.0.4.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1679,7 +1679,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xcalc $as_me 1.0.4, which was +It was created by xcalc $as_me 1.0.4.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2499,7 +2499,7 @@ # Define the identity of the package. PACKAGE='xcalc' - VERSION='1.0.4' + VERSION='1.0.4.1' cat >>confdefs.h <<_ACEOF @@ -5321,7 +5321,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xcalc $as_me 1.0.4, which was +This file was extended by xcalc $as_me 1.0.4.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5387,7 +5387,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xcalc config.status 1.0.4 +xcalc config.status 1.0.4.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.0.4/configure.ac new/xcalc-1.0.4.1/configure.ac --- old/xcalc-1.0.4/configure.ac 2010-11-25 00:57:51.000000000 +0100 +++ new/xcalc-1.0.4.1/configure.ac 2010-11-26 22:53:30.000000000 +0100 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xcalc], [1.0.4], +AC_INIT([xcalc], [1.0.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xcalc]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.0.4/install-sh new/xcalc-1.0.4.1/install-sh --- old/xcalc-1.0.4/install-sh 2010-11-20 19:54:55.000000000 +0100 +++ new/xcalc-1.0.4.1/install-sh 2010-11-26 22:55:30.000000000 +0100 @@ -136,17 +136,21 @@ -d) dir_arg=true;; + -g) chgrpcmd="$chgrpprog $2" shift;; + --help) echo "$usage"; exit $?;; -m) mode=$2 case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 exit 1;; esac shift;; + -o) chowncmd="$chownprog $2" shift;; -s) stripcmd=$stripprog;; @@ -156,10 +160,12 @@ -T) no_target_directory=true;; + --version) echo "$0 $scriptversion"; exit $?;; --) shift break;; + -*) echo "$0: invalid option: $1" >&2 exit 1;; *) break;; @@ -167,12 +173,15 @@ shift done +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $@. for arg do if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" shift # fnord fi shift # arg @@ -206,12 +215,14 @@ else u_plus_rw='% 200' fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then u_plus_rw= else u_plus_rw=,u+rw fi + cp_umask=$mode$u_plus_rw;; esac fi @@ -229,7 +240,11 @@ dstdir_status=$? else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 exit 1 fi @@ -248,15 +263,19 @@ # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then + echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst + dst=$dstdir/`basename "$src"` dstdir_status=0 else # Prefer dirname, but fall back on a substitute if dirname fails. dstdir=` (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ X"$dst" : 'X$//$[^/]' \| \ + X"$dst" : 'X$//$$' \| \ X"$dst" : 'X$/$' \| . 2>/dev/null || echo X"$dst" | sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ @@ -291,12 +310,15 @@ # Create intermediate dirs using mode 755 as modified by the umask. # This is like FreeBSD 'install' as of 1997-10-28. umask=`umask` + case $stripcmd.$umask in # Optimize common cases. *[2367][2367]) mkdir_umask=$umask;; .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; *[0-7]) mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 `;; *) mkdir_umask=$umask,go-w;; esac @@ -316,8 +338,11 @@ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 then if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. @@ -330,11 +355,14 @@ d????-?--*) different_mode=755;; *) false;; esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" } } then posix_mkdir=: fi + rmdir "$tmpdir/d" "$tmpdir" else # Remove any dirs left behind by ancient mkdir implementations. rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null @@ -346,6 +374,7 @@ if $posix_mkdir && ( umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -376,11 +405,13 @@ do test -z "$d" && continue + prefix=$prefix$d if test -d "$prefix"; then prefixes= else if $posix_mkdir; then (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 else @@ -388,6 +419,7 @@ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; *) qprefix=$prefix;; esac + prefixes="$prefixes '$qprefix'" fi fi prefix=$prefix/ @@ -396,6 +428,7 @@ if test -n "$prefixes"; then # Don't fail if two instances are running concurrently. (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || test -d "$dstdir" || exit 1 obsolete_mkdir_used=true fi @@ -403,19 +436,32 @@ fi if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 else # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # # If any of these fail, we abort the whole thing. If we want to # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && @@ -424,12 +470,17 @@ eval "$initialize_posix_glob" && $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && $posix_glob set +f && + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then rm -f "$dsttmp" else # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || # The rename failed, perhaps because mv can't rename something else # to itself, or perhaps because mv is so ancient that it does not @@ -442,12 +493,17 @@ # file should still install successfully. { test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } } || + { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 } } && # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 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 perl-Class-Data-Inheritable for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '10

30 Nov '10

Hello community, here is the log from the commit of package perl-Class-Data-Inheritable for openSUSE:Factory checked in at Tue Nov 30 15:42:20 CET 2010. -------- --- perl-Class-Data-Inheritable/perl-Class-Data-Inheritable.changes 2010-10-19 10:45:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Class-Data-Inheritable/perl-Class-Data-Inheritable.changes 2010-11-24 16:27:21.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Nov 24 15:24:56 UTC 2010 - chris(a)computersalat.de + +- recreated by cpanspec 1.78 + o fix deps +- noarch pkg + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Class-Data-Inheritable.spec ++++++ --- /var/tmp/diff_new_pack.WLffsO/_old 2010-11-30 15:33:33.000000000 +0100 +++ /var/tmp/diff_new_pack.WLffsO/_new 2010-11-30 15:33:33.000000000 +0100 @@ -19,52 +19,107 @@ Name: perl-Class-Data-Inheritable +%define cpan_name Class-Data-Inheritable +Summary: Inheritable, overridable class data Version: 0.08 -Release: 57 -Requires: perl = %{perl_version} -Provides: Class-Data-Inheritable -AutoReqProv: on +Release: 58 +License: GPL+ or Artistic Group: Development/Libraries/Perl -License: Artistic -Url: http://cpan.org/modules/by-module/Class/ -Summary: Inheritable, overridable class data -Source: Class-Data-Inheritable-%{version}.tar.bz2 +Url: http://search.cpan.org/dist/Class-Data-Inheritable/ +#Source: http://www.cpan.org/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz +Source: %{cpan_name}-%{version}.tar.bz2 +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl +%if 0%{?suse_version} < 1120 +BuildRequires: perl-macros +%endif +Requires: perl = %{perl_version} %description -Class::Data::Inheritable is for creating accessor/mutators to class -data. That is, if you want to store something about your class as a -whole (instead of about a single object). This data is then inherited -by your subclasses and can be overriden. +Class::Data::Inheritable is for creating accessor/mutators to class data. +That is, if you want to store something about your class as a whole +(instead of about a single object). This data is then inherited by your +subclasses and can be overriden. + +For example: + + Pere::Ubu->mk_classdata('Suitcase'); + +will generate the method Suitcase() in the class Pere::Ubu. + +This new method can be used to get and set a piece of class data. + + Pere::Ubu->Suitcase('Red'); + $suitcase = Pere::Ubu->Suitcase; +The interesting part happens when a class inherits from Pere::Ubu: + package Raygun; + use base qw(Pere::Ubu); + + # Raygun's suitcase is Red. + $suitcase = Raygun->Suitcase; + +Raygun inherits its Suitcase class data from Pere::Ubu. + +Inheritance of class data works analogous to method inheritance. As long as +Raygun does not "override" its inherited class data (by using Suitcase() to +set a new value) it will continue to use whatever is set in Pere::Ubu and +inherit further changes: + + # Both Raygun's and Pere::Ubu's suitcases are now Blue + Pere::Ubu->Suitcase('Blue'); + +However, should Raygun decide to set its own Suitcase() it has now +"overridden" Pere::Ubu and is on its own, just like if it had overriden a +method: + + # Raygun has an orange suitcase, Pere::Ubu's is still Blue. + Raygun->Suitcase('Orange'); + +Now that Raygun has overridden Pere::Ubu futher changes by Pere::Ubu no +longer effect Raygun. + + # Raygun still has an orange suitcase, but Pere::Ubu is using Samsonite. + Pere::Ubu->Suitcase('Samsonite'); Authors: -------- - Michael G Schwern <schwern(a)pobox.com> + Original code by Damian Conway. + Maintained by Michael G Schwern until September 2005. + Now maintained by Tony Bowden. %prep -%setup -q -n Class-Data-Inheritable-%{version} +%setup -q -n %{cpan_name}-%{version} %build -perl Makefile.PL -make %{?_smp_mflags} -make test +%{__perl} Makefile.PL INSTALLDIRS=vendor +%{__make} %{?_smp_mflags} + +%check +%{__make} test %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install_vendor +%perl_make_install +### since 11.4 perl_process_packlist +### removes .packlist, perllocal.pod files +%if 0%{?suse_version} > 1130 %perl_process_packlist +%else +# do not perl_process_packlist +# remove .packlist file +%{__rm} -rf $RPM_BUILD_ROOT%perl_vendorarch +# remove perllocal.pod file +%{__rm} -f $RPM_BUILD_ROOT%perl_archlib/perllocal.pod +%endif +%perl_gen_filelist %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT -%files -%defattr(-,root,root) -%doc %{_mandir}/man?/* -%{perl_vendorlib}/Class -%{perl_vendorarch}/auto/Class -/var/adm/perl-modules/%{name} +%files -f %{name}.files +%defattr(-,root,root,-) +%doc Changes README %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 util-linux for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '10

30 Nov '10

Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at Tue Nov 30 15:42:11 CET 2010. -------- --- util-linux/util-linux.changes 2010-11-16 17:10:39.000000000 +0100 +++ util-linux/util-linux.changes 2010-11-30 13:37:57.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Nov 30 12:19:53 UTC 2010 - puzel(a)novell.com + +- update util-linux-2.17.1-mount_losetup_crypto.patch (bnc#655804) + +------------------------------------------------------------------- +Fri Nov 26 19:10:27 CET 2010 - kay.sievers(a)novell.com + +- add Provides: fsck-with-dev-lock + +------------------------------------------------------------------- +Thu Nov 25 13:37:43 CET 2010 - kay.sievers(a)novell.com + +- add 'fsck -l' option needed for systemd + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- util-linux-fsck-l-option.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.SJJH6D/_old 2010-11-30 15:36:52.000000000 +0100 +++ /var/tmp/diff_new_pack.SJJH6D/_new 2010-11-30 15:36:52.000000000 +0100 @@ -32,12 +32,13 @@ BuildRequires: zlib-devel Url: http://userweb.kernel.org/~kzak/util-linux-ng/ Supplements: filesystem(minix) +Provides: fsck-with-dev-lock = %{version} PreReq: %install_info_prereq permissions License: GPLv2+ Group: System/Base AutoReqProv: on Version: 2.18 -Release: 4 +Release: 5 Recommends: %name-lang = %{version} Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v%{version}/%name-ng-%{v… @@ -80,6 +81,7 @@ Patch4: util-linux-2.17.1-losetup-honor-documented-c-option Patch7: util-linux-swapon-btrfs-limitations Patch8: util-linux-agetty-s-option.patch +Patch9: util-linux-fsck-l-option.patch ## ## adjtimex ## @@ -187,6 +189,7 @@ %patch4 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 # cd adjtimex-* # adjtimex patches belongs here ++++++ util-linux-2.17.1-mount_losetup_crypto.patch ++++++ --- /var/tmp/diff_new_pack.SJJH6D/_old 2010-11-30 15:36:53.000000000 +0100 +++ /var/tmp/diff_new_pack.SJJH6D/_new 2010-11-30 15:36:53.000000000 +0100 @@ -40,8 +40,8 @@ Index: util-linux-ng-2.18/mount/Makefile.am =================================================================== ---- util-linux-ng-2.18.orig/mount/Makefile.am 2010-05-24 12:35:47.000000000 +0200 -+++ util-linux-ng-2.18/mount/Makefile.am 2010-07-08 14:39:01.000000000 +0200 +--- util-linux-ng-2.18.orig/mount/Makefile.am ++++ util-linux-ng-2.18/mount/Makefile.am @@ -7,7 +7,7 @@ sbin_PROGRAMS = losetup swapon dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8 @@ -53,8 +53,8 @@ hdrs_mount = fstab.h mount_mntent.h mount_constants.h \ Index: util-linux-ng-2.18/mount/lomount.c =================================================================== ---- util-linux-ng-2.18.orig/mount/lomount.c 2010-05-19 23:36:23.000000000 +0200 -+++ util-linux-ng-2.18/mount/lomount.c 2010-07-08 14:39:29.000000000 +0200 +--- util-linux-ng-2.18.orig/mount/lomount.c ++++ util-linux-ng-2.18/mount/lomount.c @@ -23,6 +23,12 @@ #include "sundries.h" #include "xmalloc.h" @@ -182,7 +182,7 @@ } } -@@ -734,20 +793,70 @@ set_loop(const char *device, const char +@@ -734,20 +793,69 @@ set_loop(const char *device, const char } #endif @@ -226,8 +226,7 @@ + + if(!loopinfo64.lo_encrypt_key_size) { + if(!keysz) { -+ if(verbose) -+ fprintf(stderr, _("please specify a key length\n")); ++ fprintf(stderr, _("please specify a key length\n")); + return 1; + } + loopinfo64.lo_encrypt_key_size = keysz>>3; @@ -265,7 +264,7 @@ } if (ioctl(fd, LOOP_SET_FD, ffd) < 0) { -@@ -897,7 +1006,13 @@ usage(void) { +@@ -897,7 +1005,13 @@ usage(void) { fprintf(stderr, _("\nOptions:\n" " -e | --encryption <type> enable data encryption with specified <name/num>\n" @@ -279,7 +278,7 @@ " -o | --offset <num> start at offset <num> into file\n" " --sizelimit <num> loop limited to only <num> bytes of the file\n" " -p | --pass-fd <num> read passphrase from file descriptor <num>\n" -@@ -910,11 +1025,14 @@ usage(void) { +@@ -910,11 +1024,14 @@ usage(void) { int main(int argc, char **argv) { char *p, *offset, *sizelimit, *encryption, *passfd, *device, *file, *assoc; @@ -294,7 +293,7 @@ uintmax_t off = 0, slimit = 0; struct option longopts[] = { { "all", 0, 0, 'a' }, -@@ -923,6 +1041,8 @@ main(int argc, char **argv) { +@@ -923,6 +1040,8 @@ main(int argc, char **argv) { { "encryption", 1, 0, 'e' }, { "find", 0, 0, 'f' }, { "help", 0, 0, 'h' }, @@ -303,7 +302,7 @@ { "associated", 1, 0, 'j' }, { "offset", 1, 0, 'o' }, { "sizelimit", 1, 0, 128 }, -@@ -939,12 +1059,13 @@ main(int argc, char **argv) { +@@ -939,12 +1058,13 @@ main(int argc, char **argv) { capacity = delete = find = all = 0; assoc = offset = sizelimit = encryption = passfd = NULL; @@ -318,7 +317,7 @@ longopts, NULL)) != -1) { switch (c) { case 'a': -@@ -969,6 +1090,12 @@ main(int argc, char **argv) { +@@ -969,6 +1089,12 @@ main(int argc, char **argv) { case 'j': assoc = optarg; break; @@ -331,7 +330,7 @@ case 'o': offset = optarg; break; -@@ -1058,8 +1185,11 @@ main(int argc, char **argv) { +@@ -1058,8 +1184,11 @@ main(int argc, char **argv) { else { if (passfd && sscanf(passfd, "%d", &pfd) != 1) usage(); @@ -346,8 +345,8 @@ printf(_("stolen loop=%s...trying again\n"), Index: util-linux-ng-2.18/mount/lomount.h =================================================================== ---- util-linux-ng-2.18.orig/mount/lomount.h 2010-02-04 12:53:56.000000000 +0100 -+++ util-linux-ng-2.18/mount/lomount.h 2010-07-08 14:38:38.000000000 +0200 +--- util-linux-ng-2.18.orig/mount/lomount.h ++++ util-linux-ng-2.18/mount/lomount.h @@ -1,5 +1,6 @@ -extern int set_loop(const char *, const char *, unsigned long long, unsigned long long, - const char *, int, int *); @@ -359,8 +358,8 @@ extern int is_loop_autoclear(const char *device); Index: util-linux-ng-2.18/mount/losetup.8 =================================================================== ---- util-linux-ng-2.18.orig/mount/losetup.8 2010-05-19 23:36:23.000000000 +0200 -+++ util-linux-ng-2.18/mount/losetup.8 2010-07-08 14:38:38.000000000 +0200 +--- util-linux-ng-2.18.orig/mount/losetup.8 ++++ util-linux-ng-2.18/mount/losetup.8 @@ -96,9 +96,18 @@ find the first unused loop device. If a argument is present, use this device. Otherwise, print its name .IP "\fB\-h, \-\-help\fP" @@ -391,8 +390,8 @@ .BR cryptsetup (8). Index: util-linux-ng-2.18/mount/mount.8 =================================================================== ---- util-linux-ng-2.18.orig/mount/mount.8 2010-06-30 10:41:35.000000000 +0200 -+++ util-linux-ng-2.18/mount/mount.8 2010-07-08 14:38:38.000000000 +0200 +--- util-linux-ng-2.18.orig/mount/mount.8 ++++ util-linux-ng-2.18/mount/mount.8 @@ -869,6 +869,15 @@ Every time the inode is modified, the i_ .B noiversion Do not increment the i_version inode field. @@ -422,8 +421,8 @@ then any loop device allocated by Index: util-linux-ng-2.18/mount/mount.c =================================================================== ---- util-linux-ng-2.18.orig/mount/mount.c 2010-06-30 12:51:09.000000000 +0200 -+++ util-linux-ng-2.18/mount/mount.c 2010-07-08 14:38:38.000000000 +0200 +--- util-linux-ng-2.18.orig/mount/mount.c ++++ util-linux-ng-2.18/mount/mount.c @@ -96,6 +96,9 @@ struct mountargs { void *data; }; @@ -517,8 +516,8 @@ /* mount -a */ Index: util-linux-ng-2.18/mount/rmd160.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.18/mount/rmd160.c 2010-07-08 14:38:38.000000000 +0200 +--- /dev/null ++++ util-linux-ng-2.18/mount/rmd160.c @@ -0,0 +1,532 @@ +/* rmd160.c - RIPE-MD160 + * Copyright (C) 1998 Free Software Foundation, Inc. @@ -1054,8 +1053,8 @@ +} Index: util-linux-ng-2.18/mount/rmd160.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.18/mount/rmd160.h 2010-07-08 14:38:38.000000000 +0200 +--- /dev/null ++++ util-linux-ng-2.18/mount/rmd160.h @@ -0,0 +1,11 @@ +#ifndef RMD160_H +#define RMD160_H @@ -1070,8 +1069,8 @@ + Index: util-linux-ng-2.18/mount/sha512.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.18/mount/sha512.c 2010-07-08 14:38:38.000000000 +0200 +--- /dev/null ++++ util-linux-ng-2.18/mount/sha512.c @@ -0,0 +1,432 @@ +/* + * sha512.c @@ -1507,8 +1506,8 @@ +#endif Index: util-linux-ng-2.18/mount/sha512.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.18/mount/sha512.h 2010-07-08 14:38:38.000000000 +0200 +--- /dev/null ++++ util-linux-ng-2.18/mount/sha512.h @@ -0,0 +1,45 @@ +/* + * sha512.h ++++++ util-linux-fsck-l-option.patch ++++++ fsck: add support for whole-disk locking (-l option) This feature allows to call multiple independent fsck instances rather than use only one "fsck -A" process. The lock uses LOCK_EX flock(2). The lock request is ignored if the whole-disk is non-rotating disk. The verbose mode (-V) provides information about disk locking. Note that "fsck -l" does not care if the device is stacked, for example if you want to call "fsck -l /dev/md0" and "fsck -l /dev/md1" then the underlying devices will not be locked. The traditional "fsck -A" does not run in parallel for stacked devices. http://pkgs.fedoraproject.org/gitweb/?p=util-linux-ng.git;a=commitdiff;h=6c… diff -up util-linux-ng-2.18/fsck/fsck.8.kzak util-linux-ng-2.18/fsck/fsck.8 --- util-linux-ng-2.18/fsck/fsck.8.kzak 2010-06-30 12:51:35.000000000 +0200 +++ util-linux-ng-2.18/fsck/fsck.8 2010-10-26 23:55:30.000000000 +0200 @@ -7,7 +7,7 @@ fsck \- check and repair a Linux file system .SH SYNOPSIS .B fsck -.RB [ \-sAVRTMNP ] +.RB [ \-lsAVRTMNP ] .RB [ \-C .RI [ fd ]] .RB [ \-t @@ -80,6 +80,17 @@ variable. Please see the file system-sp further details. .SH OPTIONS .TP +.B \-l +Lock whole-disk device by exclusive +.BR flock (2). +This option can be used with one device only (e.g. -A and -l are mutually +exclusive). This option is recommended when more +.B fsck (8) +instances are executed in the same time. The option is ignored when used for +multiple devices or for non-rotating disk. The fsck does not lock underlying +devices if executed to check stacked devices (e.g. MD or DM) -- this feature is +not implemented yet. +.TP .B \-s Serialize .B fsck @@ -200,6 +211,11 @@ If there are multiple filesystems with t fsck will attempt to check them in parallel, although it will avoid running multiple filesystem checks on the same physical disk. .sp +.B fsck +does not check stacked devices (RAIDs, dm-crypt, ...) in parallel with any other +device. See below for FSCK_FORCE_ALL_PARALLEL setting. The /sys filesystem is +used to detemine dependencies between devices. +.sp Hence, a very common configuration in .I /etc/fstab files is to set the root filesystem to have a @@ -366,10 +382,10 @@ program's behavior is affected by the fo .B FSCK_FORCE_ALL_PARALLEL If this environment variable is set, .B fsck -will attempt to run all of the specified filesystems in parallel, -regardless of whether the filesystems appear to be on the same -device. (This is useful for RAID systems or high-end storage systems -such as those sold by companies such as IBM or EMC.) +will attempt to run all of the specified filesystems in parallel, regardless of +whether the filesystems appear to be on the same device. (This is useful for +RAID systems or high-end storage systems such as those sold by companies such +as IBM or EMC.) Note that the fs_passno value is still used. .TP .B FSCK_MAX_INST This environment variable will limit the maximum number of file system diff -up util-linux-ng-2.18/fsck/fsck.c.kzak util-linux-ng-2.18/fsck/fsck.c --- util-linux-ng-2.18/fsck/fsck.c.kzak 2010-05-19 23:36:23.000000000 +0200 +++ util-linux-ng-2.18/fsck/fsck.c 2010-10-26 23:55:30.000000000 +0200 @@ -31,6 +31,8 @@ #include <sys/wait.h> #include <sys/signal.h> #include <sys/stat.h> +#include <sys/file.h> +#include <fcntl.h> #include <limits.h> #include <stdio.h> #include <ctype.h> @@ -42,6 +44,8 @@ #include <errno.h> #include <malloc.h> #include <signal.h> +#include <dirent.h> +#include <blkid.h> #include "fsprobe.h" @@ -85,6 +89,7 @@ char *devices[MAX_DEVICES]; char *args[MAX_ARGS]; int num_devices, num_args; +int lockdisk = 0; int verbose = 0; int doall = 0; int noexecute = 0; @@ -214,11 +219,97 @@ static void parse_escape(char *word) *q = 0; } +static dev_t get_disk(const char *device) +{ + struct stat st; + dev_t disk; + + if (!stat(device, &st) && + !blkid_devno_to_wholedisk(st.st_rdev, NULL, 0, &disk)) + return disk; + + return 0; +} + +static int is_irrotational_disk(dev_t disk) +{ + char path[PATH_MAX]; + FILE *f; + int rc, x; + + rc = snprintf(path, sizeof(path), + "/sys/dev/block/%d:%d/queue/rotational", + major(disk), minor(disk)); + + if (rc < 0 || rc + 1 > sizeof(path)) + return 0; + + f = fopen(path, "r"); + if (!f) + return 0; + + rc = fscanf(f, "%u", &x); + fclose(f); + + return rc == 1 ? !x : 0; +} + +static void lock_disk(struct fsck_instance *inst) +{ + dev_t disk = inst->fs->disk ? : get_disk(inst->fs->device); + char *diskname; + + if (!disk || is_irrotational_disk(disk)) + return; + + diskname = blkid_devno_to_devname(disk); + if (!diskname) + return; + + if (verbose) + printf(_("Locking disk %s ... "), diskname); + + inst->lock = open(diskname, O_CLOEXEC | O_RDONLY); + if (inst->lock >= 0) { + int rc = -1; + + /* inform users that we're waiting on the lock */ + if (verbose && + (rc = flock(inst->lock, LOCK_EX | LOCK_NB)) != 0 && + errno == EWOULDBLOCK) + printf(_("(waiting) ")); + + if (rc != 0 && flock(inst->lock, LOCK_EX) != 0) { + close(inst->lock); /* failed */ + inst->lock = -1; + } + } + + if (verbose) + printf("%s.\n", inst->lock >= 0 ? _("success") : _("failed")); + + free(diskname); + return; +} + +static void unlock_disk(struct fsck_instance *inst) +{ + if (inst->lock >= 0) { + /* explicitly unlock, don't rely on close(), maybe some library + * (e.g. liblkid) has still open the device. + */ + flock(inst->lock, LOCK_UN); + close(inst->lock); + } +} + + + static void free_instance(struct fsck_instance *i) { + if (lockdisk) + unlock_disk(i); free(i->prog); - free(i->device); - free(i->base_device); free(i); return; } @@ -240,6 +331,8 @@ static struct fs_info *create_fs_device( fs->passno = passno; fs->flags = 0; fs->next = NULL; + fs->disk = 0; + fs->stacked = 0; if (!filesys_info) filesys_info = fs; @@ -414,8 +507,7 @@ static int progress_active(NOARGS) * Execute a particular fsck program, and link it into the list of * child processes we are waiting for. */ -static int execute(const char *type, const char *device, const char *mntpt, - int interactive) +static int execute(const char *type, struct fs_info *fs, int interactive) { char *s, *argv[80], prog[80]; int argc, i; @@ -452,7 +544,7 @@ static int execute(const char *type, con } } - argv[argc++] = string_copy(device); + argv[argc++] = string_copy(fs->device); argv[argc] = 0; s = find_fsck(prog); @@ -464,12 +556,19 @@ static int execute(const char *type, con if (verbose || noexecute) { printf("[%s (%d) -- %s] ", s, num_running, - mntpt ? mntpt : device); + fs->mountpt ? fs->mountpt : fs->device); for (i=0; i < argc; i++) printf("%s ", argv[i]); printf("\n"); } + + inst->fs = fs; + inst->lock = -1; + + if (lockdisk) + lock_disk(inst); + /* Fork and execute the correct program. */ if (noexecute) pid = -1; @@ -492,8 +591,6 @@ static int execute(const char *type, con inst->pid = pid; inst->prog = string_copy(prog); inst->type = string_copy(type); - inst->device = string_copy(device); - inst->base_device = base_device(device); inst->start_time = time(0); inst->next = NULL; @@ -597,12 +694,12 @@ static struct fsck_instance *wait_one(in } else { printf(_("Warning... %s for device %s exited " "with signal %d.\n"), - inst->prog, inst->device, sig); + inst->prog, inst->fs->device, sig); status = EXIT_ERROR; } } else { printf(_("%s %s: status is %x, should never happen.\n"), - inst->prog, inst->device, status); + inst->prog, inst->fs->device, status); status = EXIT_ERROR; } inst->exit_status = status; @@ -641,7 +738,7 @@ ret_inst: instance_list = inst->next; if (verbose > 1) printf(_("Finished with %s (exit status %d)\n"), - inst->device, inst->exit_status); + inst->fs->device, inst->exit_status); num_running--; return inst; } @@ -698,7 +795,7 @@ static void fsck_device(struct fs_info * type = DEFAULT_FSTYPE; num_running++; - retval = execute(type, fs->device, fs->mountpt, interactive); + retval = execute(type, fs, interactive); if (retval) { fprintf(stderr, _("%s: Error %d while executing fsck.%s " "for %s\n"), progname, retval, type, fs->device); @@ -924,40 +1021,70 @@ static int ignore(struct fs_info *fs) return 0; } +static int count_slaves(dev_t disk) +{ + DIR *dir; + struct dirent *dp; + char dirname[PATH_MAX]; + int count = 0; + + snprintf(dirname, sizeof(dirname), + "/sys/dev/block/%u:%u/slaves/", + major(disk), minor(disk)); + + if (!(dir = opendir(dirname))) + return -1; + + while ((dp = readdir(dir)) != 0) { +#ifdef _DIRENT_HAVE_D_TYPE + if (dp->d_type != DT_UNKNOWN && dp->d_type != DT_LNK) + continue; +#endif + if (dp->d_name[0] == '.' && + ((dp->d_name[1] == 0) || + ((dp->d_name[1] == '.') && (dp->d_name[2] == 0)))) + continue; + + count++; + } + closedir(dir); + return count; +} + /* * Returns TRUE if a partition on the same disk is already being * checked. */ -static int device_already_active(char *device) +static int disk_already_active(struct fs_info *fs) { struct fsck_instance *inst; - char *base; if (force_all_parallel) return 0; -#ifdef BASE_MD - /* Don't check a soft raid disk with any other disk */ - if (instance_list && - (!strncmp(instance_list->device, BASE_MD, sizeof(BASE_MD)-1) || - !strncmp(device, BASE_MD, sizeof(BASE_MD)-1))) + if (instance_list && instance_list->fs->stacked) + /* any instance for a stacked device is already running */ return 1; -#endif - base = base_device(device); + if (!fs->disk) { + fs->disk = get_disk(fs->device); + if (fs->disk) + fs->stacked = count_slaves(fs->disk); + } + /* * If we don't know the base device, assume that the device is * already active if there are any fsck instances running. + * + * Don't check a stacked device with any other disk too. */ - if (!base) + if (!fs->disk || fs->stacked) return (instance_list != 0); + for (inst = instance_list; inst; inst = inst->next) { - if (!inst->base_device || !strcmp(base, inst->base_device)) { - free(base); + if (!inst->fs->disk || fs->disk == inst->fs->disk) return 1; - } } - free(base); return 0; } @@ -1038,7 +1165,7 @@ static int check_all(NOARGS) * already been spawned, then we need to defer * this to another pass. */ - if (device_already_active(fs->device)) { + if (disk_already_active(fs)) { pass_done = 0; continue; } @@ -1188,6 +1315,9 @@ static void PRS(int argc, char *argv[]) } } break; + case 'l': + lockdisk++; + break; case 'V': verbose++; break; @@ -1298,6 +1428,12 @@ int main(int argc, char *argv[]) if ((num_devices == 1) || (serialize)) interactive = 1; + if (lockdisk && (doall || num_devices > 1)) { + fprintf(stderr, _("%s: the -l option can be used with one " + "device only -- ignore\n"), progname); + lockdisk = 0; + } + /* If -A was specified ("check all"), do that! */ if (doall) return check_all(); diff -up util-linux-ng-2.18/fsck/fsck.h.kzak util-linux-ng-2.18/fsck/fsck.h --- util-linux-ng-2.18/fsck/fsck.h.kzak 2010-03-18 23:11:23.000000000 +0100 +++ util-linux-ng-2.18/fsck/fsck.h 2010-10-26 23:55:30.000000000 +0200 @@ -44,6 +44,8 @@ struct fs_info { int freq; int passno; int flags; + dev_t disk; + int stacked; struct fs_info *next; }; @@ -56,12 +58,12 @@ struct fs_info { struct fsck_instance { int pid; int flags; + int lock; /* flock()ed whole disk file descriptor or -1 */ int exit_status; time_t start_time; char * prog; char * type; - char * device; - char * base_device; + struct fs_info *fs; struct fsck_instance *next; }; diff -up util-linux-ng-2.18/fsck/Makefile.am.kzak util-linux-ng-2.18/fsck/Makefile.am --- util-linux-ng-2.18/fsck/Makefile.am.kzak 2010-05-24 12:33:46.000000000 +0200 +++ util-linux-ng-2.18/fsck/Makefile.am 2010-10-26 23:55:30.000000000 +0200 @@ -3,7 +3,7 @@ include $(top_srcdir)/config/include-Mak sbin_PROGRAMS = fsck dist_man_MANS = fsck.8 -fsck_SOURCES = base_device.c fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \ +fsck_SOURCES = fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \ $(top_srcdir)/lib/fsprobe.c $(top_srcdir)/lib/canonicalize.c fsck_LDADD = fsck_CFLAGS = $(AM_CFLAGS) diff -up util-linux-ng-2.18/fsck/Makefile.in.kzak util-linux-ng-2.18/fsck/Makefile.in --- util-linux-ng-2.18/fsck/Makefile.in.kzak 2010-10-26 23:56:04.000000000 +0200 +++ util-linux-ng-2.18/fsck/Makefile.in 2010-10-26 23:56:15.000000000 +0200 @@ -62,9 +62,8 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" PROGRAMS = $(sbin_PROGRAMS) -am_fsck_OBJECTS = fsck-base_device.$(OBJEXT) fsck-fsck.$(OBJEXT) \ - fsck-ismounted.$(OBJEXT) fsck-fsprobe.$(OBJEXT) \ - fsck-canonicalize.$(OBJEXT) +am_fsck_OBJECTS = fsck-fsck.$(OBJEXT) fsck-ismounted.$(OBJEXT) \ + fsck-fsprobe.$(OBJEXT) fsck-canonicalize.$(OBJEXT) fsck_OBJECTS = $(am_fsck_OBJECTS) am__DEPENDENCIES_1 = @BUILD_LIBBLKID_FALSE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) @@ -204,6 +203,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ @@ -315,7 +315,7 @@ ul_libmount_la = $(top_builddir)/shlibs/ # mount.h is generated by ./configure script and stored in build directory ul_libmount_incdir = $(ul_libmount_builddir) dist_man_MANS = fsck.8 -fsck_SOURCES = base_device.c fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \ +fsck_SOURCES = fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \ $(top_srcdir)/lib/fsprobe.c $(top_srcdir)/lib/canonicalize.c fsck_LDADD = $(am__append_1) $(am__append_3) @@ -407,7 +407,6 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsck-base_device.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsck-canonicalize.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsck-fsck.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsck-fsprobe.Po@am__quote@ @@ -437,22 +436,6 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -fsck-base_device.o: base_device.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fsck_CFLAGS) $(CFLAGS) -MT fsck-base_device.o -MD -MP -MF $(DEPDIR)/fsck-base_device.Tpo -c -o fsck-base_device.o `test -f 'base_device.c' || echo '$(srcdir)/'`base_device.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fsck-base_device.Tpo $(DEPDIR)/fsck-base_device.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='base_device.c' object='fsck-base_device.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fsck_CFLAGS) $(CFLAGS) -c -o fsck-base_device.o `test -f 'base_device.c' || echo '$(srcdir)/'`base_device.c - -fsck-base_device.obj: base_device.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fsck_CFLAGS) $(CFLAGS) -MT fsck-base_device.obj -MD -MP -MF $(DEPDIR)/fsck-base_device.Tpo -c -o fsck-base_device.obj `if test -f 'base_device.c'; then $(CYGPATH_W) 'base_device.c'; else $(CYGPATH_W) '$(srcdir)/base_device.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fsck-base_device.Tpo $(DEPDIR)/fsck-base_device.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='base_device.c' object='fsck-base_device.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fsck_CFLAGS) $(CFLAGS) -c -o fsck-base_device.obj `if test -f 'base_device.c'; then $(CYGPATH_W) 'base_device.c'; else $(CYGPATH_W) '$(srcdir)/base_device.c'; fi` - fsck-fsck.o: fsck.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fsck_CFLAGS) $(CFLAGS) -MT fsck-fsck.o -MD -MP -MF $(DEPDIR)/fsck-fsck.Tpo -c -o fsck-fsck.o `test -f 'fsck.c' || echo '$(srcdir)/'`fsck.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fsck-fsck.Tpo $(DEPDIR)/fsck-fsck.Po diff -up util-linux-ng-2.18/Makefile.am.kzak util-linux-ng-2.18/Makefile.am --- util-linux-ng-2.18/Makefile.am.kzak 2010-03-18 23:11:23.000000000 +0100 +++ util-linux-ng-2.18/Makefile.am 2010-10-26 23:55:30.000000000 +0200 @@ -30,8 +30,10 @@ SUBDIRS += mount endif if BUILD_FSCK +if BUILD_LIBBLKID SUBDIRS += fsck endif +endif ACLOCAL_AMFLAGS = -I m4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '10

30 Nov '10

Hello community, here is the log from the commit of package perl for openSUSE:Factory checked in at Tue Nov 30 15:36:30 CET 2010. -------- --- perl/perl.changes 2010-11-22 20:28:20.000000000 +0100 +++ perl/perl.changes 2010-11-30 11:23:21.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Nov 30 10:23:06 UTC 2010 - coolo(a)novell.com + +- added a new macro %perl_requires + +------------------------------------------------------------------- +Mon Nov 29 15:20:19 UTC 2010 - coolo(a)novell.com + +- simplify macro logic a bit + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl.spec ++++++ --- /var/tmp/diff_new_pack.AEJBcL/_old 2010-11-30 15:35:08.000000000 +0100 +++ /var/tmp/diff_new_pack.AEJBcL/_new 2010-11-30 15:35:08.000000000 +0100 @@ -21,7 +21,7 @@ Name: perl Summary: The Perl interpreter Version: 5.12.2 -Release: 3 +Release: 4 %define pversion 5.12.2 License: Artistic License .. ; GPLv2+ Group: Development/Languages/Perl ++++++ macros.perl ++++++ --- /var/tmp/diff_new_pack.AEJBcL/_old 2010-11-30 15:35:08.000000000 +0100 +++ /var/tmp/diff_new_pack.AEJBcL/_new 2010-11-30 15:35:08.000000000 +0100 @@ -22,17 +22,24 @@ %perl_installarchlib %(perl -V:installarchlib | sed "s!.*='!!;s!'.*!!") %perl_prefix %{buildroot} +# Macro to encapsulate perl requires (empty for fedora and suse > 11.3) +# we keep the complicated form even here to easy sync the other macros with +# perl-macros package +# +%perl_requires() \ +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1700 \ +Requires: perl = %{perl_version} \ +%endif + # suse specific macros # %perl_make_install make DESTDIR=$RPM_BUILD_ROOT install_vendor %perl_process_packlist(n:) \ - if [ %{_target_cpu} == noarch ]; then \ - test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT%perl_vendorarch/auto && \ - find $RPM_BUILD_ROOT%perl_vendorarch/auto -name .packlist -print0 | xargs -0 -r rm ; \ - find $RPM_BUILD_ROOT%perl_vendorarch/auto -depth -type d -print0 | xargs -0 -r rmdir ; \ - else \ - test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT%perl_vendorarch/auto && \ - find $RPM_BUILD_ROOT%perl_vendorarch/auto -name .packlist -print0 | xargs -0 -r rm ; \ + if test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT%perl_vendorarch/auto; then \ + find $RPM_BUILD_ROOT%perl_vendorarch/auto -name .packlist -print0 | xargs -0 -r rm \ + if [ %{_target_cpu} == noarch ]; then \ + find $RPM_BUILD_ROOT%perl_vendorarch/auto -depth -type d -print0 | xargs -0 -r rmdir \ + fi \ fi \ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod \ %nil ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-App-CLI for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '10

30 Nov '10

Hello community, here is the log from the commit of package perl-App-CLI for openSUSE:Factory checked in at Tue Nov 30 15:33:19 CET 2010. -------- --- perl-App-CLI/perl-App-CLI.changes 2010-05-23 18:56:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-App-CLI/perl-App-CLI.changes 2010-11-27 14:16:44.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Nov 27 13:13:34 UTC 2010 - coolo(a)novell.com + +- recreate with cpanspec 1.78.02 and recompress tar + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- App-CLI-0.08.tar.gz New: ---- App-CLI-0.08.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-App-CLI.spec ++++++ --- /var/tmp/diff_new_pack.SPqzLb/_old 2010-11-30 15:32:30.000000000 +0100 +++ /var/tmp/diff_new_pack.SPqzLb/_new 2010-11-30 15:32:30.000000000 +0100 @@ -15,26 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: perl-App-CLI Version: 0.08 -Release: 2 -# +Release: 7 +License: GPL+ or Artistic +%define cpan_name App-CLI +Summary: Dispatcher module for command line interface programs +Url: http://search.cpan.org/dist/App-CLI/ Group: Development/Libraries/Perl -License: Artistic License .. ; GPLv2 -# +#Source: http://www.cpan.org/modules/by-module/App/App-CLI-%{version}.tar.gz +Source: %{cpan_name}-%{version}.tar.bz2 +BuildRequires: perl BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: perl-Locale-Maketext-Simple -Requires: perl-Locale-Maketext-Simple -Requires: perl = %{perl_version} -# -Url: http://search.cpan.org/~clkao/ -Source: http://search.cpan.org/CPAN/authors/id/C/CL/CLKAO/App-CLI-%{version}.tar.gz -# -Summary: Dispatcher module for command line interface programs +BuildArch: noarch +%if 0%{?suse_version} < 1120 +BuildRequires: perl-macros +%endif BuildRequires: perl(Getopt::Long) >= 2.35 +Requires: perl = %{perl_version} Requires: perl(Getopt::Long) >= 2.35 %description @@ -42,30 +42,29 @@ command classes. It also supports subcommand and per-command options. %prep -%setup -n App-CLI-%{version} +%setup -q -n %{cpan_name}-%{version} %build -perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall" INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__perl} Makefile.PL INSTALLDIRS=vendor +%{__make} %{?_smp_mflags} %check -make test +%{__make} test %install %perl_make_install -%perl_process_packlist +# do not perl_process_packlist (noarch) +# remove .packlist file +%{__rm} -rf %{buildroot}%perl_vendorarch +# remove perllocal.pod file +%{__rm} -rf %{buildroot}%perl_archlib +%perl_gen_filelist %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} -%files -%defattr(-,root,root) -%doc %{_mandir}/man?/* -%dir %{perl_vendorlib}/App -%{perl_vendorlib}/App/CLI* -%dir %{perl_vendorarch}/auto/App/ -%dir %{perl_vendorarch}/auto/App/CLI/ -%{perl_vendorarch}/auto/App/CLI/.packlist -/var/adm/perl-modules/%{name} +%files -f %{name}.files +%defattr(-,root,root,-) +%doc Changes %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 gnome-do for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '10

30 Nov '10

Hello community, here is the log from the commit of package gnome-do for openSUSE:Factory checked in at Tue Nov 30 15:25:27 CET 2010. -------- --- GNOME/gnome-do/gnome-do.changes 2010-09-25 15:24:35.000000000 +0200 +++ gnome-do/gnome-do.changes 2010-11-30 10:54:50.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 30 10:54:44 CET 2010 - vuntz(a)opensuse.org + +- Update gnome-do-quiet-autostart.patch so that gnome-do is only + autostarted on GNOME. Fix bnc#629385. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-do.spec ++++++ --- /var/tmp/diff_new_pack.zuWITU/_old 2010-11-30 15:22:28.000000000 +0100 +++ /var/tmp/diff_new_pack.zuWITU/_new 2010-11-30 15:22:28.000000000 +0100 @@ -20,7 +20,7 @@ Name: gnome-do Version: 0.8.3 -Release: 6 +Release: 7 License: GPLv3+ Url: http://do.davebsd.com/ Source: %{name}-%{version}.tar.bz2 ++++++ gnome-do-quiet-autostart.patch ++++++ --- /var/tmp/diff_new_pack.zuWITU/_old 2010-11-30 15:22:28.000000000 +0100 +++ /var/tmp/diff_new_pack.zuWITU/_new 2010-11-30 15:22:28.000000000 +0100 @@ -1,7 +1,7 @@ -Index: gnome-do-0.8.2/Do/src/Do.cs +Index: gnome-do-0.8.3/Do/src/Do.cs =================================================================== ---- gnome-do-0.8.2.orig/Do/src/Do.cs -+++ gnome-do-0.8.2/Do/src/Do.cs +--- gnome-do-0.8.3.orig/Do/src/Do.cs ++++ gnome-do-0.8.3/Do/src/Do.cs @@ -45,6 +45,19 @@ namespace Do { Gtk.Application.Init (); Gdk.Threads.Init (); @@ -31,10 +31,10 @@ Controller.Summon (); Gtk.Application.Run (); -Index: gnome-do-0.8.2/data/Makefile.am +Index: gnome-do-0.8.3/data/Makefile.am =================================================================== ---- gnome-do-0.8.2.orig/data/Makefile.am -+++ gnome-do-0.8.2/data/Makefile.am +--- gnome-do-0.8.3.orig/data/Makefile.am ++++ gnome-do-0.8.3/data/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = icons Docky.DefaultClockTheme @@ -54,16 +54,17 @@ @INTLTOOL_DESKTOP_RULE@ -Index: gnome-do-0.8.2/data/gnome-do-autostart.desktop.in +Index: gnome-do-0.8.3/data/gnome-do-autostart.desktop.in =================================================================== --- /dev/null -+++ gnome-do-0.8.2/data/gnome-do-autostart.desktop.in -@@ -0,0 +1,8 @@ ++++ gnome-do-0.8.3/data/gnome-do-autostart.desktop.in +@@ -0,0 +1,9 @@ +[Desktop Entry] +_Name=GNOME Do +Type=Application +Exec=gnome-do --quiet +Terminal=false +Icon=gnome-do ++OnlyShowIn=GNOME; +_Comment=Do things as quickly as possible (but no quicker) with your files, bookmarks, applications, music, contacts, and more! +Categories=Utility; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 clicfs for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '10

30 Nov '10

Hello community, here is the log from the commit of package clicfs for openSUSE:Factory checked in at Tue Nov 30 15:23:33 CET 2010. -------- --- clicfs/clicfs.changes 2010-11-29 10:27:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/clicfs/clicfs.changes 2010-11-30 13:38:39.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 30 12:38:25 UTC 2010 - coolo(a)novell.com + +- update to 1.3.10 + - still call pthread_join to catch the cow writing + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clicfs.spec ++++++ --- /var/tmp/diff_new_pack.maA5Pq/_old 2010-11-30 15:23:19.000000000 +0100 +++ /var/tmp/diff_new_pack.maA5Pq/_new 2010-11-30 15:23:19.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package clicfs (Version 1.3.9) +# spec file for package clicfs (Version 1.3.10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,7 +22,7 @@ BuildRequires: cmake e2fsprogs-devel fuse-devel gcc-c++ openssl-devel xz-devel Requires: fuse Summary: Compressed Loop Image Container -Version: 1.3.9 +Version: 1.3.10 Release: 1 License: GPLv2 Group: System/Filesystems ++++++ clicfs.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/clicfs.c new/src/clicfs.c --- old/src/clicfs.c 2010-11-29 10:21:30.000000000 +0100 +++ new/src/clicfs.c 2010-11-30 13:37:15.000000000 +0100 @@ -731,6 +731,8 @@ (void)arg; if (logger) fprintf(logger, "destroy\n"); pthread_cancel(clic_sync_tid); + void *res; + pthread_join(clic_sync_tid, &res); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 insserv for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '10

30 Nov '10

Hello community, here is the log from the commit of package insserv for openSUSE:Factory checked in at Tue Nov 30 15:22:57 CET 2010. -------- --- insserv/insserv.changes 2010-11-26 15:57:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/insserv/insserv.changes 2010-11-30 11:06:39.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 30 11:03:21 CET 2010 - werner(a)suse.de + +- Make temporary the new dependency checks nonfatal + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ insserv.spec ++++++ --- /var/tmp/diff_new_pack.LrJTXI/_old 2010-11-30 15:21:34.000000000 +0100 +++ /var/tmp/diff_new_pack.LrJTXI/_new 2010-11-30 15:21:34.000000000 +0100 @@ -24,7 +24,7 @@ Provides: aaa_base:/sbin/insserv AutoReqProv: on Version: 1.14.0 -Release: 13 +Release: 14 Summary: A Program to Arrange Initialization Scripts Url: http://savannah.nongnu.org/projects/sysvinit/ Source0: http://download.savannah.gnu.org/releases/sysvinit/insserv-%{version}.tar.b… @@ -50,6 +50,8 @@ %patch %build +# remove -DOSCBUILD if all packages are fixed +RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DOSCBUILD" make %{?_smp_mflags} INITDIR=%{_sysconfdir}/init.d INSCONF=%{_sysconfdir}/insserv.conf %install ++++++ insserv-1.14.0.dif ++++++ --- /var/tmp/diff_new_pack.LrJTXI/_old 2010-11-30 15:21:34.000000000 +0100 +++ /var/tmp/diff_new_pack.LrJTXI/_new 2010-11-30 15:21:34.000000000 +0100 @@ -1,5 +1,5 @@ --- insserv.c -+++ insserv.c 2010-11-26 14:43:54.159926470 +0000 ++++ insserv.c 2010-11-30 10:00:31.755926231 +0000 @@ -26,6 +26,7 @@ #define MINIMAL_MAKE 1 /* Remove disabled scripts from .depend.boot, * .depend.start, .depend.halt, and .depend.stop */ @@ -326,7 +326,7 @@ } if (script_inf.default_start && script_inf.default_start != empty) { -@@ -3357,6 +3452,103 @@ int main (int argc, char *argv[]) +@@ -3357,6 +3452,111 @@ int main (int argc, char *argv[]) active_script(); /* @@ -376,7 +376,9 @@ + warn("FATAL: service %s is missed in the runlevels %s to use service %s\n", + must->name, lvl2str(clvl), cur->name); + must->attr.flags |= SERV_WARNED; ++#ifndef OSCBUILD + waserr = true; ++#endif + continue; + } + if ((must->attr.flags & (SERV_ENFORCE|SERV_KNOWN)) == SERV_ENFORCE) { @@ -384,7 +386,9 @@ + warn("FATAL: service %s has to exists for service %s\n", + must->name, cur->name); + must->attr.flags |= SERV_WARNED; ++#ifndef OSCBUILD + waserr = true; ++#endif + continue; + } + if (recursive) { @@ -400,7 +404,9 @@ + if ((must->attr.flags & SERV_WARNED) == 0) + warn("FATAL: service %s has to exists for service %s\n", + must->name, cur->name); ++#ifndef OSCBUILD + waserr = true; ++#endif + must->attr.flags |= SERV_WARNED; + continue; + } @@ -417,7 +423,9 @@ + warn("FATAL: service %s is missed in the runlevels %s to use service %s\n", + must->name, lvl2str(clvl), cur->name); + must->attr.flags |= SERV_WARNED; ++#ifndef OSCBUILD + waserr = true; ++#endif + } + } + } @@ -430,7 +438,7 @@ * Sorry but we support only [KS][0-9][0-9]<name> */ if (maxstart > MAX_DEEP || maxstop > MAX_DEEP) -@@ -3435,13 +3627,16 @@ int main (int argc, char *argv[]) +@@ -3435,13 +3635,16 @@ int main (int argc, char *argv[]) script = (char*)0; while ((serv = listscripts(&script, 'X', lvl))) { @@ -448,7 +456,7 @@ slink = false; if ((serv->start->lvl & lvl) == 0) goto stop; -@@ -3616,7 +3811,7 @@ int main (int argc, char *argv[]) +@@ -3616,7 +3819,7 @@ int main (int argc, char *argv[]) script = (char*)0; while ((serv = listscripts(&script, 'X', seek))) { @@ -457,7 +465,7 @@ boolean found; char * clink; char mode; -@@ -3624,6 +3819,9 @@ int main (int argc, char *argv[]) +@@ -3624,6 +3827,9 @@ int main (int argc, char *argv[]) if (*script == '$') /* Do not link in virtual dependencies */ continue; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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