upg audit libseccomp 66

This commit is contained in:
joborun linux 2022-04-22 22:14:33 +03:00
parent fbc3a534c1
commit 66f6d42d7c
9 changed files with 134 additions and 79 deletions

View File

@ -7,18 +7,26 @@
pkgbase=audit
pkgname=('audit' 'python-audit')
pkgver=3.0.7
pkgver=3.0.8
pkgrel=01
pkgdesc='Userspace components of the audit framework w/o systemd'
pkgdesc="Userspace components of the audit framework w/o systemd"
url='https://people.redhat.com/sgrubb/audit'
arch=('x86_64')
makedepends=('glibc' 'krb5' 'libcap-ng' 'libldap' 'swig' 'linux-lts-headers' 'python')
arch=(x86_64)
makedepends=(glibc krb5 libcap-ng libldap swig linux-lts-headers python)
options=(emptydirs)
#options=('emptydirs' 'debug')
source=(${url}/${pkgname}-${pkgver}.tar.gz)
#options=(emptydirs debug) # comment above options uncomment this to have debug packages produced
source=($url/$pkgname-$pkgver.tar.gz
$pkgbase-3.0.8-config_paths.patch)
prepare() {
# replace the use of /sbin with /usr/bin in configs
patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-3.0.8-config_paths.patch
}
build() {
cd ${pkgbase}-${pkgver}
cd $pkgbase-$pkgver
./configure \
--prefix=/usr \
--sbindir=/usr/bin \
@ -27,13 +35,15 @@ build() {
--enable-gssapi-krb5=yes \
--enable-systemd=no \
--with-libcap-ng=yes
make
[ -n "${SOURCE_DATE_EPOCH}" ] && touch -h -d @$SOURCE_DATE_EPOCH bindings/swig/python/audit.py
# prevent excessive overlinking due to libtool
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
[ -n "$SOURCE_DATE_EPOCH" ] && touch -h -d @$SOURCE_DATE_EPOCH bindings/swig/python/audit.py
}
package_audit() {
depends=('glibc' 'krb5' libkrb5.so libgssapi_krb5.so 'libcap-ng' libcap-ng.so)
provides=('libaudit.so' 'libauparse.so')
depends=(glibc krb5 libkrb5.so libgssapi_krb5.so libcap-ng libcap-ng.so)
provides=(libaudit.so libauparse.so)
backup=(
etc/libaudit.conf
etc/audit/audit-stop.rules
@ -46,30 +56,28 @@ package_audit() {
etc/audit/plugins.d/syslog.conf
)
cd ${pkgbase}-${pkgver}
make DESTDIR="${pkgdir}" INSTALL='install -p' install
make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver
cd "${pkgdir}"
install -d -m 0700 var/log/audit
rm -rf etc/rc.d \
etc/sysconfig \
usr/lib/audit \
usr/lib/python*
# add log dir
install -vdm 700 "$pkgdir/var/log/$pkgname"
sed -ri 's|/sbin|/usr/bin|' \
etc/audit/*.conf \
etc/audit/plugins.d/*.conf
# remove legacy files
rm -frv "$pkgdir/usr/lib/audit"
# remove files provided by python-audit
rm -frv "$pkgdir/usr/lib/python"*
}
package_python-audit() {
depends=('python' 'audit')
depends=(audit libaudit.so libauparse.so glibc python)
pkgdesc+=' (python bindings)'
cd ${pkgbase}-${pkgver}
make -C bindings DESTDIR="${pkgdir}" INSTALL='install -p' install
make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver/bindings
}
#---- license gpg-key sha512sums ----
license=('GPL')
license=(GPL LGPL2.1)
sha256sums=(8b4c78632a9301a1c7f859b0e38fc0b9c260b8214d6b7c771bf28b3d73a62597) # audit-3.0.7.tar.gz
sha256sums=(b5f4d9b9ad69381ee18f33d3d918326aa52861509c901143f8a8c4ed5caa8913 # audit-3.0.8.tar.gz
c3647e09d1a973595d8e43e373b8644dfb7131328c7fb3e229593af02c72ca42) # audit-3.0.8-config_paths.patch

View File

@ -1,5 +1,6 @@
# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
# Maintainer : Christian Rebischke <Chris.Rebischke@archlinux.org>
# Maintainer: David Runge <dvzrv@archlinux.org>
# Contributor: Christian Rebischke <Chris.Rebischke@archlinux.org>
# Contributor: Daniel Micay <danielmicay@gmail.com>
# Contributor: <kang@insecure.ws>
# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
@ -7,26 +8,31 @@
# Contributor: henning mueller <henning@orgizm.net>
pkgbase=audit
pkgname=('audit' 'python-audit')
pkgver=3.0.7
pkgname=(audit python-audit)
pkgver=3.0.8
pkgrel=1
pkgdesc='Userspace components of the audit framework'
url='https://people.redhat.com/sgrubb/audit'
arch=('x86_64')
makedepends=('glibc' 'krb5' 'libcap-ng' 'libldap' 'swig' 'linux-headers' 'python')
license=('GPL')
options=('emptydirs' 'debug')
source=(https://people.redhat.com/sgrubb/audit/${pkgname}-${pkgver}.tar.gz)
sha512sums=('b5662b32082fc2ac54e247aa0db5442d76afa30134ebba1d624a17004e9ccf6856bb75344af4ce9d9a0a66c03e1c6f18b7d45658d7df13ea71af0c8362e08d70')
b2sums=('706db746fb779913619da794bab24a9e890e1655bbd0abb007cbc909b32ab1d643e93953a23ef864d5e189f3447a7ddb4dca1478144cdc226f5a5594545bd28f')
arch=(x86_64)
makedepends=(glibc krb5 libcap-ng libldap linux-headers python swig)
license=(GPL2 LGPL2.1)
options=(debug emptydirs)
source=(
https://people.redhat.com/sgrubb/audit/$pkgname-$pkgver.tar.gz
$pkgbase-3.0.8-config_paths.patch
)
sha512sums=('8379bf425d68381d182300e628e42de8460d2f3e15b2395e10880f94b9989656852a50a9bece75b632ec8a04c40c9e666ff4c9d6b25ace3a8f50d2011506afab'
'bc699123f810abcf9300728bf61d7fcfcc83677b75fbeb713fb24cc11b2f9edf687661aab70766acde7c3c41c6a62f8e0a54cdfb49d1c7ce2246b67fbe3feec5')
b2sums=('38a35a7540e608127cfc54a2de2cb12df8c29e778799ca53318824c84565a67b7ea131f9bba455fa469ce9139a27908738f571a6e383ce9a3274f70c09d27ec7'
'50be1b4f76ace20d8d14b4c57a9bb69daa3da35fd654aca8730bc287682fe38f1c1917b37469fb087daf9f309ffc15cca15f54166ece0a055f540c2604778fc6')
prepare() {
cd ${pkgbase}-${pkgver}
sed 's|/var/run/auditd.pid|/run/auditd.pid|' -i init.d/auditd.service
# replace the use of /sbin with /usr/bin in configs
patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-3.0.8-config_paths.patch
}
build() {
cd ${pkgbase}-${pkgver}
cd $pkgbase-$pkgver
./configure \
--prefix=/usr \
--sbindir=/usr/bin \
@ -35,13 +41,15 @@ build() {
--enable-gssapi-krb5=yes \
--enable-systemd=yes \
--with-libcap-ng=yes
# prevent excessive overlinking due to libtool
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
[ -n "${SOURCE_DATE_EPOCH}" ] && touch -h -d @$SOURCE_DATE_EPOCH bindings/swig/python/audit.py
[ -n "$SOURCE_DATE_EPOCH" ] && touch -h -d @$SOURCE_DATE_EPOCH bindings/swig/python/audit.py
}
package_audit() {
depends=('glibc' 'krb5' libkrb5.so libgssapi_krb5.so 'libcap-ng' libcap-ng.so)
provides=('libaudit.so' 'libauparse.so')
depends=(glibc krb5 libkrb5.so libgssapi_krb5.so libcap-ng libcap-ng.so)
provides=(libaudit.so libauparse.so)
backup=(
etc/libaudit.conf
etc/audit/audit-stop.rules
@ -54,29 +62,23 @@ package_audit() {
etc/audit/plugins.d/syslog.conf
)
cd ${pkgbase}-${pkgver}
make DESTDIR="${pkgdir}" INSTALL='install -p' install
make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver
cd "${pkgdir}"
install -d -m 0700 var/log/audit
rm -rf etc/rc.d \
etc/sysconfig \
usr/lib/audit \
usr/lib/python*
# add log dir
install -vdm 700 "$pkgdir/var/log/$pkgname"
sed -ri 's|/sbin|/usr/bin|' \
etc/audit/*.conf \
etc/audit/plugins.d/*.conf \
usr/lib/systemd/system/auditd.service
# remove legacy files
rm -frv "$pkgdir/usr/lib/audit"
chmod 644 usr/lib/systemd/system/auditd.service
# remove files provided by python-audit
rm -frv "$pkgdir/usr/lib/python"*
}
package_python-audit() {
depends=('python' 'audit')
depends=(audit libaudit.so libauparse.so glibc python)
pkgdesc+=' (python bindings)'
cd ${pkgbase}-${pkgver}
make -C bindings DESTDIR="${pkgdir}" INSTALL='install -p' install
make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver/bindings
}
# vim: ts=2 sw=2 et:

View File

@ -0,0 +1,36 @@
diff -ruN a/audisp/plugins/remote/au-remote.conf b/audisp/plugins/remote/au-remote.conf
--- a/audisp/plugins/remote/au-remote.conf 2022-03-29 22:52:34.000000000 +0200
+++ b/audisp/plugins/remote/au-remote.conf 2022-04-21 11:11:55.685862988 +0200
@@ -5,7 +5,7 @@
active = no
direction = out
-path = /sbin/audisp-remote
+path = /usr/bin/audisp-remote
type = always
#args =
format = string
diff -ruN a/audisp/plugins/syslog/syslog.conf b/audisp/plugins/syslog/syslog.conf
--- a/audisp/plugins/syslog/syslog.conf 2022-03-29 22:52:34.000000000 +0200
+++ b/audisp/plugins/syslog/syslog.conf 2022-04-21 11:12:54.669352650 +0200
@@ -8,7 +8,7 @@
active = no
direction = out
-path = /sbin/audisp-syslog
+path = /usr/bin/audisp-syslog
type = always
args = LOG_INFO
format = string
diff -ruN a/audisp/plugins/zos-remote/audispd-zos-remote.conf b/audisp/plugins/zos-remote/audispd-zos-remote.conf
--- a/audisp/plugins/zos-remote/audispd-zos-remote.conf 2022-03-29 22:52:34.000000000 +0200
+++ b/audisp/plugins/zos-remote/audispd-zos-remote.conf 2022-04-21 11:12:26.419277793 +0200
@@ -8,7 +8,7 @@
active = no
direction = out
-path = /sbin/audispd-zos-remote
+path = /usr/bin/audispd-zos-remote
type = always
args = /etc/audit/zos-remote.conf
format = string

View File

@ -1,3 +1,4 @@
swig
linux-lts-headers
python

View File

@ -1,13 +1,14 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgbase=libseccomp
pkgname=(libseccomp python-libseccomp)
pkgver=2.5.3
pkgrel=03
pkgver=2.5.4
pkgrel=01
pkgdesc='Enhanced seccomp library'
arch=('x86_64')
url="https://github.com/seccomp/libseccomp"
@ -54,5 +55,5 @@ license=('LGPL2.1')
validpgpkeys=('7100AADFAE6E6E940D2E0AD655E45A5AE8CA7C8A' # Paul Moore <paul@paul-moore.com>
'47A68FCE37C7D7024FD65E11356CE62C2B524099') # Tom Hromatka <tom.hromatka@oracle.com>
sha256sums=(59065c8733364725e9721ba48c3a99bbc52af921daf48df4b1e012fbc7b10a76 # libseccomp-2.5.3.tar.gz
cc1cbe9d9eb6a67b78de107eb37b2bc8d7599e3c1d36699ae2528db489cb5d44) # libseccomp-2.5.3.tar.gz.asc
sha256sums=(d82902400405cf0068574ef3dc1fe5f5926207543ba1ae6f8e7a1576351dcbdb # libseccomp-2.5.4.tar.gz
af37e70eb422e6f983c1f135a3abb342c3b787716520b71bd774e4906003807f) # libseccomp-2.5.4.tar.gz.asc

View File

@ -5,8 +5,8 @@
pkgbase=libseccomp
pkgname=(libseccomp python-libseccomp)
pkgver=2.5.3
pkgrel=3
pkgver=2.5.4
pkgrel=1
pkgdesc='Enhanced seccomp library'
arch=('x86_64')
license=('LGPL2.1')
@ -15,9 +15,9 @@ depends=('glibc')
checkdepends=('valgrind')
makedepends=('gperf' 'cython' 'python-setuptools')
source=(https://github.com/seccomp/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz{,.asc})
sha256sums=('59065c8733364725e9721ba48c3a99bbc52af921daf48df4b1e012fbc7b10a76'
sha256sums=('d82902400405cf0068574ef3dc1fe5f5926207543ba1ae6f8e7a1576351dcbdb'
'SKIP')
b2sums=('cedf04b3a926f9fe5202e6169ddac6b983e755009c14fc1d645157b9c0bcdf65d4085f8ea7abad90f3a0c13ae4d66b5d8306e725168490863aad15976de1eae7'
b2sums=('38b134cb578f9355667546f92950ebcf8c53ccaf98db568db9aadfa9629c054136849e03d4bf9f09f73998fe66a5e8a9038573d19740b2bddf5518a8a0119229'
'SKIP')
validpgpkeys=(
'7100AADFAE6E6E940D2E0AD655E45A5AE8CA7C8A' # Paul Moore <paul@paul-moore.com>

View File

@ -1,3 +1,9 @@
gperf cython python-setuptools python valgrind
gperf
cython
python-setuptools
python
valgrind
autoconf
automake

View File

@ -4,13 +4,10 @@ post_install() {
fi
if ! getent passwd s6log >/dev/null; then
useradd -u 919 -g 19 -d / -c "S6 log user" -s /usr/bin/nologin s6log
useradd -u 19 -g 19 -d / -c "S6 log user" -s /usr/bin/nologin s6log
fi
if ! ls -l /var/log | grep 66 1>/dev/null; then
mkdir -p /var/log/66
chown -R s6log:log /var/log/66
fi
mkdir -m 0755 /var/log/66 2>/dev/null
}
post_upgrade() {

View File

@ -8,11 +8,12 @@
pkgname=66
pkgver=0.6.2.0
pkgrel=03
pkgrel=04
# change in uid for s6log
pkgdesc="Small tools built around s6 and s6-rc programs"
url='https://framagit.org/Obarun/66.git'
source=("${pkgname}::git+${url}#tag=v$pkgver")
source=("${pkgname}::git+${url}#tag=v$pkgver"
66.install)
# direct: https://git.obarun.org/pkg/obcore/66/-/raw/master/trunk/66.install
makedepends=('git' 'skalibs>=2.11.2.0' 'execline>=2.8.3.0' 's6>=2.11.1.0' 's6-rc>=0.5.2.3' 'oblibs>=0.1.4.0' 'lowdown' 'linux-api-headers')
@ -55,10 +56,12 @@ package() {
make DESTDIR="$pkgdir" install
## move wrapper at the correct place
mv "$pkgdir"/etc/66/init "$pkgdir"/usr/bin
## copy wrapper at the correct place
cp "$pkgdir"/etc/66/init "$pkgdir"/usr/bin
mkdir -p "$pkgdir"/usr/bin/s6
## move powerfunctions according to joborun66 ##
mv "$pkgdir"/etc/66/{halt,poweroff,reboot,shutdown} "$pkgdir"/usr/bin/s6
## 66 License ##
install -Dm 0644 LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
}
@ -66,4 +69,5 @@ package() {
license=(ISC)
sha256sums=(SKIP)
sha256sums=(SKIP
2560ad31407cf17fbec2e52526cb1515424b9436cb4c1664e64578b5d78326a3) # 66.install