upgpkg: 0.4.2-1

.gitlab-ci.yml

@@ -5,6 +5,8 @@ stages:
 
 before_script:
   - cp ./pacman.conf /etc/pacman.conf.builder
+  - cp -f ./pkg.cfg /etc/pkg/pkg.cfg
+  - pacman -Rdd s6-rc --noconfirm
 
 package:
   stage: build

trunk/LICENSE → LICENSE

-Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
-Copyright (c) 2018-2021 Jean-Michel T.Dydak <jean-michel@obarun.org>
+Copyright (c) 2024 Eric Vidal <eric@obarun.org>
 All rights reserved.
 
 Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.

pacman.conf

@@ -7,6 +7,9 @@ ParallelDownloads = 5
 SigLevel = Required
 LocalFileSigLevel = Optional
 
+[obcore-testing]
+Server = https://cloud.server.obarun.org/$repo/os/$arch/
+
 [obcore]
 Server = https://cloud.server.obarun.org/$repo/os/$arch/
 

pkg.cfg

+makepkg_opts=( "--noconfirm" "--nosign" "--syncdeps" "--rmdeps" "--clean" "--cleanbuild" "--nodeps" )
\ No newline at end of file

trunk/PKGBUILD

-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://git.obarun.org/pkg/observice/scandir-66serv"
-#-----------------------------------------------------------------------------------------------
+# Update: https://git.obarun.org/pkg/observice/scandir-66serv/-/commits/master
 
-#-----------------------------------------| DESCRIPTION |---------------------------------------
+service=scandir
 
-pkgbase=scandir-66serv
 pkgname=scandir@-66serv
 
-pkgdesc="Service to create a nested user scandir"
+pkgdesc="Service to create a nested user scandir for 66 service manager"
 
-pkgver=0.3.1
+pkgver=0.4.2
 pkgrel=1
 
-url="https://git.obarun.org/obmods/${pkgbase}.git"
+url="https://git.obarun.org/66-service/arch/${service}.git"
 
 track=tag
-target="v${pkgver}"
-source=("${pkgbase}::git+${url}#${track}=${target}")
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
+target=${pkgver}
+source=("${service}::git+${url}#${track}=${target}")
 
 makedepends=(
-    'git'
-)
-
-#--------------------------------------------| BUILD |-------------------------------------------
+    'git')
 
-build() {
-    cd "${pkgbase}"
+build(){
+    cd "${service}"
 
     ./configure \
-        --bindir=/usr/bin \
-        --with-system-service=/usr/lib/66/service \
-        --with-system-module=/usr/lib/66/module
-}
+        --prefix=/usr \
+        --version=${pkgver}
 
-#-------------------------------------------| PACKAGE |------------------------------------------
+}
 
 package() {
-    cd "${pkgbase}"
-
-    make DESTDIR="${pkgdir}" install
-
-    install -Dm 0644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE
+    cd "${service}"
 
+    make DESTDIR=${pkgdir} install
 }
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
 
 arch=('x86_64')
 
-depends=(
-    '66>=0.6.0.0'
-    '66-tools>=0.0.7.0'
-)
+pkgdepends=()
 
-optdepends=('dbus-66serv>=0.2.0: support of scandir environment configuration')
+depends+=(
+    '66>=0.7.0.0'
+    '66-tools>=0.1.0.1'
+    's6-linux-utils=2.6.2.0'
+    's6-portable-utils=2.3.0.3'
+    #"${pkgdepends}"
+    )
 
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
+optdepends=('dbus-66serv>=0.7.0: support of scandir environment configuration')
 
 sha512sums=('SKIP')