From f26b3a873c07111dd300cbb407bd6e87a6b38768 Mon Sep 17 00:00:00 2001
From: pancake <pancake@nowsecure.com>
Date: Fri, 14 Jun 2024 19:18:10 +0200
Subject: [PATCH] Add a job to build the cydia package (#58)

---
 .github/workflows/ci.yml | 8 +++++++-
 COPYING                  | 2 +-
 LICENSE.md               | 2 +-
 Makefile                 | 6 ++----
 dist/cydia/Makefile      | 3 ++-
 main.c                   | 2 +-
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5e4d2bc..54dd82e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
-    - name: Dependencies
+    - name: ldid2
       run: |
         git clone https://github.com/razum2um/ldid
         cd ldid && make && cp -f ldid ldid2 /usr/local/bin
@@ -35,6 +35,12 @@ jobs:
       with:
         name: fsmon-ios
         path: fsmon-ios
+    - name: Cydia Package
+      run: make -C dist/cydia && cp -f dist/cydia/fsmon*.deb .
+    - uses: actions/upload-artifact@v4
+      with:
+        name: fsmon-cydia.zip
+        path: fsmon*.deb
   macos:
     runs-on: macos-latest
     steps:
diff --git a/COPYING b/COPYING
index ac314e2..17de251 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2016 NowSecure
+Copyright (c) 2015-2024 NowSecure
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/LICENSE.md b/LICENSE.md
index c08a078..bd24858 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 NowSecure, Inc
+Copyright (c) 2016-2024 NowSecure, Inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/Makefile b/Makefile
index 5e46162..1b0a8e6 100644
--- a/Makefile
+++ b/Makefile
@@ -95,10 +95,8 @@ all: macos
 oldios:
 	$(IOS_CC) $(CFLAGS) -DTARGET_IOS=1 -o fsmon-ios $(SOURCES) -framework CoreFoundation -framework MobileCoreServices
 	$(IOS_STRIP) fsmon-ios
-	if [ $(IOS_ON_DEVICE_COMPILE) != 1 ]; \
-	then \
-	    xcrun --sdk iphoneos codesign -f --entitlements ./entitlements.plist -s- fsmon-ios; \
-	fi
+	if [ $(IOS_ON_DEVICE_COMPILE) != 1 ]; then \
+		xcrun --sdk iphoneos codesign -f --entitlements ./entitlements.plist -s- fsmon-ios; fi
 
 IOS_FRAMEWORKS=-framework CoreFoundation -weak_framework MobileCoreServices -weak_framework CoreServices
 ios:
diff --git a/dist/cydia/Makefile b/dist/cydia/Makefile
index 8452ab7..6f0654d 100644
--- a/dist/cydia/Makefile
+++ b/dist/cydia/Makefile
@@ -1,10 +1,11 @@
 include ./CONFIG
 DEPENDS=
-PACKAGE_DIR?=${PWD}
+PACKAGE_DIR?=$(shell pwd)
 
 all:
 	$(SUDO) $(MAKE) mrproper
 	mkdir -p data root/usr/bin
+	$(MAKE) -C ../.. ios
 	cp -f ../../fsmon-ios root/usr/bin/fsmon
 	chmod +x root/usr/bin/fsmon
 	mkdir -p root/usr/share/man/man1
diff --git a/main.c b/main.c
index 4bf1e19..0f9be03 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* fsmon -- MIT - Copyright NowSecure 2015-2020 - pancake@nowsecure.com  */
+/* fsmon -- MIT - Copyright NowSecure 2015-2024 - pancake@nowsecure.com  */
 
 #include <stdio.h>
 #include <string.h>