[Git][java-team/filius][master] 5 commits: New upstream version 2.12.2+ds
Andreas B. Mundt (@andi)
gitlab at salsa.debian.org
Sat Jun 13 10:48:20 BST 2026
Andreas B. Mundt pushed to branch master at Debian Java Maintainers / filius
Commits:
09b90393 by Andreas B. Mundt at 2026-06-13T11:31:21+02:00
New upstream version 2.12.2+ds
- - - - -
a1492449 by Andreas B. Mundt at 2026-06-13T11:31:21+02:00
Update upstream source from tag 'upstream/2.12.2+ds'
Update to upstream version '2.12.2+ds'
with Debian dir 483432909400805080caf8e3b590f2850539cc31
- - - - -
708a7854 by Andreas B. Mundt at 2026-06-13T11:34:07+02:00
Fix icon location
- - - - -
88b89c12 by Andreas B. Mundt at 2026-06-13T11:35:02+02:00
Fix appstream metadata issues link
- - - - -
8fbdc2e0 by Andreas B. Mundt at 2026-06-13T11:39:47+02:00
Prepare release
- - - - -
9 changed files:
- Changelog.md
- debian/changelog
- debian/filius.install
- debian/upstream/com.gitlab.filius1.filius.metainfo.xml
- pom.xml
- src/main/java/filius/rahmenprogramm/Information.java
- src/main/java/filius/software/nat/NatGateway.java
- src/main/java/filius/software/system/GatewayFirmware.java
- src/main/java/filius/software/www/WebBrowser.java
Changes:
=====================================
Changelog.md
=====================================
@@ -1,5 +1,11 @@
# Changelog Filius
+## [2.12.2] - 2026-06-12
+### Fixed
+* Fix web browser for host os Windows
+* Fix initialization of NAT gateway
+* Make start-up more robust in case of corrupted settings file
+
## [2.12.1] - 2026-06-08
### Fixed
* Null pointer exception in case of ICMP
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+filius (2.12.2+ds-1) unstable; urgency=medium
+
+ * New upstream version 2.12.2+ds
+ * Fix icon location
+ * Fix appstream metadata issues link
+
+ -- Andreas B. Mundt <andi at debian.org> Sat, 13 Jun 2026 11:37:42 +0200
+
filius (2.12.1+ds1-1) unstable; urgency=medium
* Fix upstream version 2.12.1+ds1 source code.
=====================================
debian/filius.install
=====================================
@@ -2,7 +2,7 @@ debian/bin/filius usr/bin/
debian/upstream/com.gitlab.filius1.filius.metainfo.xml usr/share/metainfo/
src/deb/application-filius-project.xml usr/share/mime/packages/
src/deb/filius.desktop usr/share/applications/
-src/deb/filius32.png usr/share/pixmaps/
+src/deb/filius32.png usr/share/icons/hicolor/32x32/apps/
src/main/resources/config/*.txt usr/share/filius/config/
src/main/resources/config/filius.ini etc/
src/main/resources/hilfe usr/share/filius/
=====================================
debian/upstream/com.gitlab.filius1.filius.metainfo.xml
=====================================
@@ -30,7 +30,7 @@
<category>Network</category>
</categories>
<url type="homepage">https://www.lernsoftware-filius.de</url>
- <url type="bugtracker">https://gitlab.com/filius1/filius/-/issues</url>
+ <url type="bugtracker">https://gitlab.com/filius1/filius/-/boards</url>
<launchable type="desktop-id">filius.desktop</launchable>
<screenshots>
<screenshot type="default">
=====================================
pom.xml
=====================================
@@ -2,10 +2,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>filius</groupId>
<artifactId>filius</artifactId>
- <version>2.12.1</version>
+ <version>2.12.2</version>
<inceptionYear>2007</inceptionYear>
<properties>
- <buildDate>08.06.2026</buildDate>
+ <buildDate>12.06.2026</buildDate>
<publisher>Stefan Freischlad</publisher>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.version>4.13</junit.version>
@@ -267,26 +267,6 @@
<failOnError>false</failOnError>
</configuration>
</plugin>
-
- <!-- Create a Zip-Archive for Platform Independent Delivery -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<reporting>
@@ -363,6 +343,26 @@
</executions>
</plugin>
+ <!-- Create a Zip-Archive for Platform Independent Delivery -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
=====================================
src/main/java/filius/rahmenprogramm/Information.java
=====================================
@@ -427,7 +427,7 @@ public class Information implements Serializable {
private String holeAnwendungenDateipfad() {
String pfad = "config/Desktop";
- File desktopResource = ResourceUtil.getResourceFile(pfad + "_" + locale.toString() + ".txt");
+ File desktopResource = ResourceUtil.getResourceFile(pfad + "_" + getLocaleOrDefault().toString() + ".txt");
return desktopResource.getAbsolutePath();
}
=====================================
src/main/java/filius/software/nat/NatGateway.java
=====================================
@@ -45,11 +45,15 @@ public class NatGateway extends Firewall implements I18n {
@Override
protected void initFirewallThreads() {
Gateway gateway = (Gateway) getSystemSoftware().getKnoten();
- addAndStartThread(new NatGatewayLANThread(this, gateway.holeLANInterface(), gateway.holeWANInterface(),
- this.betriebssystem));
- addAndStartThread(new NatGatewayWANThread(this, gateway.holeWANInterface(), gateway.holeLANInterface(),
- this.betriebssystem));
- LOG.debug("Threads for WAN and LAN nic are started on {}", gateway.getName());
+ if (null != gateway) {
+ addAndStartThread(new NatGatewayLANThread(this, gateway.holeLANInterface(), gateway.holeWANInterface(),
+ this.betriebssystem));
+ addAndStartThread(new NatGatewayWANThread(this, gateway.holeWANInterface(), gateway.holeLANInterface(),
+ this.betriebssystem));
+ LOG.debug("Threads for WAN and LAN nic are started on {}", gateway.getName());
+ } else {
+ LOG.warn("NatGateway could not be initialized");
+ }
}
public void insertNewConnection(int protocol, String lanIpAddress, int lanPort, String wanIpAddress, int wanPort) {
=====================================
src/main/java/filius/software/system/GatewayFirmware.java
=====================================
@@ -100,11 +100,11 @@ public class GatewayFirmware extends InternetKnotenBetriebssystem {
LOG.trace("INVOKED-2 (" + this.hashCode() + ") " + getClass()
+ " (VermittlungsrechnerBetriebssystem), constr: VermittlungsrechnerBetriebssystem()");
setIpForwardingEnabled(true);
- initialisiereAnwendungen();
}
public void setKnoten(Knoten gateway) {
super.setKnoten(gateway);
+ initialisiereAnwendungen();
getDHCPServer().bindAddress(List.of(((Gateway) gateway).holeLANInterface()));
}
=====================================
src/main/java/filius/software/www/WebBrowser.java
=====================================
@@ -289,7 +289,7 @@ public class WebBrowser extends ClientAnwendung implements I18n {
}
public String getBrowserCacheDirectory() {
- File cacheDir = new File(Information.getInformation().getTempPfad() + getSystemSoftware().primaryMACAddress());
+ File cacheDir = new File(Information.getInformation().getTempPfad() + getSystemSoftware().primaryMACAddress().replace(":", "_"));
if (!cacheDir.exists()) {
boolean success = cacheDir.mkdir();
LOG.debug("Created temp directory '{}' with result: {}", cacheDir, success);
View it on GitLab: https://salsa.debian.org/java-team/filius/-/compare/7f0b28dceab6e2e0b72966b81a214107d440ad84...8fbdc2e0f1c88b5b11ebbc474f153ffd4e51744f
--
View it on GitLab: https://salsa.debian.org/java-team/filius/-/compare/7f0b28dceab6e2e0b72966b81a214107d440ad84...8fbdc2e0f1c88b5b11ebbc474f153ffd4e51744f
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/20260613/df053701/attachment.htm>
More information about the pkg-java-commits
mailing list