August 2014 - openSUSE Commits - openSUSE Mailing Lists

commit ant-junit for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '14

31 Aug '14

Hello community, here is the log from the commit of package ant-junit for openSUSE:Factory checked in at 2014-08-31 14:18:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ant-junit (Old) and /work/SRC/openSUSE:Factory/.ant-junit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ant-junit" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package="ant" cicount="copy" /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ant for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '14

31 Aug '14

Hello community, here is the log from the commit of package ant for openSUSE:Factory checked in at 2014-08-31 14:16:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ant (Old) and /work/SRC/openSUSE:Factory/.ant.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ant" Changes: -------- New Changes file: --- /dev/null 2014-07-24 01:57:42.080040256 +0200 +++ /work/SRC/openSUSE:Factory/.ant.new/ant-junit.changes 2014-08-31 14:16:12.000000000 +0200 @@ -0,0 +1,496 @@ +------------------------------------------------------------------- +Thu Aug 28 14:30:48 UTC 2014 - coolo(a)suse.com + +- to bootstrap 13.2 we need another split because bsf depends on things + that depend on junit and as antlr requires bsf, we need a 3rd step -> + split ant-junit to build in between ant and ant-antlr + +------------------------------------------------------------------- +Fri Jul 4 12:47:07 UTC 2014 - tchvatal(a)suse.com + +- Fix building on SLE. +- Added patch: + * apache-ant-old-gcj-build.patch + +------------------------------------------------------------------- +Fri Jul 4 11:54:48 UTC 2014 - tchvatal(a)suse.com + +- Update to 1.9.4: + * Read WHATSNEW file for full changelist + * initial support for Java 1.9 + * <junit> has now a threads attribute allowing to run the tests in + several threads. Bugzilla Report 55925 + * TarInputStream will now read archives created by tar + implementations that encode big numbers by not adding a trailing + NUL. + +------------------------------------------------------------------- +Thu May 15 13:18:36 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- fix summary (was antlr summary) + +------------------------------------------------------------------- +Mon May 12 14:00:55 UTC 2014 - darin(a)darins.net + +- SLE_11 specific spec files for ant/ant-antlr. These build with + openjdk, which introduced bootstrap breakage in Factory. +- Update pre_checkin.sh for SLE_11 specific spec's + +------------------------------------------------------------------- +Fri May 2 09:01:02 UTC 2014 - tchvatal(a)suse.com + +- Revert the bootstrap breakage. + +------------------------------------------------------------------- +Thu Apr 24 09:54:12 UTC 2014 - dmueller(a)suse.com + +- remove dependency on gpg-offline (blocks rebuilds and + tarball integrity is checked by source-validator anyway, plus + it was commented out) +- remove apache-ant-bz163689.patch (was not applied anywhere) + +------------------------------------------------------------------- +Wed Apr 23 12:55:35 UTC 2014 - darin(a)darins.net + +- Update packaging to build the openjdk and not gcj + +------------------------------------------------------------------- +Thu Jan 2 08:36:18 UTC 2014 - mvyskocil(a)suse.com + +- Update to 1.9.3 +- BugFixes: + * Ant 1.8 exec task changes have slowed exec to a crawl, apache#54128 + * <parallel> swallowed the status code of nested <fail> tasks, + apache#55539 + * a race condition could make <fixcrlf> tasks of parallel builds to + interfere with each other, apache#54393 + * <mail>'s mailport still didn't work properly when using smtps, + apache#49267 + * using attributes belonging to the if and unless namespaces + made macrodef fail, apache#55885. + * Apt is not available under JDK 1.8, apache#55922 +- drop unused macros +- add gpg verification + +------------------------------------------------------------------- +Wed Dec 4 14:58:13 UTC 2013 - mvyskocil(a)suse.com + +- use requires_eq instead of manual call of rpm -q + +------------------------------------------------------------------- +Wed Oct 2 09:52:33 UTC 2013 - mvyskocil(a)suse.com + +- install compat symlink to /usr/share/ant/bin/antRun to make scala build + +------------------------------------------------------------------- +Mon Sep 9 11:05:25 UTC 2013 - tchvatal(a)suse.com + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- +Thu Aug 22 07:47:26 UTC 2013 - mvyskocil(a)suse.com + +- Update to 1.9.2 +- Incompatible changes: + * ProjectHelper's implementation import and include tasks + defaults the targetPrefix to ProjectHelper.USE_PROJECT_NAME_AS_TARGET_PREFIX. + ProjectHelper2 is not affected, apache#54940. + * FixCRLF used to treat the EOL value ASIS to convert to the system property + line.separator. Specified was that ASIS would leave the EOL characters alone, + the task now really leaves the EOL characters alone. This also implies that + EOL ASIS will not insert a newline even if fixlast is set to true. + apache#53036 + * The CommandLauncher hierarchy that used to be a set of inner + classes of Execute has been extracted to the + org.apache.tools.ant.taskdefs.launcher package. + * Any FileResource whose represented File has a parent also has a basedir. + * Removing the Perforce Ant tasks replaced by tasks supplied by Perforce Inc. + * Setting the default encoding of StringResource to UTF-8 instead of null +- Bugfixes: + * <javadoc> post-process generated docs to migitiate frame + injection attack (CVE-2013-1571) apache#55132 + * Parsing of zip64 extra fields has become more lenient + * TarInputStream should now properly read GNU longlink entries' names. + apache#55040. + * <java> and <exec> used to be too restrictive when evaluating + whether a given set of options is compatible with spawning the new + process, apache#55112. + * Corrected XSLTC error in <junitreport>, apache#54641. + * and many more, see WHATSNEW for details + +------------------------------------------------------------------- +Mon Jan 7 12:15:09 UTC 2013 - mvyskocil(a)suse.com + +- remove xerces-j2-bootstrap depenency (bnc#789163) + +------------------------------------------------------------------- +Wed May 30 11:46:44 UTC 2012 - cfarrell(a)suse.com + +- license update: CDDL-1.0 + SPDX format (note that it should CDDL-1.1 if the (c) owner and license + steward is Oracle) + +------------------------------------------------------------------- +Tue May 15 07:02:23 UTC 2012 - mvyskocil(a)suse.cz + +- build ignore java-1_7_0-openjdk as well + +------------------------------------------------------------------- +Wed Feb 1 12:54:47 UTC 2012 - mvyskocil(a)suse.cz + +- revert the Recommends to fix a lot of build fails + +------------------------------------------------------------------- +Wed Jan 25 09:54:17 UTC 2012 - mvyskocil(a)suse.cz + +- use new _mavendepmapfragdir macro instead of hardocded path +- change java-devel Requires to Recommends + +------------------------------------------------------------------- +Tue Jan 3 01:01:19 CET 2012 - dmueller(a)suse.de + +- use dist-lite and dist_javadocs to make javadoc build really + optional +- fix arm check (ifarch does not work in a noarch spec file) + +------------------------------------------------------------------- +Thu Dec 15 08:49:28 UTC 2011 - mvyskocil(a)suse.cz + +- use dist and javadocs targets to make javadoc build really configurable +- disable javadoc build on arm to speedup the build of java platform + +------------------------------------------------------------------- +Sat Sep 17 11:04:48 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile + +------------------------------------------------------------------- +Mon Mar 14 13:02:38 UTC 2011 - mvyskocil(a)suse.cz + +- ignore openjdk for build of core ant + +------------------------------------------------------------------- +Wed Mar 9 08:56:33 UTC 2011 - mvyskocil(a)suse.cz + +- Update to ant 1.8.2 + * performance improvements in directory scanning + * XSLT task honors classpath again (bugrep 49271) + * distinction between core tasks and optional tasks is abolished + * new task augment allows to add attributes or nested elements to previously + defined references + * Lexically scoped local properties, i.e. properties that are only defined + inside a target, sequential block or similar environment. This is very + useful inside of <macrodef>s where a macro can now define a temporary + property that will disappear once the task has finished. + * <import> can now import from any file- or URL-providing resource - this + includes <javaresource>. This means <import> can read build file snippets + from JARs or fixed server URLs. There are several other improvements in the + area of import. + * Various improvements to the directory scanning code that help with symbolic + link cycles (as can be found on MacOS X Java installations for example) and + improve scanning performance. For big directory trees the improvement is + dramatic. + * The way developers can extend Ant's property expansion algorithm has been + rewritten (breaking the older API) to be easier to use and be more + powerful. The whole local properties mechanism is implemented using that + API and could be implemented in a separate library without changes in Ant's + core. Things like the yet-to-be-released props Antlib can now provide often ++++ 299 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.ant.new/ant-junit.changes --- /work/SRC/openSUSE:Factory/ant/ant.changes 2014-07-17 17:31:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ant.new/ant.changes 2014-08-31 14:16:12.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Aug 28 14:30:48 UTC 2014 - coolo(a)suse.com + +- to bootstrap 13.2 we need another split because bsf depends on things + that depend on junit and as antlr requires bsf, we need a 3rd step -> + split ant-junit to build in between ant and ant-antlr + +------------------------------------------------------------------- New: ---- ant-junit.changes ant-junit.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ant-antlr.spec ++++++ --- /var/tmp/diff_new_pack.Z8mZBD/_old 2014-08-31 14:16:15.000000000 +0200 +++ /var/tmp/diff_new_pack.Z8mZBD/_new 2014-08-31 14:16:15.000000000 +0200 @@ -19,7 +19,9 @@ ##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! ##### -%global bootstrap 0 +%bcond_with bootstrap +%bcond_with junit +%bcond_without antlr # disable javadoc build on arm platform - it delays a build a lot # mvyskocil: ifarch does not work for noarch packages ... @@ -49,7 +51,7 @@ Patch1: apache-ant-class-path-in-manifest.patch #PATCH-FIX-SLE: fix building with old gcj by working around bugs Patch2: apache-ant-old-gcj-build.patch -%if %bootstrap +%if %{with bootstrap} BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel #!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel @@ -62,15 +64,16 @@ #BuildRequires: xerces-j2-bootstrap #!BuildIgnore: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap -%if ! %bootstrap +%if %{with junit} || %{with antlr} BuildRequires: ant = %{version} BuildRequires: junit -BuildRequires: xalan-j2 +#!BuildIgnore: antlr +%endif +%if %{with antlr} BuildRequires: xerces-j2 BuildRequires: xml-commons-apis -#!BuildIgnore: antlr %endif -%if %bootstrap +%if %{with bootstrap} Requires: java-devel >= 1.5.0 Requires: javapackages-tools Requires: jaxp_parser_impl @@ -82,15 +85,26 @@ Provides: ant-nodeps = %{version} Obsoletes: ant-trax < %{version} Provides: ant-trax = %{version} -%else -# ant-antlr requires +%endif +%if %{with antlr} Requires: antlr %requires_eq ant Provides: ant-antlr = %{version}-%{release} %endif +%if %{with junit} +Requires: junit4 +%requires_eq ant +%endif BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with junit} +%description +Apache Ant is a Java-based build tool. + +This package contains optional JUnit tasks for Apache Ant. +%else +# FIXME: this should be different for antlr %description Apache Ant is a Java-based build tool. In theory, it is kind of like Make, but without Make's wrinkles. @@ -125,8 +139,9 @@ Ant has an <exec> task that allows different commands to be executed based on the OS used. +%endif -%if %bootstrap +%if %{with bootstrap} %package -n ant-jmf Summary: Optional jmf tasks for ant License: Apache-2.0 @@ -166,7 +181,8 @@ Ant. %endif #if bootstrap -%if ! %bootstrap + +%if %{with antlr} %package -n ant-apache-bsf Summary: Optional apache bsf tasks for ant @@ -299,6 +315,7 @@ License: Apache-2.0 Group: Development/Tools/Building BuildRequires: regexp +BuildRequires: xalan-j2 Requires: regexp %requires_eq ant @@ -344,18 +361,6 @@ This package contains optional jsch tasks for Apache Ant. -%package -n ant-junit -Summary: Optional junit tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: junit4 -%requires_eq ant - -%description -n ant-junit -Apache Ant is a Java-based build tool. - -This package contains optional JUnit tasks for Apache Ant. - %package -n ant-testutil Summary: Test utility classes for ant License: Apache-2.0 @@ -395,7 +400,7 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// # When bootstrapping, we don't have junit -%if %bootstrap +%if %{with bootstrap} %patch0 -p1 %if 0%{?suse_version} < 1200 %patch2 -p1 @@ -419,7 +424,11 @@ #rm src/tests/junit/org/example/junit/JUnit4Skippable.java #install jars -%if ! %bootstrap +%if %{with junit} +build-jar-repository -s -p lib/optional junit4 +%endif +%if %{with antlr} +# we need to build junit in antlr, but we remove it later build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver %endif @@ -433,7 +442,7 @@ %build export OPT_JAR_LIST=: -%if ! %bootstrap +%if %{with antlr} || %{with junit} ant -Dbuild.sysclasspath=first jars test-jar #remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests. @@ -444,8 +453,9 @@ ant javadocs %endif -%else +%endif +%if %{with bootstrap} export GC_MAXIMUM_HEAP_SIZE="134217728" #128M export JAVA_HOME=%{java_home} export CLASSPATH=$JAVA_HOME/lib/tools.jar @@ -461,6 +471,21 @@ install -d -m 755 %{buildroot}%{_javadir}/ant install -d -m 755 %{buildroot}%{_mavenpomdir} +%if ! %{with junit} +rm build/lib/ant-junit*.jar +%else +# remove all others +for i in build/lib/ant-*.jar ; do + case $i in + */ant-junit*) + ;; + *) + rm -v $i + ;; + esac +done +%endif + for jar in build/lib/*.jar do jarname=$(basename $jar .jar) @@ -470,14 +495,14 @@ case $jarname in #These go into %%{_javadir}, pom files have different names ant | ant-bootstrap | ant-launcher) -%if %bootstrap +%if %{with bootstrap} destdir=%{buildroot}%{_javadir}; destname="";pomname="JPP-$jarname.pom" %else continue %endif ;; ant-jmf|ant-swing) -%if %bootstrap +%if %{with bootstrap} destdir=%{buildroot}%{_javadir}/ant; destname="ant/"; %else continue @@ -485,7 +510,7 @@ ;; #Bootstracp builds an incomplete ant-foo jars, don't ship them *) -%if %bootstrap +%if %{with bootstrap} continue %else #These go into %%{_javadir}/ant @@ -508,7 +533,7 @@ %add_maven_depmap ${pomname} ${destname}${jarname}.jar done -%if %bootstrap +%if %{with bootstrap} #ant-parent pom install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom %add_maven_depmap JPP-ant-parent.pom @@ -520,28 +545,39 @@ # XSLs cp -p src/etc/*.xsl %{buildroot}%{ant_home}/etc rm -f %{buildroot}%{ant_home}/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl -%else -cp -p src/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl %{buildroot}%{ant_home}/etc +%endif +%if %{with junit} +cp -p src/etc/{junit-noframes,junit-frames}.xsl %{buildroot}%{ant_home}/etc +%endif +%if %{with antlr} +cp -p src/etc/{maudit-frames,jdepend,jdepend-frames}.xsl %{buildroot}%{ant_home}/etc %endif -%if %bootstrap +%if %{with bootstrap} # install everything else mkdir -p %{buildroot}%{_bindir} cp -p src/script/* %{buildroot}%{_bindir}/ mkdir -p %{buildroot}%{_datadir}/%{name}/bin/ ln -sf %{_bindir}/antRun %{buildroot}/%{_datadir}/%{name}/bin/antRun %endif -%if %bootstrap + +mkdir -p %{buildroot}%{_sysconfdir}/ant.d + +%if %{with bootstrap} # default ant.conf mkdir -p %{buildroot}%{_sysconfdir} cp -p %{SOURCE1} %{buildroot}%{_sysconfdir}/ant.conf # OPT_JAR_LIST fragments -mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d echo "ant/ant-jmf" > %{buildroot}%{_sysconfdir}/%{name}.d/jmf echo "ant/ant-swing" > %{buildroot}%{_sysconfdir}/%{name}.d/swing -%else -mkdir -p %{buildroot}%{_sysconfdir}/ant.d +%endif + +%if %{with junit} +echo "junit ant/ant-junit" > %{buildroot}%{_sysconfdir}/ant.d/junit +%endif + +%if %{with antlr} echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf echo "xml-commons-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver @@ -556,10 +592,10 @@ echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch -echo "junit ant/ant-junit" > %{buildroot}%{_sysconfdir}/ant.d/junit echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil %endif -%if ! %bootstrap + +%if %{with antlr} %if 0%{?build_javadoc} mkdir -p %{buildroot}%{_javadocdir}/ant @@ -573,7 +609,7 @@ (cd manual; ln -sf %{_javadocdir}/%{name} api) %endif #javadoc -%if %bootstrap +%if %{with bootstrap} find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ -a ! -name ant-update.xsl \ -a ! -name changelog.xsl \ @@ -585,7 +621,7 @@ | xargs -t rm %endif -%if %bootstrap +%if %{with bootstrap} %files %defattr(0644,root,root,0755) @@ -621,9 +657,9 @@ %config(noreplace) %{_mavendepmapfragdir}/* %dir %{_mavenpomdir} -%else -# ant-antlr filelist +%endif +%if %{with antlr} %files %defattr(0644,root,root,0755) %{_javadir}/ant/ant-antlr.jar @@ -634,8 +670,21 @@ %dir %{_mavenpomdir} %endif +%if %{with junit} +%files +%defattr(0644,root,root,0755) +%{_javadir}/ant/ant-junit*.jar +%{ant_home}/lib/ant-junit*.jar +%config(noreplace) %{_sysconfdir}/ant.d/junit +%config(noreplace) %{_mavendepmapfragdir}/ant-junit +%{ant_home}/etc/junit-frames.xsl +%{ant_home}/etc/junit-noframes.xsl +%{_mavenpomdir}/JPP.ant-ant-junit*.pom +%dir %{_mavenpomdir} +%endif + ### Basic ant subpackages -%if %bootstrap +%if %{with bootstrap} %files -n ant-jmf %defattr(0644,root,root,0755) @@ -658,7 +707,7 @@ %{_bindir}/*.py* %endif #if bootstrap -%if ! %bootstrap +%if %{with antlr} %files -n ant-apache-bsf %defattr(0644,root,root,0755) @@ -768,16 +817,6 @@ %{_mavenpomdir}/JPP.ant-ant-jsch.pom %dir %{_mavenpomdir} -%files -n ant-junit -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-junit*.jar -%{ant_home}/lib/ant-junit*.jar -%config(noreplace) %{_sysconfdir}/ant.d/junit -%{ant_home}/etc/junit-frames.xsl -%{ant_home}/etc/junit-noframes.xsl -%{_mavenpomdir}/JPP.ant-ant-junit*.pom -%dir %{_mavenpomdir} - %files -n ant-testutil %defattr(-,root,root,-) %{_javadir}/ant/ant-testutil.jar ++++++ ant-junit.spec ++++++ ++++ 840 lines (skipped) ++++++ ant.spec ++++++ --- /var/tmp/diff_new_pack.Z8mZBD/_old 2014-08-31 14:16:15.000000000 +0200 +++ /var/tmp/diff_new_pack.Z8mZBD/_new 2014-08-31 14:16:15.000000000 +0200 @@ -18,7 +18,9 @@ # -%global bootstrap 1 +%bcond_without bootstrap +%bcond_with junit +%bcond_with antlr # disable javadoc build on arm platform - it delays a build a lot # mvyskocil: ifarch does not work for noarch packages ... @@ -48,7 +50,7 @@ Patch1: apache-ant-class-path-in-manifest.patch #PATCH-FIX-SLE: fix building with old gcj by working around bugs Patch2: apache-ant-old-gcj-build.patch -%if %bootstrap +%if %{with bootstrap} BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel #!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel @@ -61,15 +63,16 @@ #BuildRequires: xerces-j2-bootstrap #!BuildIgnore: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap -%if ! %bootstrap +%if %{with junit} || %{with antlr} BuildRequires: ant = %{version} BuildRequires: junit -BuildRequires: xalan-j2 +#!BuildIgnore: antlr +%endif +%if %{with antlr} BuildRequires: xerces-j2 BuildRequires: xml-commons-apis -#!BuildIgnore: antlr %endif -%if %bootstrap +%if %{with bootstrap} Requires: java-devel >= 1.5.0 Requires: javapackages-tools Requires: jaxp_parser_impl @@ -81,15 +84,26 @@ Provides: ant-nodeps = %{version} Obsoletes: ant-trax < %{version} Provides: ant-trax = %{version} -%else -# ant-antlr requires +%endif +%if %{with antlr} Requires: antlr %requires_eq ant Provides: ant-antlr = %{version}-%{release} %endif +%if %{with junit} +Requires: junit4 +%requires_eq ant +%endif BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with junit} +%description +Apache Ant is a Java-based build tool. + +This package contains optional JUnit tasks for Apache Ant. +%else +# FIXME: this should be different for antlr %description Apache Ant is a Java-based build tool. In theory, it is kind of like Make, but without Make's wrinkles. @@ -124,8 +138,9 @@ Ant has an <exec> task that allows different commands to be executed based on the OS used. +%endif -%if %bootstrap +%if %{with bootstrap} %package -n ant-jmf Summary: Optional jmf tasks for ant License: Apache-2.0 @@ -165,7 +180,8 @@ Ant. %endif #if bootstrap -%if ! %bootstrap + +%if %{with antlr} %package -n ant-apache-bsf Summary: Optional apache bsf tasks for ant @@ -298,6 +314,7 @@ License: Apache-2.0 Group: Development/Tools/Building BuildRequires: regexp +BuildRequires: xalan-j2 Requires: regexp %requires_eq ant @@ -343,18 +360,6 @@ This package contains optional jsch tasks for Apache Ant. -%package -n ant-junit -Summary: Optional junit tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: junit4 -%requires_eq ant - -%description -n ant-junit -Apache Ant is a Java-based build tool. - -This package contains optional JUnit tasks for Apache Ant. - %package -n ant-testutil Summary: Test utility classes for ant License: Apache-2.0 @@ -394,7 +399,7 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// # When bootstrapping, we don't have junit -%if %bootstrap +%if %{with bootstrap} %patch0 -p1 %if 0%{?suse_version} < 1200 %patch2 -p1 @@ -418,7 +423,11 @@ #rm src/tests/junit/org/example/junit/JUnit4Skippable.java #install jars -%if ! %bootstrap +%if %{with junit} +build-jar-repository -s -p lib/optional junit4 +%endif +%if %{with antlr} +# we need to build junit in antlr, but we remove it later build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver %endif @@ -432,7 +441,7 @@ %build export OPT_JAR_LIST=: -%if ! %bootstrap +%if %{with antlr} || %{with junit} ant -Dbuild.sysclasspath=first jars test-jar #remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests. @@ -443,8 +452,9 @@ ant javadocs %endif -%else +%endif +%if %{with bootstrap} export GC_MAXIMUM_HEAP_SIZE="134217728" #128M export JAVA_HOME=%{java_home} export CLASSPATH=$JAVA_HOME/lib/tools.jar @@ -460,6 +470,21 @@ install -d -m 755 %{buildroot}%{_javadir}/ant install -d -m 755 %{buildroot}%{_mavenpomdir} +%if ! %{with junit} +rm build/lib/ant-junit*.jar +%else +# remove all others +for i in build/lib/ant-*.jar ; do + case $i in + */ant-junit*) + ;; + *) + rm -v $i + ;; + esac +done +%endif + for jar in build/lib/*.jar do jarname=$(basename $jar .jar) @@ -469,14 +494,14 @@ case $jarname in #These go into %%{_javadir}, pom files have different names ant | ant-bootstrap | ant-launcher) -%if %bootstrap +%if %{with bootstrap} destdir=%{buildroot}%{_javadir}; destname="";pomname="JPP-$jarname.pom" %else continue %endif ;; ant-jmf|ant-swing) -%if %bootstrap +%if %{with bootstrap} destdir=%{buildroot}%{_javadir}/ant; destname="ant/"; %else continue @@ -484,7 +509,7 @@ ;; #Bootstracp builds an incomplete ant-foo jars, don't ship them *) -%if %bootstrap +%if %{with bootstrap} continue %else #These go into %%{_javadir}/ant @@ -507,7 +532,7 @@ %add_maven_depmap ${pomname} ${destname}${jarname}.jar done -%if %bootstrap +%if %{with bootstrap} #ant-parent pom install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom %add_maven_depmap JPP-ant-parent.pom @@ -519,28 +544,39 @@ # XSLs cp -p src/etc/*.xsl %{buildroot}%{ant_home}/etc rm -f %{buildroot}%{ant_home}/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl -%else -cp -p src/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl %{buildroot}%{ant_home}/etc +%endif +%if %{with junit} +cp -p src/etc/{junit-noframes,junit-frames}.xsl %{buildroot}%{ant_home}/etc +%endif +%if %{with antlr} +cp -p src/etc/{maudit-frames,jdepend,jdepend-frames}.xsl %{buildroot}%{ant_home}/etc %endif -%if %bootstrap +%if %{with bootstrap} # install everything else mkdir -p %{buildroot}%{_bindir} cp -p src/script/* %{buildroot}%{_bindir}/ mkdir -p %{buildroot}%{_datadir}/%{name}/bin/ ln -sf %{_bindir}/antRun %{buildroot}/%{_datadir}/%{name}/bin/antRun %endif -%if %bootstrap + +mkdir -p %{buildroot}%{_sysconfdir}/ant.d + +%if %{with bootstrap} # default ant.conf mkdir -p %{buildroot}%{_sysconfdir} cp -p %{SOURCE1} %{buildroot}%{_sysconfdir}/ant.conf # OPT_JAR_LIST fragments -mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d echo "ant/ant-jmf" > %{buildroot}%{_sysconfdir}/%{name}.d/jmf echo "ant/ant-swing" > %{buildroot}%{_sysconfdir}/%{name}.d/swing -%else -mkdir -p %{buildroot}%{_sysconfdir}/ant.d +%endif + +%if %{with junit} +echo "junit ant/ant-junit" > %{buildroot}%{_sysconfdir}/ant.d/junit +%endif + +%if %{with antlr} echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf echo "xml-commons-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver @@ -555,10 +591,10 @@ echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch -echo "junit ant/ant-junit" > %{buildroot}%{_sysconfdir}/ant.d/junit echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil %endif -%if ! %bootstrap + +%if %{with antlr} %if 0%{?build_javadoc} mkdir -p %{buildroot}%{_javadocdir}/ant @@ -572,7 +608,7 @@ (cd manual; ln -sf %{_javadocdir}/%{name} api) %endif #javadoc -%if %bootstrap +%if %{with bootstrap} find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ -a ! -name ant-update.xsl \ -a ! -name changelog.xsl \ @@ -584,7 +620,7 @@ | xargs -t rm %endif -%if %bootstrap +%if %{with bootstrap} %files %defattr(0644,root,root,0755) @@ -620,9 +656,9 @@ %config(noreplace) %{_mavendepmapfragdir}/* %dir %{_mavenpomdir} -%else -# ant-antlr filelist +%endif +%if %{with antlr} %files %defattr(0644,root,root,0755) %{_javadir}/ant/ant-antlr.jar @@ -633,8 +669,21 @@ %dir %{_mavenpomdir} %endif +%if %{with junit} +%files +%defattr(0644,root,root,0755) +%{_javadir}/ant/ant-junit*.jar +%{ant_home}/lib/ant-junit*.jar +%config(noreplace) %{_sysconfdir}/ant.d/junit +%config(noreplace) %{_mavendepmapfragdir}/ant-junit +%{ant_home}/etc/junit-frames.xsl +%{ant_home}/etc/junit-noframes.xsl +%{_mavenpomdir}/JPP.ant-ant-junit*.pom +%dir %{_mavenpomdir} +%endif + ### Basic ant subpackages -%if %bootstrap +%if %{with bootstrap} %files -n ant-jmf %defattr(0644,root,root,0755) @@ -657,7 +706,7 @@ %{_bindir}/*.py* %endif #if bootstrap -%if ! %bootstrap +%if %{with antlr} %files -n ant-apache-bsf %defattr(0644,root,root,0755) @@ -767,16 +816,6 @@ %{_mavenpomdir}/JPP.ant-ant-jsch.pom %dir %{_mavenpomdir} -%files -n ant-junit -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-junit*.jar -%{ant_home}/lib/ant-junit*.jar -%config(noreplace) %{_sysconfdir}/ant.d/junit -%{ant_home}/etc/junit-frames.xsl -%{ant_home}/etc/junit-noframes.xsl -%{_mavenpomdir}/JPP.ant-ant-junit*.pom -%dir %{_mavenpomdir} - %files -n ant-testutil %defattr(-,root,root,-) %{_javadir}/ant/ant-testutil.jar ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.Z8mZBD/_old 2014-08-31 14:16:15.000000000 +0200 +++ /var/tmp/diff_new_pack.Z8mZBD/_new 2014-08-31 14:16:15.000000000 +0200 @@ -1,6 +1,15 @@ #!/bin/sh EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! #####\n" -sed "s/^%global bootstrap.*$/${EDIT_WARNING}%global bootstrap 0/; +sed "s/^%bcond_without bootstrap$/${EDIT_WARNING}%bcond_with bootstrap/; + s/^%bcond_with antlr/%bcond_without antlr/; s/^$Name:.*$$/\1-antlr/; 0,/^Summary:.*/{s/^Summary:.*/Summary: Antlr Task for ant/}; " < ant.spec > ant-antlr.spec +sed "s/^%bcond_without bootstrap$/${EDIT_WARNING}%bcond_with bootstrap/; + s/^%bcond_with junit/%bcond_without junit/; + s/^$Name:.*$$/\1-junit/; + 0,/^Summary:.*/{s/^Summary:.*/Summary: Optional junit tasks for ant/}; + " < ant.spec > ant-junit.spec +cp ant.changes ant-junit.changes + + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mysql-connector-cpp for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '14

