September 2014 - openSUSE Commits - openSUSE Mailing Lists

commit tomcat for openSUSE:Factory
by root＠hilbert.suse.de 22 Sep '14

22 Sep '14

Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2014-09-22 09:22:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tomcat" Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2014-09-09 06:21:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2014-09-22 09:22:55.000000000 +0200 @@ -1,0 +2,25 @@ +Wed Sep 17 11:28:46 UTC 2014 - bmaryniuk(a)suse.com + +- SLE12 has different path for the "rm" command than older versions. + To avoid possible clashes, the entire coreutils must be provided. + (bnc#894292) + +------------------------------------------------------------------- +Tue Sep 16 16:09:59 UTC 2014 - bmaryniuk(a)suse.com + +- Fixed Security Manager policies, which makes unable properly + run webapps by default. (bnc#891264) + Added: tomcat-7.0-sle.catalina.policy.patch + +------------------------------------------------------------------- +Tue Sep 16 14:13:20 UTC 2014 - bmaryniuk(a)suse.com + +- Missing security manager policy file prevents Tomcat to start + with systemd. (bnc#890995) + +------------------------------------------------------------------- +Mon Sep 15 13:02:02 UTC 2014 - dmacvicar(a)suse.de + +- Tomcat 7.0.55 requires ecj 4.4.0 + +------------------------------------------------------------------- New: ---- tomcat-7.0-sle.catalina.policy.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.SnIE4y/_old 2014-09-22 09:22:56.000000000 +0200 +++ /var/tmp/diff_new_pack.SnIE4y/_new 2014-09-22 09:22:56.000000000 +0200 @@ -72,9 +72,11 @@ Patch2: tomcat-7.0.52-property-build.windows.patch # PATCH-FIX-UPSTREAM: https://issues.apache.org/bugzilla/show_bug.cgi?id=56373 Patch3: tomcat-7.0.53-JDTCompiler-java.patch +# PATCH-FIX-SLE: Change security manager default policies bnc#891264 +Patch4: tomcat-7.0-sle.catalina.policy.patch BuildRequires: ant >= 1.8.1 BuildRequires: ant-antlr -BuildRequires: ecj >= 4.2.1 +BuildRequires: ecj >= 4.4.0 BuildRequires: fdupes BuildRequires: findutils BuildRequires: geronimo-jaf-1_0_2-api @@ -205,9 +207,9 @@ Requires: %{name}-el-%{elspec}-api = %{version}-%{release} Requires: %{name}-jsp-%{jspspec}-api = %{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{version}-%{release} -Requires(post): ecj >= 4.2.1 +Requires(post): ecj >= 4.4 Requires(post): jakarta-commons-pool-tomcat5 -Requires(preun): %{_bindir}/rm +Requires(preun): coreutils Provides: jakarta-commons-dbcp-tomcat5 = 1.4 Obsoletes: jakarta-commons-dbcp-tomcat5 < 1.4 @@ -249,6 +251,8 @@ %patch1 -p1 %patch2 -p1 %patch3 +%patch4 -p1 + # remove date from docs sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl ++++++ tomcat-7.0-sle.catalina.policy.patch ++++++ diff -Naur apache-tomcat-7.0.55-src/conf/catalina.policy apache-tomcat-7.0.55-src.new/conf/catalina.policy --- apache-tomcat-7.0.55-src/conf/catalina.policy 2014-07-18 16:49:04.000000000 +0200 +++ apache-tomcat-7.0.55-src.new/conf/catalina.policy 2014-09-16 17:49:07.963129705 +0200 @@ -95,6 +95,7 @@ // ${file.separator}classes${file.separator}logging.properties", "read"; }; + // These permissions apply to the server startup code grant codeBase "file:${catalina.home}/bin/bootstrap.jar" { permission java.security.AllPermission; @@ -107,7 +108,6 @@ permission java.security.AllPermission; }; - // If using a per instance lib directory, i.e. ${catalina.base}/lib, // then the following permission will need to be uncommented // grant codeBase "file:${catalina.base}/lib/-" { @@ -162,6 +162,9 @@ permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat"; // Precompiled JSPs need access to these packages. + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper"; + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.servlet"; + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.compiler"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.el"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime"; permission java.lang.RuntimePermission @@ -214,6 +217,15 @@ permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.util"; }; +// Additional basic permissions for web applications. +grant codeBase "file:/usr/share/java/tomcat-servlet-api.jar" { + permission java.security.AllPermission; +}; + +grant codeBase "file:/usr/share/java/tomcat-el-api.jar" { + permission java.security.AllPermission; +}; + // You can assign additional permissions to particular web applications by // adding additional "grant" entries here, based on the code base for that // application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files. @@ -245,4 +257,3 @@ // grant codeBase "jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/scrape.jar!/-" { // permission java.net.SocketPermission "*.noaa.gov:80", "connect"; // }; - ++++++ tomcat-7.0-tomcat-sysd ++++++ --- /var/tmp/diff_new_pack.SnIE4y/_old 2014-09-22 09:22:56.000000000 +0200 +++ /var/tmp/diff_new_pack.SnIE4y/_new 2014-09-22 09:22:56.000000000 +0200 @@ -60,8 +60,10 @@ if [[ "$SECURITY_MANAGER" = "true" ]]; then DSECURITY_MANAGER="-Djava.security.manager" + DSECURITY_POLICY="-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy" else unset DSECURITY_MANAGER + unset DSECURITY_POLICY fi if ${USE_JSVC}; then @@ -76,7 +78,7 @@ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" ${DSECURITY_MANAGER} \ + -Djava.io.tmpdir="$CATALINA_TMPDIR" ${DSECURITY_MANAGER} ${DSECURITY_POLICY} \ -Djava.util.logging.config.file="${CATALINA_BASE}/conf/logging.properties" \ -Djava.util.logging.manager="org.apache.juli.ClassLoaderLogManager" \ org.apache.catalina.startup.Bootstrap start -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit coccigrep for openSUSE:Factory
by root＠hilbert.suse.de 22 Sep '14

22 Sep '14

Hello community, here is the log from the commit of package coccigrep for openSUSE:Factory checked in at 2014-09-22 09:22:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/coccigrep (Old) and /work/SRC/openSUSE:Factory/.coccigrep.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "coccigrep" Changes: -------- --- /work/SRC/openSUSE:Factory/coccigrep/coccigrep.changes 2014-07-04 17:18:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.coccigrep.new/coccigrep.changes 2014-09-22 09:22:51.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 15 12:02:07 UTC 2014 - jslaby(a)suse.com + +- update to latest snapshot (20140913) + * see ChangeLog for changes + +------------------------------------------------------------------- Old: ---- coccigrep-20140217.tar.xz New: ---- coccigrep-20140913.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coccigrep.spec ++++++ --- /var/tmp/diff_new_pack.oowVmY/_old 2014-09-22 09:22:52.000000000 +0200 +++ /var/tmp/diff_new_pack.oowVmY/_new 2014-09-22 09:22:52.000000000 +0200 @@ -17,7 +17,7 @@ Name: coccigrep -Version: 20140217 +Version: 20140913 Release: 0 Summary: Semantic grep tool for C, based on coccinelle License: GPL-3.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.oowVmY/_old 2014-09-22 09:22:52.000000000 +0200 +++ /var/tmp/diff_new_pack.oowVmY/_new 2014-09-22 09:22:52.000000000 +0200 @@ -1,6 +1,6 @@ <services> <service mode="localonly" name="tar_scm"> - <param name="url">git://github.com/regit/coccigrep.git</param> + <param name="url">git://github.com/regit/coccigrep</param> <param name="scm">git</param> <param name="versionformat">%ad</param> </service> ++++++ coccigrep-20140217.tar.xz -> coccigrep-20140913.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coccigrep-20140217/README.rst new/coccigrep-20140913/README.rst --- old/coccigrep-20140217/README.rst 2014-07-02 17:19:53.000000000 +0200 +++ new/coccigrep-20140913/README.rst 2014-09-15 14:01:39.000000000 +0200 @@ -113,11 +113,13 @@ :Coccigrep Packet datalink source-*.c :Coccigrep Packet datalink set source-*.c -First command will interactively ask you the value. Second one will search all -dereference of the datalink attribute for Packet structure. The last one will -look where the set operation is done on the datalink attribute of Packet. To get -the list of operations on your system, you can run `coccigrep -L` or look at -the list provided when input for operation is asked in interactive mode. +First command will interactively ask you the value. Hit enter to use void +value for type and/or attribute (only if operation does not need them). +Second one will search all dereference of the datalink attribute for Packet +structure. The last one will look where the set operation is done on the +datalink attribute of Packet. To get the list of operations on your system, +you can run `coccigrep -L` or look at the list provided when input for +operation is asked in interactive mode. The matches will appear in the `quickfix list` and the file corresponding to first match will be opened at the corresponding line. Note that you can use completion on diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coccigrep-20140217/editors/cocci-grep.vim new/coccigrep-20140913/editors/cocci-grep.vim --- old/coccigrep-20140217/editors/cocci-grep.vim 2014-07-02 17:19:53.000000000 +0200 +++ new/coccigrep-20140913/editors/cocci-grep.vim 2014-09-15 14:01:39.000000000 +0200 @@ -64,7 +64,14 @@ let s:operation = input('Enter operation in ('. substitute(s:op_list,'\n','','g') . '): ') let s:files = input('Enter files: ') call inputrestore() - let cgrep = '-V -t ' . shellescape(s:type) . ' -a ' . s:attribute . ' -o ' . s:operation . ' ' . s:files + let cgrep = '-V ' + if s:type + let cgrep = cgrep. '-t ' . shellescape(s:type) . ' ' + endif + if s:attribute + let cgrep = cgrep. '-a ' . s:attribute . ' ' + endif + let cgrep = cgrep . '-o ' . s:operation . ' ' . s:files " 1 args: use files in current dir elseif len(argl) == (0 + s:b_files_arg) let cgrep = '-V -t ' . get(argl, 0) . ' *.[ch]' @@ -80,7 +87,9 @@ endif if s:b_files_arg - let cgrep = cgrep . ' ' . get(argl, len(argl)-1) + if ! exists ("s:files") + let cgrep = cgrep . ' ' . get(argl, len(argl)-1) + endif else let cgrep = cgrep . ' -l ' . g:coccigrep_files endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coccigrep-20140217/src/coccigrep.py new/coccigrep-20140913/src/coccigrep.py --- old/coccigrep-20140217/src/coccigrep.py 2014-07-02 17:19:53.000000000 +0200 +++ new/coccigrep-20140913/src/coccigrep.py 2014-09-15 14:01:39.000000000 +0200 @@ -23,7 +23,7 @@ import errno import re -COCCIGREP_VERSION = "1.13" +COCCIGREP_VERSION = "1.14" have_multiprocessing = True try: @@ -320,9 +320,6 @@ :type operation: str :raise: :class:`CocciRunException` """ - if stype == None: - raise CocciRunException("Can't use coccigrep without type to " - "search") self.type = stype self.attribute = attribute self.operation = operation -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit x3270 for openSUSE:Factory
by root＠hilbert.suse.de 22 Sep '14

22 Sep '14

Hello community, here is the log from the commit of package x3270 for openSUSE:Factory checked in at 2014-09-22 09:21:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/x3270 (Old) and /work/SRC/openSUSE:Factory/.x3270.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "x3270" Changes: -------- --- /work/SRC/openSUSE:Factory/x3270/x3270.changes 2014-08-13 08:48:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.x3270.new/x3270.changes 2014-09-22 09:21:42.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Sep 18 20:36:53 UTC 2014 - sfalken(a)opensuse.org + +- Removed %attr stanza from %files section as it was causing rpmlint + failure, and is not neccessary +- Added fdupes to BuildRequires and to %install section to clear rpmlint + warning about duplicate files + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x3270.spec ++++++ --- /var/tmp/diff_new_pack.LXrFBI/_old 2014-09-22 09:21:43.000000000 +0200 +++ /var/tmp/diff_new_pack.LXrFBI/_new 2014-09-22 09:21:43.000000000 +0200 @@ -21,6 +21,7 @@ Name: x3270 BuildRequires: autoconf BuildRequires: bdftopcf +BuildRequires: fdupes BuildRequires: fontpackages-devel BuildRequires: freetype2 BuildRequires: ncurses-devel @@ -216,7 +217,8 @@ cp -pr --parents pr3287-3.3/html %{buildroot}%{_docdir}/%name cp -pr --parents s3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%name cp -pr --parents tcl3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%name - +# create symlinks in documentation +%fdupes -s %{buildroot}/%{_docdir} %reconfigure_fonts_scriptlets %files @@ -257,6 +259,6 @@ %doc %{_docdir}/%name/tcl3270-3.3/html # x026 %{_bindir}/x026 -%doc %attr(644,root,root) README.SUSE +%doc README.SUSE %changelog -- 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-DateTime-Format-Strptime for openSUSE:Factory
by root＠hilbert.suse.de 22 Sep '14

22 Sep '14

Hello community, here is the log from the commit of package perl-DateTime-Format-Strptime for openSUSE:Factory checked in at 2014-09-22 09:21:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-DateTime-Format-Strptime (Old) and /work/SRC/openSUSE:Factory/.perl-DateTime-Format-Strptime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-DateTime-Format-Strptime" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-DateTime-Format-Strptime/perl-DateTime-Format-Strptime.changes 2013-06-13 17:32:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-DateTime-Format-Strptime.new/perl-DateTime-Format-Strptime.changes 2014-09-22 09:21:39.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Sep 18 17:20:22 UTC 2014 - Greg.Freemyer(a)gmail.com + +- update to v1.56 + - Recent DateTime::TimeZone changes broke the tests. + - Fixed Latin-1 content in test code. It's now UTF-8. +- change %doc to pull README.md instead of README. README is no longer in tarball. + +------------------------------------------------------------------- Old: ---- DateTime-Format-Strptime-1.54.tar.gz New: ---- DateTime-Format-Strptime-1.56.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-DateTime-Format-Strptime.spec ++++++ --- /var/tmp/diff_new_pack.oSPit1/_old 2014-09-22 09:21:40.000000000 +0200 +++ /var/tmp/diff_new_pack.oSPit1/_new 2014-09-22 09:21:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-DateTime-Format-Strptime # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,7 +17,7 @@ Name: perl-DateTime-Format-Strptime -Version: 1.54 +Version: 1.56 Release: 0 %define cpan_name DateTime-Format-Strptime Summary: Parse and format strp and strf time patterns @@ -64,6 +64,6 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes LICENSE README +%doc Changes LICENSE README.md %changelog ++++++ DateTime-Format-Strptime-1.54.tar.gz -> DateTime-Format-Strptime-1.56.tar.gz ++++++ ++++ 2334 lines of diff (skipped) -- 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-MooX-Types-MooseLike for openSUSE:Factory
by root＠hilbert.suse.de 22 Sep '14

