From f18b85f10875650735eaf7949d6a7f7cc2b6c749 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Fri, 25 Mar 2022 02:17:16 +0200 Subject: [PATCH] libnetfilter and pacman correction --- libnetfilter_conntrack/PKGBUILD | 16 +++++++++----- libnetfilter_conntrack/PKGBUILD-arch | 6 +++--- libnetfilter_conntrack/key | 1 + pacman/PKGBUILD | 7 +++--- pacman/pacman.conf | 32 +++++++++++----------------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/libnetfilter_conntrack/PKGBUILD b/libnetfilter_conntrack/PKGBUILD index b9341ac..a5da1a5 100644 --- a/libnetfilter_conntrack/PKGBUILD +++ b/libnetfilter_conntrack/PKGBUILD @@ -1,11 +1,16 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run +# Maintainer : Joe Bo Run # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname" +# Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- +#---- license gpg-key sha256sums ---- + +sha256sums=(a) + pkgname=libnetfilter_conntrack -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=01 pkgdesc='Library providing an API to the in-kernel connection tracking state table' arch=('x86_64') @@ -28,7 +33,8 @@ package() { license=('GPL') -validpgpkeys=('C09DB2063F1D7034BA6152ADAB4655A126D292E4') # Netfilter Core Team +## replaced validpgpkeys=('C09DB2063F1D7034BA6152ADAB4655A126D292E4') # Netfilter Core Team +validpgpkeys=('37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team -sha256sums=(0cd13be008923528687af6c6b860f35392d49251c04ee0648282d36b1faec1cf # libnetfilter_conntrack-1.0.8.tar.bz2 - 832f7a92383d13953a2d8bdf06f651a045e45763ce2f5165b3944c187053c439) # libnetfilter_conntrack-1.0.8.tar.bz2.sig +sha256sums=(67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8 # libnetfilter_conntrack-1.0.9.tar.bz2 + 99e228ab85643b4c28e09d0a9d098a3429724a514c11b4302702a52e95c31fb1) # libnetfilter_conntrack-1.0.9.tar.bz2.sig diff --git a/libnetfilter_conntrack/PKGBUILD-arch b/libnetfilter_conntrack/PKGBUILD-arch index d498b43..260fcd1 100644 --- a/libnetfilter_conntrack/PKGBUILD-arch +++ b/libnetfilter_conntrack/PKGBUILD-arch @@ -4,16 +4,16 @@ # Contributor: Kevin Edmonds pkgname=libnetfilter_conntrack -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc='Library providing an API to the in-kernel connection tracking state table' arch=('x86_64') depends=('libnfnetlink' 'libmnl') url='https://www.netfilter.org/projects/libnetfilter_conntrack/' license=('GPL') -validpgpkeys=('C09DB2063F1D7034BA6152ADAB4655A126D292E4') # Netfilter Core Team +validpgpkeys=('37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team source=("https://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"{,.sig}) -sha256sums=('0cd13be008923528687af6c6b860f35392d49251c04ee0648282d36b1faec1cf' +sha256sums=('67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8' 'SKIP') build() { diff --git a/libnetfilter_conntrack/key b/libnetfilter_conntrack/key index 00bdeb8..a9765a9 100644 --- a/libnetfilter_conntrack/key +++ b/libnetfilter_conntrack/key @@ -1 +1,2 @@ gpg -v --recv-key AB4655A126D292E4 +gpg --recv-keys AB4655A126D292E4 diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD index 8084242..0a7ee1f 100644 --- a/pacman/PKGBUILD +++ b/pacman/PKGBUILD @@ -7,7 +7,7 @@ pkgname=pacman pkgver=6.0.1 -pkgrel=06 +pkgrel=07 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') url="https://www.archlinux.org/pacman/" @@ -24,7 +24,8 @@ backup=(etc/pacman.conf options=(strip) source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig} add-flto-to-LDFLAGS-for-clang.patch -# sync_first_option.patch +# sync_first_option.patch # an Obarun patch that ensures upgraded keyrings preceed +# remaining upgrades, so new packages don't get rejected makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch libmakepkg-add-extra-buildflags-only-when-buildflags.patch make-link-time-optimization-flags-configurable.patch @@ -86,5 +87,5 @@ sha256sums=(0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731 # p b940e6c0c05a185dce1dbb9da0dcbebf742fca7a63f3e3308d49205afe5a6582 # makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch 7d0aee976c9c71fcf7c96ef1d99aa76efe47d8c1f4451842d6d159ec7deb4278 # libmakepkg-add-extra-buildflags-only-when-buildflags.patch 5b43e26a76be3ed10a69d4bfb2be48db8cce359baf46583411c7f124737ebe6a # make-link-time-optimization-flags-configurable.patch - 80fe3184d5c77d5d393a21b953df9cde60818ae08e4682469be557326df3c565 # pacman.conf + aa2e113eba452b9d9fef85aa87333370ae2d3bb0e06df4b0776e04c3ec76d028 # pacman.conf 9610c7c1d3c58359d88ee0b266766c002f1b0109ddc7a1cea36b35f2ef6d0079) # makepkg.conf diff --git a/pacman/pacman.conf b/pacman/pacman.conf index ede88ef..31e1809 100644 --- a/pacman/pacman.conf +++ b/pacman/pacman.conf @@ -22,7 +22,6 @@ HoldPkg = pacman glibc Architecture = auto # With this patch created by obarun, if there is a keyring update # the keyrings will update first then all other packages, so they don't fail! -SyncFirst = joborunt-keyring obarun-keyring archlinux-keyring # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup IgnorePkg = systemd systemd-libs elogind libelogind @@ -43,7 +42,10 @@ ILoveCandy # By default, pacman accepts packages signed by keys that its local keyring # trusts (see pacman-key and its man page), as well as unsigned packages. -SigLevel = Never DatabaseOptional +# After you install all 3 keyrings you can switch Siglevel to Required for Obarun and Archlinux +# We have not begun signing packages yet, it will be done late in the beta phase +# We turn it to never for now to avoid pacman problems with properly installing keys. +SigLevel = Never #LocalFileSigLevel = Optional #RemoteFileSigLevel = Required @@ -82,15 +84,22 @@ SigLevel = Never DatabaseOptional # [jobcore] +SigLevel = Never #Server = file:///var/cache/jobcore/ Server = https://osdn.net/projects/joborun/storage/jobcore/ [jobextra] +SigLevel = Never #Server = file:///var/cache/jobextra/ Server = https://osdn.net/projects/joborun/storage/jobextra/ -# [jobcomm] +[jobcomm] +SigLevel = Never # Server = file:///var/cache/jobcomm/ +# This repository has no binaries, just a database indicating +# packages that need an upgrade and which you must built on your own +Server = https://osdn.net/projects/joborun/storage/jobcomm/ + # This repository is being tested, with the intention of # staying local and not provide binaries. It can be found # in source git.disroot.org/joborun-pkg/jobcomm @@ -105,43 +114,33 @@ Server = https://osdn.net/projects/joborun/storage/jobextra/ #### before implementing strict rules on downloading pkgs! #[obcore-testing] -#SigLevel = Never #Server = https://repo.obarun.org/obcore-testing [obcore] -SigLevel = Never Server = https://repo.obarun.org/obcore #[obextra-testing] -#SigLevel = Never #Server = https://repo.obarun.org/obextra-testing [obextra] -SigLevel = Never Server = https://repo.obarun.org/obextra #[obcommunity-testing] -#SigLevel = Never #Server = https://repo.obarun.org/obcommunity-testing [obcommunity] -SigLevel = Never Server = https://repo.obarun.org/obcommunity #[obmultilib-testing] -#SigLevel = Never #Server = https://repo.obarun.org/obmultilib-testing #[obmultilib] -#SigLevel = Never #Server = https://repo.obarun.org/obmultilib #[observice-testing] -#SigLevel = Never #Server = https://repo.obarun.org/observice-testing [observice] -SigLevel = Never Server = https://repo.obarun.org/observice #### Arch begins here ####### @@ -151,34 +150,27 @@ Server = https://repo.obarun.org/observice # to cover combatibility with Arch's extra/testing pkgs [testing] -SigLevel = DatabaseOptional Include = /etc/pacman.d/mirrorlist [core] -SigLevel = DatabaseOptional Include = /etc/pacman.d/mirrorlist [extra] -SigLevel = DatabaseOptional Include = /etc/pacman.d/mirrorlist #[community-testing] -#SigLevel = DatabaseOptional #Include = /etc/pacman.d/mirrorlist [community] -SigLevel = DatabaseOptional Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, # enable the multilib repositories as required here. #[multilib-testing] -#SigLevel = DatabaseOptional #Include = /etc/pacman.d/mirrorlist [multilib] -SigLevel = DatabaseOptional Include = /etc/pacman.d/mirrorlist #### Spark-Linux begins here #######