31 Aug '14

Hello community, here is the log from the commit of package mysql-connector-cpp for openSUSE:Factory checked in at 2014-08-31 09:58:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-connector-cpp (Old) and /work/SRC/openSUSE:Factory/.mysql-connector-cpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mysql-connector-cpp" Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-connector-cpp/mysql-connector-cpp.changes 2013-04-26 19:21:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-connector-cpp.new/mysql-connector-cpp.changes 2014-08-31 09:58:50.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Aug 29 14:21:30 UTC 2014 - tchvatal(a)suse.com + +- Use cmake macros for building properly. + +------------------------------------------------------------------- +Sat Jul 26 13:36:10 UTC 2014 - cobexer(a)gmail.com + +- disable gcov coverage recording + Gcov is a development tool, it slows down execution and creates + coverage data that is not useful to users of this library. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-connector-cpp.spec ++++++ --- /var/tmp/diff_new_pack.6XUqbV/_old 2014-08-31 09:58:51.000000000 +0200 +++ /var/tmp/diff_new_pack.6XUqbV/_new 2014-08-31 09:58:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mysql-connector-cpp # -# 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 @@ -110,30 +110,19 @@ %patch0 -p1 %patch1 %patch2 -p1 +chmod -x examples/* %build -export CXXFLAGS="%optflags" -cmake \ - -DCMAKE_C_FLAGS:STRING="%{optflags}" \ - -DCMAKE_CXX_FLAGS:STRING="%{optflags}" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DBUILD_SHARED_LIBS=ON \ -%if %{_lib} == lib64 - -DLIB_SUFFIX=64 \ -%endif - -DMYSQLCPPCONN_GCOV_ENABLE=ON \ +%cmake \ + -DMYSQLCPPCONN_GCOV_ENABLE=OFF \ -DMYSQLCPPCONN_ICU_ENABLE=OFF \ -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \ -DCMAKE_INSTALL_LIB_DIR=%{_lib} \ - -DMYSQLCLIENT_STATIC_BINDING=0 \ - . + -DMYSQLCLIENT_STATIC_BINDING=0 make %{?_smp_mflags} VERBOSE=1 -chmod -x examples/* %install -make install DESTDIR="%{buildroot}" +%cmake_install rm -f %{buildroot}%{_libdir}/libmysqlcppconn-static.a rm -f %{buildroot}%{_prefix}/[A-Z]* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit haveged for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '14