22 Sep '14

Hello community, here is the log from the commit of package perl-MooX-Types-MooseLike for openSUSE:Factory checked in at 2014-09-22 09:21:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-MooX-Types-MooseLike (Old) and /work/SRC/openSUSE:Factory/.perl-MooX-Types-MooseLike.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-MooX-Types-MooseLike" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-MooX-Types-MooseLike/perl-MooX-Types-MooseLike.changes 2013-08-06 11:04:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-MooX-Types-MooseLike.new/perl-MooX-Types-MooseLike.changes 2014-09-22 09:21:36.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Sep 21 06:53:39 UTC 2014 - coolo(a)suse.com + +- updated to 0.27 + - Fix tests to not use package B (haarg) + - Bugfix for recent versions of Moo changing error messages (skaufman) + +------------------------------------------------------------------- Old: ---- MooX-Types-MooseLike-0.25.tar.gz New: ---- MooX-Types-MooseLike-0.27.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-MooX-Types-MooseLike.spec ++++++ --- /var/tmp/diff_new_pack.I92I6u/_old 2014-09-22 09:21:37.000000000 +0200 +++ /var/tmp/diff_new_pack.I92I6u/_new 2014-09-22 09:21:37.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-MooX-Types-MooseLike # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,7 +17,7 @@ Name: perl-MooX-Types-MooseLike -Version: 0.25 +Version: 0.27 Release: 0 %define cpan_name MooX-Types-MooseLike Summary: some Moosish types and a type builder @@ -33,21 +33,6 @@ BuildRequires: perl(Moo) >= 0.09101 BuildRequires: perl(Test::Fatal) >= 0.003 BuildRequires: perl(Test::More) >= 0.96 -#BuildRequires: perl(A) -#BuildRequires: perl(Distar) -#BuildRequires: perl(Human) -#BuildRequires: perl(Local::TypeLibrary) -#BuildRequires: perl(Man) -#BuildRequires: perl(Moo::Role) -#BuildRequires: perl(Moose::Meta::TypeConstraint::Class) -#BuildRequires: perl(Moose::Meta::TypeConstraint::DuckType) -#BuildRequires: perl(Moose::Meta::TypeConstraint::Enum) -#BuildRequires: perl(Moose::Meta::TypeConstraint::Role) -#BuildRequires: perl(Moose::Meta::TypeConstraint::Union) -#BuildRequires: perl(Moose::Util::TypeConstraints) -#BuildRequires: perl(MooX::Types::MooseLike) -#BuildRequires: perl(MooX::Types::MooseLike::Base) -#BuildRequires: perl(Role::Tiny) Requires: perl(Module::Runtime) >= 0.012 %{perl_requires} ++++++ MooX-Types-MooseLike-0.25.tar.gz -> MooX-Types-MooseLike-0.27.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooX-Types-MooseLike-0.25/Changes new/MooX-Types-MooseLike-0.27/Changes --- old/MooX-Types-MooseLike-0.25/Changes 2013-07-29 16:45:22.000000000 +0200 +++ new/MooX-Types-MooseLike-0.27/Changes 2014-08-19 18:40:43.000000000 +0200 @@ -1,3 +1,9 @@ +0.27 - 2014-08-19 + - Fix tests to not use package B (haarg) + +0.26 - 2014-08-18 + - Bugfix for recent versions of Moo changing error messages (skaufman) + 0.25 - 2013-07-29 - Don't trigger bool overrides when checking for object instance type [RT#87382] (Mithaldu) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooX-Types-MooseLike-0.25/META.json new/MooX-Types-MooseLike-0.27/META.json --- old/MooX-Types-MooseLike-0.25/META.json 2013-07-29 16:54:18.000000000 +0200 +++ new/MooX-Types-MooseLike-0.27/META.json 2014-08-19 18:40:56.000000000 +0200 @@ -4,7 +4,7 @@ "mateu - Mateu X. Hunter (cpan:MATEU) <hunter(a)missoula.org>" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.120921", + "generated_by" : "ExtUtils::MakeMaker version 6.88, CPAN::Meta::Converter version 2.141520", "license" : [ "perl_5" ], @@ -48,5 +48,5 @@ }, "x_IRC" : "irc://irc.perl.org/#web-simple" }, - "version" : "0.25" + "version" : "0.27" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooX-Types-MooseLike-0.25/META.yml new/MooX-Types-MooseLike-0.27/META.yml --- old/MooX-Types-MooseLike-0.25/META.yml 2013-07-29 16:54:18.000000000 +0200 +++ new/MooX-Types-MooseLike-0.27/META.yml 2014-08-19 18:40:56.000000000 +0200 @@ -3,26 +3,26 @@ author: - 'mateu - Mateu X. Hunter (cpan:MATEU) <hunter(a)missoula.org>' build_requires: - Moo: 0.09101 - Test::Fatal: 0.003 - Test::More: 0.96 + Moo: '0.09101' + Test::Fatal: '0.003' + Test::More: '0.96' configure_requires: - ExtUtils::MakeMaker: 0 + ExtUtils::MakeMaker: '0' dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.120921' +generated_by: 'ExtUtils::MakeMaker version 6.88, CPAN::Meta::Converter version 2.141520' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + version: '1.4' name: MooX-Types-MooseLike no_index: directory: - t - inc requires: - Module::Runtime: 0.012 + Module::Runtime: '0.012' resources: + IRC: irc://irc.perl.org/#web-simple bugtracker: http://rt.cpan.org/NoAuth/Bugs.html?Dist=MooX-Types-MooseLike repository: git://github.com/mateu/MooX-Types-MooseLike.git - x_IRC: irc://irc.perl.org/#web-simple -version: 0.25 +version: '0.27' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooX-Types-MooseLike-0.25/lib/MooX/Types/MooseLike/Base.pm new/MooX-Types-MooseLike-0.27/lib/MooX/Types/MooseLike/Base.pm --- old/MooX-Types-MooseLike-0.25/lib/MooX/Types/MooseLike/Base.pm 2013-07-29 16:44:32.000000000 +0200 +++ new/MooX-Types-MooseLike-0.27/lib/MooX/Types/MooseLike/Base.pm 2014-08-19 18:38:28.000000000 +0200 @@ -7,7 +7,7 @@ use Exporter 5.57 'import'; our @EXPORT_OK = (); -our $VERSION = 0.25; +our $VERSION = 0.27; # These types act like those found in Moose::Util::TypeConstraints. # Generally speaking, the same test is used. @@ -422,7 +422,7 @@ use MooX::Types::MooseLike::Base qw/HashRef ArrayRef/; -so one could then declare some attributtes like: +so one could then declare some attributes like: has 'contact' => ( is => 'ro', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooX-Types-MooseLike-0.25/lib/MooX/Types/MooseLike.pm new/MooX-Types-MooseLike-0.27/lib/MooX/Types/MooseLike.pm --- old/MooX-Types-MooseLike-0.25/lib/MooX/Types/MooseLike.pm 2013-07-29 16:43:05.000000000 +0200 +++ new/MooX-Types-MooseLike-0.27/lib/MooX/Types/MooseLike.pm 2014-08-19 18:38:18.000000000 +0200 @@ -8,7 +8,7 @@ use Carp qw(confess croak); use List::Util qw(first); -our $VERSION = '0.25'; +our $VERSION = '0.27'; sub register_types { my ($type_definitions, $into, $moose_namespace) = @_; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooX-Types-MooseLike-0.25/t/basic.t new/MooX-Types-MooseLike-0.27/t/basic.t --- old/MooX-Types-MooseLike-0.25/t/basic.t 2013-04-08 18:59:51.000000000 +0200 +++ new/MooX-Types-MooseLike-0.27/t/basic.t 2014-08-19 00:54:15.000000000 +0200 @@ -319,7 +319,7 @@ like( exception { MooX::Types::MooseLike::Test->new(an_undef => '') }, - qr/is not undef.*\n.*MooX::Types::MooseLike::Test::new.*basic\.t/, + qr/is not undef.*\n.*MooX::Types::MooseLike::Test::new.*basic\.t/s, 'The error looks like a useful stacktrace' ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooX-Types-MooseLike-0.25/t/parameterized.t new/MooX-Types-MooseLike-0.27/t/parameterized.t --- old/MooX-Types-MooseLike-0.25/t/parameterized.t 2013-03-26 06:47:09.000000000 +0100 +++ new/MooX-Types-MooseLike-0.27/t/parameterized.t 2014-08-19 18:37:44.000000000 +0200 @@ -1,17 +1,4 @@ { - package A; - use Moo; - has fun => (is => 'ro'); - 1; -} -{ - package B; - use Moo; - extends 'A'; - has funner => (is => 'ro'); - 1; -} -{ package MooX::Types::MooseLike::Test; use strict; use warnings FATAL => 'all'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooX-Types-MooseLike-0.25/t/parameterized_with_string.t new/MooX-Types-MooseLike-0.27/t/parameterized_with_string.t --- old/MooX-Types-MooseLike-0.25/t/parameterized_with_string.t 2013-07-29 16:36:09.000000000 +0200 +++ new/MooX-Types-MooseLike-0.27/t/parameterized_with_string.t 2014-08-19 18:37:44.000000000 +0200 @@ -16,15 +16,15 @@ sub quoi { 'dieu' }; } { - package A; + package ClassA; use Moo; has fun => (is => 'ro'); 1; } { - package B; + package ClassB; use Moo; - extends 'A'; + extends 'ClassA'; has funner => (is => 'ro'); 1; } @@ -48,7 +48,7 @@ ); has instance_of_A_and_B => ( is => 'ro', - isa => InstanceOf['A', 'B'], + isa => InstanceOf['ClassA', 'ClassB'], ); has instance_of_NoBool => ( is => 'ro', @@ -103,7 +103,7 @@ qr/is not an instance of the class.*IO::Handle/, 'a Foo instance is not an instance of IO::Handle' ); -ok(MooX::Types::MooseLike::Test->new(instance_of_A_and_B => B->new ), 'instance of A and B'); +ok(MooX::Types::MooseLike::Test->new(instance_of_A_and_B => ClassB->new ), 'instance of ClassA and ClassB'); ok(MooX::Types::MooseLike::Test->new(instance_of_NoBool => NoBool->new ), 'instance of NoBool'); # ConsumerOf -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit argus for openSUSE:Factory
by root＠hilbert.suse.de 22 Sep '14

22 Sep '14

