June 2024 - openSUSE Commits - openSUSE Mailing Lists

commit maven-doxia-sitetools for openSUSE:Factory
by Source-Sync 11 Jun '24

11 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven-doxia-sitetools for openSUSE:Factory checked in at 2024-06-11 18:27:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-doxia-sitetools (Old) and /work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "maven-doxia-sitetools" Tue Jun 11 18:27:41 2024 rev:9 rq:1179826 version:1.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-doxia-sitetools/maven-doxia-sitetools.changes 2024-04-03 17:21:22.083602938 +0200 +++ /work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.19518/maven-doxia-sitetools.changes 2024-06-11 18:28:20.302777661 +0200 @@ -1,0 +2,6 @@ +Mon Jun 10 16:41:51 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Use plexus-metadata-generator executable directly to simplify + build classpath + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-doxia-sitetools.spec ++++++ --- /var/tmp/diff_new_pack.rwUmnX/_old 2024-06-11 18:28:21.970838536 +0200 +++ /var/tmp/diff_new_pack.rwUmnX/_new 2024-06-11 18:28:21.974838681 +0200 @@ -29,17 +29,12 @@ Source1: %{name}-build.tar.xz Patch1: 0002-Remove-dependency-on-velocity-tools.patch BuildRequires: ant -BuildRequires: apache-commons-cli BuildRequires: apache-commons-collections BuildRequires: apache-commons-io BuildRequires: apache-commons-lang3 -BuildRequires: atinject BuildRequires: fdupes -BuildRequires: google-guice -BuildRequires: guava BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local >= 6 -BuildRequires: jdom2 BuildRequires: maven-doxia-core BuildRequires: maven-doxia-logging-api BuildRequires: maven-doxia-module-fo @@ -48,9 +43,6 @@ BuildRequires: maven-lib BuildRequires: maven-reporting-api BuildRequires: modello >= 2.0.0 -BuildRequires: objectweb-asm -BuildRequires: plexus-classworlds -BuildRequires: plexus-cli BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-i18n BuildRequires: plexus-interpolation @@ -58,12 +50,9 @@ BuildRequires: plexus-utils BuildRequires: plexus-velocity BuildRequires: plexus-xml -BuildRequires: qdox -BuildRequires: sisu-inject BuildRequires: sisu-plexus BuildRequires: unzip BuildRequires: velocity -BuildRequires: xbean BuildRequires: xmvn-install BuildRequires: xmvn-resolve BuildRequires: xz @@ -118,14 +107,9 @@ %build mkdir -p lib build-jar-repository -s lib \ - atinject \ apache-commons-collections \ apache-commons-lang3 \ - commons-cli \ commons-io \ - guava/guava \ - guice/google-guice \ - jdom2/jdom2 \ maven-doxia/doxia-core \ maven-doxia/doxia-logging-api \ maven-doxia/doxia-module-fo \ @@ -137,21 +121,14 @@ maven/maven-plugin-api \ maven/maven-project \ maven-reporting-api/maven-reporting-api \ - objectweb-asm/asm \ - org.eclipse.sisu.inject \ org.eclipse.sisu.plexus \ - plexus-classworlds \ - plexus/cli \ plexus-containers/plexus-component-annotations \ plexus-i18n/plexus-i18n \ plexus/interpolation \ - plexus-metadata-generator \ plexus/utils \ plexus/xml \ plexus-velocity/plexus-velocity \ - qdox \ - velocity \ - xbean/xbean-reflect + velocity # tests can't run because of missing deps %{ant} -Dtest.skip=true package javadoc ++++++ maven-doxia-sitetools-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doxia-decoration-model/build.xml new/doxia-decoration-model/build.xml --- old/doxia-decoration-model/build.xml 2022-05-10 10:59:20.335364865 +0200 +++ new/doxia-decoration-model/build.xml 2024-06-10 20:21:31.622643219 +0200 @@ -115,14 +115,11 @@ depends="compile" description="Generate Plexus component.xml"> <mkdir dir="${build.outputDir}/META-INF/plexus"/> - <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" - failonerror="true" - fork="true"> - <classpath> - <path refid="build.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - <arg value="-X"/> + <pathconvert property="classpath.string" pathsep=":"> + <path refid="build.classpath"/> + </pathconvert> + <exec executable="plexus-metadata-generator" failonerror="true"> + <env key="CLASSPATH" value="${build.outputDir}:${classpath.string}"/> <arg value="-s"/> <arg value="${build.srcDir}"/> <arg value="-c"/> @@ -131,7 +128,7 @@ <arg value="${build.outputDir}/META-INF/plexus"/> <arg value="-o"/> <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> - </java> + </exec> </target>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doxia-doc-renderer/build.xml new/doxia-doc-renderer/build.xml --- old/doxia-doc-renderer/build.xml 2019-03-28 21:22:12.449423382 +0100 +++ new/doxia-doc-renderer/build.xml 2024-06-10 20:21:24.349258936 +0200 @@ -80,14 +80,11 @@ depends="compile" description="Generate Plexus component.xml"> <mkdir dir="${build.outputDir}/META-INF/plexus"/> - <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" - failonerror="true" - fork="true"> - <classpath> - <path refid="build.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - <arg value="-X"/> + <pathconvert property="classpath.string" pathsep=":"> + <path refid="build.classpath"/> + </pathconvert> + <exec executable="plexus-metadata-generator" failonerror="true"> + <env key="CLASSPATH" value="${build.outputDir}:${classpath.string}"/> <arg value="-s"/> <arg value="${build.srcDir}"/> <arg value="-c"/> @@ -96,7 +93,7 @@ <arg value="${build.outputDir}/META-INF/plexus"/> <arg value="-o"/> <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> - </java> + </exec> </target>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doxia-integration-tools/build.xml new/doxia-integration-tools/build.xml --- old/doxia-integration-tools/build.xml 2019-03-28 21:22:02.153372498 +0100 +++ new/doxia-integration-tools/build.xml 2024-06-10 20:20:27.422193637 +0200 @@ -82,14 +82,11 @@ depends="compile" description="Generate Plexus component.xml"> <mkdir dir="${build.outputDir}/META-INF/plexus"/> - <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" - failonerror="true" - fork="true"> - <classpath> - <path refid="build.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - <arg value="-X"/> + <pathconvert property="classpath.string" pathsep=":"> + <path refid="build.classpath"/> + </pathconvert> + <exec executable="plexus-metadata-generator" failonerror="true"> + <env key="CLASSPATH" value="${build.outputDir}:${classpath.string}"/> <arg value="-s"/> <arg value="${build.srcDir}"/> <arg value="-c"/> @@ -98,7 +95,7 @@ <arg value="${build.outputDir}/META-INF/plexus"/> <arg value="-o"/> <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> - </java> + </exec> </target>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doxia-site-renderer/build.xml new/doxia-site-renderer/build.xml --- old/doxia-site-renderer/build.xml 2019-03-28 21:21:38.817257186 +0100 +++ new/doxia-site-renderer/build.xml 2024-06-10 20:20:18.925467474 +0200 @@ -84,14 +84,11 @@ depends="compile" description="Generate Plexus component.xml"> <mkdir dir="${build.outputDir}/META-INF/plexus"/> - <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" - failonerror="true" - fork="true"> - <classpath> - <path refid="build.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - <arg value="-X"/> + <pathconvert property="classpath.string" pathsep=":"> + <path refid="build.classpath"/> + </pathconvert> + <exec executable="plexus-metadata-generator" failonerror="true"> + <env key="CLASSPATH" value="${build.outputDir}:${classpath.string}"/> <arg value="-s"/> <arg value="${build.srcDir}"/> <arg value="-c"/> @@ -100,7 +97,7 @@ <arg value="${build.outputDir}/META-INF/plexus"/> <arg value="-o"/> <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> - </java> + </exec> </target>

1 0

commit maven-plugin-testing for openSUSE:Factory
by Source-Sync 11 Jun '24

11 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven-plugin-testing for openSUSE:Factory checked in at 2024-06-11 18:27:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-plugin-testing (Old) and /work/SRC/openSUSE:Factory/.maven-plugin-testing.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "maven-plugin-testing" Tue Jun 11 18:27:41 2024 rev:8 rq:1179821 version:3.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-plugin-testing/maven-plugin-testing.changes 2024-04-03 17:21:15.375355544 +0200 +++ /work/SRC/openSUSE:Factory/.maven-plugin-testing.new.19518/maven-plugin-testing.changes 2024-06-11 18:28:18.362706860 +0200 @@ -1,0 +2,6 @@ +Mon Jun 10 16:38:51 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Use plexus-metadata-generator executable directly to simplify + build classpath + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-plugin-testing.spec ++++++ --- /var/tmp/diff_new_pack.pusZzf/_old 2024-06-11 18:28:19.098733721 +0200 +++ /var/tmp/diff_new_pack.pusZzf/_new 2024-06-11 18:28:19.102733867 +0200 @@ -29,33 +29,24 @@ Patch1: 0002-Port-to-current-maven-artifact.patch Patch2: %{name}-blocked.patch BuildRequires: ant -BuildRequires: apache-commons-cli BuildRequires: apache-commons-io -BuildRequires: atinject BuildRequires: easymock BuildRequires: fdupes BuildRequires: google-guice -BuildRequires: guava BuildRequires: javapackages-local -BuildRequires: jdom2 BuildRequires: junit BuildRequires: maven-invoker BuildRequires: maven-lib BuildRequires: maven-resolver-api BuildRequires: maven-wagon-provider-api -BuildRequires: objectweb-asm BuildRequires: plexus-archiver BuildRequires: plexus-classworlds -BuildRequires: plexus-cli BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils BuildRequires: plexus-xml -BuildRequires: qdox -BuildRequires: sisu-inject BuildRequires: sisu-plexus BuildRequires: unzip -BuildRequires: xbean BuildRequires: xmvn-install BuildRequires: xmvn-resolve BuildRequires: mvn(org.apache.maven:maven-parent:pom:) @@ -119,13 +110,9 @@ %build mkdir -p lib build-jar-repository -s lib \ - atinject \ - commons-cli \ commons-io \ easymock \ - guava/guava \ - guice/google-guice-no_aop \ - jdom2/jdom2 \ + google-guice \ junit \ maven-invoker/maven-invoker \ maven/maven-artifact \ @@ -139,18 +126,12 @@ maven-resolver/maven-resolver-api \ maven-shared-utils/maven-shared-utils \ maven-wagon/provider-api \ - objectweb-asm/asm \ - org.eclipse.sisu.inject \ org.eclipse.sisu.plexus \ plexus/archiver \ plexus-classworlds \ - plexus/cli \ plexus-containers/plexus-component-annotations \ - plexus-metadata-generator \ plexus/utils \ - plexus/xml \ - qdox \ - xbean/xbean-reflect + plexus/xml %{ant} \ -Dtest.skip=true \ package javadoc ++++++ maven-plugin-testing-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-plugin-testing-tools/build.xml new/maven-plugin-testing-tools/build.xml --- old/maven-plugin-testing-tools/build.xml 2019-03-26 10:18:23.008188570 +0100 +++ new/maven-plugin-testing-tools/build.xml 2024-06-10 20:03:35.955126191 +0200 @@ -78,15 +78,11 @@ depends="compile" description="Generate Plexus component.xml"> <mkdir dir="${build.outputDir}/META-INF/plexus"/> - <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" - failonerror="true" - fork="true"> -  - <classpath> - <path refid="build.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - <arg value="-X"/> + <pathconvert property="classpath.string" pathsep=":"> + <path refid="build.classpath"/> + </pathconvert> + <exec executable="plexus-metadata-generator" failonerror="true"> + <env key="CLASSPATH" value="${build.outputDir}:${classpath.string}"/> <arg value="-s"/> <arg value="${build.srcDir}"/> <arg value="-c"/> @@ -95,7 +91,7 @@ <arg value="${build.outputDir}/META-INF/plexus"/> <arg value="-o"/> <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> - </java> + </exec> </target>

