PaisaNoSlim fix platform patch for libs.

2 files changed, 57 insertions, 6 deletions

diff --git a/src/main/paisa-nonslim/patches/allitnil.patch b/src/main/paisa-nonslim/patches/allitnil.patch
new file mode 100644
index 0000000..38ae4bf
--- /dev/null
+++ b/src/main/paisa-nonslim/patches/allitnil.patch
@@ -0,0 +1,48 @@
+
+  [SDCISA-15648] Just look what happens when we remove this
+
+  No idea why this lib got loaded. Comments do NOT tell anything useful. Also
+  the relevant jira issue (ISAVF-2413) is of no use, as it is no longer available.
+
+
+--- a/allitnil-domain/src/main/java/ch/post/it/paisa/allitnil/domain/printer/extendo/ExtendoNativeDriverLinux.java
++++ b/allitnil-domain/src/main/java/ch/post/it/paisa/allitnil/domain/printer/extendo/ExtendoNativeDriverLinux.java
+@@ -18,7 +18,6 @@ public class ExtendoNativeDriverLinux extends ExtendoNativeDriverAdapter {
+ 
+   private static final Logger LOGGER = LoggerFactory.getLogger(ExtendoNativeDriverLinux.class);
+ 
+-  public static final String LIB_PATH_LIBRT = "/native-64/librt.so.1";
+   public static final String LIB_PATH_LIBEXOTB = "/native-64/libExoTb.so.1.0";
+   public static final String LIB_PATH_LIBEXOAPI = "/native-64/libExoApi.so.1.0";
+ 
+@@ -27,15 +26,6 @@ public class ExtendoNativeDriverLinux extends ExtendoNativeDriverAdapter {
+   private String printerPath;
+   private int printerHandle = 0;
+ 
+-  /**
+-   * Library dependency deklarieren. Veranlasst das laden von libRt unter Linux.
+-   *
+-   * @see <a
+-   *     href="http://refspecs.linuxbase.org/LSB_3.1.0/LSB-Core-generic/LSB-Core-generic/librt.html">libRt
+-   *     - POSIX.1b Realtime Extensions library</a>
+-   */
+-  private interface LibRt extends Library {}
+-
+   /**
+    * Library dependency deklarieren. Veranlasst das laden von libRt unter Linux.
+    *
+@@ -47,7 +37,6 @@ public class ExtendoNativeDriverLinux extends ExtendoNativeDriverAdapter {
+ 
+   static {
+     try {
+-      Native.load(LIB_PATH_LIBRT, LibRt.class);
+       Native.load(LIB_PATH_LIBEXOTB, LibExoTb.class);
+       driver = Native.load(LIB_PATH_LIBEXOAPI, ExtendoNativeLibraryLinux.class);
+     } catch (Exception e) {
+
+
+  TODO rm allitnil-domain/src/main/resources/native-32/librt.so.1
+
+  TODO rm allitnil-domain/src/main/resources/native-64/librt.so.1
+
+
diff --git a/src/main/paisa-nonslim/patches/platform.patch b/src/main/paisa-nonslim/patches/platform.patch
index f6ab36b..6eb8c6e 100644
--- a/src/main/paisa-nonslim/patches/platform.patch
+++ b/src/main/paisa-nonslim/patches/platform.patch
@@ -17,8 +17,6 @@
 
 
   Mit mario debugging herausgefunden
-  (index 5f8d03973..16e9554eb 100644)
-
 
 --- a/alice/alice-docker/alice-docker-service-base/Dockerfile
 +++ b/alice/alice-docker/alice-docker-service-base/Dockerfile
@@ -31,18 +29,23 @@
  RUN sed -i -e "s|platform_version|${PROJECT_VERSION}|g"  ${JETTY_HOME}/modules/AllowNullPathInfo.mod
  WORKDIR ${JETTY_HOME}
  
-@@ -30,8 +30,13 @@ RUN apt-get update                                          && \
+@@ -26,12 +26,18 @@
+         pulseaudio pulseaudio-utils                         \
+         libncurses5                                         \
+         i2c-tools sudo vim gzip procps psmisc tar socat     \
++        libusb-1.0-0 `# used by allitnil/caveman`           \
+         tcpdump lsof telnet net-tools                       && \
      apt-get clean all                                       && \
      # TODO: may be unused
      chmod +x ./bin/jetty.sh                                 && \
 -    chmod +x ./bin/start-jetty.sh                                 && \
-+    chmod +x ./bin/start-jetty.sh                           && \
 -    chmod u+s /usr/bin/tcpdump
++    chmod +x ./bin/start-jetty.sh                           && \
 +    chmod u+s /usr/bin/tcpdump                              && \
-+    # needed for tty devices (add to base-jetty)            && \
++    # needed for tty devices (add to base-jetty)
 +    groupmod -g 18 dialout                                  && \
 +    groupmod -g 63 audio                                    && \
-+    # TODO remove as soon as it is fixed in base-jetty      && \
++    # remove as soon as it is fixed in base-jetty
 +    usermod -a -G 5,7,18,63,jetty,2001,2002 jetty
  
  # switch back to non-root