31 Aug '14

Hello community, here is the log from the commit of package haveged for openSUSE:Factory checked in at 2014-08-31 09:58:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haveged (Old) and /work/SRC/openSUSE:Factory/.haveged.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "haveged" Changes: -------- --- /work/SRC/openSUSE:Factory/haveged/haveged.changes 2014-06-25 06:57:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.haveged.new/haveged.changes 2014-08-31 09:58:49.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 29 07:23:34 UTC 2014 - tchvatal(a)suse.com + +- Adjust the service to start early enough for all usecases. + Should fix bnc#892096. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haveged.service ++++++ --- /var/tmp/diff_new_pack.Pgx9dT/_old 2014-08-31 09:58:50.000000000 +0200 +++ /var/tmp/diff_new_pack.Pgx9dT/_new 2014-08-31 09:58:50.000000000 +0200 @@ -1,13 +1,18 @@ [Unit] Description=Entropy Daemon based on the HAVEGE algorithm Documentation=man:haveged(8) http://www.issihosts.com/haveged/ +DefaultDependencies=no ConditionVirtualization=!container +Conflicts=shutdown.target +After=systemd-random-seed.service +Before=sysinit.target shutdown.target [Service] ExecStart=/usr/sbin/haveged -w 1024 -v 0 -F CapabilityBoundingSet=CAP_SYS_ADMIN PrivateNetwork=yes +Restart=always SuccessExitStatus=137 143 [Install] -WantedBy=multi-user.target +WantedBy=sysinit.target -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit scons for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '14