1 0

commit maven-artifact-transfer for openSUSE:Factory
by Source-Sync 11 Jun '24

11 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven-artifact-transfer for openSUSE:Factory checked in at 2024-06-11 18:27:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-artifact-transfer (Old) and /work/SRC/openSUSE:Factory/.maven-artifact-transfer.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "maven-artifact-transfer" Tue Jun 11 18:27:39 2024 rev:10 rq:1179766 version:0.13.1 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-artifact-transfer/maven-artifact-transfer.changes 2024-04-03 17:21:27.999821122 +0200 +++ /work/SRC/openSUSE:Factory/.maven-artifact-transfer.new.19518/maven-artifact-transfer.changes 2024-06-11 18:28:16.990656789 +0200 @@ -1,0 +2,6 @@ +Mon Jun 10 16:29:15 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Use plexus-metadata-generator executable directly to simplify + build classpath + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-artifact-transfer.spec ++++++ --- /var/tmp/diff_new_pack.89g1UV/_old 2024-06-11 18:28:17.578678248 +0200 +++ /var/tmp/diff_new_pack.89g1UV/_new 2024-06-11 18:28:17.578678248 +0200 @@ -29,32 +29,21 @@ Patch1: 0002-Remove-support-for-maven-3.0.X.patch Patch2: 0003-Port-to-maven-3.8.1.patch BuildRequires: ant -BuildRequires: apache-commons-cli -BuildRequires: apache-commons-codec -BuildRequires: atinject BuildRequires: fdupes -BuildRequires: google-guice -BuildRequires: guava BuildRequires: javapackages-local >= 6 -BuildRequires: jdom2 BuildRequires: maven-common-artifact-filters BuildRequires: maven-lib BuildRequires: maven-resolver-api BuildRequires: maven-resolver-impl BuildRequires: maven-resolver-util -BuildRequires: objectweb-asm BuildRequires: plexus-classworlds -BuildRequires: plexus-cli BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils BuildRequires: plexus-xml -BuildRequires: qdox -BuildRequires: sisu-inject BuildRequires: sisu-plexus BuildRequires: slf4j BuildRequires: unzip -BuildRequires: xbean BuildArch: noarch %description @@ -85,12 +74,6 @@ %build mkdir -p lib build-jar-repository -s lib \ - atinject \ - commons-cli \ - commons-codec \ - guava/guava \ - guice/google-guice-no_aop \ - jdom2/jdom2 \ maven-common-artifact-filters/maven-common-artifact-filters \ maven/maven-artifact \ maven/maven-core \ @@ -98,19 +81,12 @@ maven-resolver/maven-resolver-api \ maven-resolver/maven-resolver-impl \ maven-resolver/maven-resolver-util \ - objectweb-asm/asm \ - org.eclipse.sisu.inject \ org.eclipse.sisu.plexus \ plexus-classworlds \ - plexus/cli \ plexus-containers/plexus-component-annotations \ - plexus-metadata-generator \ plexus/utils \ plexus/xml \ - qdox \ - slf4j/api \ - slf4j/simple \ - xbean/xbean-reflect + slf4j/api %{ant} \ package javadoc ++++++ maven-artifact-transfer-build.xml ++++++ --- /var/tmp/diff_new_pack.89g1UV/_old 2024-06-11 18:28:17.626680000 +0200 +++ /var/tmp/diff_new_pack.89g1UV/_new 2024-06-11 18:28:17.630680146 +0200 @@ -17,7 +17,8 @@ <property name="spec.version" value="0.13"/> - <property name="compiler.source" value="1.8"/> + <property name="compiler.release" value="8"/> + <property name="compiler.source" value="1.${compiler.release}"/> <property name="compiler.target" value="${compiler.source}"/> <property name="build.finalName" value="${project.artifactId}-${project.version}"/> @@ -61,6 +62,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="false" @@ -80,15 +82,11 @@ depends="compile" description="Generate Plexus component.xml"> <mkdir dir="${build.outputDir}/META-INF/plexus"/> - <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" - failonerror="true" - fork="true"> -  - <classpath> - <path refid="build.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - <arg value="-X"/> + <pathconvert property="classpath.string" pathsep=":"> + <path refid="build.classpath"/> + </pathconvert> + <exec executable="plexus-metadata-generator" failonerror="true"> + <env key="CLASSPATH" value="${build.outputDir}:${classpath.string}"/> <arg value="-s"/> <arg value="${build.srcDir}"/> <arg value="-c"/> @@ -97,7 +95,7 @@ <arg value="${build.outputDir}/META-INF/plexus"/> <arg value="-o"/> <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> - </java> + </exec> </target>  @@ -115,6 +113,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="false"

1 0

commit maven-javadoc-plugin for openSUSE:Factory
by Source-Sync 11 Jun '24

11 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven-javadoc-plugin for openSUSE:Factory checked in at 2024-06-11 18:27:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-javadoc-plugin (Old) and /work/SRC/openSUSE:Factory/.maven-javadoc-plugin.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "maven-javadoc-plugin" Tue Jun 11 18:27:38 2024 rev:15 rq:1179762 version:3.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-javadoc-plugin/maven-javadoc-plugin.changes 2024-04-03 17:21:18.287462940 +0200 +++ /work/SRC/openSUSE:Factory/.maven-javadoc-plugin.new.19518/maven-javadoc-plugin.changes 2024-06-11 18:28:14.986583652 +0200 @@ -1,0 +2,7 @@ +Mon Jun 10 16:33:19 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Remove dependency on plexus-metadata-generator, + plexus-component-metadata and on their dependencies, since there + is no plexus @Component annotation any more + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-javadoc-plugin.spec ++++++ --- /var/tmp/diff_new_pack.SzvNu7/_old 2024-06-11 18:28:16.122625110 +0200 +++ /var/tmp/diff_new_pack.SzvNu7/_new 2024-06-11 18:28:16.122625110 +0200 @@ -34,18 +34,13 @@ Patch0: %{base_name}-bootstrap-resources.patch Patch1: stale-data-encoding.patch Patch2: no-override.patch -BuildRequires: apache-commons-cli -BuildRequires: apache-commons-io BuildRequires: apache-commons-lang3 BuildRequires: apache-commons-text BuildRequires: atinject BuildRequires: fdupes -BuildRequires: google-guice -BuildRequires: guava BuildRequires: httpcomponents-client BuildRequires: httpcomponents-core BuildRequires: javapackages-local -BuildRequires: jdom2 BuildRequires: maven-archiver BuildRequires: maven-common-artifact-filters BuildRequires: maven-doxia-core @@ -61,11 +56,7 @@ BuildRequires: maven-resolver-util BuildRequires: maven-shared-utils BuildRequires: maven-wagon-provider-api -BuildRequires: objectweb-asm BuildRequires: plexus-archiver -BuildRequires: plexus-classworlds -BuildRequires: plexus-cli -BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-interactivity-api BuildRequires: plexus-io BuildRequires: plexus-languages @@ -75,7 +66,6 @@ BuildRequires: sisu-inject BuildRequires: sisu-plexus BuildRequires: unzip -BuildRequires: xbean BuildRequires: xmvn-install BuildRequires: xmvn-resolve BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) @@ -84,7 +74,6 @@ Name: %{base_name}-bootstrap BuildRequires: ant BuildRequires: modello >= 2.0.0 -BuildRequires: plexus-metadata-generator %else Name: %{base_name} BuildRequires: xmvn @@ -96,7 +85,6 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-resources-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-surefire-plugin) BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) -BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) Obsoletes: %{base_name}-bootstrap #!BuildRequires: maven-compiler-plugin-bootstrap @@ -141,13 +129,8 @@ apache-commons-lang3 \ apache-commons-text \ atinject \ - commons-cli \ - commons-io \ - guava/guava \ - guice/google-guice-no_aop \ httpcomponents/httpclient \ httpcomponents/httpcore \ - jdom2/jdom2 \ maven-archiver/maven-archiver \ maven-common-artifact-filters/maven-common-artifact-filters \ maven-doxia/doxia-core \ @@ -169,21 +152,15 @@ maven-reporting-api/maven-reporting-api \ maven-shared-utils/maven-shared-utils \ maven-wagon/provider-api \ - objectweb-asm/asm \ org.eclipse.sisu.inject \ org.eclipse.sisu.plexus \ plexus/archiver \ - plexus-classworlds \ - plexus/cli \ - plexus-containers/plexus-component-annotations \ plexus/interactivity-api \ plexus/io \ plexus-languages/plexus-java \ - plexus-metadata-generator \ plexus/utils \ plexus/xml \ - qdox \ - xbean/xbean-reflect + qdox %{ant} -Dtest.skip=true jar %else xmvn --batch-mode --offline \ ++++++ maven-javadoc-plugin-build.xml ++++++ --- /var/tmp/diff_new_pack.SzvNu7/_old 2024-06-11 18:28:16.166626715 +0200 +++ /var/tmp/diff_new_pack.SzvNu7/_new 2024-06-11 18:28:16.170626862 +0200 @@ -143,34 +143,6 @@ </target>  -  -  - - <target name="plexus" - depends="compile" - description="Generate Plexus component.xml"> - <mkdir dir="${build.outputDir}/META-INF/plexus"/> - <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" - failonerror="true" - fork="true"> -  - <classpath> - <path refid="build.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - <arg value="-X"/> - <arg value="-s"/> - <arg value="${build.srcDir}"/> - <arg value="-c"/> - <arg value="${build.outputDir}"/> - <arg value="-m"/> - <arg value="${build.outputDir}/META-INF/plexus"/> - <arg value="-o"/> - <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> - </java> - </target> - -    @@ -197,7 +169,7 @@  <target name="compile-tests" - depends="plexus" + depends="compile" description="Compile the test code" unless="test.skip"> <mkdir dir="${build.testOutputDir}"/> @@ -225,41 +197,11 @@ </target>  -  -  - - <target name="plexus-tests" - depends="compile-tests" - description="Generate Plexus component.xml for tests" - unless="test.skip"> - <mkdir dir="${build.outputDir}/META-INF/plexus"/> - <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" - failonerror="true" - fork="true"> -  - <classpath> - <path refid="build.testclasspath"/> - <pathelement location="${build.outputDir}"/> - <pathelement location="${build.restOutputDir}"/> - </classpath> - <arg value="-X"/> - <arg value="-s"/> - <arg value="${build.testDir}"/> - <arg value="-c"/> - <arg value="${build.restOutputDir}"/> - <arg value="-m"/> - <arg value="${build.restOutputDir}/META-INF/plexus"/> - <arg value="-o"/> - <arg value="${build.restOutputDir}/META-INF/plexus/components.xml"/> - </java> - </target> - -    <target name="test" - depends="plexus-tests, junit-missing" + depends="junit-missing" unless="junit.skipped" description="Run the test cases"> <mkdir dir="${test.reports}"/> @@ -355,7 +297,7 @@   - <target name="package" depends="sisu,plexus,test" description="Package the application"> + <target name="package" depends="sisu,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false"

1 0

commit plexus-containers for openSUSE:Factory
by Source-Sync 11 Jun '24