Hello community, here is the log from the commit of package argus for openSUSE:Factory checked in at 2014-09-22 09:12:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/argus (Old) and /work/SRC/openSUSE:Factory/.argus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "argus" Changes: -------- --- /work/SRC/openSUSE:Factory/argus/argus.changes 2013-02-21 14:07:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.argus.new/argus.changes 2014-09-22 09:12:34.000000000 +0200 @@ -1,0 +2,41 @@ +Thu Sep 18 19:56:48 UTC 2014 - sfalken(a)opensuse.org + +- Changed SuSE to SUSE in README.SUSE (sr#250033) + +------------------------------------------------------------------- +Thu Sep 18 01:09:58 UTC 2014 - sfalken(a)opensuse.org + +- Update to 3.0.8 version: + + Changes from 3.0.6.1: + Update and Fixes for remote argus data filter support + Changes for netflow packet parsing to fix netflow in clients. + Fixes for wild metric counts in new flow data. + Update filter logic to be consistent with client filters. + Modifications for timeout issues when in non-select polling. + Fix for source id type assignement from commandline + Change for compiler timeout values + Fixes for ARP direction processing + Back out of duplicate packet tracking logic + Mods for duplicate packet reporting + Modify configure.ac for pcap_dump_flush for older libpcaps + Modify timeouts within "nonselectable" packet processing loop. + Use VID for the VLAN identifer for the key. + Fix syslog while daemonized + Remove nanosleep() to improve performance. + Major addtions for SDN tracking. New Flow model specifications in argus.conf. + Fixes for solaris port, to avoid scheduling problems with record timeouts + + Added: + argus-3.0.8.tar.gz + README.SUSE + + Dropped: + argus-3.0.6.1.tar.bz2 + README.SuSE + + Fixes in Specfile + Changed permissions to 0644 for argus.service to clear rpmlint warning + Removed System/Magic from chmod command, to clear rpmlint warning + Removed %attr stanza from %doc lines, unneeded, and they were set incorrectly + in the first place, and causing rpmlint to fail, due to unreadable files + Removed %config from argus.service in %files, not neccessary, and causes rpmlint + warning + +------------------------------------------------------------------- Old: ---- README.SuSE argus-3.0.6.1.tar.bz2 New: ---- README.SUSE argus-3.0.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ argus.spec ++++++ --- /var/tmp/diff_new_pack.IN3tK8/_old 2014-09-22 09:12:36.000000000 +0200 +++ /var/tmp/diff_new_pack.IN3tK8/_new 2014-09-22 09:12:36.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package argus # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -16,27 +16,29 @@ # - Name: argus -BuildRequires: bison flex libpcap-devel tcpd-devel tcsh +BuildRequires: bison +BuildRequires: flex +BuildRequires: libpcap-devel +BuildRequires: tcpd-devel +BuildRequires: tcsh +Summary: Network Monitoring Tool License: GPL-2.0 and LGPL-2.1 and BSD-3-Clause and MIT Group: Productivity/Networking/Diagnostic -Summary: Network Monitoring Tool -Version: 3.0.6.1 -Release: 3 +Version: 3.0.8 +Release: 0 Url: http://www.qosient.com/argus/ -Source: %{name}-%{version}.tar.bz2 -Source3: README.SuSE +Source: %{name}-%{version}.tar.gz +Source3: README.SUSE Source4: argus_linux.8.gz Source5: argus.service -Patch1: %{name}-%{version}-libpcap.patch +Patch1: %{name}-3.0.6.1-libpcap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: systemd %package server -License: GPL-2.0 and LGPL-2.1 and BSD-3-Clause and MIT -Group: Productivity/Networking/Diagnostic Summary: Daemon for Network Monitoring Tool +Group: Productivity/Networking/Diagnostic Requires: argus %{?systemd_requires} Provides: argus:/usr/sbin/argus @@ -65,7 +67,7 @@ install -d -m 755 $RPM_BUILD_ROOT{/etc,/usr/{sbin,bin,share/man},%{_docdir}} install -m 700 bin/argus $RPM_BUILD_ROOT/usr/sbin/argus install -m 700 bin/arg* $RPM_BUILD_ROOT/usr/bin/ -install -D -m 0755 %{SOURCE5} %{buildroot}/%{_unitdir}/argus.service +install -D -m 0644 %{SOURCE5} %{buildroot}/%{_unitdir}/argus.service # alread in sbin rm -f $RPM_BUILD_ROOT/usr/bin/argus rm -f $RPM_BUILD_ROOT/usr/bin/argus_linux @@ -77,8 +79,8 @@ install -m 600 support/Config/argus.conf $RPM_BUILD_ROOT/etc/argus.conf install -m 755 support/Archive/argusarchive $RPM_BUILD_ROOT/usr/bin/ find support -type f -exec chmod 0644 {} \; -chmod a+x support/{Archive/argusarchive,Startup/argus,System/magic} - +#chmod a+x support/{Archive/argusarchive,Startup/argus,System/magic} +chmod a+x support/{Archive/argusarchive,Startup/argus} %pre server %service_add_pre argus.service @@ -98,10 +100,10 @@ %files server %defattr(-,root,root) -%attr(0644,root,root) %doc doc COPYING MANIFEST README.* support -%attr(0644,root,root) %doc %{_mandir}/man*/* +%doc doc COPYING MANIFEST README.* support +%doc %{_mandir}/man*/* %config /etc/argus.conf -%config %{_unitdir}/argus.service +%{_unitdir}/argus.service %{_sbindir}/* %changelog ++++++ README.SUSE ++++++ README.SUSE choeger, 4.5.98 Argus is a network-monitoring-tool. Take a look at /usr/doc/packages/README* for details. Please change the variables in /etc/sysconfig/argus if you need. A daily restart-script may look like this: ----------------------------------[snip]--------------------------------- #!/bin/sh rcargus stop mv /var/log/argus.log /var/log/argus.`date +"%y%m%d"`.log gzip -9 /var/log/argus.`date +"%y%m%d"`.log rcargus start ----------------------------------[snip]--------------------------------- you may copy it to /root/bin/argus_restart and add the following to your /etc/crontab: ----------------------------------[snip]--------------------------------- 50 17 * * * root /root/bin/argus_restart ----------------------------------[snip]--------------------------------- if you want to restart argus at 17:50 (5:50pm). Use the tools 'ra' and 'services' to take a look in your captured argus-data. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kernel-source for openSUSE:Factory
by root＠hilbert.suse.de 20 Sep '14

20 Sep '14

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2014-09-20 15:51:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes 2014-09-19 22:27:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2014-09-20 15:52:07.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Sep 17 22:55:37 CEST 2014 - jslaby(a)suse.cz + +- Linux 3.16.3 (bnc#890096). +- Delete + patches.fixes/reiserfs-fix-corruption-introduced-by-balance_leaf-refactor. +- Delete patches.fixes/rtsx_usb-export-device-table. +- Update config files. + Set CONFIG_SMS_SIANO_DEBUGFS=n as it is in master. +- commit d2bbe7f + +------------------------------------------------------------------- kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa-xen.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.kLFFjr/_old 2014-09-20 15:52:11.000000000 +0200 +++ /var/tmp/diff_new_pack.kLFFjr/_new 2014-09-20 15:52:11.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.16 -%define patchversion 3.16.2 +%define patchversion 3.16.3 %define variant %{nil} %define vanilla_only 0 @@ -59,11 +59,11 @@ Summary: A Debug Version of the Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.16.2 +Version: 3.16.3 %if 0%{?is_kotd} -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %else -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %endif Url: http://www.kernel.org/ BuildRequires: bc kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.kLFFjr/_old 2014-09-20 15:52:11.000000000 +0200 +++ /var/tmp/diff_new_pack.kLFFjr/_new 2014-09-20 15:52:11.000000000 +0200 @@ -16,7 +16,7 @@ # -%define patchversion 3.16.2 +%define patchversion 3.16.3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -25,11 +25,11 @@ Summary: Kernel Documentation License: GPL-2.0 Group: Documentation/Man -Version: 3.16.2 +Version: 3.16.3 %if 0%{?is_kotd} -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %else -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %endif BuildRequires: docbook-toys BuildRequires: docbook-utils ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.kLFFjr/_old 2014-09-20 15:52:11.000000000 +0200 +++ /var/tmp/diff_new_pack.kLFFjr/_new 2014-09-20 15:52:11.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.16 -%define patchversion 3.16.2 +%define patchversion 3.16.3 %define variant %{nil} %define vanilla_only 0 @@ -59,11 +59,11 @@ Summary: The Amazon EC2 Xen Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.16.2 +Version: 3.16.3 %if 0%{?is_kotd} -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %else -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %endif Url: http://www.kernel.org/ BuildRequires: bc kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.kLFFjr/_old 2014-09-20 15:52:11.000000000 +0200 +++ /var/tmp/diff_new_pack.kLFFjr/_new 2014-09-20 15:52:11.000000000 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 3.16.2 +%define patchversion 3.16.3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -45,11 +45,11 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 3.16.2 +Version: 3.16.3 %if 0%{?is_kotd} -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %else -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %endif %description ++++++ kernel-obs-qa-xen.spec ++++++ --- /var/tmp/diff_new_pack.kLFFjr/_old 2014-09-20 15:52:11.000000000 +0200 +++ /var/tmp/diff_new_pack.kLFFjr/_new 2014-09-20 15:52:11.000000000 +0200 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 3.16.2 +%define patchversion 3.16.3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -36,11 +36,11 @@ Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES -Version: 3.16.2 +Version: 3.16.3 %if 0%{?is_kotd} -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %else -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %endif %description kernel-obs-qa.spec: same change ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.kLFFjr/_old 2014-09-20 15:52:11.000000000 +0200 +++ /var/tmp/diff_new_pack.kLFFjr/_new 2014-09-20 15:52:11.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.16 -%define patchversion 3.16.2 +%define patchversion 3.16.3 %define variant %{nil} %define vanilla_only 0 @@ -59,11 +59,11 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 3.16.2 +Version: 3.16.3 %if 0%{?is_kotd} -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %else -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %endif Url: http://www.kernel.org/ BuildRequires: bc ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.kLFFjr/_old 2014-09-20 15:52:11.000000000 +0200 +++ /var/tmp/diff_new_pack.kLFFjr/_new 2014-09-20 15:52:11.000000000 +0200 @@ -18,7 +18,7 @@ %define srcversion 3.16 -%define patchversion 3.16.2 +%define patchversion 3.16.3 %define variant %{nil} %define vanilla_only 0 @@ -30,11 +30,11 @@ Summary: The Linux Kernel Sources License: GPL-2.0 Group: Development/Sources -Version: 3.16.2 +Version: 3.16.3 %if 0%{?is_kotd} -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %else -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %endif Url: http://www.kernel.org/ AutoReqProv: off ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.kLFFjr/_old 2014-09-20 15:52:11.000000000 +0200 +++ /var/tmp/diff_new_pack.kLFFjr/_new 2014-09-20 15:52:11.000000000 +0200 @@ -24,12 +24,12 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 3.16.2 +Version: 3.16.3 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %else -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %endif %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.kLFFjr/_old 2014-09-20 15:52:11.000000000 +0200 +++ /var/tmp/diff_new_pack.kLFFjr/_new 2014-09-20 15:52:11.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.16 -%define patchversion 3.16.2 +%define patchversion 3.16.3 %define variant %{nil} %define vanilla_only 0 @@ -59,11 +59,11 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0 Group: System/Kernel -Version: 3.16.2 +Version: 3.16.3 %if 0%{?is_kotd} -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %else -Release: <RELEASE>.g5fca623 +Release: <RELEASE>.gd2bbe7f %endif Url: http://www.kernel.org/ BuildRequires: bc kernel-xen.spec: same change ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/arm64/default new/config/arm64/default --- old/config/arm64/default 2014-09-07 06:40:17.000000000 +0200 +++ new/config/arm64/default 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 3.16.1 Kernel Configuration +# Linux/arm64 3.16.3 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv6hl/default new/config/armv6hl/default --- old/config/armv6hl/default 2014-09-07 06:40:17.000000000 +0200 +++ new/config/armv6hl/default 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.16.1 Kernel Configuration +# Linux/arm 3.16.3 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -3626,6 +3626,7 @@ CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/default new/config/armv7hl/default --- old/config/armv7hl/default 2014-09-07 06:40:17.000000000 +0200 +++ new/config/armv7hl/default 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.16.1 Kernel Configuration +# Linux/arm 3.16.3 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -4475,6 +4475,7 @@ CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/lpae new/config/armv7hl/lpae --- old/config/armv7hl/lpae 2014-09-07 06:40:17.000000000 +0200 +++ new/config/armv7hl/lpae 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.16.1 Kernel Configuration +# Linux/arm 3.16.3 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -4221,6 +4221,7 @@ CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/debug new/config/i386/debug --- old/config/i386/debug 2014-09-07 06:40:17.000000000 +0200 +++ new/config/i386/debug 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.16.0 Kernel Configuration +# Linux/i386 3.16.3 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4360,6 +4360,7 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/default new/config/i386/default --- old/config/i386/default 2014-09-07 06:40:17.000000000 +0200 +++ new/config/i386/default 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.16.0 Kernel Configuration +# Linux/i386 3.16.3 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4397,6 +4397,7 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/desktop new/config/i386/desktop --- old/config/i386/desktop 2014-09-07 06:40:17.000000000 +0200 +++ new/config/i386/desktop 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.16.0 Kernel Configuration +# Linux/i386 3.16.3 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4291,6 +4291,7 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/ec2 new/config/i386/ec2 --- old/config/i386/ec2 2014-09-07 06:40:17.000000000 +0200 +++ new/config/i386/ec2 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.16.0 Kernel Configuration +# Linux/i386 3.16.3 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae --- old/config/i386/pae 2014-09-07 06:40:17.000000000 +0200 +++ new/config/i386/pae 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.16.0 Kernel Configuration +# Linux/i386 3.16.3 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4292,6 +4292,7 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vanilla new/config/i386/vanilla --- old/config/i386/vanilla 2014-09-07 06:40:17.000000000 +0200 +++ new/config/i386/vanilla 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.16.0 Kernel Configuration +# Linux/i386 3.16.3 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4391,6 +4391,7 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2014-09-07 06:40:17.000000000 +0200 +++ new/config/i386/xen 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.16.2 Kernel Configuration +# Linux/i386 3.16.3 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4066,6 +4066,7 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/default new/config/ppc/default --- old/config/ppc/default 2014-09-07 06:40:17.000000000 +0200 +++ new/config/ppc/default 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.16.0 Kernel Configuration +# Linux/powerpc 3.16.3 Kernel Configuration # # CONFIG_PPC64 is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/vanilla new/config/ppc/vanilla --- old/config/ppc/vanilla 2014-09-07 06:40:17.000000000 +0200 +++ new/config/ppc/vanilla 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.16.0 Kernel Configuration +# Linux/powerpc 3.16.3 Kernel Configuration # # CONFIG_PPC64 is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/debug new/config/ppc64/debug --- old/config/ppc64/debug 2014-09-07 06:40:17.000000000 +0200 +++ new/config/ppc64/debug 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.16.0 Kernel Configuration +# Linux/powerpc 3.16.3 Kernel Configuration # CONFIG_PPC64=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/default new/config/ppc64/default --- old/config/ppc64/default 2014-09-07 06:40:17.000000000 +0200 +++ new/config/ppc64/default 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.16.0 Kernel Configuration +# Linux/powerpc 3.16.3 Kernel Configuration # CONFIG_PPC64=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/vanilla new/config/ppc64/vanilla --- old/config/ppc64/vanilla 2014-09-07 06:40:17.000000000 +0200 +++ new/config/ppc64/vanilla 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.16.0 Kernel Configuration +# Linux/powerpc 3.16.3 Kernel Configuration # CONFIG_PPC64=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64le/debug new/config/ppc64le/debug --- old/config/ppc64le/debug 2014-09-07 06:40:17.000000000 +0200 +++ new/config/ppc64le/debug 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.16.0 Kernel Configuration +# Linux/powerpc 3.16.3 Kernel Configuration # CONFIG_PPC64=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64le/default new/config/ppc64le/default --- old/config/ppc64le/default 2014-09-07 06:40:17.000000000 +0200 +++ new/config/ppc64le/default 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.16.0 Kernel Configuration +# Linux/powerpc 3.16.3 Kernel Configuration # CONFIG_PPC64=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64le/vanilla new/config/ppc64le/vanilla --- old/config/ppc64le/vanilla 2014-09-07 06:40:17.000000000 +0200 +++ new/config/ppc64le/vanilla 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.16.0 Kernel Configuration +# Linux/powerpc 3.16.3 Kernel Configuration # CONFIG_PPC64=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/default new/config/s390x/default --- old/config/s390x/default 2014-09-07 06:40:17.000000000 +0200 +++ new/config/s390x/default 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 3.16.0 Kernel Configuration +# Linux/s390 3.16.3 Kernel Configuration # CONFIG_MMU=y CONFIG_ZONE_DMA=y @@ -341,6 +341,9 @@ CONFIG_INLINE_WRITE_UNLOCK_BH=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y CONFIG_FREEZER=y # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/vanilla new/config/s390x/vanilla --- old/config/s390x/vanilla 2014-09-07 06:40:17.000000000 +0200 +++ new/config/s390x/vanilla 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 3.16.0 Kernel Configuration +# Linux/s390 3.16.3 Kernel Configuration # CONFIG_MMU=y CONFIG_ZONE_DMA=y @@ -339,6 +339,9 @@ CONFIG_INLINE_WRITE_UNLOCK_BH=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y CONFIG_FREEZER=y # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/debug new/config/x86_64/debug --- old/config/x86_64/debug 2014-09-07 06:40:17.000000000 +0200 +++ new/config/x86_64/debug 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.16.0 Kernel Configuration +# Linux/x86_64 3.16.3 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -4244,6 +4244,7 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default --- old/config/x86_64/default 2014-09-07 06:40:17.000000000 +0200 +++ new/config/x86_64/default 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.16.0 Kernel Configuration +# Linux/x86_64 3.16.3 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -4234,6 +4234,7 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/desktop new/config/x86_64/desktop --- old/config/x86_64/desktop 2014-09-07 06:40:17.000000000 +0200 +++ new/config/x86_64/desktop 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.16.0 Kernel Configuration +# Linux/x86_64 3.16.3 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -4233,6 +4233,7 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/ec2 new/config/x86_64/ec2 --- old/config/x86_64/ec2 2014-09-07 06:40:17.000000000 +0200 +++ new/config/x86_64/ec2 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.16.0 Kernel Configuration +# Linux/x86_64 3.16.3 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/vanilla new/config/x86_64/vanilla --- old/config/x86_64/vanilla 2014-09-07 06:40:17.000000000 +0200 +++ new/config/x86_64/vanilla 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.16.0 Kernel Configuration +# Linux/x86_64 3.16.3 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -4230,6 +4230,7 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/xen new/config/x86_64/xen --- old/config/x86_64/xen 2014-09-07 06:40:17.000000000 +0200 +++ new/config/x86_64/xen 2014-09-18 08:32:16.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.16.2 Kernel Configuration +# Linux/x86_64 3.16.3 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -4013,6 +4013,7 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/reiserfs-fix-corruption-introduced-by-balance_leaf-refactor new/patches.fixes/reiserfs-fix-corruption-introduced-by-balance_leaf-refactor --- old/patches.fixes/reiserfs-fix-corruption-introduced-by-balance_leaf-refactor 2014-09-17 14:06:06.000000000 +0200 +++ new/patches.fixes/reiserfs-fix-corruption-introduced-by-balance_leaf-refactor 1970-01-01 01:00:00.000000000 +0100 @@ -1,376 +0,0 @@ -From: Jeff Mahoney <jeffm(a)suse.com> -Subject: reiserfs: fix corruption introduced by balance_leaf refactor -Patch-mainline: submitted to reiserfs-devel, 4 Aug 2014 - -Commits f1f007c308e (reiserfs: balance_leaf refactor, pull out -balance_leaf_insert_left) and cf22df182bf (reiserfs: balance_leaf -refactor, pull out balance_leaf_paste_left) missed that the `body' -pointer was getting repositioned. Subsequent users of the pointer -would expect it to be repositioned, and as a result, parts of the -tree would get overwritten. The most common observed corruption -is indirect block pointers being overwritten. - -Since the body value isn't actually used anymore in the called routines, -we can pass back the offset it should be shifted. We constify the body -and ih pointers in the balance_leaf as a mostly-free preventative measure. - -Cc: <stable(a)vger.kernel.org> # 3.16 -Reported-by: Jeff Chua <jeff.chua.linux(a)gmail.com> -Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> ---- - fs/reiserfs/do_balan.c | 111 +++++++++++++++++++++++++++---------------------- - fs/reiserfs/lbalance.c | 5 +- - fs/reiserfs/reiserfs.h | 9 ++- - 3 files changed, 71 insertions(+), 54 deletions(-) - ---- a/fs/reiserfs/do_balan.c -+++ b/fs/reiserfs/do_balan.c -@@ -286,12 +286,14 @@ static int balance_leaf_when_delete(stru - return 0; - } - --static void balance_leaf_insert_left(struct tree_balance *tb, -- struct item_head *ih, const char *body) -+static unsigned int balance_leaf_insert_left(struct tree_balance *tb, -+ struct item_head *const ih, -+ const char * const body) - { - int ret; - struct buffer_info bi; - int n = B_NR_ITEMS(tb->L[0]); -+ unsigned body_shift_bytes = 0; - - if (tb->item_pos == tb->lnum[0] - 1 && tb->lbytes != -1) { - /* part of new item falls into L[0] */ -@@ -329,7 +331,7 @@ static void balance_leaf_insert_left(str - - put_ih_item_len(ih, new_item_len); - if (tb->lbytes > tb->zeroes_num) { -- body += (tb->lbytes - tb->zeroes_num); -+ body_shift_bytes = tb->lbytes - tb->zeroes_num; - tb->zeroes_num = 0; - } else - tb->zeroes_num -= tb->lbytes; -@@ -349,11 +351,12 @@ static void balance_leaf_insert_left(str - tb->insert_size[0] = 0; - tb->zeroes_num = 0; - } -+ return body_shift_bytes; - } - - static void balance_leaf_paste_left_shift_dirent(struct tree_balance *tb, -- struct item_head *ih, -- const char *body) -+ struct item_head * const ih, -+ const char * const body) - { - int n = B_NR_ITEMS(tb->L[0]); - struct buffer_info bi; -@@ -413,17 +416,18 @@ static void balance_leaf_paste_left_shif - tb->pos_in_item -= tb->lbytes; - } - --static void balance_leaf_paste_left_shift(struct tree_balance *tb, -- struct item_head *ih, -- const char *body) -+static unsigned int balance_leaf_paste_left_shift(struct tree_balance *tb, -+ struct item_head * const ih, -+ const char * const body) - { - struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb->tb_path); - int n = B_NR_ITEMS(tb->L[0]); - struct buffer_info bi; -+ int body_shift_bytes = 0; - - if (is_direntry_le_ih(item_head(tbS0, tb->item_pos))) { - balance_leaf_paste_left_shift_dirent(tb, ih, body); -- return; -+ return 0; - } - - RFALSE(tb->lbytes <= 0, -@@ -497,7 +501,7 @@ static void balance_leaf_paste_left_shif - * insert_size[0] - */ - if (l_n > tb->zeroes_num) { -- body += (l_n - tb->zeroes_num); -+ body_shift_bytes = l_n - tb->zeroes_num; - tb->zeroes_num = 0; - } else - tb->zeroes_num -= l_n; -@@ -526,13 +530,14 @@ static void balance_leaf_paste_left_shif - */ - leaf_shift_left(tb, tb->lnum[0], tb->lbytes); - } -+ return body_shift_bytes; - } - - - /* appended item will be in L[0] in whole */ - static void balance_leaf_paste_left_whole(struct tree_balance *tb, -- struct item_head *ih, -- const char *body) -+ struct item_head * const ih, -+ const char * const body) - { - struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb->tb_path); - int n = B_NR_ITEMS(tb->L[0]); -@@ -584,39 +589,44 @@ static void balance_leaf_paste_left_whol - tb->zeroes_num = 0; - } - --static void balance_leaf_paste_left(struct tree_balance *tb, -- struct item_head *ih, const char *body) -+static unsigned int balance_leaf_paste_left(struct tree_balance *tb, -+ struct item_head * const ih, -+ const char * const body) - { - /* we must shift the part of the appended item */ - if (tb->item_pos == tb->lnum[0] - 1 && tb->lbytes != -1) -- balance_leaf_paste_left_shift(tb, ih, body); -+ return balance_leaf_paste_left_shift(tb, ih, body); - else - balance_leaf_paste_left_whole(tb, ih, body); -+ return 0; - } - - /* Shift lnum[0] items from S[0] to the left neighbor L[0] */ --static void balance_leaf_left(struct tree_balance *tb, struct item_head *ih, -- const char *body, int flag) -+static unsigned int balance_leaf_left(struct tree_balance *tb, -+ struct item_head * const ih, -+ const char * const body, int flag) - { - if (tb->lnum[0] <= 0) -- return; -+ return 0; - - /* new item or it part falls to L[0], shift it too */ - if (tb->item_pos < tb->lnum[0]) { - BUG_ON(flag != M_INSERT && flag != M_PASTE); - - if (flag == M_INSERT) -- balance_leaf_insert_left(tb, ih, body); -+ return balance_leaf_insert_left(tb, ih, body); - else /* M_PASTE */ -- balance_leaf_paste_left(tb, ih, body); -+ return balance_leaf_paste_left(tb, ih, body); - } else - /* new item doesn't fall into L[0] */ - leaf_shift_left(tb, tb->lnum[0], tb->lbytes); -+ return 0; - } - - - static void balance_leaf_insert_right(struct tree_balance *tb, -- struct item_head *ih, const char *body) -+ struct item_head * const ih, -+ const char * const body) - { - - struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb->tb_path); -@@ -704,7 +714,8 @@ static void balance_leaf_insert_right(st - - - static void balance_leaf_paste_right_shift_dirent(struct tree_balance *tb, -- struct item_head *ih, const char *body) -+ struct item_head * const ih, -+ const char * const body) - { - struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb->tb_path); - struct buffer_info bi; -@@ -754,7 +765,8 @@ static void balance_leaf_paste_right_shi - } - - static void balance_leaf_paste_right_shift(struct tree_balance *tb, -- struct item_head *ih, const char *body) -+ struct item_head * const ih, -+ const char * const body) - { - struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb->tb_path); - int n_shift, n_rem, r_zeroes_number, version; -@@ -831,7 +843,8 @@ static void balance_leaf_paste_right_shi - } - - static void balance_leaf_paste_right_whole(struct tree_balance *tb, -- struct item_head *ih, const char *body) -+ struct item_head * const ih, -+ const char * const body) - { - struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb->tb_path); - int n = B_NR_ITEMS(tbS0); -@@ -874,7 +887,8 @@ static void balance_leaf_paste_right_who - } - - static void balance_leaf_paste_right(struct tree_balance *tb, -- struct item_head *ih, const char *body) -+ struct item_head * const ih, -+ const char * const body) - { - struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb->tb_path); - int n = B_NR_ITEMS(tbS0); -@@ -896,8 +910,9 @@ static void balance_leaf_paste_right(str - } - - /* shift rnum[0] items from S[0] to the right neighbor R[0] */ --static void balance_leaf_right(struct tree_balance *tb, struct item_head *ih, -- const char *body, int flag) -+static void balance_leaf_right(struct tree_balance *tb, -+ struct item_head * const ih, -+ const char * const body, int flag) - { - if (tb->rnum[0] <= 0) - return; -@@ -911,8 +926,8 @@ static void balance_leaf_right(struct tr - } - - static void balance_leaf_new_nodes_insert(struct tree_balance *tb, -- struct item_head *ih, -- const char *body, -+ struct item_head * const ih, -+ const char * const body, - struct item_head *insert_key, - struct buffer_head **insert_ptr, - int i) -@@ -1003,8 +1018,8 @@ static void balance_leaf_new_nodes_inser - - /* we append to directory item */ - static void balance_leaf_new_nodes_paste_dirent(struct tree_balance *tb, -- struct item_head *ih, -- const char *body, -+ struct item_head * const ih, -+ const char * const body, - struct item_head *insert_key, - struct buffer_head **insert_ptr, - int i) -@@ -1058,8 +1073,8 @@ static void balance_leaf_new_nodes_paste - } - - static void balance_leaf_new_nodes_paste_shift(struct tree_balance *tb, -- struct item_head *ih, -- const char *body, -+ struct item_head * const ih, -+ const char * const body, - struct item_head *insert_key, - struct buffer_head **insert_ptr, - int i) -@@ -1131,8 +1146,8 @@ static void balance_leaf_new_nodes_paste - } - - static void balance_leaf_new_nodes_paste_whole(struct tree_balance *tb, -- struct item_head *ih, -- const char *body, -+ struct item_head * const ih, -+ const char * const body, - struct item_head *insert_key, - struct buffer_head **insert_ptr, - int i) -@@ -1184,8 +1199,8 @@ static void balance_leaf_new_nodes_paste - - } - static void balance_leaf_new_nodes_paste(struct tree_balance *tb, -- struct item_head *ih, -- const char *body, -+ struct item_head * const ih, -+ const char * const body, - struct item_head *insert_key, - struct buffer_head **insert_ptr, - int i) -@@ -1214,8 +1229,8 @@ static void balance_leaf_new_nodes_paste - - /* Fill new nodes that appear in place of S[0] */ - static void balance_leaf_new_nodes(struct tree_balance *tb, -- struct item_head *ih, -- const char *body, -+ struct item_head * const ih, -+ const char * const body, - struct item_head *insert_key, - struct buffer_head **insert_ptr, - int flag) -@@ -1254,8 +1269,8 @@ static void balance_leaf_new_nodes(struc - } - - static void balance_leaf_finish_node_insert(struct tree_balance *tb, -- struct item_head *ih, -- const char *body) -+ struct item_head * const ih, -+ const char * const body) - { - struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb->tb_path); - struct buffer_info bi; -@@ -1271,8 +1286,8 @@ static void balance_leaf_finish_node_ins - } - - static void balance_leaf_finish_node_paste_dirent(struct tree_balance *tb, -- struct item_head *ih, -- const char *body) -+ struct item_head * const ih, -+ const char * const body) - { - struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb->tb_path); - struct item_head *pasted = item_head(tbS0, tb->item_pos); -@@ -1305,8 +1320,8 @@ static void balance_leaf_finish_node_pas - } - - static void balance_leaf_finish_node_paste(struct tree_balance *tb, -- struct item_head *ih, -- const char *body) -+ struct item_head * const ih, -+ const char * const body) - { - struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb->tb_path); - struct buffer_info bi; -@@ -1349,8 +1364,8 @@ static void balance_leaf_finish_node_pas - * of the affected item which remains in S - */ - static void balance_leaf_finish_node(struct tree_balance *tb, -- struct item_head *ih, -- const char *body, int flag) -+ struct item_head * const ih, -+ const char * const body, int flag) - { - /* if we must insert or append into buffer S[0] */ - if (0 <= tb->item_pos && tb->item_pos < tb->s0num) { -@@ -1402,7 +1417,7 @@ static int balance_leaf(struct tree_bala - && is_indirect_le_ih(item_head(tbS0, tb->item_pos))) - tb->pos_in_item *= UNFM_P_SIZE; - -- balance_leaf_left(tb, ih, body, flag); -+ body += balance_leaf_left(tb, ih, body, flag); - - /* tb->lnum[0] > 0 */ - /* Calculate new item position */ ---- a/fs/reiserfs/lbalance.c -+++ b/fs/reiserfs/lbalance.c -@@ -899,8 +899,9 @@ void leaf_delete_items(struct buffer_inf - - /* insert item into the leaf node in position before */ - void leaf_insert_into_buf(struct buffer_info *bi, int before, -- struct item_head *inserted_item_ih, -- const char *inserted_item_body, int zeros_number) -+ struct item_head * const inserted_item_ih, -+ const char * const inserted_item_body, -+ int zeros_number) - { - struct buffer_head *bh = bi->bi_bh; - int nr, free_space; ---- a/fs/reiserfs/reiserfs.h -+++ b/fs/reiserfs/reiserfs.h -@@ -3216,11 +3216,12 @@ int leaf_shift_right(struct tree_balance - void leaf_delete_items(struct buffer_info *cur_bi, int last_first, int first, - int del_num, int del_bytes); - void leaf_insert_into_buf(struct buffer_info *bi, int before, -- struct item_head *inserted_item_ih, -- const char *inserted_item_body, int zeros_number); --void leaf_paste_in_buffer(struct buffer_info *bi, int pasted_item_num, -- int pos_in_item, int paste_size, const char *body, -+ struct item_head * const inserted_item_ih, -+ const char * const inserted_item_body, - int zeros_number); -+void leaf_paste_in_buffer(struct buffer_info *bi, int pasted_item_num, -+ int pos_in_item, int paste_size, -+ const char * const body, int zeros_number); - void leaf_cut_from_buffer(struct buffer_info *bi, int cut_item_num, - int pos_in_item, int cut_size); - void leaf_paste_entries(struct buffer_info *bi, int item_num, int before, - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/rtsx_usb-export-device-table new/patches.fixes/rtsx_usb-export-device-table --- old/patches.fixes/rtsx_usb-export-device-table 2014-09-17 14:06:06.000000000 +0200 +++ new/patches.fixes/rtsx_usb-export-device-table 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -From: Jeff Mahoney <jeffm(a)suse.com> -Subject: rtsx_usb: export device table -References: bnc#890096 -Patch-mainline: Submitted to LKML 8 Aug 2014 - -The rtsx_usb driver contains the table for the devices it supports but -doesn't export it. As a result, no alias is generated and it doesn't -get loaded automatically. - -Via https://bugzilla.novell.com/show_bug.cgi?id=890096 - -Reported-by: Marcel Witte <wittemar(a)googlemail.com> -Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> ---- - drivers/mfd/rtsx_usb.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/mfd/rtsx_usb.c -+++ b/drivers/mfd/rtsx_usb.c -@@ -744,6 +744,7 @@ static struct usb_device_id rtsx_usb_usb - { USB_DEVICE(0x0BDA, 0x0140) }, - { } - }; -+MODULE_DEVICE_TABLE(usb, rtsx_usb_usb_ids); - - static struct usb_driver rtsx_usb_driver = { - .name = "rtsx_usb", - ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 7310 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.kLFFjr/_old 2014-09-20 15:52:12.000000000 +0200 +++ /var/tmp/diff_new_pack.kLFFjr/_new 2014-09-20 15:52:12.000000000 +0200 @@ -29,6 +29,7 @@ ######################################################## patches.kernel.org/patch-3.16.1 patches.kernel.org/patch-3.16.1-2 + patches.kernel.org/patch-3.16.2-3 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -260,7 +261,6 @@ ######################################################## # Reiserfs Patches ######################################################## - patches.fixes/reiserfs-fix-corruption-introduced-by-balance_leaf-refactor ######################################################## # dlm @@ -402,7 +402,6 @@ ######################################################## # USB ######################################################## - patches.fixes/rtsx_usb-export-device-table ######################################################## # I2C ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.kLFFjr/_old 2014-09-20 15:52:12.000000000 +0200 +++ /var/tmp/diff_new_pack.kLFFjr/_new 2014-09-20 15:52:12.000000000 +0200 @@ -1,3 +1,3 @@ -2014-09-17 14:06:06 +0200 -GIT Revision: 5fca623fef82770d0a6895d3fb6382ac069cb1a6 +2014-09-18 08:32:16 +0200 +GIT Revision: d2bbe7fb53704e1d54bc1e3939ba0c9e0fa6aa3b GIT Branch: stable -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 20 Sep '14

20 Sep '14

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-09-20 15:51:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2014-09-10 17:01:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-09-20 15:51:55.000000000 +0200 @@ -1,0 +2,217 @@ +Fri Sep 19 18:18:50 CEST 2014 - ms(a)suse.de + +- v5.06.162 released + +------------------------------------------------------------------- +Fri Sep 19 18:05:48 CEST 2014 - ms(a)suse.de + +- Increase max per storage device wait period to 30 sec (bnc #897516) + +------------------------------------------------------------------- +Fri Sep 19 17:47:03 CEST 2014 - ms(a)suse.de + +- Prevent activation of a partition on non x86 systems (bnc #897507) + + The active flag is used by legacy BIOS systems on x86 systems. + On other architectures it could cause trouble because that + information is not expected + +------------------------------------------------------------------- +Fri Sep 19 17:32:26 CEST 2014 - ms(a)suse.de + +- Eliminate use of haveBootPartition variable in the initrd code + + kiwi provides exact information in the partition ID's variables + created when the image is build in setupPartIDs. The indicator if + a boot partition is in use was not set correctly by the existing + function. The indicator for a boot partition should be the + filesystem label set to 'BOOT' and the check if this partition is + not equal to the root partition. In the repartition code the + partition ID for the root partition is always defined correctly + by the kiwi_RootPart variable and should not depend on any + condition. That way there was no code left which requires and + extra boolean haveBootPartition variable and also fixes the wrong + pID assignment described in bug (bnc #897497) + +------------------------------------------------------------------- +Fri Sep 19 09:03:52 CEST 2014 - coolo(a)suse.de + +- remove media check from mini iso (bnc#895021) + +------------------------------------------------------------------- +Thu Sep 18 14:46:03 CEST 2014 - coolo(a)suse.de + +- make the mini isos reasonable size again + + instead of just removing the root file, remove all files actually downloaded + from NET repo + +------------------------------------------------------------------- +Wed Sep 17 16:24:17 CEST 2014 - ms(a)suse.de + +- v5.06.161 released + +------------------------------------------------------------------- +Wed Sep 17 16:20:02 CEST 2014 - ms(a)suse.de + +- Add a post install script for kiwi + + The file /dev/shm/lwp-download will be removed in order to + allow kiwi to create this file with the permissions it needs. + The support to allow kiwi to run kiwi --info as non root user + requires this cleanup step because lwp-download is created + with permissions which allows root and normal users to call + the script. former versions leaves a version of the script + which doesn't allow non root users to call or change it which + results in a raise condition for a non privileged --info + call + +------------------------------------------------------------------- +Wed Sep 17 15:42:57 CEST 2014 - ms(a)suse.de + +- Really fixed package update from sle11 to sle12 (bnc #893340) + + the man pages were moved from kiwi-doc to the main kiwi package + between sle11 and sle12. Thus the main kiwi package has to set + a conflicts for the kiwi-doc package in versions < 5 + +------------------------------------------------------------------- +Wed Sep 17 12:10:19 CEST 2014 - adrian(a)suse.de + +- KIWICollect: handle POOL flavors as "ftp" flavors (bnc#896930) + +------------------------------------------------------------------- +Wed Sep 17 09:39:26 CEST 2014 - ms(a)suse.de + +- Fixed spec file by adding missing requirements; tar and psmisc + +------------------------------------------------------------------- +Tue Sep 16 14:54:55 CEST 2014 - ms(a)suse.de + +- Allow kiwi --info to be called without root permission + + There is one exception though. If the repo is an iso file + which needs to be loop mounted we still need root privileges + to call the mount system call. In such a case kiwi will + exit with a useful error message + +------------------------------------------------------------------- +Tue Sep 16 11:41:20 CEST 2014 - ms(a)suse.de + +- v5.06.160 released + +------------------------------------------------------------------- +Tue Sep 16 11:37:25 CEST 2014 - ms(a)suse.de + +- Improve spee of nic setup in netboot initrd (bnc #893788) + + With this commit the list of preferred interfaces which are + either the BOOTIF interface or the list of all detected ones + is used to run the dhcp discovery. The first successfully + discovered interface is used to setup the default gateway + and route as there can only be one + +------------------------------------------------------------------- +Mon Sep 15 09:46:18 CEST 2014 - ms(a)suse.de + +- Fixed package build due to failed unit tests + + The unit tests failed when building on non x86 architectures + because the test reference files for these architectures + contained an unexpected newline at the end of the file. In + addition subsequent tests should not fail which was the case + because existing test tmpdirs were not correctly cleaned up + +------------------------------------------------------------------- +Fri Sep 12 15:36:18 CEST 2014 - ms(a)suse.de + +- Use legacy bios_grub partition only on ix86 and x86_64 (bnc #896445) + +------------------------------------------------------------------- +Fri Sep 12 12:40:23 CEST 2014 - ms(a)suse.de + +- v5.06.159 released + +------------------------------------------------------------------- +Fri Sep 12 12:21:38 CEST 2014 - ms(a)suse.de + +- Fully document virtualsize attribute of <vagrantconfig> in schema + +------------------------------------------------------------------- +Fri Sep 12 01:49:53 CEST 2014 - ms(a)suse.de + +- Move useLVM helper function into global space and explain + conditions for using LVM or not in one central place + +------------------------------------------------------------------- +Fri Sep 12 01:23:08 CEST 2014 - ms(a)suse.de + +- Added runtime check for the bootpartition requirements + + If the use of a bootpartition is explicitly disabled + and one of the filesystems btrfs, zfs or xfs are used + this is only supported with the grub2 bootloader. + +------------------------------------------------------------------- +Fri Sep 12 00:51:46 CEST 2014 - ms(a)suse.de + +- Implement preferlvm="true|false" attribute for <systemdisk> + + When using filesystems which provides a volume management like + btrfs and zfs do, kiwi will make use of it by default. With the + preferlvm attribute the user can overwrite the default and prefer + LVM for volume management + +------------------------------------------------------------------- +Thu Sep 11 18:22:17 CEST 2014 - opensuse(a)suse.de + +- make the two vagrant box templates more consistent + + This makes it easier to see the differences which really matter. + +------------------------------------------------------------------- +Thu Sep 11 16:05:56 CEST 2014 - opensuse(a)suse.de + +- remove pointless $xmlsize assignment + + This assignment is pointless since $xmlsize will always get set to + another value soon after. + +------------------------------------------------------------------- +Thu Sep 11 11:48:31 CEST 2014 - adrian(a)suse.de + +- do not publish appdata for source rpms + +------------------------------------------------------------------- +Thu Sep 11 11:25:47 CEST 2014 - ms(a)suse.de + +- Make suseImportBuildKey more robust (bnc #896126) + + Check if dumpsigs tool exist and don't operate on + files which do not exist + +------------------------------------------------------------------- +Wed Sep 10 17:57:56 CEST 2014 - ms(a)suse.de + +- Prevent building iso with empty loader directory + ++++ 20 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kiwi/kiwi.changes ++++ and /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.VkkaFx/_old 2014-09-20 15:51:58.000000000 +0200 +++ /var/tmp/diff_new_pack.VkkaFx/_new 2014-09-20 15:51:58.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 5.06.158 +Version: 5.06.162 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz @@ -35,6 +35,7 @@ Provides: kiwi:%{_mandir}/man1/KIWI::images.sh.1.gz Provides: kiwi:%{_mandir}/man1/KIWI::kiwirc.1.gz Provides: kiwi:%{_mandir}/man1/kiwi.1.gz +Conflicts: kiwi-doc < 5 # requirements to build packages BuildRequires: diffutils BuildRequires: e2fsprogs @@ -85,8 +86,10 @@ Requires: perl-XML-LibXML-Common Requires: perl-XML-SAX Requires: perl-libwww-perl +Requires: psmisc Requires: rsync Requires: screen +Requires: tar Requires: util-linux %if 0%{?suse_version} # SUSE specific requires @@ -243,10 +246,6 @@ Summary: KIWI - Appliance Builder Documentation License: LGPL-2.0+ Group: Documentation/Howto -Obsoletes: kiwi-doc:%{_mandir}/man1/KIWI::config.sh.1.gz -Obsoletes: kiwi-doc:%{_mandir}/man1/KIWI::images.sh.1.gz -Obsoletes: kiwi-doc:%{_mandir}/man1/KIWI::kiwirc.1.gz -Obsoletes: kiwi-doc:%{_mandir}/man1/kiwi.1.gz %if 0%{?suse_version} > 1120 BuildArch: noarch %endif @@ -738,6 +737,13 @@ done %endif +%post -n kiwi +# make sure kiwi can create this file from scratch with the +# permissions it needs and is not in trouble if it exists +# already with permissions which doesn't allow kiwi to create +# or use this file if kiwi is called as non root user +rm -f /dev/shm/lwp-download + %clean rm -rf $RPM_BUILD_ROOT #================================================= ++++++ kiwi-docu.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/examples/extras/suse-13.1/suse-vagrant-box/config.xml new/doc/examples/extras/suse-13.1/suse-vagrant-box/config.xml --- old/doc/examples/extras/suse-13.1/suse-vagrant-box/config.xml 2014-08-29 22:30:41.000000000 +0200 +++ new/doc/examples/extras/suse-13.1/suse-vagrant-box/config.xml 2014-09-12 12:41:26.000000000 +0200 @@ -28,10 +28,10 @@ <bootloader-theme>openSUSE</bootloader-theme> </preferences> <users group="root"> - <user name="root" password="vh4vw1N4alxKQ" home="/root"/> + <user name="root" password="vagrant" pwdformat="plain" home="/root"/> </users> <users group="vagrant"> - <user name="vagrant" password="vh4vw1N4alxKQ" home="/home/vagrant"/> + <user name="vagrant" password="vagrant" pwdformat="plain" home="/home/vagrant"/> </users> <repository type="yast2"> <source path="obs://13.1/repo/oss"/> ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ ++++ 8228 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit phpMyAdmin for openSUSE:Factory
by root＠hilbert.suse.de 20 Sep '14

20 Sep '14

Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2014-09-20 15:51:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old) and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phpMyAdmin" Changes: -------- --- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2014-09-15 18:25:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes 2014-09-20 15:51:27.000000000 +0200 @@ -1,0 +2,15 @@ +Sat Sep 20 12:12:53 UTC 2014 - ecsos(a)schirra.net + +- update to 4.2.9 (2014-09-20) + - fix bug ajax.js responseHandler: cannot read property of null + - fix bug sql.js: str is undefined + - sf#4524 Allow for direct selection of "0" + on the "user overview" page + - sf#4529 Undefined index: pos + - sf#4523 tbl_change.js: insert as new row submit type on + multiple selected records does not set all AUTO_INCREMENTs + to 0 value + - fix bug ajax.js responseHandler: another "cannot read property" + - fix bug tbl_structure.js "cannot read property" + +------------------------------------------------------------------- Old: ---- phpMyAdmin-4.2.8.1-all-languages.tar.bz2 New: ---- phpMyAdmin-4.2.9-all-languages.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.u1t2Ns/_old 2014-09-20 15:51:28.000000000 +0200 +++ /var/tmp/diff_new_pack.u1t2Ns/_new 2014-09-20 15:51:28.000000000 +0200 @@ -34,7 +34,7 @@ Summary: Administration of MySQL over the web License: GPL-2.0+ Group: Productivity/Networking/Web/Frontends -Version: 4.2.8.1 +Version: 4.2.9 Release: 0 Url: http://www.phpMyAdmin.net Source0: http://sourceforge.net/projects/phpmyadmin/files/%{name}-%{version}-all-lan… ++++++ phpMyAdmin-4.2.8.1-all-languages.tar.bz2 -> phpMyAdmin-4.2.9-all-languages.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin-4.2.8.1-all-languages.tar.bz2 /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin-4.2.9-all-languages.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemd for openSUSE:Factory
by root＠hilbert.suse.de 20 Sep '14

20 Sep '14

Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2014-09-20 15:51:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2014-09-17 17:42:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2014-09-20 15:51:20.000000000 +0200 @@ -1,0 +2,51 @@ +Fri Sep 19 13:08:14 UTC 2014 - werner(a)suse.de + +- Add patch 0001-bnc888612-logind-polkit-acpi.patch from Frederic + to solve bnc#888612 - AUDIT-0: Power button press at gdm login + should not prompt for credentials + +------------------------------------------------------------------- +Fri Sep 19 11:36:48 UTC 2014 - werner(a)suse.de + +- Add upstream bugfix patches + 0001-journal-Do-not-count-on-the-compiler-initializing-fo.patch + 0002-include-fcntl.h-rather-than-sys-fcntl.h.patch + 0003-mount-order-options-before-other-arguments-to-mount.patch + 0004-shared-wtmp-utmp-don-t-clear-store_wtmp-in-utmp_put_.patch + 0005-shared-label.h-add-missing-stdio.h-include.patch + 0006-shared-sparse-endian.h-add-missing-byteswap.h-includ.patch + 0007-libudev-monitor-warn-if-we-fail-to-request-SO_PASSCR.patch + 0008-shared-conf-parser-don-t-leak-memory-on-error-in-DEF.patch + 1080-udevd-parse_argv-warn-if-argumens-are-invalid.patch + 1081-udevd-check-return-of-various-functions.patch + 1082-udevadm-hwdb-check-return-value-of-fseeko.patch + 1083-udev-node-warn-if-chmod-chown-fails.patch + 1084-udev-ctrl-log-if-setting-SO_PASSCRED-fails.patch + 1085-udev-fix-typos.patch + 1086-udevd-don-t-fail-if-run-udev-exists.patch + +------------------------------------------------------------------- +Thu Sep 18 13:21:45 UTC 2014 - werner(a)suse.de + +- Add upstream bugfix patches + 0001-core-fix-resource-leak-in-manager_environment_add.patch + 0002-util-remove-a-unnecessary-check.patch + 0003-udev-event-explicitly-don-t-read-from-invalid-fd.patch + 0004-shared-conf-parser.patch + 0005-logind-fix-typo.patch + 0006-systemctl-fix-resource-leak-CID-1237747.patch + 0007-libudev-monitor-warn-if-we-fail-to-request-SO_PASSCR.patch + 0008-shared-conf-parser-don-t-leak-memory-on-error-in-DEF.patc + 0009-bus-fix-bus_print_property-to-use-int-for-booleans.patch +- Remove 0001-sizeof-bool-used-by-gcc-depends-on-arch.patch as + 0009-bus-fix-bus_print_property-to-use-int-for-booleans.patch + is the upstream solution + +------------------------------------------------------------------- +Wed Sep 17 16:02:33 UTC 2014 - werner(a)suse.de + +- Add patch 0001-sizeof-bool-used-by-gcc-depends-on-arch.patch to + fix for the size of the gcc builtin type bool also known as _Bool + from the include header stdbool.h. + +------------------------------------------------------------------- systemd.changes: same change New: ---- 0001-bnc888612-logind-polkit-acpi.patch 0001-core-fix-resource-leak-in-manager_environment_add.patch 0001-journal-Do-not-count-on-the-compiler-initializing-fo.patch 0002-include-fcntl.h-rather-than-sys-fcntl.h.patch 0002-util-remove-a-unnecessary-check.patch 0003-mount-order-options-before-other-arguments-to-mount.patch 0003-udev-event-explicitly-don-t-read-from-invalid-fd.patch 0004-shared-conf-parser.patch 0004-shared-wtmp-utmp-don-t-clear-store_wtmp-in-utmp_put_.patch 0005-logind-fix-typo.patch 0005-shared-label.h-add-missing-stdio.h-include.patch 0006-shared-sparse-endian.h-add-missing-byteswap.h-includ.patch 0006-systemctl-fix-resource-leak-CID-1237747.patch 0007-libudev-monitor-warn-if-we-fail-to-request-SO_PASSCR.patch 0008-shared-conf-parser-don-t-leak-memory-on-error-in-DEF.patch 0009-bus-fix-bus_print_property-to-use-int-for-booleans.patch 1080-udevd-parse_argv-warn-if-argumens-are-invalid.patch 1081-udevd-check-return-of-various-functions.patch 1082-udevadm-hwdb-check-return-value-of-fseeko.patch 1083-udev-node-warn-if-chmod-chown-fails.patch 1084-udev-ctrl-log-if-setting-SO_PASSCRED-fails.patch 1085-udev-fix-typos.patch 1086-udevd-don-t-fail-if-run-udev-exists.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.Qg1xrU/_old 2014-09-20 15:51:25.000000000 +0200 +++ /var/tmp/diff_new_pack.Qg1xrU/_new 2014-09-20 15:51:25.000000000 +0200 @@ -856,6 +856,38 @@ Patch413: 0009-journal-do-not-leak-mmaps-on-OOM.patch # PATCH-FIX-UPSTREAM added at 2014/09/16 Patch414: 0010-manager-use-correct-cleanup-function.patch +# PATCH-FIX-UPSTREAM added at 2014/09/18 +Patch415: 0001-core-fix-resource-leak-in-manager_environment_add.patch +# PATCH-FIX-UPSTREAM added at 2014/09/18 +Patch416: 0002-util-remove-a-unnecessary-check.patch +# PATCH-FIX-UPSTREAM added at 2014/09/18 +Patch417: 0003-udev-event-explicitly-don-t-read-from-invalid-fd.patch +# PATCH-FIX-UPSTREAM added at 2014/09/18 +Patch418: 0004-shared-conf-parser.patch +# PATCH-FIX-UPSTREAM added at 2014/09/18 +Patch419: 0005-logind-fix-typo.patch +# PATCH-FIX-UPSTREAM added at 2014/09/18 +Patch420: 0006-systemctl-fix-resource-leak-CID-1237747.patch +# PATCH-FIX-UPSTREAM added at 2014/09/16 +Patch421: 0007-libudev-monitor-warn-if-we-fail-to-request-SO_PASSCR.patch +# PATCH-FIX-UPSTREAM added at 2014/09/18 +Patch422: 0008-shared-conf-parser-don-t-leak-memory-on-error-in-DEF.patch +# PATCH-FIX-UPSTREAM added at 2014/09/18 -- Be aware that the size of the type bool may vary +Patch423: 0009-bus-fix-bus_print_property-to-use-int-for-booleans.patch +# PATCH-FIX-UPSTREAM added at 2014/09/19 +Patch424: 0001-journal-Do-not-count-on-the-compiler-initializing-fo.patch +# PATCH-FIX-UPSTREAM added at 2014/09/19 +Patch425: 0002-include-fcntl.h-rather-than-sys-fcntl.h.patch +# PATCH-FIX-UPSTREAM added at 2014/09/19 +Patch426: 0003-mount-order-options-before-other-arguments-to-mount.patch +# PATCH-FIX-UPSTREAM added at 2014/09/19 +Patch427: 0004-shared-wtmp-utmp-don-t-clear-store_wtmp-in-utmp_put_.patch +# PATCH-FIX-UPSTREAM added at 2014/09/19 +Patch428: 0005-shared-label.h-add-missing-stdio.h-include.patch +# PATCH-FIX-UPSTREAM added at 2014/09/19 +Patch429: 0006-shared-sparse-endian.h-add-missing-byteswap.h-includ.patch +# PATCH-FIX-SUSE AUDIT-0: Power button press at gdm login should not prompt for credentials (bnc#888612) +Patch430: 0001-bnc888612-logind-polkit-acpi.patch # UDEV PATCHES # ============ @@ -1021,6 +1053,20 @@ Patch1078: 1078-udev-remove-userspace-firmware-loading-support.patch # PATCH-FIX-UPSTREAM 1079-udev-remove-userspace-firmware-loading-support.patch Patch1079: 1079-udev-remove-userspace-firmware-loading-support.patch +# PATCH-FIX-UPSTREAM 1080-udevd-parse_argv-warn-if-argumens-are-invalid.patch +Patch1080: 1080-udevd-parse_argv-warn-if-argumens-are-invalid.patch +# PATCH-FIX-UPSTREAM 1081-udevd-check-return-of-various-functions.patch +Patch1081: 1081-udevd-check-return-of-various-functions.patch +# PATCH-FIX-UPSTREAM 1082-udevadm-hwdb-check-return-value-of-fseeko.patch +Patch1082: 1082-udevadm-hwdb-check-return-value-of-fseeko.patch +# PATCH-FIX-UPSTREAM 1083-udev-node-warn-if-chmod-chown-fails.patch +Patch1083: 1083-udev-node-warn-if-chmod-chown-fails.patch +# PATCH-FIX-UPSTREAM 1084-udev-ctrl-log-if-setting-SO_PASSCRED-fails.patch +Patch1084: 1084-udev-ctrl-log-if-setting-SO_PASSCRED-fails.patch +# PATCH-FIX-UPSTREAM 1085-udev-fix-typos.patch +Patch1085: 1085-udev-fix-typos.patch +# PATCH-FIX-UPSTREAM 1085-udevd-don-t-fail-if-run-udev-exists.patch +Patch1086: 1086-udevd-don-t-fail-if-run-udev-exists.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1596,6 +1642,22 @@ %patch412 -p0 %patch413 -p0 %patch414 -p0 +%patch415 -p0 +%patch416 -p0 +%patch417 -p0 +%patch418 -p0 +%patch419 -p0 +%patch420 -p0 +%patch421 -p0 +%patch422 -p0 +%patch423 -p0 +%patch424 -p0 +%patch425 -p0 +%patch426 -p0 +%patch427 -p0 +%patch428 -p0 +%patch429 -p0 +%patch430 -p1 # udev patches %patch1001 -p1 @@ -1706,6 +1768,13 @@ %patch1078 -p1 %endif %endif +%patch1080 -p0 +%patch1081 -p0 +%patch1082 -p0 +%patch1083 -p0 +%patch1084 -p0 +%patch1085 -p0 +%patch1086 -p0 # remove patch backups find -name '*.orig' -exec rm -f '{}' \+ systemd.spec: same change ++++++ 0001-bnc888612-logind-polkit-acpi.patch ++++++ --- src/login/logind-action.c | 5 +++++ src/login/logind-dbus.c | 20 ++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) Index: systemd-210/src/login/logind-action.c =================================================================== --- systemd-210/src/login/logind-action.c +++ systemd-210/src/login/logind-action.c @@ -101,6 +101,11 @@ int manager_handle_action( /* If the key handling is inhibited, don't do anything */ if (inhibit_key > 0) { + if (inhibit_key == INHIBIT_HANDLE_POWER_KEY) { + int fd; + fd = open("/run/systemd/acpi-shutdown", O_CREAT|O_WRONLY|O_TRUNC, S_IRUSR); + close(fd); + } if (manager_is_inhibited(m, inhibit_key, INHIBIT_BLOCK, NULL, true, false, 0, NULL)) { log_debug("Refusing operation, %s is inhibited.", inhibit_what_to_string(inhibit_key)); return 0; Index: systemd-210/src/login/logind-dbus.c =================================================================== --- systemd-210/src/login/logind-dbus.c +++ systemd-210/src/login/logind-dbus.c @@ -1469,9 +1469,11 @@ static int method_do_shutdown_or_sleep( sd_bus_error *error) { _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; - bool multiple_sessions, blocked; + bool multiple_sessions, blocked, shutdown_through_acpi; int interactive, r; uid_t uid; + int fd; + struct stat buf; assert(m); assert(message); @@ -1515,7 +1517,17 @@ static int method_do_shutdown_or_sleep( multiple_sessions = r > 0; blocked = manager_is_inhibited(m, w, INHIBIT_BLOCK, NULL, false, true, uid, NULL); - if (multiple_sessions) { + fd = open ("/run/systemd/acpi-shutdown", O_NOFOLLOW|O_PATH|O_CLOEXEC); + if (fd >= 0) { + shutdown_through_acpi = ((fstat(fd,&buf) == 0) && (time(NULL) - buf.st_mtime <= 65)); + close(fd); + unlink ("/run/systemd/acpi-shutdown"); + } + else + shutdown_through_acpi = false; + + + if (multiple_sessions && !shutdown_through_acpi) { r = bus_verify_polkit_async(m->bus, &m->polkit_registry, message, action_multiple_sessions, interactive, error, method, m); if (r < 0) @@ -1524,7 +1536,7 @@ static int method_do_shutdown_or_sleep( return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */ } - if (blocked) { + if (blocked && !shutdown_through_acpi) { r = bus_verify_polkit_async(m->bus, &m->polkit_registry, message, action_ignore_inhibit, interactive, error, method, m); if (r < 0) @@ -1533,7 +1545,7 @@ static int method_do_shutdown_or_sleep( return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */ } - if (!multiple_sessions && !blocked) { + if (!multiple_sessions && !blocked && !shutdown_through_acpi) { r = bus_verify_polkit_async(m->bus, &m->polkit_registry, message, action, interactive, error, method, m); if (r < 0) ++++++ 0001-core-fix-resource-leak-in-manager_environment_add.patch ++++++ >From aa9f8a30fd7dc7aa3aa2575b75b3f9a0ab3f02db Mon Sep 17 00:00:00 2001 From: Andreas Henriksson <andreas(a)fatal.se> Date: Tue, 16 Sep 2014 21:11:02 +0200 Subject: [PATCH] core: fix resource leak in manager_environment_add Second error path must free the (potentially) allocated memory in the first code chunk before returning. Found by coverity. Fixes: CID#1237750 --- src/core/manager.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git src/core/manager.c src/core/manager.c index 0770727..e0c1cd1 100644 --- src/core/manager.c +++ src/core/manager.c @@ -2751,8 +2751,10 @@ int manager_environment_add(Manager *m, char **minus, char **plus) { if (!strv_isempty(plus)) { b = strv_env_merge(2, l, plus); - if (!b) + if (!b) { + strv_free(a); return -ENOMEM; + } l = b; } -- 1.7.9.2 ++++++ 0001-journal-Do-not-count-on-the-compiler-initializing-fo.patch ++++++ >From e8c108ca9f11a382742f212f5b42a02536b3d40f Mon Sep 17 00:00:00 2001 From: Philippe De Swert <philippedeswert(a)gmail.com> Date: Wed, 17 Sep 2014 00:27:16 +0300 Subject: [PATCH] journal: Do not count on the compiler initializing found_last to false There is a very unlikely case where this can happen since gcc usually does the sane thing. But let's make sure found_last is initialized anyway. Fixes: CID#996386 --- src/journal/journal-verify.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git src/journal/journal-verify.c src/journal/journal-verify.c index 6c8ca8c..b4e8f73 100644 --- src/journal/journal-verify.c +++ src/journal/journal-verify.c @@ -804,7 +804,7 @@ int journal_file_verify( usec_t last_usec = 0; int data_fd = -1, entry_fd = -1, entry_array_fd = -1; unsigned i; - bool found_last; + bool found_last = false; #ifdef HAVE_GCRYPT uint64_t last_tag = 0; #endif -- 1.7.9.2 ++++++ 0002-include-fcntl.h-rather-than-sys-fcntl.h.patch ++++++ >From fdb8bd0fe7244b72ddc1c08e401ebddefdaf4f46 Mon Sep 17 00:00:00 2001 From: Emil Renner Berthing <systemd(a)esmil.dk> Date: Thu, 18 Sep 2014 15:24:38 +0200 Subject: [PATCH] include fcntl.h rather than sys/fcntl.h --- src/socket-proxy/socket-proxyd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git src/socket-proxy/socket-proxyd.c src/socket-proxy/socket-proxyd.c index 81d8457..ff2b24f 100644 --- src/socket-proxy/socket-proxyd.c +++ src/socket-proxy/socket-proxyd.c @@ -26,7 +26,7 @@ #include <stdlib.h> #include <string.h> #include <netdb.h> -#include <sys/fcntl.h> +#include <fcntl.h> #include <sys/socket.h> #include <sys/un.h> #include <unistd.h> -- 1.7.9.2 ++++++ 0002-util-remove-a-unnecessary-check.patch ++++++ Based on 42646a8bf24be2c9280554c9d8540c67c835b3c4 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen <phomes(a)gmail.com> Date: Tue, 16 Sep 2014 22:58:35 +0200 Subject: [PATCH] util: remove a unnecessary check We only break out of the previous loop if fd >= 0 so there is no use in checking it again. Found by coverity. Fixes: CID#1237577 --- src/shared/util.c | 3 --- 1 file changed, 3 deletions(-) --- src/shared/util.c +++ src/shared/util.c 2014-09-18 13:05:08.218236754 +0000 @@ -1772,9 +1772,6 @@ int open_terminal(const char *name, int c++; } - if (fd < 0) - return -errno; - r = isatty(fd); if (r < 0) { close_nointr_nofail(fd); ++++++ 0003-mount-order-options-before-other-arguments-to-mount.patch ++++++ Based on 141a1ceaa62578f1ed14f04cae2113dd0f49fd7f Mon Sep 17 00:00:00 2001 From: Emil Renner Berthing <systemd(a)esmil.dk> Date: Thu, 18 Sep 2014 15:24:59 +0200 Subject: [PATCH] mount: order options before other arguments to mount --- src/core/mount.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) --- src/core/mount.c +++ src/core/mount.c 2014-09-19 10:13:51.638238597 +0000 @@ -947,10 +947,11 @@ static void mount_enter_mounting(Mount * r = exec_command_set( m->control_command, "/bin/mount", - m->parameters_fragment.what, - m->where, + "-n", "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto", m->parameters_fragment.options ? "-o" : NULL, m->parameters_fragment.options, + m->parameters_fragment.what, + m->where, NULL); else r = -ENOENT; @@ -994,10 +995,11 @@ static void mount_enter_remounting(Mount r = exec_command_set( m->control_command, "/bin/mount", - m->parameters_fragment.what, - m->where, + "-n", "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto", "-o", o, + m->parameters_fragment.what, + m->where, NULL); } else r = -ENOENT; ++++++ 0003-udev-event-explicitly-don-t-read-from-invalid-fd.patch ++++++ >From 3f796750b192e62701e91a95f85389f876d1059b Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg(a)jklm.no> Date: Wed, 17 Sep 2014 21:44:56 +0200 Subject: [PATCH] udev: event - explicitly don't read() from invalid fd This fixes CID #1237641. --- src/udev/udev-event.c | 3 +++ 1 file changed, 3 insertions(+) diff --git src/udev/udev-event.c src/udev/udev-event.c index 6b8b5a8..c8b1420 100644 --- src/udev/udev-event.c +++ src/udev/udev-event.c @@ -494,6 +494,9 @@ static void spawn_read(struct udev_event *event, for (i = 0; i < fdcount; i++) { int *fd = (int *)ev[i].data.ptr; + if (*fd < 0) + continue; + if (ev[i].events & EPOLLIN) { ssize_t count; char buf[4096]; -- 1.7.9.2 ++++++ 0004-shared-conf-parser.patch ++++++ Based on 83e341a637b75f7f592a5dc717c34d8b67ed4ffa Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg(a)jklm.no> Date: Wed, 17 Sep 2014 22:17:53 +0200 Subject: [PATCH] shared: conf-parser Check memory allocation. Found by Coverity. Fixes CID #1237644. --- src/shared/conf-parser.h | 4 ++++ 1 file changed, 4 insertions(+) --- src/shared/conf-parser.h +++ src/shared/conf-parser.h 2014-09-18 13:07:07.314735514 +0000 @@ -181,6 +181,8 @@ int log_syntax_internal(const char *unit assert(data); \ \ xs = new0(type, 1); \ + if(!xs) \ + return -ENOMEM; \ *xs = invalid; \ \ FOREACH_WORD(w, l, rvalue, state) { \ @@ -213,6 +215,7 @@ int log_syntax_internal(const char *unit xs = realloc(xs, (++i + 1) * sizeof(type)); \ if (!xs) \ return -ENOMEM; \ + \ *(xs + i) = invalid; \ } \ \ ++++++ 0004-shared-wtmp-utmp-don-t-clear-store_wtmp-in-utmp_put_.patch ++++++ >From 863f3ce0d050f005839f6aa41fe7bac5478a7b5e Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg(a)jklm.no> Date: Fri, 19 Sep 2014 08:03:31 +0200 Subject: [PATCH] shared: wtmp-utmp - don't clear store_wtmp in utmp_put_dead_process() Also modernize a few other things and add comments to explain CID #1237503 and CID #1237504. --- src/shared/utmp-wtmp.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git src/shared/utmp-wtmp.c src/shared/utmp-wtmp.c index 30a0c03..31f13ec 100644 --- src/shared/utmp-wtmp.c +++ src/shared/utmp-wtmp.c @@ -92,8 +92,6 @@ int utmp_get_runlevel(int *runlevel, int *previous) { static void init_timestamp(struct utmpx *store, usec_t t) { assert(store); - zero(*store); - if (t <= 0) t = now(CLOCK_REALTIME); @@ -143,7 +141,7 @@ static int write_entry_wtmp(const struct utmpx *store) { assert(store); /* wtmp is a simple append-only file where each entry is - simply appended to * the end; i.e. basically a log. */ + simply appended to the end; i.e. basically a log. */ errno = 0; updwtmpx(_PATH_WTMPX, store); @@ -172,7 +170,7 @@ static int write_entry_both(const struct utmpx *store) { } int utmp_put_shutdown(void) { - struct utmpx store; + struct utmpx store = {}; init_entry(&store, 0); @@ -183,7 +181,7 @@ int utmp_put_shutdown(void) { } int utmp_put_reboot(usec_t t) { - struct utmpx store; + struct utmpx store = {}; init_entry(&store, t); @@ -206,16 +204,17 @@ _pure_ static const char *sanitize_id(const char *id) { } int utmp_put_init_process(const char *id, pid_t pid, pid_t sid, const char *line) { - struct utmpx store; + struct utmpx store = { + .ut_type = INIT_PROCESS, + .ut_pid = pid, + .ut_session = sid, + }; assert(id); init_timestamp(&store, 0); - store.ut_type = INIT_PROCESS; - store.ut_pid = pid; - store.ut_session = sid; - + /* ut_id needs only be nul-terminated if it is shorter than sizeof(ut_id) */ strncpy(store.ut_id, sanitize_id(id), sizeof(store.ut_id)); if (line) @@ -225,14 +224,15 @@ int utmp_put_init_process(const char *id, pid_t pid, pid_t sid, const char *line } int utmp_put_dead_process(const char *id, pid_t pid, int code, int status) { - struct utmpx lookup, store, store_wtmp, *found; + struct utmpx lookup = { + .ut_type = INIT_PROCESS /* looks for DEAD_PROCESS, LOGIN_PROCESS, USER_PROCESS, too */ + }, store, store_wtmp, *found; assert(id); setutxent(); - zero(lookup); - lookup.ut_type = INIT_PROCESS; /* looks for DEAD_PROCESS, LOGIN_PROCESS, USER_PROCESS, too */ + /* ut_id needs only be nul-terminated if it is shorter than sizeof(ut_id) */ strncpy(lookup.ut_id, sanitize_id(id), sizeof(lookup.ut_id)); found = getutxid(&lookup); @@ -260,7 +260,7 @@ int utmp_put_dead_process(const char *id, pid_t pid, int code, int status) { int utmp_put_runlevel(int runlevel, int previous) { - struct utmpx store; + struct utmpx store = {}; int r; assert(runlevel > 0); -- 1.7.9.2 ++++++ 0005-logind-fix-typo.patch ++++++ >From 2b2332856bafe25c4aa17db2a90bdcddef1fec1a Mon Sep 17 00:00:00 2001 From: Ronny Chevalier <chevalier.ronny(a)gmail.com> Date: Wed, 17 Sep 2014 20:10:44 +0200 Subject: [PATCH] logind: fix typo --- src/login/logind-session-dbus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git src/login/logind-session-dbus.c src/login/logind-session-dbus.c index 7d81500..58836fc 100644 --- src/login/logind-session-dbus.c +++ src/login/logind-session-dbus.c @@ -249,7 +249,7 @@ static int method_set_idle_hint(sd_bus *bus, sd_bus_message *message, void *user return r; if (uid != 0 && uid != s->user->uid) - return sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Only owner of session my set idle hint"); + return sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Only owner of session may set idle hint"); session_set_idle_hint(s, b); -- 1.7.9.2 ++++++ 0005-shared-label.h-add-missing-stdio.h-include.patch ++++++ >From 45f15021e3524b04d574b9ff4e801cb3219daf3f Mon Sep 17 00:00:00 2001 From: Emil Renner Berthing <systemd(a)esmil.dk> Date: Thu, 18 Sep 2014 15:24:42 +0200 Subject: [PATCH] shared/label.h: add missing stdio.h include --- src/shared/label.h | 1 + 1 file changed, 1 insertion(+) diff --git src/shared/label.h src/shared/label.h index 7294820..cb2ec79 100644 --- src/shared/label.h +++ src/shared/label.h @@ -24,6 +24,7 @@ #include <sys/types.h> #include <stdbool.h> #include <sys/socket.h> +#include <stdio.h> int label_init(const char *prefix); void label_finish(void); -- 1.7.9.2 ++++++ 0006-shared-sparse-endian.h-add-missing-byteswap.h-includ.patch ++++++ >From 8e8af4cfc7fa373504a22e58966909161acfb72f Mon Sep 17 00:00:00 2001 From: Emil Renner Berthing <systemd(a)esmil.dk> Date: Thu, 18 Sep 2014 15:24:43 +0200 Subject: [PATCH] shared/sparse-endian.h: add missing byteswap.h include --- src/shared/sparse-endian.h | 1 + 1 file changed, 1 insertion(+) diff --git src/shared/sparse-endian.h src/shared/sparse-endian.h index eb4dbf3..c913fda 100644 --- src/shared/sparse-endian.h +++ src/shared/sparse-endian.h @@ -21,6 +21,7 @@ #ifndef SPARSE_ENDIAN_H #define SPARSE_ENDIAN_H +#include <byteswap.h> #include <endian.h> #include <stdint.h> -- 1.7.9.2 ++++++ 0006-systemctl-fix-resource-leak-CID-1237747.patch ++++++ >From 48a2900c6612052149a1d0dd88aeacb99b49ce4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez(a)opensuse.org> Date: Wed, 17 Sep 2014 21:56:25 -0300 Subject: [PATCH] systemctl: fix resource leak CID #1237747 ..by simply moving the declaration of "unit" into the STRV_FOREACH loop as suggested by Andreas. --- src/systemctl/systemctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git src/systemctl/systemctl.c src/systemctl/systemctl.c index 88be871..9012128 100644 --- src/systemctl/systemctl.c +++ src/systemctl/systemctl.c @@ -4449,7 +4449,6 @@ static int show(sd_bus *bus, char **args) { } static int cat(sd_bus *bus, char **args) { - _cleanup_free_ char *unit = NULL; _cleanup_strv_free_ char **names = NULL; char **name; bool first = true; @@ -4468,6 +4467,8 @@ static int cat(sd_bus *bus, char **args) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_strv_free_ char **dropin_paths = NULL; _cleanup_free_ char *fragment_path = NULL; + _cleanup_free_ char *unit = NULL; + char **path; unit = unit_dbus_path_from_name(*name); -- 1.7.9.2 ++++++ 0007-libudev-monitor-warn-if-we-fail-to-request-SO_PASSCR.patch ++++++ >From 9dedfe7f667a8cb22ba85d0223556c69c4fd0e9a Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg(a)jklm.no> Date: Thu, 18 Sep 2014 09:20:46 +0200 Subject: [PATCH] libudev: monitor - warn if we fail to request SO_PASSCRED The function still succeeds, so there is no functional change. This fixes CID #996288. --- src/libudev/libudev-monitor.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git src/libudev/libudev-monitor.c src/libudev/libudev-monitor.c index 186e5e1..59698b8 100644 --- src/libudev/libudev-monitor.c +++ src/libudev/libudev-monitor.c @@ -412,7 +412,10 @@ _public_ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor) } /* enable receiving of sender credentials */ - setsockopt(udev_monitor->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)); + err = setsockopt(udev_monitor->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)); + if (err < 0) + udev_err(udev_monitor->udev, "setting SO_PASSCRED failed: %m\n"); + return 0; } -- 1.7.9.2 ++++++ 0008-shared-conf-parser-don-t-leak-memory-on-error-in-DEF.patch ++++++ Based on 77c10205bb337585c320e91af4b416f2dcc6faba Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg(a)jklm.no> Date: Thu, 18 Sep 2014 13:47:00 +0200 Subject: [PATCH] shared: conf-parser - don't leak memory on error in DEFINE_CONFIG_PARSE_ENUMV Found by Coverity. Fixes CID #1237746. --- src/shared/conf-parser.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) --- src/shared/conf-parser.h +++ src/shared/conf-parser.h 2014-09-18 13:14:43.730234764 +0000 @@ -171,7 +171,8 @@ int log_syntax_internal(const char *unit void *data, \ void *userdata) { \ \ - type **enums = data, *xs, x, *ys; \ + type **enums = data, x, *ys; \ + _cleanup_free_ type *xs = NULL; \ char *w, *state; \ size_t l, i = 0; \ \ @@ -187,6 +188,7 @@ int log_syntax_internal(const char *unit \ FOREACH_WORD(w, l, rvalue, state) { \ _cleanup_free_ char *en = NULL; \ + type *new_xs; \ \ en = strndup(w, l); \ if (!en) \ @@ -212,8 +214,10 @@ int log_syntax_internal(const char *unit continue; \ \ *(xs + i) = x; \ - xs = realloc(xs, (++i + 1) * sizeof(type)); \ - if (!xs) \ + new_xs = realloc(xs, (++i + 1) * sizeof(type)); \ + if (new_xs) \ + xs = new_xs; \ + else \ return -ENOMEM; \ \ *(xs + i) = invalid; \ @@ -221,5 +225,7 @@ int log_syntax_internal(const char *unit \ free(*enums); \ *enums = xs; \ + xs = NULL; \ + \ return 0; \ } ++++++ 0009-bus-fix-bus_print_property-to-use-int-for-booleans.patch ++++++ >From c2fa048c4a70c8386c6d8fe939e5ea9edecf1e98 Mon Sep 17 00:00:00 2001 From: David Herrmann <dh.herrmann(a)gmail.com> Date: Thu, 18 Sep 2014 13:28:28 +0200 Subject: [PATCH] bus: fix bus_print_property() to use "int" for booleans We always use "int" if we retrieve boolean values from sd-bus, as "bool" is only a single byte, but full int on va-args. Thanks to Werner Fink for the report! --- src/libsystemd/sd-bus/bus-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git src/libsystemd/sd-bus/bus-util.c src/libsystemd/sd-bus/bus-util.c index 7c6da60..9018bce 100644 --- src/libsystemd/sd-bus/bus-util.c +++ src/libsystemd/sd-bus/bus-util.c @@ -631,7 +631,7 @@ int bus_print_property(const char *name, sd_bus_message *property, bool all) { } case SD_BUS_TYPE_BOOLEAN: { - bool b; + int b; r = sd_bus_message_read_basic(property, type, &b); if (r < 0) -- 1.7.9.2 ++++++ 1080-udevd-parse_argv-warn-if-argumens-are-invalid.patch ++++++ Based on 6f5cf8a8b1de763383f7382821147e538b7dbd6d Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg(a)jklm.no> Date: Thu, 18 Sep 2014 19:02:03 +0200 Subject: [PATCH] udevd: parse_argv - warn if argumens are invalid Found by Coverity. Fixes CID #1238780. --- src/udev/udevd.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) --- src/udev/udevd.c +++ src/udev/udevd.c 2014-09-19 10:36:25.602735652 +0000 @@ -1002,11 +1002,20 @@ static void kernel_cmdline_options(struc log_set_max_level(prio); udev_set_log_priority(udev, prio); } else if (startswith(opt, "udev.children-max=")) { - children_max = strtoul(opt + 18, NULL, 0); + r = safe_atoi(opt + 18, &children_max); + if (r < 0) + log_warning("Invalid udev.children-max ignored: %s", opt + 18); } else if (startswith(opt, "udev.exec-delay=")) { - exec_delay = strtoul(opt + 16, NULL, 0); + r = safe_atoi(opt + 16, &exec_delay); + if (r < 0) + log_warning("Invalid udev.exec-delay ignored: %s", opt + 16); } else if (startswith(opt, "udev.event-timeout=")) { - event_timeout_usec = strtoul(opt + 16, NULL, 0) * USEC_PER_SEC; + r = safe_atou64(opt + 16, &event_timeout_usec); + if (r < 0) { + log_warning("Invalid udev.event-timeout ignored: %s", opt + 16); + break; + } + event_timeout_usec *= USEC_PER_SEC; event_timeout_warn_usec = (event_timeout_usec / 3) ? : 1; } @@ -1052,7 +1061,7 @@ int main(int argc, char *argv[]) { label_init("/dev"); for (;;) { - int option; + int option, r; option = getopt_long(argc, argv, "c:de:DtN:hV", options, NULL); if (option == -1) @@ -1063,14 +1072,23 @@ int main(int argc, char *argv[]) { daemonize = true; break; case 'c': - children_max = strtoul(optarg, NULL, 0); + r = safe_atoi(optarg, &children_max); + if (r < 0) + log_warning("Invalid --children-max ignored: %s", optarg); break; case 'e': - exec_delay = strtoul(optarg, NULL, 0); + r = safe_atoi(optarg, &exec_delay); + if (r < 0) + log_warning("Invalid --exec-delay ignored: %s", optarg); break; case 't': - event_timeout_usec = strtoul(optarg, NULL, 0) * USEC_PER_SEC; - event_timeout_warn_usec = (event_timeout_usec / 3) ? : 1; + r = safe_atou64(optarg, &event_timeout_usec); + if (r < 0) + log_warning("Invalig --event-timeout ignored: %s", optarg); + else { + event_timeout_usec *= USEC_PER_SEC; + event_timeout_warn_usec = (event_timeout_usec / 3) ? : 1; + } break; case 'D': debug = true; ++++++ 1081-udevd-check-return-of-various-functions.patch ++++++ Based on d457ff8319b1e7c522c146f75e272f1226f4720c Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg(a)jklm.no> Date: Thu, 18 Sep 2014 19:07:02 +0200 Subject: [PATCH] udevd: check return of various functions One reported by Coverity. Fixes CID #996252. --- src/udev/udevd.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) --- src/udev/udevd.c +++ src/udev/udevd.c 2014-09-19 11:33:21.566236309 +0000 @@ -1044,7 +1044,7 @@ int main(int argc, char *argv[]) { int fd_worker = -1; struct epoll_event ep_ctrl, ep_inotify, ep_signal, ep_netlink, ep_worker; struct udev_ctrl_connection *ctrl_conn = NULL; - int rc = 1; + int rc = 1, r; udev = udev_new(); if (udev == NULL) @@ -1058,7 +1058,11 @@ int main(int argc, char *argv[]) { log_set_max_level(udev_get_log_priority(udev)); log_debug("version %s", VERSION); - label_init("/dev"); + r = label_init("/dev"); + if (r < 0) { + log_error("could not initialize labelling: %s", strerror(-r)); + goto exit; + } for (;;) { int option, r; @@ -1137,10 +1141,18 @@ int main(int argc, char *argv[]) { } /* set umask before creating any file/directory */ - chdir("/"); + r = chdir("/"); + if (r < 0) { + log_error("could not change dir to /: %m"); + goto exit; + } umask(022); - mkdir("/run/udev", 0755); + r = mkdir("/run/udev", 0755); + if (r < 0) { + log_error("could not create /run/udev: %m"); + goto exit; + } dev_setup(NULL); ++++++ 1082-udevadm-hwdb-check-return-value-of-fseeko.patch ++++++ >From f901aaadd68050bc575c1c15b84f8f31fd4d494d Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg(a)jklm.no> Date: Thu, 18 Sep 2014 19:16:54 +0200 Subject: [PATCH] udevadm: hwdb - check return value of fseeko() Fonud by Coverity. Fixes CID #996255. --- src/udev/udevadm-hwdb.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git src/udev/udevadm-hwdb.c src/udev/udevadm-hwdb.c index 65cbf61..64273fb 100644 --- src/udev/udevadm-hwdb.c +++ src/udev/udevadm-hwdb.c @@ -365,7 +365,12 @@ static int trie_store(struct trie *trie, const char *filename) { fchmod(fileno(t.f), 0444); /* write nodes */ - fseeko(t.f, sizeof(struct trie_header_f), SEEK_SET); + err = fseeko(t.f, sizeof(struct trie_header_f), SEEK_SET); + if (err < 0) { + fclose(t.f); + unlink_noerrno(filename_tmp); + return -errno; + } root_off = trie_store_nodes(&t, trie->root); h.nodes_root_off = htole64(root_off); pos = ftello(t.f); @@ -378,7 +383,12 @@ static int trie_store(struct trie *trie, const char *filename) { /* write header */ size = ftello(t.f); h.file_size = htole64(size); - fseeko(t.f, 0, SEEK_SET); + err = fseeko(t.f, 0, SEEK_SET); + if (err < 0) { + fclose(t.f); + unlink_noerrno(filename_tmp); + return -errno; + } fwrite(&h, sizeof(struct trie_header_f), 1, t.f); err = ferror(t.f); if (err) -- 1.7.9.2 ++++++ 1083-udev-node-warn-if-chmod-chown-fails.patch ++++++ >From 543afdc63c02a5af3cf6bd2a264162f23474346a Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg(a)jklm.no> Date: Thu, 18 Sep 2014 19:22:09 +0200 Subject: [PATCH] udev: node - warn if chmod/chown fails No functional change, just log the warning. Fonud by Coverity. Fixes CID #1237544. --- src/udev/udev-node.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git src/udev/udev-node.c src/udev/udev-node.c index c164603..8ef7889 100644 --- src/udev/udev-node.c +++ src/udev/udev-node.c @@ -281,8 +281,12 @@ static int node_permissions_apply(struct udev_device *dev, bool apply, if ((stats.st_mode & 0777) != (mode & 0777) || stats.st_uid != uid || stats.st_gid != gid) { log_debug("set permissions %s, %#o, uid=%u, gid=%u", devnode, mode, uid, gid); - chmod(devnode, mode); - chown(devnode, uid, gid); + err = chmod(devnode, mode); + if (err < 0) + log_warning("setting mode of %s to %#o failed: %m", devnode, mode); + err = chown(devnode, uid, gid); + if (err < 0) + log_warning("setting owner of %s to uid=%u, gid=%u failed: %m", devnode, uid, gid); } else { log_debug("preserve permissions %s, %#o, uid=%u, gid=%u", devnode, mode, uid, gid); } -- 1.7.9.2 ++++++ 1084-udev-ctrl-log-if-setting-SO_PASSCRED-fails.patch ++++++ Based on 4bbdff757ed4e718a3348b93439a03055cc5e3bc Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg(a)jklm.no> Date: Thu, 18 Sep 2014 19:26:11 +0200 Subject: [PATCH] udev: ctrl - log if setting SO_PASSCRED fails No functional change. Found by Coverity. Fixes CID #1237533. --- src/udev/udev-ctrl.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- src/udev/udev-ctrl.c +++ src/udev/udev-ctrl.c 2014-09-19 10:45:55.494236229 +0000 @@ -74,6 +74,7 @@ struct udev_ctrl *udev_ctrl_new_from_fd( { struct udev_ctrl *uctrl; const int on = 1; + int r; uctrl = new0(struct udev_ctrl, 1); if (uctrl == NULL) @@ -92,7 +93,9 @@ struct udev_ctrl *udev_ctrl_new_from_fd( uctrl->bound = true; uctrl->sock = fd; } - setsockopt(uctrl->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)); + r = setsockopt(uctrl->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)); + if (r < 0) + log_warning("could not set SO_PASSCRED: %m"); uctrl->saddr.sun_family = AF_LOCAL; strscpy(uctrl->saddr.sun_path, sizeof(uctrl->saddr.sun_path), "/run/udev/control"); @@ -209,7 +212,10 @@ struct udev_ctrl_connection *udev_ctrl_g } /* enable receiving of the sender credentials in the messages */ - setsockopt(conn->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)); + r = setsockopt(conn->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)); + if (r < 0) + log_warning("colud not set SO_PASSCRED: %m"); + udev_ctrl_ref(uctrl); return conn; err: ++++++ 1085-udev-fix-typos.patch ++++++ Based on 65fea570f03df51dadc06a3e0d261a71fe62aa01 Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg(a)jklm.no> Date: Thu, 18 Sep 2014 20:25:33 +0200 Subject: [PATCH] udev: fix typos Spotted by Andreas Henriksson. --- src/udev/udev-ctrl.c | 2 +- src/udev/udevd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- src/udev/udev-ctrl.c +++ src/udev/udev-ctrl.c 2014-09-19 00:00:00.000000000 +0000 @@ -214,7 +214,7 @@ struct udev_ctrl_connection *udev_ctrl_g /* enable receiving of the sender credentials in the messages */ r = setsockopt(conn->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)); if (r < 0) - log_warning("colud not set SO_PASSCRED: %m"); + log_warning("could not set SO_PASSCRED: %m"); udev_ctrl_ref(uctrl); return conn; --- src/udev/udevd.c +++ src/udev/udevd.c 2014-09-19 10:47:36.306235720 +0000 @@ -1088,7 +1088,7 @@ int main(int argc, char *argv[]) { case 't': r = safe_atou64(optarg, &event_timeout_usec); if (r < 0) - log_warning("Invalig --event-timeout ignored: %s", optarg); + log_warning("Invalid --event-timeout ignored: %s", optarg); else { event_timeout_usec *= USEC_PER_SEC; event_timeout_warn_usec = (event_timeout_usec / 3) ? : 1; ++++++ 1086-udevd-don-t-fail-if-run-udev-exists.patch ++++++ >From 25773e7fc59b4ce53d67da4e18bfe4d13ab0b14b Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg(a)jklm.no> Date: Thu, 18 Sep 2014 21:57:49 +0200 Subject: [PATCH] udevd: don't fail if /run/udev exists --- src/udev/udevd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git src/udev/udevd.c src/udev/udevd.c index 37db81c..29ccb51 100644 --- src/udev/udevd.c +++ src/udev/udevd.c @@ -1155,7 +1155,7 @@ int main(int argc, char *argv[]) { umask(022); r = mkdir("/run/udev", 0755); - if (r < 0) { + if (r < 0 && errno != EEXIST) { log_error("could not create /run/udev: %m"); goto exit; } -- 1.7.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0