.github/build-canary-v3

@@ -1 +0,0 @@
-1

.github/build-nest-v3

@@ -1 +0,0 @@
-1

.github/release-canary-v3

@@ -1 +0,0 @@
-6

.github/release-nest-v3

@@ -1 +0,0 @@
-1

.github/workflows/build-canaryv3.yml

@@ -1,37 +0,0 @@
-name: PikaOS Package Build Only (Canary) (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/build-canary-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh

.github/workflows/build-nestv3.yml

@@ -1,37 +0,0 @@
-name: PikaOS Package Build Only (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/build-nest-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh

.github/workflows/release-canaryv3.yml

@@ -1,40 +0,0 @@
-name: PikaOS Package Build & Release (Canary) (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/release-canary-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh
-
-    - name: Release Package
-      run: ./release.sh

.github/workflows/release-nestv3.yml

@@ -1,40 +0,0 @@
-name: PikaOS Package Build & Release (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/release-nest-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh
-
-    - name: Release Package
-      run: ./release.sh

.github/workflows/release.yml

@@ -7,13 +7,16 @@ jobs:
   build:
     runs-on: self-hosted
     container:
-      image: ghcr.io/pikaos-linux/pika-package-container:latest
+      image: ubuntu:22.10
       volumes:
         - /proc:/proc
       options: --privileged -it
 
     steps:
     - uses: actions/checkout@v3
+  
+    - name: Install needed packages
+      run: apt update && apt install software-properties-common sudo git bc gpg gpg-agent bison build-essential ccache cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar reprepro dpkg-sig devscripts dh-make -y
 
     - name: Import GPG key
       id: import_gpg
@@ -35,12 +38,3 @@ jobs:
 
     - name: Release Package
       run: ./release.sh
-
-    - name: Purge cache
-      uses: strrife/cloudflare-chunked-purge-action@master
-      env:
-        # Zone is required by both authentication methods
-        CLOUDFLARE_ZONE: ${{ secrets.CLOUDFLARE_ZONE }}
-
-        CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
-        PURGE_URLS: ${{ secrets.PURGE_URLS }}

LICENSE.md

@@ -1,24 +0,0 @@
-MIT License (With DPKG packaging compatibility)
-
-Copyright (c) 2024 PikaOS
-
-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:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Notes:
-The files covered by this license are any files and directories in the root of this repository (including but not limited to: `main.sh`, `release.sh`, and `.github`), with the exception of the `debian` directory and its contents if `debian/copyright` exists, and declares any files or directories as a different LICENSE/COPYRIGHT.

debian/TODO

@@ -0,0 +1 @@
+* fix hardening-no-pie

debian/changelog

@@ -1,23 +1,3 @@
-goverlay (2:1.1.1-101pika2) pika; urgency=medium
-
-  * New upstream release + Update to PikaOS 4
-
- -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 15 Oct 2022 18:58:00 +0300
-
-goverlay (1:0.9.1-100pika1) pikauwu; urgency=medium
-
-  * Update to pikauwu
-
- -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 15 Oct 2022 18:58:00 +0300
-
-
-goverlay (1:0.9.1-99pika1.lunar) lunar; urgency=medium
-
-  * Update to lunar
-
- -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 15 Oct 2022 18:58:00 +0300
-
-
 goverlay (1:0.9.1-99pika1) kinetic; urgency=medium
 
   * Initial Push to PPA

debian/control

@@ -9,10 +9,11 @@ Build-Depends: debhelper-compat (= 13),
                lcl-qt5,
                lazarus-src,
                libgl-dev,
-               libqt6pas6-dev,
 Rules-Requires-Root: no
 Standards-Version: 4.6.1
 Homepage: https://github.com/benjamimgois/goverlay
+Vcs-Browser: https://salsa.debian.org/games-team/goverlay
+Vcs-Git: https://salsa.debian.org/games-team/goverlay.git
 
 Package: goverlay
 Architecture: any
@@ -21,9 +22,8 @@ Depends: ${misc:Depends},
          mangohud,
          mesa-utils,
          vulkan-tools,
-         libqt6pas6,
          git,
-Recommends: vkbasalt, mangohud:i386
+Recommends: vkbasalt,
 Suggests: breeze,
           adwaita-qt,
 Description: Graphical UI to help manage Vulkan / OpenGL overlays

debian/gbp.conf

@@ -0,0 +1,4 @@
+[DEFAULT]
+debian-branch = debian/latest
+upstream-branch = upstream/latest
+filter = .gitignore

debian/salsa-ci.yml

@@ -0,0 +1,3 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml

debian/upstream/metadata

@@ -0,0 +1,4 @@
+Bug-Database: https://github.com/benjamimgois/goverlay/issues
+Bug-Submit: https://github.com/benjamimgois/goverlay/issues/new
+Repository: https://github.com/benjamimgois/goverlay.git
+Repository-Browse: https://github.com/benjamimgois/goverlay

debian/watch

@@ -0,0 +1,2 @@
+version=4
+https://github.com/benjamimgois/goverlay/tags (?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@

main.sh

@@ -1,32 +1,23 @@
-#! /bin/bash
+DEBIAN_FRONTEND=noninteractive
-
-set -e
-
-VERSION="1.1.1"
-
-source ./pika-build-config.sh
-
-echo "$PIKA_BUILD_ARCH" > pika-build-arch
-
-# temp lib
-if [[ $(cat ./.github/release-canary-v3) == "6" ]]
-then
-	wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.8/libqt6pas6-dev_6.2.8-1_amd64.deb -O ./libqt6pas6-dev.deb
-	wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.8/libqt6pas6_6.2.8-1_amd64.deb -O ./libqt6pas6.deb
-	apt-get install ./libqt6pas6-dev.deb ./libqt6pas6.deb -y
-fi
 
+# Add dependent repositories
+wget -q -O - https://ppa.pika-os.com/key.gpg | sudo apt-key add -
+add-apt-repository https://ppa.pika-os.com
+add-apt-repository ppa:pikaos/pika
+add-apt-repository ppa:kubuntu-ppa/backports
 # Clone Upstream
-git clone https://github.com/benjamimgois/goverlay -b "$VERSION"
+git clone https://github.com/benjamimgois/goverlay -b 0.9.1
 cp -rvf ./debian ./goverlay
 cd ./goverlay
 
 # Get build deps
+ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
+DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
 apt-get build-dep ./ -y
 
 # Build package
-LOGNAME=root dh_make --createorig -y -l -p goverlay_"$VERSION" || echo "dh-make: Ignoring Last Error"
+LOGNAME=root dh_make --createorig -y -l -p goverlay_0.9.1
-dpkg-buildpackage --no-sign
+dpkg-buildpackage
 
 # Move the debs to output
 cd ../

pika-build-config/amd64-v3.sh

@@ -1,10 +0,0 @@
-#! /bin/bash
-export PIKA_BUILD_ARCH="amd64-v3"
-export DEBIAN_FRONTEND="noninteractive"
-export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_BUILD_OPTIONS="nocheck notest terse"
-export DPKG_GENSYMBOLS_CHECK_LEVEL=0

pika-build-config/i386.sh

@@ -1,5 +0,0 @@
-#! /bin/bash
-export PIKA_BUILD_ARCH="i386"
-export DEBIAN_FRONTEND="noninteractive"
-export DEB_BUILD_OPTIONS="nocheck notest terse"
-export DPKG_GENSYMBOLS_CHECK_LEVEL=0

release.sh

@@ -1,2 +1,11 @@
-# send debs to server
+# Sign the packages
-rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/
+dpkg-sig --sign builder ./output/*.deb
+
+# Pull down existing ppa repo db files etc
+rsync -azP --exclude '*.deb' ferreo@direct.pika-os.com:/srv/www/pikappa/ ./output/repo
+
+# Add the new package to the repo
+reprepro -V --basedir ./output/repo/ includedeb kinetic ./output/*.deb
+
+# Push the updated ppa repo to the server
+rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/