11 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plexus-containers for openSUSE:Factory checked in at 2024-06-11 18:27:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plexus-containers (Old) and /work/SRC/openSUSE:Factory/.plexus-containers.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plexus-containers" Tue Jun 11 18:27:36 2024 rev:15 rq:1179739 version:2.2.0 Changes: -------- plexus-containers.changes: same change --- /work/SRC/openSUSE:Factory/plexus-containers/plexus-metadata-generator.changes 2024-05-16 17:19:40.165695226 +0200 +++ /work/SRC/openSUSE:Factory/.plexus-containers.new.19518/plexus-metadata-generator.changes 2024-06-11 18:28:13.982547011 +0200 @@ -1,0 +2,5 @@ +Mon Jun 10 16:12:04 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Add dependency on jakarta-inject, needed by google-guice 6.0.0 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ plexus-containers.spec: same change ++++++ plexus-metadata-generator.spec ++++++ --- /var/tmp/diff_new_pack.aMju1e/_old 2024-06-11 18:28:14.718573870 +0200 +++ /var/tmp/diff_new_pack.aMju1e/_new 2024-06-11 18:28:14.718573870 +0200 @@ -55,6 +55,7 @@ Requires: atinject Requires: google-guice Requires: guava +Requires: jakarta-inject Requires: jdom2 Requires: objectweb-asm >= 7 Requires: plexus-cli @@ -158,7 +159,7 @@ cp -pr plexus-%{comp_name}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir} # script -%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:atinject:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:guice/google-guice:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:plexus/xml:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name} +%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:atinject:jakarta-inject:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:guice/google-guice:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:plexus/xml:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name} %files -f .mfiles %license LICENSE-2.0.txt LICENSE.MIT

1 0

commit google-guice for openSUSE:Factory
by Source-Sync 11 Jun '24

11 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package google-guice for openSUSE:Factory checked in at 2024-06-11 18:27:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/google-guice (Old) and /work/SRC/openSUSE:Factory/.google-guice.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "google-guice" Tue Jun 11 18:27:36 2024 rev:7 rq:1179734 version:6.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/google-guice/google-guice.changes 2024-02-22 20:58:53.495987538 +0100 +++ /work/SRC/openSUSE:Factory/.google-guice.new.19518/google-guice.changes 2024-06-11 18:28:12.534494165 +0200 @@ -1,0 +2,66 @@ +Mon Jun 10 13:45:04 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Upgrade to upstream version 6.0.0 + * JEE Jakarta Transition + + Guice 6.0 adds support for jakarta.inject, the new namespace + for the JSR330 spec (after the javax -> jakarta JEE + transition). + Guice 6.0 is intended to help users migrate their code to the + jakarta namespace. It continues to fully support the + javax.inject namespace while also mostly supporting the + jakarta.inject namespace. The only part of Guice 6.0 that + doesn't support jakarta.inject are the bind(..).toProvider + methods. Those methods still require javax.inject or + com.google.inject Providers. + + The Guice 6.0 servlet & persist extensions only support the + javax.servlet and javax.persistence namespaces respectively. + + Guice 6.0 can help with incremental migrations to the + jakarta.inject namespace, by incrementally replacing + javax.inject references to jakarta.inject. This works + everywhere, except for code where a jakarta Provider is passed + to bind(..).toProvider. + * Guice Core + + Adds jakarta.inject support. + + Support Java 21 (via updating ASM to 9.5 and other changes). + + Improve AOP support on JVMs such as Azul. + + Fix a deadlock or crash associated with recursively loading + just-in-time bindings. + + Make PrivateModule.binder() non-private, to allow subclass + customization, such as calling skipSources. + + Fix an endloop loop (that can OOM) in singleton lock cycle + detection. + + Fix tests to pass on Windows, despite the different line + separator. + + Improvements to OSGi metadata. + + Mark the JSR305 dependency as optional (since it's not + required at runtime). + + Fix Binder.requestInjection(TypeLiteral<T>, T) to use the + TypeLiteral. + + Honor scoping annotations on concrete types when provisioned + by their @ProvidedBy annotation + + Add a way to tell if a class is "enhanced" by Guice, and + retrieve the original class. + + Ensure the order of bind(...) statements does not matter when + referring to JIT bindings. + + Implement Matcher.and and Matcher.or as default methods + directly in Matcher, so that the AbstractMatcher subclass + isn't required. + + Mark the error_prone_annotations dependency as optional. + * Servlet + + Fix an NPE if contextPath is null + * Persist + + Persist had a number of changes, some of which are backwards + incompatible. Notably: injection of EntityManager no longer + implicitly starts a unit of work (because this led to leaks). + Users can opt-in to the legacy behavior by constructing the + JpaPersistModule with a JpaPersistOptions that sets + setAutoBeginWorkOnEntityManagerCreation to true. + + EntityManager provisioning no longer automatically starts a + unit of work. + + Ignore multiple start/stop calls, rather than throwing an + exception. + + Support manually initiated rollbacks. + + Don't wrap Object-defined methods (e.g: toString, finalize, + equals, hashCode) in transactions. + +------------------------------------------------------------------- Old: ---- google-guice-5.1.0.tar.xz New: ---- google-guice-6.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ google-guice.spec ++++++ --- /var/tmp/diff_new_pack.dC0MnB/_old 2024-06-11 18:28:13.290521755 +0200 +++ /var/tmp/diff_new_pack.dC0MnB/_new 2024-06-11 18:28:13.290521755 +0200 @@ -18,7 +18,7 @@ %global short_name guice Name: google-%{short_name} -Version: 5.1.0 +Version: 6.0.0 Release: 0 Summary: Dependency injection framework for Java 5 and above License: Apache-2.0 @@ -34,6 +34,7 @@ BuildRequires: glassfish-servlet-api BuildRequires: google-errorprone-annotations BuildRequires: guava +BuildRequires: jakarta-inject BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local >= 6 BuildRequires: jsr-305 @@ -176,6 +177,7 @@ glassfish-servlet-api \ google-errorprone/annotations \ guava/guava \ + jakarta-inject \ jsr-305 \ objectweb-asm/asm \ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.dC0MnB/_old 2024-06-11 18:28:13.326523069 +0200 +++ /var/tmp/diff_new_pack.dC0MnB/_new 2024-06-11 18:28:13.330523215 +0200 @@ -2,7 +2,7 @@ <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/google/guice.git</param> - <param name="revision">5.1.0</param> + <param name="revision">6.0.0</param> <param name="versionformat">@PARENT_TAG@</param> <param name="filename">google-guice</param> </service> ++++++ google-guice-5.1.0.tar.xz -> google-guice-6.0.0.tar.xz ++++++ ++++ 17623 lines of diff (skipped) ++++++ google-guice-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2023-05-02 16:20:25.586657209 +0200 +++ new/common.xml 2024-06-10 11:47:47.484960091 +0200 @@ -3,7 +3,7 @@ <project name="guice-common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="5.1.0"/> + <property name="project.version" value="6.0.0"/> <property name="project.groupId" value="com.google.inject"/> <property name="compiler.source" value="1.8"/>

1 0

commit modello for openSUSE:Factory
by Source-Sync 11 Jun '24

11 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package modello for openSUSE:Factory checked in at 2024-06-11 18:27:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/modello (Old) and /work/SRC/openSUSE:Factory/.modello.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "modello" Tue Jun 11 18:27:34 2024 rev:19 rq:1179732 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/modello/modello.changes 2024-06-06 12:33:20.798066015 +0200 +++ /work/SRC/openSUSE:Factory/.modello.new.19518/modello.changes 2024-06-11 18:28:09.166371246 +0200 @@ -1,0 +2,5 @@ +Mon Jun 10 14:01:25 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Add dependency on jakarta-inject, needed by google-guice 6.0.0 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ modello.spec ++++++ --- /var/tmp/diff_new_pack.7Zmy0V/_old 2024-06-11 18:28:10.834432122 +0200 +++ /var/tmp/diff_new_pack.7Zmy0V/_new 2024-06-11 18:28:10.834432122 +0200 @@ -34,6 +34,7 @@ BuildRequires: fdupes BuildRequires: guava BuildRequires: jackson-core +BuildRequires: jakarta-inject BuildRequires: javadoc-parser BuildRequires: javapackages-local >= 6 BuildRequires: jsoup @@ -53,6 +54,7 @@ Requires: google-guice Requires: guava Requires: jackson-core +Requires: jakarta-inject Requires: javadoc-parser Requires: javapackages-tools Requires: plexus-build-api @@ -118,6 +120,7 @@ atinject \ guava/guava \ jackson-core \ + jakarta-inject \ javadoc-parser \ jsoup \ junit \ @@ -163,7 +166,7 @@ %fdupes -s %{buildroot}%{_javadocdir} # script -%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:aopalliance:atinject:google-guice:guava:jackson-core:javadoc-parser:plexus/plexus-build-api:plexus/plexus-build-api0:plexus/classworlds:plexus-containers/plexus-component-annotations:plexus/utils:plexus/xml:org.eclipse.sisu.inject:org.eclipse.sisu.plexus:slf4j/api:slf4j/simple:snakeyaml:velocity %{name} true +%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:aopalliance:atinject:google-guice:guava:jackson-core:jakarta-inject:javadoc-parser:plexus/plexus-build-api:plexus/plexus-build-api0:plexus/classworlds:plexus-containers/plexus-component-annotations:plexus/utils:plexus/xml:org.eclipse.sisu.inject:org.eclipse.sisu.plexus:slf4j/api:slf4j/simple:snakeyaml:velocity %{name} true %files -f .mfiles -f .mfiles-core %license LICENSE.txt LICENSE-2.0.txt

1 0

commit sisu for openSUSE:Factory
by Source-Sync 11 Jun '24

11 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sisu for openSUSE:Factory checked in at 2024-06-11 18:27:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sisu (Old) and /work/SRC/openSUSE:Factory/.sisu.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sisu" Tue Jun 11 18:27:33 2024 rev:11 rq:1179731 version:0.9.0.M3 Changes: -------- --- /work/SRC/openSUSE:Factory/sisu/sisu.changes 2024-06-06 12:33:22.930143713 +0200 +++ /work/SRC/openSUSE:Factory/.sisu.new.19518/sisu.changes 2024-06-11 18:28:07.182298837 +0200 @@ -1,0 +2,5 @@ +Mon Jun 10 14:02:10 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Add dependency on jakarta-inject, needed by google-guice 6.0.0 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sisu.spec ++++++ --- /var/tmp/diff_new_pack.un4Z6b/_old 2024-06-11 18:28:07.902325113 +0200 +++ /var/tmp/diff_new_pack.un4Z6b/_new 2024-06-11 18:28:07.902325113 +0200 @@ -36,6 +36,7 @@ BuildRequires: glassfish-annotation-api BuildRequires: google-guice BuildRequires: guice-servlet +BuildRequires: jakarta-inject BuildRequires: javapackages-local >= 6 BuildRequires: junit BuildRequires: junit5-minimal @@ -89,10 +90,11 @@ %build mkdir -p lib build-jar-repository -s lib \ + atinject \ + cdi-api \ glassfish-annotation-api \ google-guice-no_aop \ - javax.enterprise.inject/cdi-api \ - javax.inject/atinject \ + jakarta-inject \ junit \ junit5 \ osgi-core/osgi.core \

1 0

commit aws-cli for openSUSE:Factory
by Source-Sync 11 Jun '24