31 Aug '14

Hello community, here is the log from the commit of package scons for openSUSE:Factory checked in at 2014-08-31 09:58:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scons (Old) and /work/SRC/openSUSE:Factory/.scons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scons" Changes: -------- --- /work/SRC/openSUSE:Factory/scons/scons.changes 2014-08-11 10:06:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scons.new/scons.changes 2014-08-31 09:58:47.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Aug 28 20:46:40 UTC 2014 - andreas.stieger(a)gmx.de + +- SCons 2.3.3: + * New functionality: + - Added Copy Action symlink soft-copy support + * Changed/Enhanced existing functionality: + - Improved SWIG detection + * Fixes: + - Fix regression on Windows in D language update + - Fixed the newglossary action to work with VariantDir (LaTeX). + - Added a default for the BUILDERS environment variable, + to prevent not defined exception on a Clone(). + - Fixed handling of CPPDEFINE var in Append() + for several list-dict combinations +- Remove scons-2.3.2-python.patch, committed upstream + +------------------------------------------------------------------- Old: ---- scons-2.3.2-python.patch scons-2.3.2.tar.gz scons-user.html-2.3.2.tar.bz2 New: ---- scons-2.3.3.tar.gz scons-user.html-2.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scons.spec ++++++ --- /var/tmp/diff_new_pack.huXdjQ/_old 2014-08-31 09:58:49.000000000 +0200 +++ /var/tmp/diff_new_pack.huXdjQ/_new 2014-08-31 09:58:49.000000000 +0200 @@ -26,7 +26,7 @@ Summary: Replacement for Make License: MIT Group: Development/Tools/Building -Version: 2.3.2 +Version: 2.3.3 Release: 0 Source0: http://prdownloads.sourceforge.net/scons/%{name}-%{version}.tar.gz #http://www.scons.org/doc/%%{version}/HTML/scons-user.html @@ -36,7 +36,6 @@ # Sets _mandir to _datadir/man instead of _prefix/man Patch0: %{name}-1.2.0-fix-install.patch Patch1: %{name}-1.2.0-noenv.patch -Patch2: scons-2.3.2-python.patch Url: http://www.scons.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes @@ -57,7 +56,6 @@ %setup -q -a1 %patch0 -p1 %patch1 -%patch2 -p2 # fix libdir for qt patch -p0 <<EOF ++++++ scons-2.3.2.tar.gz -> scons-2.3.3.tar.gz ++++++ ++++ 2959 lines of diff (skipped) ++++++ scons-user.html-2.3.2.tar.bz2 -> scons-user.html-2.3.3.tar.bz2 ++++++ ++++ 1872 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 zsh for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '14

31 Aug '14

Hello community, here is the log from the commit of package zsh for openSUSE:Factory checked in at 2014-08-31 09:58:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zsh (Old) and /work/SRC/openSUSE:Factory/.zsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zsh" Changes: -------- --- /work/SRC/openSUSE:Factory/zsh/zsh.changes 2014-08-07 08:07:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zsh.new/zsh.changes 2014-08-31 09:58:43.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Aug 28 19:14:23 UTC 2014 - idonmez(a)suse.com + +- Update to version 5.0.6 + * See included ChangeLog +- Remove zsh-update-zypper-completion.patch, fixed upstream + +------------------------------------------------------------------- Old: ---- zsh-5.0.5.tar.bz2 zsh-update-zypper-completion.patch New: ---- zsh-5.0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zsh.spec ++++++ --- /var/tmp/diff_new_pack.h8qZlT/_old 2014-08-31 09:58:45.000000000 +0200 +++ /var/tmp/diff_new_pack.h8qZlT/_new 2014-08-31 09:58:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: zsh -Version: 5.0.5 +Version: 5.0.6 Release: 0 Summary: Shell with comprehensive completion License: MIT @@ -37,7 +37,6 @@ Source17: zshprompt.pl %endif Patch1: trim-unneeded-completions.patch -Patch2: zsh-update-zypper-completion.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} Requires(pre): %{install_info_prereq} @@ -95,7 +94,6 @@ %setup -q -n %{name}-%{version} %if 0%{?suse_version} %patch1 -p1 -%patch2 -p1 %endif # Remove executable bit @@ -137,10 +135,6 @@ # remove some unwanted files in Etc/ rm -f Etc/Makefile* Etc/*.yo -# FATE#316521 -mv Completion/openSUSE/Command/_SuSEconfig Completion/openSUSE/Command/_SUSEconfig -sed -i s,_SuSEconfig,_SUSEconfig, Completion/openSUSE/Command/.distfiles - %install %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version} rm -rf %{buildroot} ++++++ zsh-5.0.5.tar.bz2 -> zsh-5.0.6.tar.bz2 ++++++ ++++ 19641 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 menu-cache for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '14

30 Aug '14

