From f36abc3ab53fda714ca93ba380ca1ef00eb4c25b Mon Sep 17 00:00:00 2001
From: Filippo Carletti <filippo.carletti@gmail.com>
Date: Wed, 18 Sep 2024 15:07:13 +0200
Subject: [PATCH 1/2] Download rules for suricata-5

https://github.com/NethServer/dev/issues/7029
---
 .../e-smith/templates/etc/pulledpork/pulledpork.conf/20options  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root/etc/e-smith/templates/etc/pulledpork/pulledpork.conf/20options b/root/etc/e-smith/templates/etc/pulledpork/pulledpork.conf/20options
index a84e510..0a08136 100644
--- a/root/etc/e-smith/templates/etc/pulledpork/pulledpork.conf/20options
+++ b/root/etc/e-smith/templates/etc/pulledpork/pulledpork.conf/20options
@@ -152,7 +152,7 @@ IPRVersion=/etc/suricata/rules/iplists
 # This value MUST contain all 4 minor version
 # numbers. ET rules are now also dependant on this, verify supported ET versions
 # prior to simply throwing rubbish in this variable kthx!
-snort_version=suricata-4.0
+snort_version=suricata-5.0
 
 # Here you can specify what rule modification files to run automatically.
 # simply uncomment and specify the apt path.

From 629496768ff4a5f08dbb961eb3323ea153e17607 Mon Sep 17 00:00:00 2001
From: Filippo Carletti <filippo.carletti@gmail.com>
Date: Wed, 18 Sep 2024 16:35:21 +0200
Subject: [PATCH 2/2] CI: remove Travis, add GH

---
 .github/workflows/make-rpms.yml | 57 +++++++++++++++++++++++++++++++++
 .travis.yml                     | 38 ----------------------
 2 files changed, 57 insertions(+), 38 deletions(-)
 create mode 100644 .github/workflows/make-rpms.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/make-rpms.yml b/.github/workflows/make-rpms.yml
new file mode 100644
index 0000000..e53883f
--- /dev/null
+++ b/.github/workflows/make-rpms.yml
@@ -0,0 +1,57 @@
+name: Make RPMs
+on:
+  push:
+    branches:
+      - master
+      - main
+  pull_request:
+jobs:
+  make-rpm:
+    runs-on: ubuntu-22.04
+    env:
+      dest_id: core
+      docker_image: ghcr.io/nethserver/makerpms:7
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ref: ${{ github.head_ref }}
+      - name: Generate .env file
+        run: |
+          cat > .env <<EOF
+            DEST_ID=${{ env.dest_id }}
+            NSVER=7
+            DOCKER_IMAGE=${{ env.docker_image }}
+            GITHUB_ACTIONS=1
+            GITHUB_HEAD_REF=${{ github.head_ref }}
+            GITHUB_REF=${{ github.ref }}
+            GITHUB_REPOSITORY=${{ github.repository }}
+            GITHUB_RUN_ID=${{ github.run_id }}
+            ENDPOINTS_PACK=${{ secrets.endpoints_pack }}
+            SECRET=${{ secrets.secret }}
+            SECRET_URL=${{ secrets.secret_url }}
+            AUTOBUILD_SECRET=${{ secrets.autobuild_secret }}
+            AUTOBUILD_SECRET_URL=${{ secrets.autobuild_secret_url }}
+          EOF
+      - name: Run prep-sources if present.
+        run: if test -f "prep-sources"; then ./prep-sources; fi
+      - name: Build RPM and publish
+        run: |
+          echo "Starting build..."
+          docker run --name makerpms \
+            --env-file .env \
+            --hostname $GITHUB_RUN_ID-$GITHUB_RUN_NUMBER.nethserver.org \
+            --volume $PWD:/srv/makerpms/src:ro \
+            ${{ env.docker_image }} \
+            makerpms-github -s *.spec
+          echo "Build succesful."
+          if [[ "${{ secrets.endpoints_pack }}" && "${{ secrets.secret }}" ]]; then
+            echo "Publish configuration exists, pushing package to repo."
+            docker commit makerpms nethserver/build
+            docker run \
+              --env-file .env \
+              nethserver/build \
+              uploadrpms-github
+            echo "Publish complete."
+          fi
+          rm .env
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 0593621..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-language: ruby
-services:
-    - docker
-branches:
-    only:
-        - master
-env:
-   global:
-    - DEST_ID=core
-    - NSVER=7
-    - DOCKER_IMAGE=nethserver/makerpms:${NSVER}
-    - >
-        EVARS="
-        -e DEST_ID
-        -e TRAVIS_BRANCH
-        -e TRAVIS_BUILD_ID
-        -e TRAVIS_PULL_REQUEST_BRANCH
-        -e TRAVIS_PULL_REQUEST
-        -e TRAVIS_REPO_SLUG
-        -e TRAVIS_TAG
-        -e NSVER
-        -e VERSIONS_PACK
-        -e STAGES_PACK
-        -e UPLOAD_DEST
-        "
-
-script: >
-    docker run -ti --name makerpms ${EVARS}
-    --hostname b${TRAVIS_BUILD_NUMBER}.nethserver.org
-    --volume $PWD:/srv/makerpms/src:ro ${DOCKER_IMAGE} makerpms-travis -s *.spec
-    && docker commit makerpms nethserver/build
-    && docker run -ti ${EVARS}
-    -e SECRET
-    -e SECRET_URL
-    -e AUTOBUILD_SECRET
-    -e AUTOBUILD_SECRET_URL
-    nethserver/build uploadrpms-travis