11 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package aws-cli for openSUSE:Factory checked in at 2024-06-11 18:27:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aws-cli (Old) and /work/SRC/openSUSE:Factory/.aws-cli.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aws-cli" Tue Jun 11 18:27:31 2024 rev:95 rq:1179725 version:1.33.4 Changes: -------- --- /work/SRC/openSUSE:Factory/aws-cli/aws-cli.changes 2024-05-16 17:15:51.297400210 +0200 +++ /work/SRC/openSUSE:Factory/.aws-cli.new.19518/aws-cli.changes 2024-06-11 18:28:03.518165119 +0200 @@ -1,0 +2,198 @@ +Mon Jun 10 15:30:31 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com> + +- Update to 1.33.4 + * api-change:``auditmanager``: New feature: common controls. When creating custom controls, you can + now use pre-grouped AWS data sources based on common compliance themes. Also, the awsServices + parameter is deprecated because we now manage services in scope for you. If used, the input is + ignored and an empty list is returned. + * api-change:``b2bi``: Added exceptions to B2Bi List operations and ConflictException to B2Bi + StartTransformerJob operation. Also made capabilities field explicitly required when creating a + Partnership. + * api-change:``codepipeline``: CodePipeline now supports overriding S3 Source Object Key during + StartPipelineExecution, as part of Source Overrides. + * api-change:``sagemaker``: This release introduces a new optional parameter: InferenceAmiVersion, + in ProductionVariant. + * api-change:``verifiedpermissions``: This release adds OpenIdConnect (OIDC) configuration support + for IdentitySources, allowing for external IDPs to be used in authorization requests. +- from version 1.33.3 + * api-change:``account``: This release adds 3 new APIs (AcceptPrimaryEmailUpdate, GetPrimaryEmail, + and StartPrimaryEmailUpdate) used to centrally manage the root user email address of member + accounts within an AWS organization. + * api-change:``firehose``: Adds integration with Secrets Manager for Redshift, Splunk, + HttpEndpoint, and Snowflake destinations + * api-change:``fsx``: This release adds support to increase metadata performance on FSx for Lustre + file systems beyond the default level provisioned when a file system is created. This can be done + by specifying MetadataConfiguration during the creation of Persistent_2 file systems or by updating + it on demand. + * api-change:``glue``: This release adds support for creating and updating Glue Data Catalog Views. + * api-change:``iotwireless``: Adds support for wireless device to be in Conflict FUOTA Device + Status due to a FUOTA Task, so it couldn't be attached to a new one. + * api-change:``location``: Added two new APIs, VerifyDevicePosition and ForecastGeofenceEvents. + Added support for putting larger geofences up to 100,000 vertices with Geobuf fields. + * api-change:``sns``: Doc-only update for SNS. These changes include customer-reported issues and + TXC3 updates. + * api-change:``sqs``: Doc only updates for SQS. These updates include customer-reported issues and + TCX3 modifications. + * api-change:``storagegateway``: Adds SoftwareUpdatePreferences to DescribeMaintenanceStartTime and + UpdateMaintenanceStartTime, a structure which contains AutomaticUpdatePolicy. +- from version 1.33.2 + * api-change:``globalaccelerator``: This release contains a new optional ip-addresses input field + for the update accelerator and update custom routing accelerator apis. This input enables consumers + to replace IPv4 addresses on existing accelerators with addresses provided in the input. + * api-change:``glue``: AWS Glue now supports native SaaS connectivity: Salesforce connector + available now + * api-change:``s3``: Added new params copySource and key to copyObject API for supporting S3 Access + Grants plugin. These changes will not change any of the existing S3 API functionality. + * bugfix:emr customization: Update the EC2 service principal when creating the trust policy for EMR + default roles to always be ec2.amazonaws.com. +- from version 1.33.1 + * api-change:``ec2``: U7i instances with up to 32 TiB of DDR5 memory and 896 vCPUs are now + available. C7i-flex instances are launched and are lower-priced variants of the Amazon EC2 C7i + instances that offer a baseline level of CPU performance with the ability to scale up to the full + compute performance 95% of the time. + * api-change:``pipes``: This release adds Timestream for LiveAnalytics as a supported target in + EventBridge Pipes + * api-change:``sagemaker``: Extend DescribeClusterNode response with private DNS hostname and IP + address, and placement information about availability zone and availability zone ID. + * api-change:``taxsettings``: Initial release of AWS Tax Settings API +- from version 1.33.0 + * api-change:``amplify``: This doc-only update identifies fields that are specific to Gen 1 and Gen + 2 applications. + * api-change:``batch``: This release adds support for the AWS Batch GetJobQueueSnapshot API + operation. + * api-change:``eks``: Adds support for EKS add-ons pod identity associations integration + * api-change:``iottwinmaker``: Support RESET_VALUE UpdateType for PropertyUpdates to reset property + value to default or null + * feature:logs start-live-tail: Adds support for starting a live tail streaming session for one or + more log groups. +- from version 1.32.117 + * api-change:``codebuild``: AWS CodeBuild now supports Self-hosted GitHub Actions runners for + Github Enterprise + * api-change:``codeguru-security``: This release includes minor model updates and documentation + updates. + * api-change:``elasticache``: Update to attributes of TestFailover and minor revisions. + * api-change:``launch-wizard``: This release adds support for describing workload deployment + specifications, deploying additional workload types, and managing tags for Launch Wizard resources + with API operations. +- from version 1.32.116 + * api-change:``acm``: add v2 smoke tests and smithy smokeTests trait for SDK testing. + * api-change:``bedrock-agent``: With this release, Knowledge bases for Bedrock adds support for + Titan Text Embedding v2. + * api-change:``bedrock-runtime``: This release adds Converse and ConverseStream APIs to Bedrock + Runtime + * api-change:``cloudtrail``: CloudTrail Lake returns PartitionKeys in the GetEventDataStore API + response. Events are grouped into partitions based on these keys for better query performance. For + example, the calendarday key groups events by day, while combining the calendarday key with the + hour key groups them by day and hour. + * api-change:``connect``: Adding associatedQueueIds as a SearchCriteria and response field to the + SearchRoutingProfiles API + * api-change:``emr-serverless``: The release adds support for spark structured streaming. + * api-change:``rds``: Updates Amazon RDS documentation for Aurora Postgres DBname. + * api-change:``sagemaker``: Adds Model Card information as a new component to Model Package. + Autopilot launches algorithm selection for TimeSeries modality to generate AutoML candidates per + algorithm. + * bugfix:``ssm start-session``: Only provide profile name to session-manager-plugin if provided + using --profile flag +- from version 1.32.115 + * api-change:``athena``: Throwing validation errors on CreateNotebook with Name containing + `/`,`:`,`\` + * api-change:``codebuild``: AWS CodeBuild now supports manually creating GitHub webhooks + * api-change:``connect``: This release includes changes to DescribeContact API's response by + including ConnectedToSystemTimestamp, RoutingCriteria, Customer, Campaign, + AnsweringMachineDetectionStatus, CustomerVoiceActivity, QualityMetrics, DisconnectDetails, and + SegmentAttributes information from a contact in Amazon Connect. + * api-change:``glue``: Add optional field JobMode to CreateJob and UpdateJob APIs. + * api-change:``securityhub``: Add ROOT type for TargetType model +- from version 1.32.114 + * api-change:``dynamodb``: Doc-only update for DynamoDB. Specified the IAM actions needed to + authorize a user to create a table with a resource-based policy. + * api-change:``ec2``: Providing support to accept BgpAsnExtended attribute + * api-change:``kafka``: Adds ControllerNodeInfo in ListNodes response to support Raft mode for MSK + * api-change:``swf``: This release adds new APIs for deleting activity type and workflow type + resources. +- from version 1.32.113 + * api-change:``dynamodb``: Documentation only updates for DynamoDB. + * api-change:``iotfleetwise``: AWS IoT FleetWise now supports listing vehicles with attributes + filter, ListVehicles API is updated to support additional attributes filter. + * api-change:``managedblockchain``: This is a minor documentation update to address the impact of + the shut down of the Goerli and Polygon networks. +- from version 1.32.112 + * api-change:``emr-serverless``: This release adds the capability to run interactive workloads + using Apache Livy Endpoint. + * api-change:``opsworks``: Documentation-only update for OpsWorks Stacks. +- from version 1.32.111 + * api-change:``chatbot``: This change adds support for tagging Chatbot configurations. + * api-change:``cloudformation``: Added DeletionMode FORCE_DELETE_STACK for deleting a stack that is + stuck in DELETE_FAILED state due to resource deletion failure. + * api-change:``kms``: This release includes feature to import customer's asymmetric (RSA, ECC and + SM2) and HMAC keys into KMS in China. + * api-change:``opensearch``: This release adds support for enabling or disabling a data source + configured as part of Zero-ETL integration with Amazon S3, by setting its status. + * api-change:``wafv2``: You can now use Security Lake to collect web ACL traffic data. +- from version 1.32.110 + * api-change:``cloudfront``: Model update; no change to SDK functionality. + * api-change:``glue``: Add Maintenance window to CreateJob and UpdateJob APIs and JobRun response. + Add a new Job Run State for EXPIRED. + * api-change:``lightsail``: This release adds support for Amazon Lightsail instances to switch + between dual-stack or IPv4 only and IPv6-only public IP address types. + * api-change:``mailmanager``: This release includes a new Amazon SES feature called Mail Manager, + which is a set of email gateway capabilities designed to help customers strengthen their + organization's email infrastructure, simplify email workflow management, and streamline email + compliance control. + * api-change:``pi``: Performance Insights added a new input parameter called AuthorizedActions to + support the fine-grained access feature. Performance Insights also restricted the acceptable input + characters. + * api-change:``rds``: Updates Amazon RDS documentation for Db2 license through AWS Marketplace. + * api-change:``storagegateway``: Added new SMBSecurityStrategy enum named + MandatoryEncryptionNoAes128, new mode enforces encryption and disables AES 128-bit algorithums. +- from version 1.32.109 + * api-change:``bedrock-agent``: This release adds support for using Guardrails with Bedrock Agents. + * api-change:``bedrock-agent-runtime``: This release adds support for using Guardrails with Bedrock + Agents. + * api-change:``controltower``: Added ListControlOperations API and filtering support for + ListEnabledControls API. Updates also includes added metadata for enabled controls and control + operations. + * api-change:``osis``: Add support for creating an OpenSearch Ingestion pipeline that is attached + to a provided VPC. Add information about the destinations of an OpenSearch Ingestion pipeline to + the GetPipeline and ListPipelines APIs. + * api-change:``rds``: This release adds support for EngineLifecycleSupport on DBInstances, + DBClusters, and GlobalClusters. + * api-change:``secretsmanager``: add v2 smoke tests and smithy smokeTests trait for SDK testing +- from version 1.32.108 + * api-change:``application-autoscaling``: add v2 smoke tests and smithy smokeTests trait for SDK + testing. + * api-change:``codebuild``: Aws CodeBuild now supports 36 hours build timeout + * api-change:``elbv2``: This release adds dualstack-without-public-ipv4 IP address type for ALB. + * api-change:``lakeformation``: Introduces a new API, GetDataLakePrincipal, that returns the + identity of the invoking principal + * api-change:``transfer``: Enable use of CloudFormation traits in Smithy model to improve generated + CloudFormation schema from the Smithy API model. +- from version 1.32.107 + * api-change:``acm-pca``: This release adds support for waiters to fail on AccessDeniedException + when having insufficient permissions + * api-change:``connect``: Adding Contact Flow metrics to the GetMetricDataV2 API + * api-change:``kafka``: AWS MSK support for Broker Removal. + * api-change:``mwaa``: Amazon MWAA now supports Airflow web server auto scaling to automatically + handle increased demand from REST APIs, Command Line Interface (CLI), or more Airflow User + Interface (UI) users. Customers can specify maximum and minimum web server instances during + environment creation and update workflow. + * api-change:``quicksight``: This release adds DescribeKeyRegistration and UpdateKeyRegistration + APIs to manage QuickSight Customer Managed Keys (CMK). + * api-change:``sagemaker``: Introduced WorkerAccessConfiguration to SageMaker Workteam. This allows + customers to configure resource access for workers in a workteam. + * api-change:``secretsmanager``: Documentation updates for AWS Secrets Manager +- from version 1.32.106 + * api-change:``bedrock-agent-runtime``: Updating Bedrock Knowledge Base Metadata & Filters feature + with two new filters listContains and stringContains + * api-change:``codebuild``: CodeBuild Reserved Capacity VPC Support + * api-change:``datasync``: Task executions now display a CANCELLING status when an execution is in + the process of being cancelled. + * api-change:``grafana``: This release adds new ServiceAccount and ServiceAccountToken APIs. + * api-change:``medical-imaging``: Added support for importing medical imaging data from Amazon S3 + buckets across accounts and regions. + * api-change:``securityhub``: Documentation-only update for AWS Security Hub +- Refresh patches for new version + * ac_update-docutils.patch +- Update Requires from setup.py + +------------------------------------------------------------------- Old: ---- 1.32.105.tar.gz New: ---- 1.33.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aws-cli.spec ++++++ --- /var/tmp/diff_new_pack.Alqhrv/_old 2024-06-11 18:28:04.582203950 +0200 +++ /var/tmp/diff_new_pack.Alqhrv/_new 2024-06-11 18:28:04.582203950 +0200 @@ -24,7 +24,7 @@ %global _sitelibdir %{%{pythons}_sitelib} Name: aws-cli -Version: 1.32.105 +Version: 1.33.4 Release: 0 Summary: Amazon Web Services Command Line Interface License: Apache-2.0 @@ -42,7 +42,7 @@ BuildRequires: %{pythons}-setuptools BuildRequires: %{pythons}-wheel Requires: %{pythons} -Requires: %{pythons}-botocore >= 1.34.105 +Requires: %{pythons}-botocore >= 1.34.122 Requires: %{pythons}-six Requires: (%{pythons}-PyYAML >= 3.10 with %{pythons}-PyYAML <= 6.1) Requires: (%{pythons}-colorama >= 0.2.5 with %{pythons}-colorama <= 0.5.0) ++++++ 1.32.105.tar.gz -> 1.33.4.tar.gz ++++++ ++++ 1994 lines of diff (skipped) ++++++ ac_update-docutils.patch ++++++ --- /var/tmp/diff_new_pack.Alqhrv/_old 2024-06-11 18:28:06.146261028 +0200 +++ /var/tmp/diff_new_pack.Alqhrv/_new 2024-06-11 18:28:06.150261174 +0200 @@ -1,6 +1,6 @@ -diff -Nru aws-cli-1.32.105.orig/requirements-docs.txt aws-cli-1.32.105/requirements-docs.txt ---- aws-cli-1.32.105.orig/requirements-docs.txt 2024-05-14 20:05:47.000000000 +0200 -+++ aws-cli-1.32.105/requirements-docs.txt 2024-05-16 13:42:46.446914441 +0200 +diff -Nru aws-cli-1.33.4.orig/requirements-docs.txt aws-cli-1.33.4/requirements-docs.txt +--- aws-cli-1.33.4.orig/requirements-docs.txt 2024-06-07 20:05:42.000000000 +0200 ++++ aws-cli-1.33.4/requirements-docs.txt 2024-06-10 17:29:56.087910543 +0200 @@ -3,7 +3,7 @@ jinja2<3.1 @@ -10,28 +10,123 @@ Sphinx==1.4.9 -e . # alabaster version 0.7.13 requires Sphinx>1.6 -diff -Nru aws-cli-1.32.105.orig/setup.cfg aws-cli-1.32.105/setup.cfg ---- aws-cli-1.32.105.orig/setup.cfg 2024-05-14 20:05:47.000000000 +0200 -+++ aws-cli-1.32.105/setup.cfg 2024-05-16 13:43:08.640300938 +0200 +diff -Nru aws-cli-1.33.4.orig/setup.cfg aws-cli-1.33.4/setup.cfg +--- aws-cli-1.33.4.orig/setup.cfg 2024-06-07 20:05:42.000000000 +0200 ++++ aws-cli-1.33.4/setup.cfg 2024-06-10 17:30:13.334624224 +0200 @@ -4,7 +4,7 @@ [metadata] requires_dist = - botocore==1.34.105 + botocore==1.34.122 - docutils>=0.10,<0.17 + docutils>=0.10 s3transfer>=0.10.0,<0.11.0 PyYAML>=3.10,<6.1 colorama>=0.2.5,<0.4.7 -diff -Nru aws-cli-1.32.105.orig/setup.py aws-cli-1.32.105/setup.py ---- aws-cli-1.32.105.orig/setup.py 2024-05-14 20:05:47.000000000 +0200 -+++ aws-cli-1.32.105/setup.py 2024-05-16 13:42:57.993608767 +0200 +diff -Nru aws-cli-1.33.4.orig/setup.py aws-cli-1.33.4/setup.py +--- aws-cli-1.33.4.orig/setup.py 2024-06-07 20:05:42.000000000 +0200 ++++ aws-cli-1.33.4/setup.py 2024-06-10 17:29:17.897806494 +0200 @@ -25,7 +25,7 @@ install_requires = [ - 'botocore==1.34.105', + 'botocore==1.34.122', - 'docutils>=0.10,<0.17', + 'docutils>=0.10', 's3transfer>=0.10.0,<0.11.0', 'PyYAML>=3.10,<6.1', 'colorama>=0.2.5,<0.4.7', +diff -Nru aws-cli-1.33.4.orig/setup.py~ aws-cli-1.33.4/setup.py~ +--- aws-cli-1.33.4.orig/setup.py~ 1970-01-01 01:00:00.000000000 +0100 ++++ aws-cli-1.33.4/setup.py~ 2024-06-07 20:05:42.000000000 +0200 +@@ -0,0 +1,91 @@ ++#!/usr/bin/env python ++import codecs ++import os.path ++import re ++import sys ++ ++from setuptools import setup, find_packages ++ ++ ++here = os.path.abspath(os.path.dirname(__file__)) ++ ++ ++def read(*parts): ++ return codecs.open(os.path.join(here, *parts), 'r').read() ++ ++ ++def find_version(*file_paths): ++ version_file = read(*file_paths) ++ version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", ++ version_file, re.M) ++ if version_match: ++ return version_match.group(1) ++ raise RuntimeError("Unable to find version string.") ++ ++ ++install_requires = [ ++ 'botocore==1.34.122', ++ 'docutils>=0.10,<0.17', ++ 's3transfer>=0.10.0,<0.11.0', ++ 'PyYAML>=3.10,<6.1', ++ 'colorama>=0.2.5,<0.4.7', ++ 'rsa>=3.1.2,<4.8', ++] ++ ++ ++setup_options = dict( ++ name='awscli', ++ version=find_version("awscli", "__init__.py"), ++ description='Universal Command Line Environment for AWS.', ++ long_description=read('README.rst'), ++ author='Amazon Web Services', ++ url='http://aws.amazon.com/cli/', ++ scripts=['bin/aws', 'bin/aws.cmd', ++ 'bin/aws_completer', 'bin/aws_zsh_completer.sh', ++ 'bin/aws_bash_completer'], ++ packages=find_packages(exclude=['tests*']), ++ include_package_data=True, ++ install_requires=install_requires, ++ extras_require={}, ++ license="Apache License 2.0", ++ python_requires=">= 3.8", ++ classifiers=[ ++ 'Development Status :: 5 - Production/Stable', ++ 'Intended Audience :: Developers', ++ 'Intended Audience :: System Administrators', ++ 'Natural Language :: English', ++ 'License :: OSI Approved :: Apache Software License', ++ 'Programming Language :: Python', ++ 'Programming Language :: Python :: 3', ++ 'Programming Language :: Python :: 3 :: Only', ++ 'Programming Language :: Python :: 3.8', ++ 'Programming Language :: Python :: 3.9', ++ 'Programming Language :: Python :: 3.10', ++ 'Programming Language :: Python :: 3.11', ++ 'Programming Language :: Python :: 3.12', ++ ], ++ project_urls={ ++ 'Source': 'https://github.com/aws/aws-cli', ++ 'Reference': 'https://docs.aws.amazon.com/cli/latest/reference/', ++ 'Changelog': 'https://github.com/aws/aws-cli/blob/develop/CHANGELOG.rst', ++ }, ++) ++ ++ ++if 'py2exe' in sys.argv: ++ # This will actually give us a py2exe command. ++ import py2exe ++ # And we have some py2exe specific options. ++ setup_options['options'] = { ++ 'py2exe': { ++ 'optimize': 0, ++ 'skip_archive': True, ++ 'dll_excludes': ['crypt32.dll'], ++ 'packages': ['docutils', 'urllib', 'httplib', 'HTMLParser', ++ 'awscli', 'ConfigParser', 'xml.etree', 'pipes'], ++ } ++ } ++ setup_options['console'] = ['bin/aws'] ++ ++ ++setup(**setup_options)

