From 162252cdbd1793bb7c0e509f1a4e37ee3ccdc149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Berk=20=C3=87akar?= <berk.cakar@ug.bilkent.edu.tr>
Date: Thu, 29 Apr 2021 02:07:51 +0300
Subject: [PATCH] Fixed flatpak

---
 hardware/virtualization/flatpak/actions.py      | 11 +++++++----
 .../virtualization/flatpak/comar/package.py     | 17 +++++++++++++++++
 hardware/virtualization/flatpak/pspec.xml       | 10 ++++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 hardware/virtualization/flatpak/comar/package.py

diff --git a/hardware/virtualization/flatpak/actions.py b/hardware/virtualization/flatpak/actions.py
index c9e6999ea4..cbf91f2609 100644
--- a/hardware/virtualization/flatpak/actions.py
+++ b/hardware/virtualization/flatpak/actions.py
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2018 TUBITAK/UEKAE
 # Licensed under the GNU General Public License, version 2.
 # See the file http://www.gnu.org/copyleft/gpl.txt.
 
@@ -13,9 +12,13 @@ from pisi.actionsapi import get
 
 def setup():
     shelltools.system("NOCONFIGURE=1 ./autogen.sh")
-    autotools.configure("--with-priv-mode=setuid \
+    autotools.configure(" --enable-selinux-module=no \
                           --with-system-bubblewrap \
-                          --disable-static")
+                          --disable-static \
+                          --with-priv-mode=setuid \
+                          --with-profile-dir=/etc/profile.d \
+                          --with-dbus-config-dir=/usr/share/dbus-1/system.d \
+                          --disable-nls")
     
     pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
@@ -25,6 +28,6 @@ def build():
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
-    #pisitools.removeDir("/usr/share/selinux")
+    pisitools.removeDir("/usr/lib/systemd")
 
     pisitools.dodoc("COPYING", "README*", "NEWS")
diff --git a/hardware/virtualization/flatpak/comar/package.py b/hardware/virtualization/flatpak/comar/package.py
new file mode 100644
index 0000000000..f25412c7f7
--- /dev/null
+++ b/hardware/virtualization/flatpak/comar/package.py
@@ -0,0 +1,17 @@
+#!/usr/bin/python
+
+import os, re
+
+def postInstall(fromVersion, fromRelease, toVersion, toRelease):
+    try:
+        os.system("getent group flatpak || /usr/sbin/groupadd -g 93 flatpak")
+        os.system("getent passwd flatpak || /usr/sbin/useradd -g flatpak -u 93 -d /var/empty -s /bin/false -c 'flatpak User' flatpak")
+        os.system("/usr/bin/passwd -l flatpak")
+    except:
+        pass
+
+def preRemove():
+    try:
+        os.system ("groupdel flatpak")
+    except:
+        pass
\ No newline at end of file
diff --git a/hardware/virtualization/flatpak/pspec.xml b/hardware/virtualization/flatpak/pspec.xml
index c2f42ab42a..91a488134a 100644
--- a/hardware/virtualization/flatpak/pspec.xml
+++ b/hardware/virtualization/flatpak/pspec.xml
@@ -79,6 +79,9 @@
             <AdditionalFile target="/etc/profile.d/flatpak-bindir.sh" permission="0644" owner="root">flatpak-bindir.sh</AdditionalFile>
             <AdditionalFile target="/usr/share/flatpak/flathub.flatpakrepo" permission="0644" owner="root">flathub.flatpakrepo</AdditionalFile>
         </AdditionalFiles>
+        <Provides>
+            <COMAR script="package.py">System.Package</COMAR>
+        </Provides>
     </Package>
 
     <Package>
@@ -106,6 +109,13 @@
     </Package>
 
     <History>
+        <Update release="13">
+            <Date>2021-04-29</Date>
+            <Version>1.10.2</Version>
+            <Comment>Fixed flatpak does nothing</Comment>
+            <Name>Berk Çakar</Name>
+            <Email>berk2238@hotmail.com</Email>
+        </Update>
     	<Update release="12">
             <Date>2021-04-25</Date>
             <Version>1.10.2</Version>