Hello community, here is the log from the commit of package menu-cache for openSUSE:Factory checked in at 2014-08-30 18:56:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/menu-cache (Old) and /work/SRC/openSUSE:Factory/.menu-cache.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "menu-cache" Changes: -------- --- /work/SRC/openSUSE:Factory/menu-cache/menu-cache.changes 2014-08-05 21:11:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.menu-cache.new/menu-cache.changes 2014-08-30 18:56:19.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Aug 26 17:16:17 UTC 2014 - trcs(a)gmx.com + +- new upstream version 0.6.1 + * Fixed invalid memory access after cache reload. + * A little cleanup of dist tarball: removed unused files + menu-cache.h and libmenu-cache-uninstalled.pc.in. + +------------------------------------------------------------------- Old: ---- menu-cache-0.6.0.tar.xz New: ---- menu-cache-0.6.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ menu-cache.spec ++++++ --- /var/tmp/diff_new_pack.qSCgoD/_old 2014-08-30 18:56:21.000000000 +0200 +++ /var/tmp/diff_new_pack.qSCgoD/_new 2014-08-30 18:56:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: menu-cache -Version: 0.6.0 +Version: 0.6.1 Release: 0 Summary: A tool speed up menus License: GPL-2.0+ and LGPL-2.1+ @@ -81,6 +81,6 @@ %files -n libmenu-cache3 %defattr(-,root,root) %{_libdir}/libmenu-cache.so.3 -%{_libdir}/libmenu-cache.so.3.0.2 +%{_libdir}/libmenu-cache.so.3.0.3 %changelog ++++++ menu-cache-0.6.0.tar.xz -> menu-cache-0.6.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/menu-cache-0.6.0/NEWS new/menu-cache-0.6.1/NEWS --- old/menu-cache-0.6.0/NEWS 2014-08-03 16:40:43.000000000 +0200 +++ new/menu-cache-0.6.1/NEWS 2014-08-26 19:17:39.000000000 +0200 @@ -1,3 +1,11 @@ +Changes in 0.6.1 since 0.6.0: + +* Fixed invalid memory access after cache reload. + +* A little cleanup of dist tarball: removed unused files menu-cache.h and + libmenu-cache-uninstalled.pc.in. + + Changes in 0.6.0 since 0.5.1: * Fixed few GLIB compatibility issues. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/menu-cache-0.6.0/aclocal.m4 new/menu-cache-0.6.1/aclocal.m4 --- old/menu-cache-0.6.0/aclocal.m4 2014-08-03 16:40:58.000000000 +0200 +++ new/menu-cache-0.6.1/aclocal.m4 2014-08-26 19:17:47.000000000 +0200 @@ -9403,7 +9403,8 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/menu-cache-0.6.0/config.guess new/menu-cache-0.6.1/config.guess --- old/menu-cache-0.6.0/config.guess 2014-08-03 16:40:59.000000000 +0200 +++ new/menu-cache-0.6.1/config.guess 2014-08-26 19:17:49.000000000 +0200 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to <config-patches(a)gnu.org> and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.gues… +# +# Please send patches with a ChangeLog entry to config-patches(a)gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include <features.h> + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,10 +820,13 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -852,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,31 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1256,7 +1297,7 @@ NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,157 +1371,6 @@ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c <<EOF -#ifdef _SEQUENT_ -# include <sys/types.h> -# include <sys/utsname.h> -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include <sys/param.h> - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach $[0-9]*$.*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include <sys/param.h> -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <<EOF $0: unable to guess system type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/menu-cache-0.6.0/config.sub new/menu-cache-0.6.1/config.sub --- old/menu-cache-0.6.0/config.sub 2014-08-03 16:41:00.000000000 +0200 +++ new/menu-cache-0.6.1/config.sub 2014-08-26 19:17:49.000000000 +0200 @@ -1,24 +1,18 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. - -timestamp='2012-04-18' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# Copyright 1992-2014 Free Software Foundation, Inc. + +timestamp='2014-05-01' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, see <http://www.gnu.org/licenses/>. @@ -26,11 +20,12 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to <config-patches(a)gnu.org>. Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches(a)gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +116,7 @@ maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,10 +252,12 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -270,10 +265,11 @@ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -287,20 +283,22 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -328,7 +326,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -370,13 +368,13 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -385,11 +383,13 @@ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -403,18 +403,22 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -788,11 +792,15 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -828,7 +836,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1019,7 +1027,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1346,21 +1358,21 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1368,7 +1380,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1492,9 +1504,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1543,6 +1552,9 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/menu-cache-0.6.0/configure new/menu-cache-0.6.1/configure --- old/menu-cache-0.6.0/configure 2014-08-03 16:41:00.000000000 +0200 +++ new/menu-cache-0.6.1/configure 2014-08-26 19:17:50.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for menu-cache 0.6.0. +# Generated by GNU Autoconf 2.69 for menu-cache 0.6.1. # # Report bugs to <http://lxde.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='menu-cache' PACKAGE_TARNAME='menu-cache' -PACKAGE_VERSION='0.6.0' -PACKAGE_STRING='menu-cache 0.6.0' +PACKAGE_VERSION='0.6.1' +PACKAGE_STRING='menu-cache 0.6.1' PACKAGE_BUGREPORT='http://lxde.org/' PACKAGE_URL='' @@ -1355,7 +1355,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures menu-cache 0.6.0 to adapt to many kinds of systems. +\`configure' configures menu-cache 0.6.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1425,7 +1425,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of menu-cache 0.6.0:";; + short | recursive ) echo "Configuration of menu-cache 0.6.1:";; esac cat <<\_ACEOF @@ -1550,7 +1550,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -menu-cache configure 0.6.0 +menu-cache configure 0.6.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1828,7 +1828,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by menu-cache $as_me 0.6.0, which was +It was created by menu-cache $as_me 0.6.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2693,7 +2693,7 @@ # Define the identity of the package. PACKAGE='menu-cache' - VERSION='0.6.0' + VERSION='0.6.1' cat >>confdefs.h <<_ACEOF @@ -2785,6 +2785,7 @@ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi fi + ac_config_headers="$ac_config_headers config.h" @@ -12860,7 +12861,7 @@ exec_prefix="$exec_prefix_save" -ac_config_files="$ac_config_files Makefile libmenu-cache/Makefile libmenu-cache/libmenu-cache.pc libmenu-cache/libmenu-cache-uninstalled.pc libmenu-cache/menu-cache.h menu-cache-gen/Makefile menu-cache-daemon/Makefile docs/Makefile docs/reference/Makefile docs/reference/libmenu-cache/Makefile" +ac_config_files="$ac_config_files Makefile libmenu-cache/Makefile libmenu-cache/libmenu-cache.pc libmenu-cache/menu-cache.h menu-cache-gen/Makefile menu-cache-daemon/Makefile docs/Makefile docs/reference/Makefile docs/reference/libmenu-cache/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -13419,7 +13420,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by menu-cache $as_me 0.6.0, which was +This file was extended by menu-cache $as_me 0.6.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13485,7 +13486,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -menu-cache config.status 0.6.0 +menu-cache config.status 0.6.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -13897,7 +13898,6 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "libmenu-cache/Makefile") CONFIG_FILES="$CONFIG_FILES libmenu-cache/Makefile" ;; "libmenu-cache/libmenu-cache.pc") CONFIG_FILES="$CONFIG_FILES libmenu-cache/libmenu-cache.pc" ;; - "libmenu-cache/libmenu-cache-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES libmenu-cache/libmenu-cache-uninstalled.pc" ;; "libmenu-cache/menu-cache.h") CONFIG_FILES="$CONFIG_FILES libmenu-cache/menu-cache.h" ;; "menu-cache-gen/Makefile") CONFIG_FILES="$CONFIG_FILES menu-cache-gen/Makefile" ;; "menu-cache-daemon/Makefile") CONFIG_FILES="$CONFIG_FILES menu-cache-daemon/Makefile" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/menu-cache-0.6.0/configure.ac new/menu-cache-0.6.1/configure.ac --- old/menu-cache-0.6.0/configure.ac 2014-08-03 16:40:43.000000000 +0200 +++ new/menu-cache-0.6.1/configure.ac 2014-08-26 19:17:39.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([menu-cache], [0.6.0], +AC_INIT([menu-cache], [0.6.1], [http://lxde.org/] AC_CONFIG_SRCDIR(menu-cache-gen/gmenu-tree.h) @@ -79,7 +79,6 @@ Makefile libmenu-cache/Makefile libmenu-cache/libmenu-cache.pc -libmenu-cache/libmenu-cache-uninstalled.pc libmenu-cache/menu-cache.h menu-cache-gen/Makefile menu-cache-daemon/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/menu-cache-0.6.0/libmenu-cache/Makefile.am new/menu-cache-0.6.1/libmenu-cache/Makefile.am --- old/menu-cache-0.6.0/libmenu-cache/Makefile.am 2014-08-03 16:40:43.000000000 +0200 +++ new/menu-cache-0.6.1/libmenu-cache/Makefile.am 2014-08-26 19:17:39.000000000 +0200 @@ -24,18 +24,17 @@ libmenu_cache_la_LDFLAGS = \ -no-undefined \ -export-symbols-regex menu_cache \ - -version-info 3:2:0 \ + -version-info 3:3:0 \ $(NULL) lib_menu_cache_includedir = $(includedir)/menu-cache -lib_menu_cache_include_HEADERS = \ +nodist_lib_menu_cache_include_HEADERS = \ menu-cache.h \ $(NULL) EXTRA_DIST = \ - libmenu-cache.pc.in \ - libmenu-cache-uninstalled.pc.in \ + libmenu-cache.pc.in \ $(NULL) pkgconfigdir = $(libdir)/pkgconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/menu-cache-0.6.0/libmenu-cache/Makefile.in new/menu-cache-0.6.1/libmenu-cache/Makefile.in --- old/menu-cache-0.6.0/libmenu-cache/Makefile.in 2014-08-03 16:41:00.000000000 +0200 +++ new/menu-cache-0.6.1/libmenu-cache/Makefile.in 2014-08-26 19:17:50.000000000 +0200 @@ -82,18 +82,15 @@ host_triplet = @host@ subdir = libmenu-cache DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/libmenu-cache.pc.in \ - $(srcdir)/libmenu-cache-uninstalled.pc.in \ - $(srcdir)/menu-cache.h.in $(top_srcdir)/depcomp \ - $(lib_menu_cache_include_HEADERS) + $(srcdir)/libmenu-cache.pc.in $(srcdir)/menu-cache.h.in \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = libmenu-cache.pc libmenu-cache-uninstalled.pc \ - menu-cache.h +CONFIG_CLEAN_FILES = libmenu-cache.pc menu-cache.h CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -181,7 +178,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(pkgconfig_DATA) -HEADERS = $(lib_menu_cache_include_HEADERS) +HEADERS = $(nodist_lib_menu_cache_include_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -360,17 +357,16 @@ libmenu_cache_la_LDFLAGS = \ -no-undefined \ -export-symbols-regex menu_cache \ - -version-info 3:2:0 \ + -version-info 3:3:0 \ $(NULL) lib_menu_cache_includedir = $(includedir)/menu-cache -lib_menu_cache_include_HEADERS = \ +nodist_lib_menu_cache_include_HEADERS = \ menu-cache.h \ $(NULL) EXTRA_DIST = \ - libmenu-cache.pc.in \ - libmenu-cache-uninstalled.pc.in \ + libmenu-cache.pc.in \ $(NULL) pkgconfigdir = $(libdir)/pkgconfig @@ -411,8 +407,6 @@ $(am__aclocal_m4_deps): libmenu-cache.pc: $(top_builddir)/config.status $(srcdir)/libmenu-cache.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -libmenu-cache-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/libmenu-cache-uninstalled.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ menu-cache.h: $(top_builddir)/config.status $(srcdir)/menu-cache.h.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ @@ -509,9 +503,9 @@ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) -install-lib_menu_cache_includeHEADERS: $(lib_menu_cache_include_HEADERS) +install-nodist_lib_menu_cache_includeHEADERS: $(nodist_lib_menu_cache_include_HEADERS) @$(NORMAL_INSTALL) - @list='$(lib_menu_cache_include_HEADERS)'; test -n "$(lib_menu_cache_includedir)" || list=; \ + @list='$(nodist_lib_menu_cache_include_HEADERS)'; test -n "$(lib_menu_cache_includedir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(lib_menu_cache_includedir)'"; \ $(MKDIR_P) "$(DESTDIR)$(lib_menu_cache_includedir)" || exit 1; \ @@ -525,9 +519,9 @@ $(INSTALL_HEADER) $$files "$(DESTDIR)$(lib_menu_cache_includedir)" || exit $$?; \ done -uninstall-lib_menu_cache_includeHEADERS: +uninstall-nodist_lib_menu_cache_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(lib_menu_cache_include_HEADERS)'; test -n "$(lib_menu_cache_includedir)" || list=; \ + @list='$(nodist_lib_menu_cache_include_HEADERS)'; test -n "$(lib_menu_cache_includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(lib_menu_cache_includedir)'; $(am__uninstall_files_from_dir) @@ -673,7 +667,7 @@ info-am: -install-data-am: install-lib_menu_cache_includeHEADERS \ +install-data-am: install-nodist_lib_menu_cache_includeHEADERS \ install-pkgconfigDATA install-dvi: install-dvi-am @@ -721,7 +715,7 @@ ps-am: uninstall-am: uninstall-libLTLIBRARIES \ - uninstall-lib_menu_cache_includeHEADERS \ + uninstall-nodist_lib_menu_cache_includeHEADERS \ uninstall-pkgconfigDATA .MAKE: install-am install-strip @@ -733,15 +727,15 @@ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES \ - install-lib_menu_cache_includeHEADERS install-man install-pdf \ + install-info-am install-libLTLIBRARIES install-man \ + install-nodist_lib_menu_cache_includeHEADERS install-pdf \ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-libLTLIBRARIES \ - uninstall-lib_menu_cache_includeHEADERS \ + uninstall-nodist_lib_menu_cache_includeHEADERS \ uninstall-pkgconfigDATA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/menu-cache-0.6.0/libmenu-cache/libmenu-cache-uninstalled.pc.in new/menu-cache-0.6.1/libmenu-cache/libmenu-cache-uninstalled.pc.in --- old/menu-cache-0.6.0/libmenu-cache/libmenu-cache-uninstalled.pc.in 2014-08-03 16:40:43.000000000 +0200 +++ new/menu-cache-0.6.1/libmenu-cache/libmenu-cache-uninstalled.pc.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libmenu-cache -Description: Cache for freedesktop.org menu spec -Requires: glib-2.0 -Version: @VERSION@ -Libs: ${pc_top_builddir}/${pcfiledir}/libmenu-cache.la -Cflags: -I${pc_top_builddir}/${pcfiledir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/menu-cache-0.6.0/libmenu-cache/menu-cache.c new/menu-cache-0.6.1/libmenu-cache/menu-cache.c --- old/menu-cache-0.6.0/libmenu-cache/menu-cache.c 2014-08-03 16:40:43.000000000 +0200 +++ new/menu-cache-0.6.1/libmenu-cache/menu-cache.c 2014-08-26 19:17:39.000000000 +0200 @@ -76,6 +76,12 @@ g_mutex_unlock(sync_run_mutex); } while(0) #endif +typedef struct +{ + char *dir; + gint n_ref; +} MenuCacheFileDir; + struct _MenuCacheItem { guint n_ref; @@ -84,7 +90,7 @@ char* name; char* comment; char* icon; - const char* file_dir; + MenuCacheFileDir* file_dir; char* file_name; MenuCacheDir* parent; }; @@ -98,7 +104,6 @@ struct _MenuCacheApp { MenuCacheItem item; - const char* file_dir; char* generic_name; char* exec; char* working_dir; @@ -115,8 +120,6 @@ char* reg; /* includes md5 sum */ char* md5; /* link inside of reg */ char* cache_file; - char** all_used_files; - int n_all_used_files; char** known_des; GSList* notifiers; GThread* thr; @@ -151,16 +154,18 @@ #endif } -static MenuCacheItem* read_item(GDataInputStream* f, MenuCache* cache); +static MenuCacheItem* read_item(GDataInputStream* f, MenuCache* cache, + MenuCacheFileDir** all_used_files, int n_all_used_files); /* functions read_dir(), read_app(), and read_item() should be called for items that aren't accessible yet, therefore no lock is required */ -static void read_dir(GDataInputStream* f, MenuCacheDir* dir, MenuCache* cache) +static void read_dir(GDataInputStream* f, MenuCacheDir* dir, MenuCache* cache, + MenuCacheFileDir** all_used_files, int n_all_used_files) { MenuCacheItem* item; /* load child items in the dir */ - while( (item = read_item( f, cache )) ) + while( (item = read_item( f, cache, all_used_files, n_all_used_files )) ) { /* menu_cache_ref shouldn't be called here for dir. * Otherwise, circular reference will happen. */ @@ -209,7 +214,8 @@ g_free(line); } -static MenuCacheItem* read_item(GDataInputStream* f, MenuCache* cache) +static MenuCacheItem* read_item(GDataInputStream* f, MenuCache* cache, + MenuCacheFileDir** all_used_files, int n_all_used_files) { MenuCacheItem* item; char *line; @@ -318,46 +324,64 @@ } idx = atoi( line ); g_free(line); - if( G_LIKELY( idx >=0 && idx < cache->n_all_used_files ) ) - item->file_dir = cache->all_used_files[ idx ] + 1; + if( G_LIKELY( idx >=0 && idx < n_all_used_files ) ) + { + item->file_dir = all_used_files[ idx ]; + g_atomic_int_inc(&item->file_dir->n_ref); + } if( item->type == MENU_CACHE_TYPE_DIR ) - read_dir( f, MENU_CACHE_DIR(item), cache ); + read_dir( f, MENU_CACHE_DIR(item), cache, all_used_files, n_all_used_files ); else if( item->type == MENU_CACHE_TYPE_APP ) read_app( f, MENU_CACHE_APP(item), cache ); return item; } -static gboolean read_all_used_files(GDataInputStream* f, MenuCache* cache) +static void menu_cache_file_dir_unref(MenuCacheFileDir *file_dir) +{ + if (file_dir && g_atomic_int_dec_and_test(&file_dir->n_ref)) + { + g_free(file_dir->dir); + g_free(file_dir); + } +} + +static gint read_all_used_files(GDataInputStream* f, MenuCache* cache, + MenuCacheFileDir*** all_used_files) { char *line; gsize len; int i, n; - char** dirs; + MenuCacheFileDir** dirs; line = g_data_input_stream_read_line(f, &len, cache->cancellable, NULL); if(G_UNLIKELY(line == NULL)) - return FALSE; + return -1; - cache->n_all_used_files = n = atoi( line ); - dirs = g_new0( char*, n + 1 ); + n = atoi( line ); g_free(line); + if (G_UNLIKELY(n <= 0)) + return n; + + dirs = g_new0( MenuCacheFileDir *, n ); for( i = 0; i < n; ++i ) { line = g_data_input_stream_read_line(f, &len, cache->cancellable, NULL); if(G_UNLIKELY(line == NULL)) { - g_strfreev(dirs); - cache->n_all_used_files = 0; - return FALSE; + while (i-- > 0) + menu_cache_file_dir_unref(dirs[i]); + g_free(dirs); + return -1; } - - dirs[i] = line; /* don't include \n */ + dirs[i] = g_new(MenuCacheFileDir, 1); + dirs[i]->n_ref = 1; + dirs[i]->dir = line; /* don't include \n */ } - cache->all_used_files = dirs; - return TRUE; + *all_used_files = dirs; + return n; } static gboolean read_all_known_des(GDataInputStream* f, MenuCache* cache) @@ -447,7 +471,6 @@ g_free( cache->menu_name ); g_free(cache->reg); /* g_free( cache->menu_file_path ); */ - g_strfreev( cache->all_used_files ); g_strfreev(cache->known_des); g_slist_free(cache->notifiers); g_slice_free( MenuCache, cache ); @@ -606,6 +629,8 @@ GFile* file; GFileInputStream* istr = NULL; GDataInputStream* f; + MenuCacheFileDir** all_used_files; + int i, n; file = g_file_new_for_path(cache->cache_file); if(!file) @@ -648,12 +673,11 @@ MENU_CACHE_UNLOCK; goto _fail; } - g_strfreev( cache->all_used_files ); /* get all used files */ - if( ! read_all_used_files( f, cache ) ) + n = read_all_used_files( f, cache, &all_used_files ); + if (n <= 0) { - cache->all_used_files = NULL; MENU_CACHE_UNLOCK; goto _fail; } @@ -664,6 +688,9 @@ { cache->known_des = NULL; MENU_CACHE_UNLOCK; + for (i = 0; i < n; i++) + menu_cache_file_dir_unref(all_used_files[i]); + g_free(all_used_files); _fail: g_object_unref(f); return FALSE; @@ -672,13 +699,17 @@ if(cache->root_dir) menu_cache_item_unref( MENU_CACHE_ITEM(cache->root_dir) ); - cache->root_dir = (MenuCacheDir*)read_item( f, cache ); + cache->root_dir = (MenuCacheDir*)read_item( f, cache, all_used_files, n ); g_object_unref(f); g_idle_add_full(G_PRIORITY_HIGH_IDLE, reload_notify, menu_cache_ref(cache), (GDestroyNotify)menu_cache_unref); MENU_CACHE_UNLOCK; + for (i = 0; i < n; i++) + menu_cache_file_dir_unref(all_used_files[i]); + g_free(all_used_files); + return TRUE; } @@ -707,6 +738,8 @@ g_free( item->comment ); g_free( item->icon ); + menu_cache_file_dir_unref(item->file_dir); + if( item->file_name && item->file_name != item->id ) g_free( item->file_name ); @@ -855,7 +888,7 @@ */ const char* menu_cache_item_get_file_dirname( MenuCacheItem* item ) { - return item->file_dir; + return item->file_dir->dir + 1; } /** @@ -874,7 +907,7 @@ { if( ! item->file_name || ! item->file_dir ) return NULL; - return g_build_filename( item->file_dir, item->file_name, NULL ); + return g_build_filename( item->file_dir->dir + 1, item->file_name, NULL ); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/menu-cache-0.6.0/libmenu-cache/menu-cache.h new/menu-cache-0.6.1/libmenu-cache/menu-cache.h --- old/menu-cache-0.6.0/libmenu-cache/menu-cache.h 2014-08-03 16:41:05.000000000 +0200 +++ new/menu-cache-0.6.1/libmenu-cache/menu-cache.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,176 +0,0 @@ -/* - * menu-cache.h - * - * libmenu-cache is a small convinient library used to access - * caches of freedesktop.org menus generated by menu-cache-gen. - * - * Copyright 2008 PCMan <pcman.tw(a)gmail.com> - * Copyright 2012-2013 Andriy Grytsenko (LStranger) <andrej(a)rep.kiev.ua> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ - -#ifndef __MENU_CACHE_H__ -#define __MENU_CACHE_H__ - -#include <glib.h> - -G_BEGIN_DECLS - -#define __VERSION_MAJOR 0 -#define __VERSION_MINOR 6 -#define __VERSION_MICRO 0 - -#define MENU_CACHE_CHECK_VERSION(_a,_b,_c) \ - (__VERSION_MAJOR > _a || \ - (__VERSION_MAJOR == _a && __VERSION_MINOR > _b) || \ - (__VERSION_MAJOR == _a && __VERSION_MINOR == _b && __VERSION_MICRO >= _c)) - -#define MENU_CACHE_ITEM(x) ((MenuCacheItem*)x) -#define MENU_CACHE_DIR(x) ((MenuCacheDir*)x) -#define MENU_CACHE_APP(x) ((MenuCacheApp*)x) - -typedef struct _MenuCacheItem MenuCacheItem; -typedef struct _MenuCacheDir MenuCacheDir; -typedef struct _MenuCacheApp MenuCacheApp; -typedef struct _MenuCache MenuCache; - -/** - * MenuCacheType: - * @MENU_CACHE_TYPE_NONE: invalid type - * @MENU_CACHE_TYPE_DIR: item #MenuCacheDir - * @MENU_CACHE_TYPE_APP: item #MenuCacheApp - * @MENU_CACHE_TYPE_SEP: menu separator - * - * type of #MenuCacheItem. - */ -typedef enum -{ - MENU_CACHE_TYPE_NONE, - MENU_CACHE_TYPE_DIR, - MENU_CACHE_TYPE_APP, - MENU_CACHE_TYPE_SEP -}MenuCacheType; - -/** - * MenuCacheShowFlag: - * @SHOW_IN_LXDE: show in LXDE - * @SHOW_IN_GNOME: show in GNOME - * @SHOW_IN_KDE: show in KDE - * @SHOW_IN_XFCE: show in XFCE - * @SHOW_IN_ROX: show in ROX - * - * bitmask of desktop environments where the item should be visible. - */ -typedef enum -{ - SHOW_IN_LXDE = 1 << 0, - SHOW_IN_GNOME = 1 << 1, - SHOW_IN_KDE = 1 << 2, - SHOW_IN_XFCE = 1 << 3, - SHOW_IN_ROX = 1 << 4, - /*< private >*/ - N_KNOWN_DESKTOPS = 5 -}MenuCacheShowFlag; - -/** - * MenuCacheItemFlag: - * @FLAG_USE_TERMINAL: run this application in terminal - * @FLAG_USE_SN: use Startup Notify for this application - * @FLAG_IS_NODISPLAY: application is hidden from menu - * - * flags for application run. - */ -typedef enum -{ - FLAG_USE_TERMINAL = 1 << 0, - FLAG_USE_SN = 1 << 1, - FLAG_IS_NODISPLAY = 1 << 2 -}MenuCacheItemFlag; - -void menu_cache_init(int flags); - -MenuCache* menu_cache_lookup( const char* menu_name ); -MenuCache* menu_cache_lookup_sync( const char* menu_name ); -/* MenuCache* menu_cache_lookup_by_cache_id( const char* md5 ); */ - -MenuCache* menu_cache_ref(MenuCache* cache); -void menu_cache_unref(MenuCache* cache); - -gboolean menu_cache_reload( MenuCache* cache ); - -#ifndef G_DISABLE_DEPRECATED -MenuCacheDir* menu_cache_get_root_dir( MenuCache* cache ); -MenuCacheDir* menu_cache_get_dir_from_path( MenuCache* cache, const char* path ); -#endif -MenuCacheDir* menu_cache_dup_root_dir( MenuCache* cache ); -MenuCacheItem* menu_cache_item_from_path( MenuCache* cache, const char* path ); - -typedef struct _MenuCacheNotifyId* MenuCacheNotifyId; -typedef void (*MenuCacheReloadNotify)(MenuCache* cache, gpointer user_data); - -MenuCacheNotifyId menu_cache_add_reload_notify(MenuCache* cache, - MenuCacheReloadNotify func, - gpointer user_data); -void menu_cache_remove_reload_notify(MenuCache* cache, MenuCacheNotifyId notify_id); - -guint32 menu_cache_get_desktop_env_flag( MenuCache* cache, const char* desktop_env ); - - -MenuCacheItem* menu_cache_item_ref(MenuCacheItem* item); -gboolean menu_cache_item_unref(MenuCacheItem* item); - -MenuCacheType menu_cache_item_get_type( MenuCacheItem* item ); -const char* menu_cache_item_get_id( MenuCacheItem* item ); -const char* menu_cache_item_get_name( MenuCacheItem* item ); -const char* menu_cache_item_get_comment( MenuCacheItem* item ); -const char* menu_cache_item_get_icon( MenuCacheItem* item ); - -const char* menu_cache_item_get_file_basename( MenuCacheItem* item ); -const char* menu_cache_item_get_file_dirname( MenuCacheItem* item ); -char* menu_cache_item_get_file_path( MenuCacheItem* item ); - -#ifndef G_DISABLE_DEPRECATED -MenuCacheDir* menu_cache_item_get_parent( MenuCacheItem* item ); -GSList* menu_cache_dir_get_children( MenuCacheDir* dir ); -#endif -MenuCacheDir* menu_cache_item_dup_parent( MenuCacheItem* item ); -GSList* menu_cache_dir_list_children( MenuCacheDir* dir ); -MenuCacheItem *menu_cache_find_child_by_id(MenuCacheDir *dir, const char *id); -MenuCacheItem *menu_cache_find_child_by_name(MenuCacheDir *dir, const char *name); - -char* menu_cache_dir_make_path( MenuCacheDir* dir ); - -const char* menu_cache_app_get_exec( MenuCacheApp* app ); -const char* menu_cache_app_get_working_dir( MenuCacheApp* app ); - -guint32 menu_cache_app_get_show_flags( MenuCacheApp* app ); -gboolean menu_cache_app_get_is_visible( MenuCacheApp* app, guint32 de_flags ); -gboolean menu_cache_dir_is_visible(MenuCacheDir *dir); - -gboolean menu_cache_app_get_use_terminal( MenuCacheApp* app ); -gboolean menu_cache_app_get_use_sn( MenuCacheApp* app ); - -GSList* menu_cache_list_all_apps(MenuCache* cache); - -MenuCacheItem *menu_cache_find_item_by_id(MenuCache *cache, const char *id); -/* -MenuCacheApp* menu_cache_find_app_by_exec( const char* exec ); -*/ -G_END_DECLS - -#endif - -- 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 30 Aug '14