1 0

commit haproxy for openSUSE:Factory
by Source-Sync 11 Jun '24

11 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package haproxy for openSUSE:Factory checked in at 2024-06-11 18:27:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haproxy (Old) and /work/SRC/openSUSE:Factory/.haproxy.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "haproxy" Tue Jun 11 18:27:29 2024 rev:144 rq:1179720 version:3.0.1+git0.471a1b2f1 Changes: -------- --- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes 2024-06-03 17:41:44.919227508 +0200 +++ /work/SRC/openSUSE:Factory/.haproxy.new.19518/haproxy.changes 2024-06-11 18:27:56.701916368 +0200 @@ -1,0 +2,29 @@ +Mon Jun 10 14:52:46 UTC 2024 - mrueckert(a)suse.de + +- Update to version 3.0.1+git0.471a1b2f1: + * [RELEASE] Released version 3.0.1 + * BUG/MINOR: mux-h1: Use the right variable to set NEGO_FF_FL_EXACT_SIZE flag + * BUG/MAJOR: mux-h1: Properly copy chunked input data during zero-copy nego + * BUG/MEDIUM: stconn/mux-h1: Fix suspect change causing timeouts + * BUG/MINOR: quic: ensure Tx buf is always purged + * BUG/MINOR: quic: fix computed length of emitted STREAM frames + * BUG/MEDIUM: ssl: bad auth selection with TLS1.2 and WolfSSL + * BUG/MEDIUM: ssl: wrong priority whem limiting ECDSA ciphers in ECDSA+RSA configuration + * BUG/MEDIUM: mux-quic: Don't unblock zero-copy fwding if blocked during nego + * CLEANUP: hlua: simplify ambiguous lua_insert() usage in hlua_ctx_resume() + * BUG/MINOR: hlua: fix leak in hlua_ckch_set() error path + * BUG/MINOR: hlua: prevent LJMP in hlua_traceback() + * BUG/MINOR: hlua: fix unsafe hlua_pusherror() usage + * BUG/MINOR: hlua: don't use lua_pushfstring() when we don't expect LJMP + * CLEANUP: hlua: use hlua_pusherror() where relevant + * BUG/MINOR: quic: prevent crash on qc_kill_conn() + * BUG/MEDIUM: mux-quic: Unblock zero-copy forwarding if the txbuf can be released + * MEDIUM: stconn: Be able to unblock zero-copy data forwarding from done_fastfwd + * BUG/MEDIUM: h1-htx: Don't state interim responses are bodyless + * BUG/MINOR: hlua: use CertCache.set() from various hlua contexts + * DOC: configuration: add an example for keywords from crt-store + * BUG/MINOR: tools: fix possible null-deref in env_expand() on out-of-memory + * BUG/MINOR: tcpcheck: report correct error in tcp-check rule parser + * BUG/MINOR: cfgparse: remove the correct option on httpcheck send-state warning + +------------------------------------------------------------------- Old: ---- haproxy-3.0.0+git0.5590ada47.tar.gz New: ---- haproxy-3.0.1+git0.471a1b2f1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haproxy.spec ++++++ --- /var/tmp/diff_new_pack.y7VcPL/_old 2024-06-11 18:27:59.370013737 +0200 +++ /var/tmp/diff_new_pack.y7VcPL/_new 2024-06-11 18:27:59.370013737 +0200 @@ -53,7 +53,7 @@ %endif Name: haproxy -Version: 3.0.0+git0.5590ada47 +Version: 3.0.1+git0.471a1b2f1 Release: 0 # # ++++++ _service ++++++ --- /var/tmp/diff_new_pack.y7VcPL/_old 2024-06-11 18:27:59.410015197 +0200 +++ /var/tmp/diff_new_pack.y7VcPL/_new 2024-06-11 18:27:59.418015489 +0200 @@ -6,7 +6,7 @@ <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-replacement">\1</param> - <param name="revision">v3.0.0</param> + <param name="revision">v3.0.1</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.y7VcPL/_old 2024-06-11 18:27:59.438016219 +0200 +++ /var/tmp/diff_new_pack.y7VcPL/_new 2024-06-11 18:27:59.442016364 +0200 @@ -1,7 +1,8 @@ <servicedata> <service name="tar_scm"> <param name="url">http://git.haproxy.org/git/haproxy-3.0.git/</param> - <param name="changesrevision">5590ada4731a1f75004675680b4bdca61fa4c507</param> + <param name="changesrevision">471a1b2f11d7367ac03056a3d840146741341b64</param> </service> </servicedata> +(No newline at EOF) ++++++ haproxy-3.0.0+git0.5590ada47.tar.gz -> haproxy-3.0.1+git0.471a1b2f1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/CHANGELOG new/haproxy-3.0.1+git0.471a1b2f1/CHANGELOG --- old/haproxy-3.0.0+git0.5590ada47/CHANGELOG 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/CHANGELOG 2024-06-10 16:15:30.000000000 +0200 @@ -1,6 +1,31 @@ ChangeLog : =========== +2024/06/10 : 3.0.1 + - BUG/MINOR: cfgparse: remove the correct option on httpcheck send-state warning + - BUG/MINOR: tcpcheck: report correct error in tcp-check rule parser + - BUG/MINOR: tools: fix possible null-deref in env_expand() on out-of-memory + - DOC: configuration: add an example for keywords from crt-store + - BUG/MINOR: hlua: use CertCache.set() from various hlua contexts + - BUG/MEDIUM: h1-htx: Don't state interim responses are bodyless + - MEDIUM: stconn: Be able to unblock zero-copy data forwarding from done_fastfwd + - BUG/MEDIUM: mux-quic: Unblock zero-copy forwarding if the txbuf can be released + - BUG/MINOR: quic: prevent crash on qc_kill_conn() + - CLEANUP: hlua: use hlua_pusherror() where relevant + - BUG/MINOR: hlua: don't use lua_pushfstring() when we don't expect LJMP + - BUG/MINOR: hlua: fix unsafe hlua_pusherror() usage + - BUG/MINOR: hlua: prevent LJMP in hlua_traceback() + - BUG/MINOR: hlua: fix leak in hlua_ckch_set() error path + - CLEANUP: hlua: simplify ambiguous lua_insert() usage in hlua_ctx_resume() + - BUG/MEDIUM: mux-quic: Don't unblock zero-copy fwding if blocked during nego + - BUG/MEDIUM: ssl: wrong priority whem limiting ECDSA ciphers in ECDSA+RSA configuration + - BUG/MEDIUM: ssl: bad auth selection with TLS1.2 and WolfSSL + - BUG/MINOR: quic: fix computed length of emitted STREAM frames + - BUG/MINOR: quic: ensure Tx buf is always purged + - BUG/MEDIUM: stconn/mux-h1: Fix suspect change causing timeouts + - BUG/MAJOR: mux-h1: Properly copy chunked input data during zero-copy nego + - BUG/MINOR: mux-h1: Use the right variable to set NEGO_FF_FL_EXACT_SIZE flag + 2024/05/29 : 3.0.0 - MINOR: sample: implement the uptime sample fetch - CI: scripts: fix build of vtest regarding option -C diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/VERDATE new/haproxy-3.0.1+git0.471a1b2f1/VERDATE --- old/haproxy-3.0.0+git0.5590ada47/VERDATE 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/VERDATE 2024-06-10 16:15:30.000000000 +0200 @@ -1,2 +1,2 @@ $Format:%ci$ -2024/05/29 +2024/06/10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/VERSION new/haproxy-3.0.1+git0.471a1b2f1/VERSION --- old/haproxy-3.0.0+git0.5590ada47/VERSION 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/VERSION 2024-06-10 16:15:30.000000000 +0200 @@ -1 +1 @@ -3.0.0 +3.0.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/doc/configuration.txt new/haproxy-3.0.1+git0.471a1b2f1/doc/configuration.txt --- old/haproxy-3.0.0+git0.5590ada47/doc/configuration.txt 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/doc/configuration.txt 2024-06-10 16:15:30.000000000 +0200 @@ -3,7 +3,7 @@ Configuration Manual ---------------------- version 3.0 - 2024/05/29 + 2024/06/10 This document covers the configuration language as implemented in the version @@ -16141,6 +16141,7 @@ certS.pem [curves X25519:P-256 ciphers ECDHE-ECDSA-AES256-GCM-SHA384] secure.domain.tld default.pem.rsa * default.pem.ecdsa * + foo.crt [key bar.pem ocsp foo.ocsp ocsp-update on] foo.bar.com default-crt <cert> This option does the same as the "crt" option, with the difference that this diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/doc/lua-api/index.rst new/haproxy-3.0.1+git0.471a1b2f1/doc/lua-api/index.rst --- old/haproxy-3.0.0+git0.5590ada47/doc/lua-api/index.rst 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/doc/lua-api/index.rst 2024-06-10 16:15:30.000000000 +0200 @@ -4463,6 +4463,10 @@ :param string certificate.issuer: The certificate of the OCSP issuer. :param string certificate.sctl: An SCTL file. + .. Note:: + This function may be slow. As such, it may only be used during startup + (main or init context) or from a yield-capable runtime context. + .. code-block:: lua CertCache.set{filename="certs/localhost9994.pem.rsa", crt=crt} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/include/haproxy/stconn-t.h new/haproxy-3.0.1+git0.471a1b2f1/include/haproxy/stconn-t.h --- old/haproxy-3.0.0+git0.5590ada47/include/haproxy/stconn-t.h 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/include/haproxy/stconn-t.h 2024-06-10 16:15:30.000000000 +0200 @@ -39,6 +39,7 @@ * .done_fastfwd() on consumer side must take care of this flag */ IOBUF_FL_EOI = 0x00000010, /* A EOI was encountered on producer side */ + IOBUF_FL_FF_WANT_ROOM = 0x00000020, /* Producer need more room in the IOBUF to forward data */ }; /* Flags used */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/include/haproxy/stconn.h new/haproxy-3.0.1+git0.471a1b2f1/include/haproxy/stconn.h --- old/haproxy-3.0.0+git0.5590ada47/include/haproxy/stconn.h 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/include/haproxy/stconn.h 2024-06-10 16:15:30.000000000 +0200 @@ -474,7 +474,7 @@ if (se_fl_test(se, SE_FL_T_MUX)) { const struct mux_ops *mux = se->conn->mux; - se->iobuf.flags &= ~IOBUF_FL_FF_BLOCKED; + se->iobuf.flags &= ~(IOBUF_FL_FF_BLOCKED|IOBUF_FL_FF_WANT_ROOM); if (mux->nego_fastfwd && mux->done_fastfwd) { /* Disable zero-copy forwarding if EOS or an error was reported. */ if (se_fl_test(se, SE_FL_EOS|SE_FL_ERROR|SE_FL_ERR_PENDING)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/src/applet.c new/haproxy-3.0.1+git0.471a1b2f1/src/applet.c --- old/haproxy-3.0.0+git0.5590ada47/src/applet.c 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/src/applet.c 2024-06-10 16:15:30.000000000 +0200 @@ -694,7 +694,7 @@ if (se_fl_test(appctx->sedesc, SE_FL_WANT_ROOM)) { /* The applet request more room, report the info at the iobuf level */ - sdo->iobuf.flags |= IOBUF_FL_FF_BLOCKED; + sdo->iobuf.flags |= (IOBUF_FL_FF_BLOCKED|IOBUF_FL_FF_WANT_ROOM); TRACE_STATE("waiting for more room", APPLET_EV_RECV|APPLET_EV_BLK, appctx); } @@ -716,8 +716,9 @@ /* else */ /* applet_have_more_data(appctx); */ - if (se_done_ff(sdo) != 0) { - /* Something was forwarding, don't reclaim more room */ + if (se_done_ff(sdo) != 0 || !(sdo->iobuf.flags & (IOBUF_FL_FF_BLOCKED|IOBUF_FL_FF_WANT_ROOM))) { + /* Something was forwarding or the consumer states it is not + * blocked anyore, don't reclaim more room */ se_fl_clr(appctx->sedesc, SE_FL_WANT_ROOM); TRACE_STATE("more room available", APPLET_EV_RECV|APPLET_EV_BLK, appctx); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/src/cfgparse.c new/haproxy-3.0.1+git0.471a1b2f1/src/cfgparse.c --- old/haproxy-3.0.0+git0.5590ada47/src/cfgparse.c 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/src/cfgparse.c 2024-06-10 16:15:30.000000000 +0200 @@ -3053,7 +3053,7 @@ ha_warning("'%s' will be ignored for %s '%s' (requires 'option httpchk').\n", "send-state", proxy_type_str(curproxy), curproxy->id); err_code |= ERR_WARN; - curproxy->options &= ~PR_O2_CHK_SNDST; + curproxy->options2 &= ~PR_O2_CHK_SNDST; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/src/h1_htx.c new/haproxy-3.0.1+git0.471a1b2f1/src/h1_htx.c --- old/haproxy-3.0.0+git0.5590ada47/src/h1_htx.c 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/src/h1_htx.c 2024-06-10 16:15:30.000000000 +0200 @@ -295,7 +295,8 @@ /* Responses known to have no body. */ h1m->flags |= H1_MF_XFER_LEN; h1m->curr_len = h1m->body_len = 0; - flags |= HTX_SL_F_BODYLESS_RESP; + if (code >= 200) + flags |= HTX_SL_F_BODYLESS_RESP; } else if (h1m->flags & (H1_MF_CLEN|H1_MF_CHNK)) { /* Responses with a known body length. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/src/hlua.c new/haproxy-3.0.1+git0.471a1b2f1/src/hlua.c --- old/haproxy-3.0.0+git0.5590ada47/src/hlua.c 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/src/hlua.c 2024-06-10 16:15:30.000000000 +0200 @@ -260,6 +260,70 @@ return str; } +/* below is an helper function similar to lua_pushvfstring() to push a + * formatted string on Lua stack but in a safe way (function may not LJMP). + * It can be useful to push allocated strings (ie: error messages) on the + * stack and ensure proper cleanup. + * + * Returns a pointer to the internal copy of the string on success and NULL + * on error. + * + * It is assumed that the calling function is allowed to manipulate <L> + */ +__LJMP static int _hlua_pushvfstring_safe(lua_State *L) +{ + const char **dst = lua_touserdata(L, 1); + const char *fmt = lua_touserdata(L, 2); + va_list *argp = lua_touserdata(L, 3); + + *dst = lua_pushvfstring(L, fmt, *argp); + return 1; +} +static const char *hlua_pushvfstring_safe(lua_State *L, const char *fmt, va_list argp) +{ + const char *dst = NULL; + va_list cpy_argp; /* required if argp is implemented as array type */ + + if (!lua_checkstack(L, 4)) + return NULL; + + va_copy(cpy_argp, argp); + + /* push our custom _hlua_pushvfstring_safe() function on the stack, then + * push our destination string pointer, fmt and arg list + */ + lua_pushcfunction(L, _hlua_pushvfstring_safe); + lua_pushlightuserdata(L, &dst); // 1st func argument = dst string pointer + lua_pushlightuserdata(L, (void *)fmt); // 2nd func argument = fmt + lua_pushlightuserdata(L, &cpy_argp); // 3rd func argument = arg list + + /* call our custom function with proper arguments using pcall() to catch + * exceptions (if any) + */ + switch (lua_pcall(L, 3, 1, 0)) { + case LUA_OK: + break; + default: + /* error was caught */ + dst = NULL; + } + va_end(cpy_argp); + + return dst; +} + +static const char *hlua_pushfstring_safe(lua_State *L, const char *fmt, ...) +{ + va_list argp; + const char *dst; + + va_start(argp, fmt); + dst = hlua_pushvfstring_safe(L, fmt, argp); + va_end(argp); + + return dst; +} + #define SET_SAFE_LJMP_L(__L, __HLUA) \ ({ \ int ret; \ @@ -784,20 +848,41 @@ luaL_unref(L, LUA_REGISTRYINDEX, ref); } -__LJMP const char *hlua_traceback(lua_State *L, const char* sep) +__LJMP static int _hlua_traceback(lua_State *L) +{ + lua_Debug *ar = lua_touserdata(L, 1); + + /* Fill fields: + * 'S': fills in the fields source, short_src, linedefined, lastlinedefined, and what; + * 'l': fills in the field currentline; + * 'n': fills in the field name and namewhat; + * 't': fills in the field istailcall; + */ + return lua_getinfo(L, "Slnt", ar); +} + + +/* This function cannot fail (output will simply be truncated upon errors) */ +const char *hlua_traceback(lua_State *L, const char* sep) { lua_Debug ar; int level = 0; struct buffer *msg = get_trash_chunk(); while (lua_getstack(L, level++, &ar)) { - /* Fill fields: - * 'S': fills in the fields source, short_src, linedefined, lastlinedefined, and what; - * 'l': fills in the field currentline; - * 'n': fills in the field name and namewhat; - * 't': fills in the field istailcall; - */ - lua_getinfo(L, "Slnt", &ar); + if (!lua_checkstack(L, 2)) + goto end; // abort + + lua_pushcfunction(L, _hlua_traceback); + lua_pushlightuserdata(L, &ar); + + /* safe getinfo */ + switch (lua_pcall(L, 1, 1, 0)) { + case LUA_OK: + break; + default: + goto end; // abort + } /* skip these empty entries, usually they come from deep C functions */ if (ar.currentline < 0 && *ar.what == 'C' && !*ar.namewhat && !ar.name) @@ -838,6 +923,7 @@ chunk_appendf(msg, " ..."); } + end: return msg->area; } @@ -855,16 +941,50 @@ /* This function pushes an error string prefixed by the file name * and the line number where the error is encountered. + * + * It returns 1 on success and 0 on failure (function won't LJMP) */ +__LJMP static int _hlua_pusherror(lua_State *L) +{ + const char *fmt = lua_touserdata(L, 1); + va_list *argp = lua_touserdata(L, 2); + + luaL_where(L, 2); + lua_pushvfstring(L, fmt, *argp); + lua_concat(L, 2); + + return 1; +} static int hlua_pusherror(lua_State *L, const char *fmt, ...) { va_list argp; + int ret = 1; + + if (!lua_checkstack(L, 3)) + return 0; + va_start(argp, fmt); - luaL_where(L, 1); - lua_pushvfstring(L, fmt, argp); + + /* push our custom _hlua_pusherror() function on the stack, then + * push fmt and arg list + */ + lua_pushcfunction(L, _hlua_pusherror); + lua_pushlightuserdata(L, (void *)fmt); // 1st func argument = fmt + lua_pushlightuserdata(L, &argp); // 2nd func argument = arg list + + /* call our custom function with proper arguments using pcall() to catch + * exceptions (if any) + */ + switch (lua_pcall(L, 2, 1, 0)) { + case LUA_OK: + break; + default: + ret = 0; + } + va_end(argp); - lua_concat(L, 2); - return 1; + + return ret; } /* This functions is used with sample fetch and converters. It @@ -1367,8 +1487,8 @@ } reg = regex_comp(argp[idx].data.str.area, !(argp[idx].type_flags & ARGF_REG_ICASE), 1, &err); if (!reg) { - msg = lua_pushfstring(L, "error compiling regex '%s' : '%s'", - argp[idx].data.str.area, err); + msg = hlua_pushfstring_safe(L, "error compiling regex '%s' : '%s'", + argp[idx].data.str.area, err); free(err); goto error; } @@ -1388,7 +1508,8 @@ ul = auth_find_userlist(argp[idx].data.str.area); if (!ul) { - msg = lua_pushfstring(L, "unable to find userlist '%s'", argp[idx].data.str.area); + msg = hlua_pushfstring_safe(L, "unable to find userlist '%s'", + argp[idx].data.str.area); goto error; } argp[idx].type = ARGT_USR; @@ -1412,9 +1533,9 @@ /* Check for type of argument. */ if ((mask & ARGT_MASK) != argp[idx].type) { - msg = lua_pushfstring(L, "'%s' expected, got '%s'", - arg_type_names[(mask & ARGT_MASK)], - arg_type_names[argp[idx].type & ARGT_MASK]); + msg = hlua_pushfstring_safe(L, "'%s' expected, got '%s'", + arg_type_names[(mask & ARGT_MASK)], + arg_type_names[argp[idx].type & ARGT_MASK]); goto error; } @@ -1960,12 +2081,14 @@ msg = hlua_tostring_safe(lua->T, -1); trace = hlua_traceback(lua->T, ", "); if (msg) - lua_pushfstring(lua->T, "[state-id %d] runtime error: %s from %s", lua->state_id, msg, trace); + hlua_pushfstring_safe(lua->T, "[state-id %d] runtime error: %s from %s", + lua->state_id, msg, trace); else - lua_pushfstring(lua->T, "[state-id %d] unknown runtime error from %s", lua->state_id, trace); + hlua_pushfstring_safe(lua->T, "[state-id %d] unknown runtime error from %s", + lua->state_id, trace); - /* Move the error msg at the top and then empty the stack except last msg */ - lua_insert(lua->T, -lua_gettop(lua->T)); + /* Move the error msg at the bottom and then empty the stack except last msg */ + lua_insert(lua->T, 1); lua_settop(lua->T, 1); ret = HLUA_E_ERRMSG; break; @@ -1984,12 +2107,14 @@ } msg = hlua_tostring_safe(lua->T, -1); if (msg) - lua_pushfstring(lua->T, "[state-id %d] message handler error: %s", lua->state_id, msg); + hlua_pushfstring_safe(lua->T, "[state-id %d] message handler error: %s", + lua->state_id, msg); else - lua_pushfstring(lua->T, "[state-id %d] message handler error", lua->state_id); + hlua_pushfstring_safe(lua->T, "[state-id %d] message handler error", + lua->state_id); - /* Move the error msg at the top and then empty the stack except last msg */ - lua_insert(lua->T, -lua_gettop(lua->T)); + /* Move the error msg at the bottom and then empty the stack except last msg */ + lua_insert(lua->T, 1); lua_settop(lua->T, 1); ret = HLUA_E_ERRMSG; break; @@ -2369,9 +2494,7 @@ /* error case: we can't use luaL_error because we must * free the err variable. */ - luaL_where(L, 1); - lua_pushfstring(L, "'new': %s.", err); - lua_concat(L, 2); + hlua_pusherror(L, "'new': %s.", err); free(err); chunk_destroy(&args[0].data.str); WILL_LJMP(lua_error(L)); @@ -4702,7 +4825,7 @@ /* Run the special args checker. */ if (f->val_args && !f->val_args(args, NULL)) { - lua_pushfstring(L, "error in arguments"); + hlua_pushfstring_safe(L, "error in arguments"); goto error; } @@ -12989,8 +13112,10 @@ list_for_each_entry_from(ckchi, &old_ckchs->ckch_inst, by_ckchs) { struct ckch_inst *new_inst; - /* it takes a lot of CPU to creates SSL_CTXs, so we yield every 10 CKCH instances */ - if (y % 10 == 0) { + /* it takes a lot of CPU to creates SSL_CTXs, so we yield every 10 CKCH instances + * during runtime + */ + if (hlua && (y % 10) == 0) { *lua_ckchi = ckchi; @@ -13018,8 +13143,9 @@ error: ckch_store_free(new_ckchs); HA_SPIN_UNLOCK(CKCH_LOCK, &ckch_lock); - WILL_LJMP(luaL_error(L, "%s", err)); + hlua_pushfstring_safe(L, "%s", err); free(err); + WILL_LJMP(lua_error(L)); return 0; } @@ -13053,6 +13179,14 @@ WILL_LJMP(luaL_error(L, "'CertCache.set' needs a table as argument")); hlua = hlua_gethlua(L); + if (hlua && HLUA_CANT_YIELD(hlua)) { + /* using hlua_ckch_set() during runtime from a context that + * doesn't allow yielding (e.g.: fetches) is not supported + * as it may cause contention. + */ + WILL_LJMP(luaL_error(L, "Cannot use CertCache.set from a " + "non-yield capable runtime context")); + } /* FIXME: this should not return an error but should come back later */ if (HA_SPIN_TRYLOCK(CKCH_LOCK, &ckch_lock)) @@ -13135,15 +13269,28 @@ lua_ckchi = lua_newuserdata(L, sizeof(struct ckch_inst *)); *lua_ckchi = NULL; - task_wakeup(hlua->task, TASK_WOKEN_MSG); - MAY_LJMP(hlua_yieldk(L, 0, 0, hlua_ckch_commit_yield, TICK_ETERNITY, 0)); + if (hlua) { + /* yield right away to let hlua_ckch_commit_yield() benefit from + * a fresh task cycle on next wakeup + */ + task_wakeup(hlua->task, TASK_WOKEN_MSG); + MAY_LJMP(hlua_yieldk(L, 0, 0, hlua_ckch_commit_yield, TICK_ETERNITY, 0)); + } else { + /* body/init context: yielding not available, perform the commit as a + * 1-shot operation (may be slow, but haproxy process is starting so + * it is acceptable) + */ + hlua_ckch_commit_yield(L, LUA_OK, 0); + } end: HA_SPIN_UNLOCK(CKCH_LOCK, &ckch_lock); if (errcode & ERR_CODE) { ckch_store_free(new_ckchs); - WILL_LJMP(luaL_error(L, "%s", err)); + hlua_pushfstring_safe(L, "%s", err); + free(err); + WILL_LJMP(lua_error(L)); } free(err); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/src/mux_h1.c new/haproxy-3.0.1+git0.471a1b2f1/src/mux_h1.c --- old/haproxy-3.0.0+git0.5590ada47/src/mux_h1.c 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/src/mux_h1.c 2024-06-10 16:15:30.000000000 +0200 @@ -4376,7 +4376,7 @@ do_shutw: h1_close(h1c); - if (mode & SE_SHW_NORMAL) + if (!(mode & SE_SHW_NORMAL)) h1c->flags |= H1C_F_SILENT_SHUT; if (!b_data(&h1c->obuf)) @@ -4724,7 +4724,9 @@ if (xfer > b_data(input)) xfer = b_data(input); + h1c->obuf.head += offset; h1s->sd->iobuf.data = b_xfer(&h1c->obuf, input, xfer); + h1c->obuf.head -= offset; /* Cannot forward more data, wait for room */ if (b_data(input)) @@ -4860,7 +4862,7 @@ ret = 0; if (h1m->state == H1_MSG_DATA && (h1m->flags & (H1_MF_CHNK|H1_MF_CLEN)) && count > h1m->curr_len) { - flags |= NEGO_FF_FL_EXACT_SIZE; + nego_flags |= NEGO_FF_FL_EXACT_SIZE; count = h1m->curr_len; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/src/mux_quic.c new/haproxy-3.0.1+git0.471a1b2f1/src/mux_quic.c --- old/haproxy-3.0.0+git0.5590ada47/src/mux_quic.c 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/src/mux_quic.c 2024-06-10 16:15:30.000000000 +0200 @@ -3046,8 +3046,17 @@ qcs->flags |= QC_SF_FIN_STREAM; } - if (!(qcs->flags & QC_SF_FIN_STREAM) && !sd->iobuf.data) + if (!(qcs->flags & QC_SF_FIN_STREAM) && !sd->iobuf.data) { + TRACE_STATE("no data sent", QMUX_EV_STRM_SEND, qcs->qcc->conn, qcs); + + /* There is nothing to forward and the SD was blocked after a + * successful nego by the producer. We can try to release the + * TXBUF to retry. In this case, the TX buf MUST exist. + */ + if ((qcs->sd->iobuf.flags & IOBUF_FL_FF_WANT_ROOM) && !qcc_release_stream_txbuf(qcs)) + qcs->sd->iobuf.flags &= ~(IOBUF_FL_FF_BLOCKED|IOBUF_FL_FF_WANT_ROOM); goto end; + } data += sd->iobuf.offset; total = qcs->qcc->app_ops->done_ff(qcs); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/src/quic_conn.c new/haproxy-3.0.1+git0.471a1b2f1/src/quic_conn.c --- old/haproxy-3.0.0+git0.5590ada47/src/quic_conn.c 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/src/quic_conn.c 2024-06-10 16:15:30.000000000 +0200 @@ -161,7 +161,9 @@ TRACE_PROTO("killing the connection", QUIC_EV_CONN_KILL, qc); qc->flags |= QUIC_FL_CONN_TO_KILL; qc->flags &= ~QUIC_FL_CONN_RETRANS_NEEDED; - task_wakeup(qc->idle_timer_task, TASK_WOKEN_OTHER); + + if (!(qc->flags & QUIC_FL_CONN_EXP_TIMER)) + task_wakeup(qc->idle_timer_task, TASK_WOKEN_OTHER); qc_notify_err(qc); @@ -549,11 +551,8 @@ { struct list send_list = LIST_HEAD_INIT(send_list); struct quic_conn *qc = context; - struct quic_enc_level *qel; TRACE_ENTER(QUIC_EV_CONN_IO_CB, qc); - - qel = qc->ael; TRACE_STATE("connection handshake state", QUIC_EV_CONN_IO_CB, qc, &qc->state); if (qc_test_fd(qc)) @@ -592,11 +591,10 @@ goto out; } - if (!qel_need_sending(qel, qc)) - goto out; - /* XXX TODO: how to limit the list frames to send */ - qel_register_send(&send_list, qel, &qel->pktns->tx.frms); + if (qel_need_sending(qc->ael, qc)) + qel_register_send(&send_list, qc->ael, &qc->ael->pktns->tx.frms); + if (!qc_send(qc, 0, &send_list)) { TRACE_DEVEL("qc_send() failed", QUIC_EV_CONN_IO_CB, qc); goto out; @@ -802,10 +800,6 @@ qel_register_send(&send_list, qel, &qel->pktns->tx.frms); } - /* Skip sending if no QEL with frames to sent. */ - if (LIST_ISEMPTY(&send_list)) - goto out; - if (!qc_send(qc, 0, &send_list)) { TRACE_DEVEL("qc_send() failed", QUIC_EV_CONN_IO_CB, qc); goto out; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/src/quic_tx.c new/haproxy-3.0.1+git0.471a1b2f1/src/quic_tx.c --- old/haproxy-3.0.0+git0.5590ada47/src/quic_tx.c 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/src/quic_tx.c 2024-06-10 16:15:30.000000000 +0200 @@ -691,7 +691,7 @@ int qc_send(struct quic_conn *qc, int old_data, struct list *send_list) { struct quic_enc_level *qel, *tmp_qel; - int ret, status = 0; + int ret = 0, status = 0; struct buffer *buf; TRACE_ENTER(QUIC_EV_CONN_TXPKT, qc); @@ -713,7 +713,7 @@ } /* Prepare and send packets until we could not further prepare packets. */ - do { + while (!LIST_ISEMPTY(send_list)) { /* Buffer must always be empty before qc_prep_pkts() usage. * qc_send_ppkts() ensures it is cleared on success. */ @@ -727,7 +727,12 @@ qc_txb_release(qc); goto out; } - } while (ret > 0 && !LIST_ISEMPTY(send_list)); + + if (ret <= 0) { + TRACE_DEVEL("stopping on qc_prep_pkts() return", QUIC_EV_CONN_TXPKT, qc); + break; + } + } qc_txb_release(qc); if (ret < 0) @@ -1425,6 +1430,7 @@ ret = 0; if (*len > room) goto leave; + room -= *len; /* If we are not probing we must take into an account the congestion * control window. @@ -1458,8 +1464,8 @@ QUIC_EV_CONN_BCFRMS, qc, &room, len); /* Compute the length of this CRYPTO frame header */ hlen = 1 + quic_int_getsize(cf->crypto.offset); - /* Compute the data length of this CRyPTO frame. */ - dlen = max_stream_data_size(room, *len + hlen, cf->crypto.len); + /* Compute the data length of this CRYPTO frame. */ + dlen = max_stream_data_size(room, hlen, cf->crypto.len); TRACE_DEVEL(" CRYPTO data length (hlen, crypto.len, dlen)", QUIC_EV_CONN_BCFRMS, qc, &hlen, &cf->crypto.len, &dlen); if (!dlen) @@ -1550,7 +1556,7 @@ hlen = 1 + quic_int_getsize(cf->stream.id) + ((cf->type & QUIC_STREAM_FRAME_TYPE_OFF_BIT) ? quic_int_getsize(cf->stream.offset.key) : 0); /* Compute the data length of this STREAM frame. */ - avail_room = room - hlen - *len; + avail_room = room - hlen; if ((ssize_t)avail_room <= 0) continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/src/ssl_sock.c new/haproxy-3.0.1+git0.471a1b2f1/src/ssl_sock.c --- old/haproxy-3.0.0+git0.5590ada47/src/ssl_sock.c 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/src/ssl_sock.c 2024-06-10 16:15:30.000000000 +0200 @@ -2268,10 +2268,14 @@ } if (has_ecdsa_sig) { /* in very rare case: has ecdsa sign but not a ECDSA cipher */ const SSL_CIPHER *cipher; + STACK_OF(SSL_CIPHER) *ha_ciphers; /* haproxy side ciphers */ uint32_t cipher_id; size_t len; const uint8_t *cipher_suites; + + ha_ciphers = SSL_get_ciphers(ssl); has_ecdsa_sig = 0; + #ifdef OPENSSL_IS_BORINGSSL len = ctx->cipher_suites_len; cipher_suites = ctx->cipher_suites; @@ -2290,6 +2294,10 @@ if (!cipher) continue; + /* check if this cipher is available in haproxy configuration */ + if (sk_SSL_CIPHER_find(ha_ciphers, cipher) == -1) + continue; + cipher_id = SSL_CIPHER_get_id(cipher); /* skip the SCSV "fake" signaling ciphersuites because they are NID_auth_any (RFC 7507) */ if (cipher_id == SSL3_CK_SCSV || cipher_id == SSL3_CK_FALLBACK_SCSV) @@ -2556,6 +2564,10 @@ return 0; if (SSL_version(ssl) != TLS1_3_VERSION) { + + /* with TLS <= 1.2, we must use the auth which is provided by the cipher, but we don't need to + * consider the auth provided by the signature algorithms */ + for (idx = 0; idx < suiteSz; idx += 2) { WOLFSSL_CIPHERSUITE_INFO info; info = wolfSSL_get_ciphersuite_info(suites[idx], suites[idx+1]); @@ -2564,23 +2576,22 @@ else if (info.eccAuth) has_ecdsa_sig = 1; } - } + } else { + /* with TLS >= 1.3, we must use the auth which is provided by the signature algorithms because + * the ciphers does not provide the auth */ - if (hashSigAlgoSz > 0) { - /* sigalgs extension takes precedence over ciphersuites */ - has_ecdsa_sig = 0; - has_rsa_sig = 0; - } - for (idx = 0; idx < hashSigAlgoSz; idx += 2) { - int hashAlgo; - int sigAlgo; - - wolfSSL_get_sigalg_info(hashSigAlgo[idx+0], hashSigAlgo[idx+1], &hashAlgo, &sigAlgo); - - if (sigAlgo == RSAk || sigAlgo == RSAPSSk) - has_rsa_sig = 1; - else if (sigAlgo == ECDSAk) - has_ecdsa_sig = 1; + for (idx = 0; idx < hashSigAlgoSz; idx += 2) { + int hashAlgo; + int sigAlgo; + + wolfSSL_get_sigalg_info(hashSigAlgo[idx+0], hashSigAlgo[idx+1], &hashAlgo, &sigAlgo); + + if (sigAlgo == RSAk || sigAlgo == RSAPSSk) + has_rsa_sig = 1; + else if (sigAlgo == ECDSAk) + has_ecdsa_sig = 1; + + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/src/tcpcheck.c new/haproxy-3.0.1+git0.471a1b2f1/src/tcpcheck.c --- old/haproxy-3.0.0+git0.5590ada47/src/tcpcheck.c 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/src/tcpcheck.c 2024-06-10 16:15:30.000000000 +0200 @@ -3434,7 +3434,7 @@ px->conf.args.ctx = ARGC_SRV; lf_expr_init(&chk->expect.hdr.value_fmt); if (!parse_logformat_string(vpat, px, &chk->expect.hdr.value_fmt, 0, SMP_VAL_BE_CHK_RUL, errmsg)) { - memprintf(errmsg, "'%s' invalid log-format string (%s).\n", npat, *errmsg); + memprintf(errmsg, "'%s' invalid log-format string (%s).\n", vpat, *errmsg); goto error; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haproxy-3.0.0+git0.5590ada47/src/tools.c new/haproxy-3.0.1+git0.471a1b2f1/src/tools.c --- old/haproxy-3.0.0+git0.5590ada47/src/tools.c 2024-05-29 14:43:38.000000000 +0200 +++ new/haproxy-3.0.1+git0.471a1b2f1/src/tools.c 2024-06-10 16:15:30.000000000 +0200 @@ -4627,8 +4627,9 @@ * corresponding value. A variable is identified as a series of alphanumeric * characters or underscores following a '$' sign. The <in> string must be * free()able. NULL returns NULL. The resulting string might be reallocated if - * some expansion is made. Variable names may also be enclosed into braces if - * needed (eg: to concatenate alphanum characters). + * some expansion is made (an NULL will be returned on failure). Variable names + * may also be enclosed into braces if needed (eg: to concatenate alphanum + * characters). */ char *env_expand(char *in) { @@ -4683,6 +4684,9 @@ } out = my_realloc2(out, out_len + (txt_end - txt_beg) + val_len + 1); + if (!out) + goto leave; + if (txt_end > txt_beg) { memcpy(out + out_len, txt_beg, txt_end - txt_beg); out_len += txt_end - txt_beg; @@ -4697,6 +4701,7 @@ /* here we know that <out> was allocated and that we don't need <in> anymore */ free(in); +leave: return out; }

1 0