[Git][java-team/vnu][master] 4 commits: Depends: Add curl to bin:vnu-server package
bastif (@bastif)
gitlab at salsa.debian.org
Thu May 14 08:33:01 BST 2026
bastif pushed to branch master at Debian Java Maintainers / vnu
Commits:
73be1f2e by Fab Stz at 2026-05-14T09:02:14+02:00
Depends: Add curl to bin:vnu-server package
- - - - -
75b9cf9d by Fab Stz at 2026-05-14T09:14:42+02:00
Update the way we set -Xss2048k on relevant archs
- On jetty9 & jetty12 use /etc/jetty{9,12}/start.d/vnu-*.ini file
- BTW disable the workaround in debian/tests/webapp_validate_common.sh
- - - - -
f1ad975a by Fab Stz at 2026-05-14T09:30:51+02:00
Autopkgtest: redirect 'systemctl edit' output to stdout
Prevents autopkgtest to fail because it detected output written to stderr
- - - - -
bb8c3d8b by Fab Stz at 2026-05-14T09:31:07+02:00
Update changelog for 23.4.11+dfsg-3 release
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/rules
- debian/tests/webapp_validate_common.sh
- + debian/vnu-jetty12-start.d-xss.ini
- debian/vnu-jetty12.README.Debian
- + debian/vnu-jetty9-start.d-xss.ini
- debian/vnu-jetty9.README.Debian
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+vnu (23.4.11+dfsg-3) UNRELEASED; urgency=medium
+
+ * Remove tomcat11 workaround wrt tomcat-jakartaee-migration
+ * Depends: Add curl to bin:vnu-server package
+ * Update the way we set -Xss2048k on relevant archs
+ * Autopkgtest: redirect 'systemctl edit' output to stdout
+
+ -- Fab Stz <fabstz-it at yahoo.fr> Thu, 14 May 2026 09:31:07 +0200
+
vnu (23.4.11+dfsg-2) unstable; urgency=medium
* d/copyright: Replace old fsf address
=====================================
debian/control
=====================================
@@ -70,6 +70,7 @@ Description: Nu Html Checker (v.Nu) - HTTP client
Package: vnu-server
Architecture: all
Depends:
+ curl,
java-wrappers,
libvnu-java,
netcat-openbsd | ncat | netcat-traditional,
@@ -132,7 +133,7 @@ Description: Nu Html Checker (v.Nu) - web app
symbolic links to the libraries it depends on.
Package: vnu-jetty9
-Architecture: all
+Architecture: any
Depends:
jetty9,
vnu-common,
@@ -147,7 +148,7 @@ Description: Nu Html Checker (v.Nu) - jetty9 configuration files
This package ships configuration files for usage with jetty9.
Package: vnu-jetty12
-Architecture: all
+Architecture: any
Depends:
jetty12,
vnu-common,
=====================================
debian/rules
=====================================
@@ -50,8 +50,10 @@ export VNU_BUILDDEPS_CLASSPATH = $(cp)
export VNU_SERVER_BUILDDEPS_CLASSPATH = $(cp_jetty)
export DEB_VERSION_UPSTREAM
-ifneq ($(filter i386 loong64,$(DEB_HOST_ARCH)),)
- # On i386 & loong64, we have to set stacksize=512 (will result in -Xss=512k)
+ARCH_REQUIRING_CUSTOM_XSS = i386 loong64
+
+ifneq ($(filter $(ARCH_REQUIRING_CUSTOM_XSS),$(DEB_HOST_ARCH)),)
+ # On $(ARCH_REQUIRING_CUSTOM_XSS), we have to set stacksize=512 (will result in -Xss=512k)
# Otherwise we would have this error:
#StackOverflowError while evaluating HTML schema.
#The checker requires a java thread stack size of at least 512k.
@@ -105,6 +107,14 @@ execute_before_dh_install:
chmod +x debian/java-wrappers/$${wrapper} ;\
done
+execute_after_dh_install:
+ifneq ($(filter $(ARCH_REQUIRING_CUSTOM_XSS),$(DEB_HOST_ARCH)),)
+ mkdir -p debian/vnu-jetty9/etc/jetty9/start.d/
+ mkdir -p debian/vnu-jetty12/etc/jetty12/start.d/
+ cp debian/vnu-jetty9-start.d-xss.ini debian/vnu-jetty9/etc/jetty9/start.d/vnu-xss-$(DEB_HOST_ARCH).ini
+ cp debian/vnu-jetty12-start.d-xss.ini debian/vnu-jetty12/etc/jetty12/start.d/vnu-xss-$(DEB_HOST_ARCH).ini
+endif
+
override_dh_installchangelogs:
dh_installchangelogs --no-trim CHANGELOG.md
=====================================
debian/tests/webapp_validate_common.sh
=====================================
@@ -78,22 +78,10 @@ start_server()
path="$3"
if [ -n "$AUTOPKGTEST_TMP" ]; then
case "$server" in
- jetty9)
- if [ "$(dpkg --print-architecture)" = "i386" ] || [ "$(dpkg --print-architecture)" = "loong64" ]; then
- echo "Adding -Xss2048k JVM option."
- echo -e '[Service]\nEnvironment="JAVA_OPTIONS=-Xss2048k"' | sudo systemctl edit --drop-in vnu-jetty9.conf --stdin jetty9.service
- fi
- ;;
- jetty12)
- if [ "$(dpkg --print-architecture)" = "i386" ] || [ "$(dpkg --print-architecture)" = "loong64" ]; then
- echo "Adding -Xss2048k JVM option."
- echo -e '[Service]\nEnvironment="JAVA_OPTIONS=-Xss2048k"' | sudo systemctl edit --drop-in vnu-jetty12.conf --stdin jetty12.service
- fi
- ;;
tomcat11)
if [ "$(dpkg --print-architecture)" = "i386" ] || [ "$(dpkg --print-architecture)" = "loong64" ]; then
echo "Adding -Xss2048k JVM option."
- echo -e '[Service]\nEnvironment="CATALINA_OPTS=-Xss2048k"' | sudo systemctl edit --drop-in vnu-tomcat11.conf --stdin tomcat11.service
+ echo -e '[Service]\nEnvironment="CATALINA_OPTS=-Xss2048k"' | sudo systemctl edit --drop-in vnu-tomcat11.conf --stdin tomcat11.service 2>&1
fi
;;
esac
=====================================
debian/vnu-jetty12-start.d-xss.ini
=====================================
@@ -0,0 +1,2 @@
+--exec
+-Xss2048k
=====================================
debian/vnu-jetty12.README.Debian
=====================================
@@ -2,10 +2,18 @@ With jetty12, vnu webapp is reachable at:
http://localhost:8080/vnu
-On some architectures (eg. i386, loong64), you may also have to launch
-jetty with the following JVM option "-Xss2048k".
+On some architectures (eg. i386, loong64), vnu needs the JVM to be invoked
+with the following JVM option "-Xss2048k".
-To achieve this, you could set the JAVA_OPTIONS environment variable this way.
+This is enabled on these architecture with the following content in file
+/etc/jetty12/start.d/vnu-xss-${ARCH}.ini
+
+ --exec
+ -Xss2048k
+
+You may need to restart jetty so that it is considered.
+
+Alternatively you could set the JAVA_OPTIONS environment variable this way.
echo -e '[Service]\nEnvironment="JAVA_OPTIONS=-Xss2048k"' | \
systemctl edit --drop-in vnu-jetty12.conf --stdin jetty12.service
=====================================
debian/vnu-jetty9-start.d-xss.ini
=====================================
@@ -0,0 +1,2 @@
+--exec
+-Xss2048k
=====================================
debian/vnu-jetty9.README.Debian
=====================================
@@ -2,10 +2,18 @@ With jetty9, vnu webapp is reachable at:
http://localhost:8080/vnu
-On some architectures (eg. i386, loong64), you may also have to launch
-jetty with the following JVM option "-Xss2048k".
+On some architectures (eg. i386, loong64), vnu needs the JVM to be invoked
+with the following JVM option "-Xss2048k".
-To achieve this, you could set the JAVA_OPTIONS environment variable this way.
+This is enabled on these architecture with the following content in file
+/etc/jetty9/start.d/vnu-xss-${ARCH}.ini
+
+ --exec
+ -Xss2048k
+
+You may need to restart jetty so that it is considered.
+
+Alternatively you could set the JAVA_OPTIONS environment variable this way.
echo -e '[Service]\nEnvironment="JAVA_OPTIONS=-Xss2048k"' | \
systemctl edit --drop-in vnu-jetty9.conf --stdin jetty9.service
View it on GitLab: https://salsa.debian.org/java-team/vnu/-/compare/61a818d956a73cce242893ac95ca8a7a020ee4a3...bb8c3d8b2572fa0c562bd50467789d33e964bba4
--
View it on GitLab: https://salsa.debian.org/java-team/vnu/-/compare/61a818d956a73cce242893ac95ca8a7a020ee4a3...bb8c3d8b2572fa0c562bd50467789d33e964bba4
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20260514/33935ddb/attachment.htm>
More information about the pkg-java-commits
mailing list