30 Aug '14

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-08-30 18:55:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-28 21:05:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-08-30 18:56:09.000000000 +0200 @@ -1,0 +2,77 @@ +Fri Aug 29 22:29:31 CEST 2014 - ms(a)suse.de + +- v5.06.157 released + +------------------------------------------------------------------- +Fri Aug 29 22:14:08 CEST 2014 - ms(a)suse.de + +- Fixed KIWIOVFConfigWriter rasd:HostResource for ovf:/disk + + The reference ID was set to a wrong value not matching the + ovf:DiskSection section + +------------------------------------------------------------------- +Fri Aug 29 21:22:38 CEST 2014 - ms(a)suse.de + +- Fixed creation of virtualbox vagrant boxes + + Add hardlink box-disk1.vmdk to real vmdk image in box tarball + +------------------------------------------------------------------- +Fri Aug 29 21:19:21 CEST 2014 - ms(a)suse.de + +- Cleanup KIWIOVFConfigWriter + + Prevent use of uninitialized values + +------------------------------------------------------------------- +Fri Aug 29 19:32:26 CEST 2014 - ms(a)suse.de + +- Update vagrant example for virtualbox + +------------------------------------------------------------------- +Fri Aug 29 19:31:11 CEST 2014 - ms(a)suse.de + +- Added missing format attribute in ovf:DiskSection in config writer + +------------------------------------------------------------------- +Fri Aug 29 15:21:55 CEST 2014 - ms(a)suse.de + +- v5.06.156 released + +------------------------------------------------------------------- +Fri Aug 29 15:15:49 CEST 2014 - ms(a)suse.de + +- Allow bootloader setup to run on aarch64 for grub2 and uboot (bnc #894214) + +------------------------------------------------------------------- +Fri Aug 29 14:18:49 CEST 2014 - ms(a)suse.de + +- Added virtualbox-guest-tools in suse-13.1 vagrant example + +------------------------------------------------------------------- +Fri Aug 29 14:15:32 CEST 2014 - ms(a)suse.de + +- Fixed broken ovf:href for image file + + Within the vagrant virtualbox box creation the vmdk file was + renamed but this action broke the reference to that file inside + the ovf config file + +------------------------------------------------------------------- +Fri Aug 29 10:35:55 CEST 2014 - ms(a)suse.de + +- Prevent creation of custom /etc/ImagePackages in netboot + + The information there is created at image creation time + already and the call increases the first boot time. This + fixes (bnc #893776) + +------------------------------------------------------------------- +Fri Aug 29 10:32:29 CEST 2014 - ms(a)suse.de + +- Make sure kiwi initrd creates /run/log + + dracut stores its log file there + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.8w3IuI/_old 2014-08-30 18:56:11.000000000 +0200 +++ /var/tmp/diff_new_pack.8w3IuI/_new 2014-08-30 18:56:11.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 5.06.155 +Version: 5.06.157 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz ++++++ 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-12 14:05:04.000000000 +0200 +++ new/doc/examples/extras/suse-13.1/suse-vagrant-box/config.xml 2014-08-29 22:30:41.000000000 +0200 @@ -12,6 +12,10 @@ <type image="vmx" filesystem="ext3" boot="vmxboot/suse-13.1" format="vagrant" bootloader="grub2" kernelcmdline="nomodeset"> <vagrantconfig provider="libvirt" virtualsize="16"/> <vagrantconfig provider="virtualbox" virtualsize="16"/> + <machine memory="512" guestOS="suse" HWversion="9" ovftype="vmware"> + <vmdisk id="0" controller="lsilogic"/> + </machine> + <size unit="G">10</size> </type> <version>1.13.1</version> <packagemanager>zypper</packagemanager> @@ -37,6 +41,7 @@ <product name="openSUSE"/> <package name="plymouth-branding-openSUSE" bootinclude="true"/> <package name="grub2-branding-openSUSE" bootinclude="true"/> + <package name="virtualbox-guest-tools"/> <package name="ifplugd"/> <package name="iputils"/> <package name="vim"/> @@ -52,6 +57,17 @@ <package name="sudo"/> <package name="rsync"/> <package name="kernel-default"/> + <package name="virtualbox-guest-kmp-default"/> + <package name="kiwi"/> + <package name="kiwi-tools"/> + <package name="kiwi-desc-isoboot"/> + <package name="kiwi-desc-netboot"/> + <package name="kiwi-desc-oemboot"/> + <package name="kiwi-desc-vmxboot"/> + <package name="kiwi-templates"/> + <package name="btrfsprogs"/> + <package name="genisoimage"/> + <package name="squashfs"/> </packages> <packages type="bootstrap"> <package name="udev"/> ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ ++++ 8004 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 dracut for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '14

30 Aug '14

Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2014-08-30 18:55:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dracut" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2014-08-25 11:03:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-08-30 18:56:06.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Aug 29 14:27:49 UTC 2014 - trenn(a)suse.de + +- Do not blindly try to touch the logfile (bnc#893219) +* Add 0146-dracut.sh-corrected-logfile-check.patch +- Only fix UUID= fstab parsing +* Add 0147-dracut.sh-Fix-UUID-fstab-parsing-in-case-mount-optio.patch +- Also fix other parsing syntax in fstab like LABEL= +* Add 0148-dracut.sh-Fix-LABEL-and-other-fstab-syntax.patch +- Fix up some bugs from previous commit +* Add 0149-dracut.sh-Fix-fstab-parsing-again.patch +- bnc#893615 +* Add 0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch +- pixz does need too much memory, go back to xz in a conservative way + (bnc#893981) +* Add 0151-Go-back-to-xz-again-pixz-may-use-too-much-memory-whi.patch +- Add some default tools to initrd when debug module is included and + already provided an commented example line how to easily enable it. + No functional change by default. +* Add 0152-Add-a-comment-to-easily-add-debug-modules-also-add-v.patch + +------------------------------------------------------------------- New: ---- 0146-dracut.sh-corrected-logfile-check.patch 0147-dracut.sh-Fix-UUID-fstab-parsing-in-case-mount-optio.patch 0148-dracut.sh-Fix-LABEL-and-other-fstab-syntax.patch 0149-dracut.sh-Fix-fstab-parsing-again.patch 0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch 0151-Go-back-to-xz-again-pixz-may-use-too-much-memory-whi.patch 0152-Add-a-comment-to-easily-add-debug-modules-also-add-v.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.rXy5NU/_old 2014-08-30 18:56:08.000000000 +0200 +++ /var/tmp/diff_new_pack.rXy5NU/_new 2014-08-30 18:56:08.000000000 +0200 @@ -166,6 +166,13 @@ Patch143: 0143-iscsi-Fix-up-ipv6-in-brackets-iterate-over-all-possi.patch Patch144: 0144-90crypt-Fixed-crypttab_contains-to-also-work-with-de.patch Patch145: 0145-40network-handle-ip-ifname-static-correctly.patch +Patch146: 0146-dracut.sh-corrected-logfile-check.patch +Patch147: 0147-dracut.sh-Fix-UUID-fstab-parsing-in-case-mount-optio.patch +Patch148: 0148-dracut.sh-Fix-LABEL-and-other-fstab-syntax.patch +Patch149: 0149-dracut.sh-Fix-fstab-parsing-again.patch +Patch150: 0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch +Patch151: 0151-Go-back-to-xz-again-pixz-may-use-too-much-memory-whi.patch +Patch152: 0152-Add-a-comment-to-easily-add-debug-modules-also-add-v.patch BuildRequires: asciidoc BuildRequires: bash @@ -185,10 +192,10 @@ Requires: sed Requires: systemd >= 200 # systemd-sysvinit provides: poweroff, reboot, halt -Requires: pixz Requires: systemd-sysvinit Requires: udev > 166 Requires: util-linux >= 2.21 +Requires: xz Recommends: binutils Recommends: logrotate Obsoletes: mkinitrd < 2.8.2 @@ -354,6 +361,13 @@ %patch143 -p1 %patch144 -p1 %patch145 -p1 +%patch146 -p1 +%patch147 -p1 +%patch148 -p1 +%patch149 -p1 +%patch150 -p1 +%patch151 -p1 +%patch152 -p1 %build %configure\ ++++++ 0146-dracut.sh-corrected-logfile-check.patch ++++++ >From 077c4bc889733c6c38b767c99f56ef67a82ef432 Mon Sep 17 00:00:00 2001 From: jloeser <jloeser(a)suse.de> Date: Fri, 22 Aug 2014 16:31:34 +0200 Subject: dracut.sh: corrected logfile check --- dracut.sh | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dracut.sh b/dracut.sh index ffe4989..5bf41f2 100755 --- a/dracut.sh +++ b/dracut.sh @@ -803,9 +803,13 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) # eliminate IFS hackery when messing with fw_dir fw_dir=${fw_dir//:/ } -if [[ ! -f $logfile ]];then - if [[ ! `touch $logfile > /dev/null 2>&1` ]];then - printf "%s\n" "dracut: touch $logfile failed. Couldn't create logfile." +# check for logfile and try to create one if it doesn't exist +if [[ -n "$logfile" ]];then + if [[ ! -f "$logfile" ]];then + touch "$logfile" + if [ ! $? -eq 0 ] ;then + printf "%s\n" "dracut: touch $logfile failed." >&2 + fi fi fi -- 1.7.6.1 ++++++ 0147-dracut.sh-Fix-UUID-fstab-parsing-in-case-mount-optio.patch ++++++ >From be3797f733ad5e956c73d0f17ba8bddc12b7f570 Mon Sep 17 00:00:00 2001 From: Thomas Renninger <trenn(a)suse.de> Date: Fri, 22 Aug 2014 18:52:22 +0200 Subject: dracut.sh: Fix UUID= fstab parsing in case --mount option is passed Dracut parses /etc/fstab when --mount is option is passed (e.g. kdump). In host_devs variable the real block device must be stored, not UUID= There are other /etc/fstab syntax possibilities we now warn that they are not correctly parsed. This will be fixed by another patch when there is time to test this properly. Signed-off-by: Thomas Renninger <trenn(a)suse.de> --- dracut.sh | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dracut.sh b/dracut.sh index 297c6bf..d087530 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1020,9 +1020,28 @@ declare -A host_fs_types for line in "${fstab_lines[@]}"; do set -- $line + dev="$1" #dev mp fs fsopts - push_host_devs "$1" - host_fs_types["$1"]="$3" + case "$dev" in + UUID=*) + dev=/dev/disk/by-uuid/${dev#UUID=*} + ;; + LABEL=*) + dwarn "Not supported fstab line: $@" + ;; + PARTUUID=*) + dwarn "Not supported fstab line: $@" + ;; + PARTLABEL=*) + dwarn "Not supported fstab line: $@" + ;; + *) + dwarn "Not supported fstab line: $@" + ;; + esac + push_host_devs "$dev" + echo "$dev" "$3" + host_fs_types["$dev"]="$3" done for f in $add_fstab; do -- 1.7.6.1 ++++++ 0148-dracut.sh-Fix-LABEL-and-other-fstab-syntax.patch ++++++ >From 445d0a70896485991ba8ccc763422eefcda1ba1e Mon Sep 17 00:00:00 2001 From: Thomas Renninger <trenn(a)suse.de> Date: Mon, 25 Aug 2014 18:04:05 +0200 Subject: dracut.sh: Fix LABEL= and other fstab syntax On my test system I had problem with -o device in combination with -l option, but this must have been a blkid, or sysfs issue. Patch should be correct. Signed-off-by: Thomas Renninger <trenn(a)suse.de> --- dracut.sh | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dracut.sh b/dracut.sh index d087530..2baacfd 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1024,19 +1024,16 @@ for line in "${fstab_lines[@]}"; do #dev mp fs fsopts case "$dev" in UUID=*) - dev=/dev/disk/by-uuid/${dev#UUID=*} + dev=$(blkid -l -t PARTLABEL="$dev" -o device) ;; LABEL=*) - dwarn "Not supported fstab line: $@" + dev=$(blkid -l -t LABEL="$dev" -o device) ;; PARTUUID=*) - dwarn "Not supported fstab line: $@" + dev=$(blkid -l -t PARTUUID="$dev" -o device) ;; PARTLABEL=*) - dwarn "Not supported fstab line: $@" - ;; - *) - dwarn "Not supported fstab line: $@" + dev=$(blkid -l -t PARTLABEL="$dev" -o device) ;; esac push_host_devs "$dev" -- 1.7.6.1 ++++++ 0149-dracut.sh-Fix-fstab-parsing-again.patch ++++++ >From b444f676e0c3847a42e7cd360846c8b669b022c3 Mon Sep 17 00:00:00 2001 From: Thomas Renninger <trenn(a)suse.de> Date: Tue, 26 Aug 2014 17:31:33 +0200 Subject: dracut.sh: Fix fstab parsing again... Signed-off-by: Thomas Renninger <trenn(a)suse.de> --- dracut.sh | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dracut.sh b/dracut.sh index 2baacfd..3a0c64b 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1024,20 +1024,20 @@ for line in "${fstab_lines[@]}"; do #dev mp fs fsopts case "$dev" in UUID=*) - dev=$(blkid -l -t PARTLABEL="$dev" -o device) + dev=$(blkid -l -t UUID=${dev#UUID=} -o device) ;; LABEL=*) - dev=$(blkid -l -t LABEL="$dev" -o device) + dev=$(blkid -l -t LABEL=${dev#LABEL=} -o device) ;; PARTUUID=*) - dev=$(blkid -l -t PARTUUID="$dev" -o device) + dev=$(blkid -l -t PARTUUID=${dev#PARTUUID=} -o device) ;; PARTLABEL=*) - dev=$(blkid -l -t PARTLABEL="$dev" -o device) + dev=$(blkid -l -t PARTLABEL=${dev#PARTLABEL=} -o device) ;; esac + [ -z "$dev" ] && dwarn "Bad fstab entry $@" && continue push_host_devs "$dev" - echo "$dev" "$3" host_fs_types["$dev"]="$3" done -- 1.7.6.1 ++++++ 0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch ++++++ >From b5a5fb4486dee09287df825ecd1d2f8b76a98682 Mon Sep 17 00:00:00 2001 From: Martin Wilck <martin.wilck(a)ts.fujitsu.com> Date: Fri, 29 Aug 2014 15:42:51 +0200 Subject: Find kernel modules in extra and weak-updates path also Signed-off-by: Thomas Renninger <trenn(a)suse.de> --- dracut-functions.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dracut-functions.sh b/dracut-functions.sh index 22e16ff..208c295 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -1623,7 +1623,7 @@ find_kernel_modules_by_path () { _OLDIFS=$IFS IFS=: while read a rest; do - [[ $a = */$1/* ]] || [[ $a = updates/* ]] || continue + [[ $a = */$1/* ]] || [[ $a = updates/* ]] || [[ $a = extra/* ]] || [[ $a = weak-updates/* ]] || continue printf "%s\n" "$srcmods/$a" done < "$srcmods/modules.dep" IFS=$_OLDIFS -- 1.7.6.1 ++++++ 0151-Go-back-to-xz-again-pixz-may-use-too-much-memory-whi.patch ++++++ >From f25f24d6b13061b952d5420939898fe9d5496804 Mon Sep 17 00:00:00 2001 From: Thomas Renninger <trenn(a)suse.de> Date: Fri, 29 Aug 2014 16:17:50 +0200 Subject: Go back to xz again, pixz may use too much memory while compressing. bnc#893981 Signed-off-by: Thomas Renninger <trenn(a)suse.de> --- dracut.conf.d/suse.conf.example | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dracut.conf.d/suse.conf.example b/dracut.conf.d/suse.conf.example index 818b59f..b0ef0e5 100644 --- a/dracut.conf.d/suse.conf.example +++ b/dracut.conf.d/suse.conf.example @@ -7,7 +7,7 @@ hostonly="yes" hostonly_cmdline="yes" -compress="pixz -6" +compress="xz -0 --check=crc32 --memlimit-compress=50%" i18n_vars="/etc/sysconfig/language:RC_LANG-LANG,RC_LC_ALL-LC_ALL /etc/sysconfig/console:CONSOLE_UNICODEMAP-FONT_UNIMAP,CONSOLE_FONT-FONT,CONSOLE_SCREENMAP-FONT_MAP /etc/sysconfig/keyboard:KEYTABLE-KEYMAP" omit_drivers+=" i2o_scsi" -- 1.7.6.1 ++++++ 0152-Add-a-comment-to-easily-add-debug-modules-also-add-v.patch ++++++ >From 9cbbca5888f657833e658fcfe1fc21e74c3a3507 Mon Sep 17 00:00:00 2001 From: Thomas Renninger <trenn(a)suse.de> Date: Fri, 29 Aug 2014 16:19:33 +0200 Subject: Add a comment to easily add debug modules, also add vi to debug module Signed-off-by: Thomas Renninger <trenn(a)suse.de> --- dracut.conf.d/suse.conf.example | 10 ++++++++++ modules.d/95debug/module-setup.sh | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dracut.conf.d/suse.conf.example b/dracut.conf.d/suse.conf.example index b0ef0e5..37ffd72 100644 --- a/dracut.conf.d/suse.conf.example +++ b/dracut.conf.d/suse.conf.example @@ -12,3 +12,13 @@ compress="xz -0 --check=crc32 --memlimit-compress=50%" i18n_vars="/etc/sysconfig/language:RC_LANG-LANG,RC_LC_ALL-LC_ALL /etc/sysconfig/console:CONSOLE_UNICODEMAP-FONT_UNIMAP,CONSOLE_FONT-FONT,CONSOLE_SCREENMAP-FONT_MAP /etc/sysconfig/keyboard:KEYTABLE-KEYMAP" omit_drivers+=" i2o_scsi" +# Below adds additional tools to the initrd which are not urgently necessary to +# bring up the system, but help to debug problems. +# See /usr/lib/dracut/modules.d/95debug/module-setup.sh which additional tools +# are installed and add more if you need them. This specifically helps if you +# use: +# rd.break=[cmdline|pre-udev|pre-trigger|initqueue|pre-mount| +# mount|pre-pivot|cleanup] +# boot parameter or if you are forced to enter the dracut emergency shell. + +# add_dracutmodules+=debug diff --git a/modules.d/95debug/module-setup.sh b/modules.d/95debug/module-setup.sh index 1891fa8..cdc56dc 100755 --- a/modules.d/95debug/module-setup.sh +++ b/modules.d/95debug/module-setup.sh @@ -16,7 +16,7 @@ depends() { # called by dracut install() { inst_multiple -o ps grep more cat rm strace free showmount \ - ping netstat rpcinfo vi scp ping6 ssh find \ + ping netstat rpcinfo vi scp ping6 ssh find vi \ fsck fsck.ext2 fsck.ext4 fsck.ext3 fsck.ext4dev fsck.vfat e2fsck } -- 1.7.6.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 zypper for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '14

30 Aug '14

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at 2014-08-30 18:55:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zypper (Old) and /work/SRC/openSUSE:Factory/.zypper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zypper" Changes: -------- --- /work/SRC/openSUSE:Factory/zypper/zypper.changes 2014-07-29 16:47:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zypper.new/zypper.changes 2014-08-30 18:56:04.000000000 +0200 @@ -1,0 +2,24 @@ +Fri Aug 29 15:06:07 CEST 2014 - ma(a)suse.de + +- download: use $XDG_CACHE_HOME/zypp/packages for non-root user + (bnc#891515) +- download --dry-run: list packages we would download +- Accept -f,--force option with refresh-services(refs) +- version 1.11.12 + +------------------------------------------------------------------- +Sun Aug 24 01:16:08 CEST 2014 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Thu Aug 21 01:17:35 CEST 2014 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Mon Aug 18 14:01:30 CEST 2014 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- zypper-1.11.11.tar.bz2 New: ---- zypper-1.11.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.GutId7/_old 2014-08-30 18:56:05.000000000 +0200 +++ /var/tmp/diff_new_pack.GutId7/_new 2014-08-30 18:56:05.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: cmake >= 2.4.6 BuildRequires: gcc-c++ >= 4.7 BuildRequires: gettext-devel >= 0.15 -BuildRequires: libzypp-devel >= 14.27.0 +BuildRequires: libzypp-devel >= 14.27.2 BuildRequires: readline-devel >= 5.1 Requires: procps %if 0%{?suse_version} @@ -33,7 +33,7 @@ Summary: Command line software manager using libzypp License: GPL-2.0+ Group: System/Packages -Version: 1.11.11 +Version: 1.11.12 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ zypper-1.11.11.tar.bz2 -> zypper-1.11.12.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/zypper/zypper-1.11.11.tar.bz2 /work/SRC/openSUSE:Factory/.zypper.new/zypper-1.11.12.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