joborun-pkg/jobextra
joborun-pkg
/
jobextra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upg at-spi2-core mercurial net-snmp nut ostree pacman-contrib syslog-ng

This commit is contained in:
joborun linux 2024-03-17 01:21:18 +02:00
parent 36a350ffcf
commit 6a551621a5
19 changed files with 678 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
at-spi2-core/PKGBUILD
View File

@ -7,7 +7,7 @@
pkgbase=at-spi2-core
pkgname=(at-spi2-core) # at-spi2-core-docs) # uncomment the docs sections and modify this pkg list to build the docs documents
pkgver=2.50.1
pkgver=2.50.2
pkgrel=01
# Arch replaced makedependency from libsystemd to systemd, the reason for the rerun 2.44.0-2
# Let's see if it makes a difference to us :) :P
@ -16,7 +16,7 @@ url="https://gitlab.gnome.org/GNOME/at-spi2-core"
depends=(dbus glib2 libxtst xorg-xprop libx11 libxml2 gsettings-desktop-schemas)
makedepends=(gobject-introspection git meson gi-docgen python-sphinx)
checkdepends=(at-spi2-core)
_commit=ee07a30c836137d7653cdb26921ef966a3b47e1d # tags/AT_SPI2_CORE_2_50_1^0
_commit=f09f09517732e02af3cc6d62477b024ed9672896 # tags/AT_SPI2_CORE_2_50_2^0
# options=(debug) ## uncomment this to have the debug package built
source=("git+$url.git#commit=$_commit")
@ -94,5 +94,5 @@ license=(GPL2)
sha256sums=('SKIP')
## 12d1afc4139413684b5ac9bd32347de47e8cbadbde9516a2f8436e2af3dd4528 at-spi2-core-2.50.1-01-x86_64.pkg.tar.lz
## 7aa63f7892a8c2c634eaf125e98f20b42e059f46d694e74c7dfa6f41f5d47615 at-spi2-core-2.50.2-01-x86_64.pkg.tar.lz

7
at-spi2-core/PKGBUILD-arch
View File

@ -1,4 +1,5 @@
# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
# Maintainer: Fabian Bornschein <fabiscafe@archlinux.org>
# Contributor: Ionut Biru <ibiru@archlinux.org>
pkgbase=at-spi2-core
@ -6,12 +7,12 @@ pkgname=(
at-spi2-core
at-spi2-core-docs
)
pkgver=2.50.1
pkgver=2.50.2
pkgrel=1
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
url="https://gitlab.gnome.org/GNOME/at-spi2-core"
arch=(x86_64)
license=(GPL2)
license=(LGPL-2.1-or-later)
depends=(
dbus
glib2
@ -33,7 +34,7 @@ makedepends=(
checkdepends=(
at-spi2-core
)
_commit=ee07a30c836137d7653cdb26921ef966a3b47e1d # tags/AT_SPI2_CORE_2_50_1^0
_commit=f09f09517732e02af3cc6d62477b024ed9672896 # tags/AT_SPI2_CORE_2_50_2^0
source=("git+https://gitlab.gnome.org/GNOME/at-spi2-core.git#commit=$_commit")
b2sums=('SKIP')

13
mercurial/PKGBUILD
View File

@ -6,7 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=mercurial
pkgver=6.6.3
pkgver=6.7
pkgrel=01
pkgdesc='A scalable distributed SCM tool'
url="https://www.mercurial-scm.org/"
@ -74,9 +74,14 @@ validpgpkeys=(2BCCE14F5C6725AA2EA8AEB7B9C9DC824AA5BDD5 #
818D87CD1AC180C394C86E633A33DE460D9EC39F # Pulkit Goyal <7895pulkit@gmail.com>
1F66F8CDF654E905C11DA061A11E01CD0E05D956) # Raphaël Gomès <alphare@raphaelgomes.dev>
sha256sums=(f75d6a4a75823a1b7d713a4967eca2f596f466e58fc6bc06d72642932fd7e307 # mercurial-6.6.3.tar.gz
879623d4c4cc62fb2c8636b058431950095e5c0397c65a7e8fbae4dd52c725d9 # mercurial-6.6.3.tar.gz.asc
sha512sums=('c25fccb334702f2d3d228c16e1842cc6d0f258ca7f278f8e9cd270220073b3d851bb9c8eedfa837255d99f3159fd8b0f9f5373e20b779ee625ea946869c80165'
'SKIP'
'710dcddb24d928efc97370e869d9caa083107929ed9a1086dd2a3ae0caaf2c71e2f29060597e29315b6b15b1616251c42412e268ce737109c48ae4d7aa1b9555')
sha256sums=(5358ed20604c67a7bc7ff81141f735586c328fbb6a18440d2e1e6cd0c044a4c6 # mercurial-6.7.tar.gz
ecdd7a953fe0394aeb7059897551374fa8b45fc0c696f10c556ea79a6df75105 # mercurial-6.7.tar.gz.asc
87427151713e689cd87dc50d50c048e0e58285815e4eb61962b50583532cbde5) # mercurial.profile
## dedac03d0f5dda39dfc9e616aed9d4522b705d033d371e0690260003978d8bdf mercurial-6.6.3-01-x86_64.pkg.tar.lz
## 0e3991e9dc80c4c6f52c0166154d393bd713bdf555c948e5ec7835616ea79319 mercurial-6.7-01-x86_64.pkg.tar.lz

7
mercurial/PKGBUILD-arch
View File

@ -1,9 +1,10 @@
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Maintainer: Caleb Maclennan <caleb@alerque.com>
# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=mercurial
pkgver=6.6.3
pkgver=6.7
pkgrel=1
pkgdesc='A scalable distributed SCM tool'
arch=(x86_64)
@ -29,7 +30,7 @@ validpgpkeys=(2BCCE14F5C6725AA2EA8AEB7B9C9DC824AA5BDD5
1F66F8CDF654E905C11DA061A11E01CD0E05D956) # Raphaël Gomès <alphare@raphaelgomes.dev>
source=(https://www.mercurial-scm.org/release/${pkgname}-${pkgver}.tar.gz{,.asc}
mercurial.profile)
sha512sums=('a7e0a466aa402659c1169a8c98c30be831b83cb7058416ed9cbe142977feda09008ff43f8c08c0dfdc217c449c6a1e8460cdcd62680e5dc1d0a632b52536486f'
sha512sums=('c25fccb334702f2d3d228c16e1842cc6d0f258ca7f278f8e9cd270220073b3d851bb9c8eedfa837255d99f3159fd8b0f9f5373e20b779ee625ea946869c80165'
'SKIP'
'710dcddb24d928efc97370e869d9caa083107929ed9a1086dd2a3ae0caaf2c71e2f29060597e29315b6b15b1616251c42412e268ce737109c48ae4d7aa1b9555')

1
mercurial/deps
View File

@ -2,6 +2,7 @@ python-docutils
python-build
python-installer
python-setuptools
python-typing_extensions
python-wheel
gettext

581
net-snmp/0001-pcre2.patch Normal file
View File

@ -0,0 +1,581 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: gagan sidhu <gagan@hotmail.com>
Date: Sun, 21 May 2023 15:47:36 -0600
Subject: [PATCH 1/3] add pcre2 support
(cherry picked from commit d3e95c87b32397815f6d5bcfc844259f2552697a)
Conflicts:
agent/mibgroup/host/data_access/swrun.c
agent/mibgroup/if-mib/data_access/interface.c
agent/mibgroup/struct.h
agent/mibgroup/ucd-snmp/proc.c
configure.d/config_os_libs1
include/net-snmp/data_access/interface.h
---
agent/mibgroup/host/data_access/swrun.c | 18 ++++++--
agent/mibgroup/if-mib/data_access/interface.c | 44 ++++++++++++++++---
agent/mibgroup/struct.h | 2 +-
agent/mibgroup/ucd-snmp/proc.c | 27 +++++++++---
agent/mibgroup/ucd-snmp/proc.h | 2 +-
configure.d/config_os_libs1 | 27 ++++++++++++
configure.d/config_project_with_enable | 4 ++
include/net-snmp/data_access/interface.h | 9 +++-
include/net-snmp/data_access/swrun.h | 2 +-
include/net-snmp/types.h | 2 +-
10 files changed, 116 insertions(+), 21 deletions(-)
diff --git a/agent/mibgroup/host/data_access/swrun.c b/agent/mibgroup/host/data_access/swrun.c
index f58143a0b7..f0442b4493 100644
--- a/agent/mibgroup/host/data_access/swrun.c
+++ b/agent/mibgroup/host/data_access/swrun.c
@@ -17,7 +17,10 @@
#include "swrun.h"
#include "swrun_private.h"
-#ifdef HAVE_PCRE_H
+#if defined(HAVE_PCRE2_H)
+#define PCRE2_CODE_UNIT_WIDTH 8
+#include <pcre2.h>
+#elif defined(HAVE_PCRE_H)
#include <pcre.h>
#endif
@@ -100,14 +103,21 @@ swrun_max_processes( void )
#endif /* NETSNMP_FEATURE_REMOVE_SWRUN_MAX_PROCESSES */
#ifndef NETSNMP_FEATURE_REMOVE_SWRUN_COUNT_PROCESSES_BY_REGEX
-#ifdef HAVE_PCRE_H
+#if defined(HAVE_PCRE2_H) || defined(HAVE_PCRE_H)
int
swrun_count_processes_by_regex( char *name, netsnmp_regex_ptr regexp )
{
netsnmp_swrun_entry *entry;
netsnmp_iterator *it;
int i = 0;
+#ifdef HAVE_PCRE2_H
+ pcre2_match_data *ndx_match;
+ int *found_ndx;
+ ndx_match = pcre2_match_data_create(30, NULL);
+ found_ndx = pcre2_get_ovector_pointer(ndx_match);
+#elif HAVE_PCRE_H
int found_ndx[30];
+#endif
int found;
char fullCommand[64 + 128 + 128 + 3];
@@ -125,7 +135,9 @@ swrun_count_processes_by_regex( char *name, netsnmp_regex_ptr regexp )
}
}
ITERATOR_RELEASE( it );
-
+#ifdef HAVE_PCRE2_H
+ pcre2_match_data_free(ndx_match);
+#endif
return i;
}
#endif /* HAVE_PCRE_H */
diff --git a/agent/mibgroup/if-mib/data_access/interface.c b/agent/mibgroup/if-mib/data_access/interface.c
index 3f1b392864..5d714e9895 100644
--- a/agent/mibgroup/if-mib/data_access/interface.c
+++ b/agent/mibgroup/if-mib/data_access/interface.c
@@ -16,7 +16,11 @@
#include "if-mib/ifTable/ifTable.h"
#include "if-mib/data_access/interface.h"
#include "interface_private.h"
-#if defined(HAVE_PCRE_H)
+
+#if defined(HAVE_PCRE2_H)
+#define PCRE2_CODE_UNIT_WIDTH 8
+#include <pcre2.h>
+#elif defined(HAVE_PCRE_H)
#include <pcre.h>
#elif defined(HAVE_REGEX_H)
#include <sys/types.h>
@@ -824,7 +828,13 @@ int netsnmp_access_interface_max_reached(const char *name)
int netsnmp_access_interface_include(const char *name)
{
netsnmp_include_if_list *if_ptr;
-#ifdef HAVE_PCRE_H
+#if defined(HAVE_PCRE2_H)
+ //pcre_exec->pcre2_match
+ //ovector->pcre2_match_data
+ pcre2_match_data *ndx_match;
+ ndx_match = pcre2_match_data_create(3, NULL);
+ int *found_ndx = pcre2_get_ovector_pointer(ndx_match);
+#elif defined(HAVE_PCRE_H)
int found_ndx[3];
#endif
@@ -840,7 +850,13 @@ int netsnmp_access_interface_include(const char *name)
for (if_ptr = include_list; if_ptr; if_ptr = if_ptr->next) {
-#if defined(HAVE_PCRE_H)
+#if defined(HAVE_PCRE2_H)
+ if (pcre2_match(if_ptr->regex_ptr, name, strlen(name), 0, 0,
+ ndx_match, NULL) >= 0) {
+ pcre2_match_data_free(ndx_match);
+ return TRUE;
+ }
+#elif defined(HAVE_PCRE_H)
if (pcre_exec(if_ptr->regex_ptr, NULL, name, strlen(name), 0, 0,
found_ndx, 3) >= 0)
return TRUE;
@@ -964,7 +980,13 @@ _parse_include_if_config(const char *token, char *cptr)
{
netsnmp_include_if_list *if_ptr, *if_new;
char *name, *st;
-#if defined(HAVE_PCRE_H)
+#if defined(HAVE_PCRE2_H)
+ //we can only get the message upon calling pcre2_error_message.
+ // so an additional variable is required.
+ int pcre2_err_code;
+ unsigned char pcre2_error[128];
+ int pcre2_error_offset;
+#elif defined(HAVE_PCRE_H)
const char *pcre_error;
int pcre_error_offset;
#elif defined(HAVE_REGEX_H)
@@ -996,7 +1018,15 @@ _parse_include_if_config(const char *token, char *cptr)
config_perror("Out of memory");
goto err;
}
-#if defined(HAVE_PCRE_H)
+#if defined(HAVE_PCRE2_H)
+ if_new->regex_ptr = pcre2_compile(if_new->name, PCRE2_ZERO_TERMINATED, 0,
+ &pcre2_err_code, &pcre2_error_offset, NULL);
+ if (!if_new->regex_ptr) {
+ pcre2_get_error_message(pcre2_err_code, pcre2_error, 128);
+ config_perror(pcre2_error);
+ goto err;
+ }
+#elif defined(HAVE_PCRE_H)
if_new->regex_ptr = pcre_compile(if_new->name, 0, &pcre_error,
&pcre_error_offset, NULL);
if (!if_new->regex_ptr) {
@@ -1032,7 +1062,7 @@ _parse_include_if_config(const char *token, char *cptr)
err:
if (if_new) {
-#if defined(HAVE_PCRE_H) || defined(HAVE_REGEX_H)
+#if defined(HAVE_PCRE2_H) || defined(HAVE_PCRE_H) || defined(HAVE_REGEX_H)
free(if_new->regex_ptr);
#endif
free(if_new->name);
@@ -1047,7 +1077,7 @@ _free_include_if_config(void)
while (if_ptr) {
if_next = if_ptr->next;
-#if defined(HAVE_PCRE_H)
+#if defined(HAVE_PCRE2_H) || defined(HAVE_PCRE_H)
free(if_ptr->regex_ptr);
#elif defined(HAVE_REGEX_H)
regfree(if_ptr->regex_ptr);
diff --git a/agent/mibgroup/struct.h b/agent/mibgroup/struct.h
index d6c69c0449..d6d85e4124 100644
--- a/agent/mibgroup/struct.h
+++ b/agent/mibgroup/struct.h
@@ -30,7 +30,7 @@ struct extensible {
struct myproc {
char name[STRMAX];
-#ifdef HAVE_PCRE_H
+#if defined(HAVE_PCRE2_H) || defined(HAVE_PCRE_H)
netsnmp_regex_ptr regexp;
#endif
char fixcmd[STRMAX];
diff --git a/agent/mibgroup/ucd-snmp/proc.c b/agent/mibgroup/ucd-snmp/proc.c
index 01704e8f39..f819122bc2 100644
--- a/agent/mibgroup/ucd-snmp/proc.c
+++ b/agent/mibgroup/ucd-snmp/proc.c
@@ -39,7 +39,10 @@
# include <time.h>
# endif
#endif
-#ifdef HAVE_PCRE_H
+#ifdef HAVE_PCRE2_H
+#define PCRE2_CODE_UNIT_WIDTH 8
+#include <pcre2.h>
+#elif HAVE_PCRE_H
#include <pcre.h>
#endif
@@ -134,7 +137,7 @@ proc_free_config(void)
for (ptmp = procwatch; ptmp != NULL;) {
ptmp2 = ptmp;
ptmp = ptmp->next;
-#ifdef HAVE_PCRE_H
+#if defined(HAVE_PCRE2_H) || defined(HAVE_PCRE_H)
free(ptmp2->regexp.regex_ptr);
#endif
free(ptmp2);
@@ -208,7 +211,7 @@ proc_parse_config(const char *token, char *cptr)
if (*procp == NULL)
return; /* memory alloc error */
numprocs++;
-#ifdef HAVE_PCRE_H
+#if defined(HAVE_PCRE2_H) || defined(HAVE_PCRE_H)
(*procp)->regexp.regex_ptr = NULL;
#endif
/*
@@ -220,9 +223,22 @@ proc_parse_config(const char *token, char *cptr)
cptr = skip_not_white(cptr);
if ((cptr = skip_white(cptr))) {
(*procp)->min = atoi(cptr);
-#ifdef HAVE_PCRE_H
+#if defined(HAVE_PCRE2_H) || defined(HAVE_PCRE_H)
cptr = skip_not_white(cptr);
if ((cptr = skip_white(cptr))) {
+ DEBUGMSGTL(("ucd-snmp/regexp_proc", "Loading regex %s\n", cptr));
+#ifdef HAVE_PCRE2_H
+ unsigned char pcre2_error_msg[128];
+ int pcre2_err_code;
+ int pcre2_error_offset;
+
+ (*procp)->regexp.regex_ptr =
+ pcre2_compile(cptr, PCRE2_ZERO_TERMINATED, 0, &pcre2_err_code, &pcre2_error_offset, NULL);
+ pcre2_get_error_message(pcre2_err_code, pcre2_error_msg, 128);
+ if ((*procp)->regexp.regex_ptr == NULL) {
+ config_perror(pcre2_error_msg);
+ }
+#elif HAVE_PCRE_H
const char *pcre_error;
int pcre_error_offset;
@@ -232,6 +248,7 @@ proc_parse_config(const char *token, char *cptr)
if ((*procp)->regexp.regex_ptr == NULL) {
config_perror(pcre_error);
}
+#endif
}
#endif
} else
@@ -406,7 +423,7 @@ sh_count_procs(char *procname)
return swrun_count_processes_by_name( procname );
}
-#ifdef HAVE_PCRE_H
+#if defined(HAVE_PCRE2_H) || defined(HAVE_PCRE_H)
netsnmp_feature_require(swrun_count_processes_by_regex);
int
sh_count_procs_by_regex(char *procname, netsnmp_regex_ptr regexp)
diff --git a/agent/mibgroup/ucd-snmp/proc.h b/agent/mibgroup/ucd-snmp/proc.h
index dd95082339..001fcfa3be 100644
--- a/agent/mibgroup/ucd-snmp/proc.h
+++ b/agent/mibgroup/ucd-snmp/proc.h
@@ -12,7 +12,7 @@ config_require(util_funcs)
extern WriteMethod fixProcError;
int sh_count_myprocs(struct myproc *);
int sh_count_procs(char *);
-#ifdef HAVE_PCRE_H
+#if defined(HAVE_PCRE2_H) || defined(HAVE_PCRE_H)
int sh_count_procs_by_regex(char *, netsnmp_regex_ptr);
#endif
diff --git a/configure.d/config_os_libs1 b/configure.d/config_os_libs1
index 3ccd41c1a8..0bbbf38701 100644
--- a/configure.d/config_os_libs1
+++ b/configure.d/config_os_libs1
@@ -97,6 +97,32 @@ LIBS="$netsnmp_save_LIBS"
#
# regex in process table
#
+if test "x$with_pcre2" != "xno"; then
+ AC_CHECK_HEADER([pcre2.h], [
+ AC_DEFINE([HAVE_PCRE2_H], [1], [Define to 1 if you have <pcre2.h>.])
+ pcre2_h=yes
+ ],
+ [pcre2_h=no], [#define PCRE2_CODE_UNIT_WIDTH 8]
+ )
+fi
+if test "x$pcre2header_h" = "xno" -o "x$pcre2_h" = "xno" ; then
+ if test "x$with_pcre2" = "xyes" ; then
+ AC_MSG_ERROR([Could not find the pcre2 header file needed and was specifically asked to use pcre2 support])
+ else
+ with_pcre2=no
+ fi
+fi
+
+if test "x$with_pcre2" != "xno"; then
+ NETSNMP_SEARCH_LIBS([pcre2_match_8], [pcre2-8], [
+ LMIBLIBS="$LMIBLIBS -lpcre2-8"
+ ],,, LAGENTLIBS)
+ AC_SUBST(LAGENTLIBS)
+ AC_SUBST(LMIBLIBS)
+fi
+
+if test "x$with_pcre2" != "xyes"; then
+
if test "x$with_pcre" != "xno"; then
AC_CHECK_HEADER([pcre.h], [
AC_DEFINE([HAVE_PCRE_H], [1], [Define to 1 if you have <pcre.h>.])
@@ -123,3 +149,4 @@ if test "x$with_pcre" != "xno"; then
AC_SUBST(LAGENTLIBS)
AC_SUBST(LMIBLIBS)
fi
+fi
diff --git a/configure.d/config_project_with_enable b/configure.d/config_project_with_enable
index cdf56deb69..b6dabfbf8d 100644
--- a/configure.d/config_project_with_enable
+++ b/configure.d/config_project_with_enable
@@ -160,6 +160,10 @@ NETSNMP_ARG_WITH(rpm,
management system when building the host MIB
module.])
+NETSNMP_ARG_WITH(pcre2-8,
+[ --without-pcre2 Don't include pcre2 process searching
+ support in the agent.],
+ with_pcre2="$withval", with_pcre2="maybe")
NETSNMP_ARG_WITH(pcre,
[ --without-pcre Don't include pcre process searching
diff --git a/include/net-snmp/data_access/interface.h b/include/net-snmp/data_access/interface.h
index 36c32475f5..2c7c880340 100644
--- a/include/net-snmp/data_access/interface.h
+++ b/include/net-snmp/data_access/interface.h
@@ -10,7 +10,10 @@
extern "C" {
#endif
-#if defined(HAVE_PCRE_H)
+#if defined(HAVE_PCRE2_H)
+#define PCRE2_CODE_UNIT_WIDTH 8
+#include <pcre2.h>
+#elif defined(HAVE_PCRE_H)
#include <pcre.h>
#elif defined(HAVE_REGEX_H)
#include <regex.h>
@@ -211,7 +214,9 @@ typedef struct _conf_if_list {
typedef netsnmp_conf_if_list conf_if_list; /* backwards compat */
typedef struct _include_if_list {
-#if defined(HAVE_PCRE_H)
+#if defined(HAVE_PCRE2_H)
+ pcre2_code *regex_ptr;
+#elif defined(HAVE_PCRE_H)
pcre *regex_ptr;
#elif defined(HAVE_REGEX_H)
regex_t *regex_ptr;
diff --git a/include/net-snmp/data_access/swrun.h b/include/net-snmp/data_access/swrun.h
index 2b8636b7a8..578f1ed6d7 100644
--- a/include/net-snmp/data_access/swrun.h
+++ b/include/net-snmp/data_access/swrun.h
@@ -90,7 +90,7 @@ extern "C" {
int swrun_count_processes_by_name( char *name );
#if !defined(NETSNMP_FEATURE_REMOVE_SWRUN_COUNT_PROCESSES_BY_REGEX) \
- && defined(HAVE_PCRE_H)
+ && (defined(HAVE_PCRE2_H) || defined(HAVE_PCRE_H))
int swrun_count_processes_by_regex(char *name, netsnmp_regex_ptr regexp);
#endif
diff --git a/include/net-snmp/types.h b/include/net-snmp/types.h
index d489f37b16..eb1b8f1b28 100644
--- a/include/net-snmp/types.h
+++ b/include/net-snmp/types.h
@@ -63,7 +63,7 @@ typedef long ssize_t;
typedef unsigned long int nfds_t;
#endif
-#ifdef HAVE_PCRE_H
+#if defined(HAVE_PCRE2_H) || defined(HAVE_PCRE_H)
/*
* Abstract the pcre typedef such that not all *.c files have to include
* <pcre.h>.
--
2.43.2
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 21 May 2023 16:18:56 -0700
Subject: [PATCH 2/3] Improve pcre2 support
Fix compiler warnings. Convert C++ comments to C comments. Make sure that
declarations occur before statements.
(cherry picked from commit 346b6f8959513320e5b674fd670c49ba2cd43af5)
Conflicts:
agent/mibgroup/host/data_access/swrun.c
---
agent/mibgroup/host/data_access/swrun.c | 16 +++++++---
agent/mibgroup/if-mib/data_access/interface.c | 32 ++++++++++---------
agent/mibgroup/ucd-snmp/proc.c | 12 ++++---
3 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/agent/mibgroup/host/data_access/swrun.c b/agent/mibgroup/host/data_access/swrun.c
index f0442b4493..6bfb267531 100644
--- a/agent/mibgroup/host/data_access/swrun.c
+++ b/agent/mibgroup/host/data_access/swrun.c
@@ -111,10 +111,7 @@ swrun_count_processes_by_regex( char *name, netsnmp_regex_ptr regexp )
netsnmp_iterator *it;
int i = 0;
#ifdef HAVE_PCRE2_H
- pcre2_match_data *ndx_match;
- int *found_ndx;
- ndx_match = pcre2_match_data_create(30, NULL);
- found_ndx = pcre2_get_ovector_pointer(ndx_match);
+ pcre2_match_data *ndx_match = pcre2_match_data_create(30, NULL);
#elif HAVE_PCRE_H
int found_ndx[30];
#endif
@@ -122,14 +119,23 @@ swrun_count_processes_by_regex( char *name, netsnmp_regex_ptr regexp )
char fullCommand[64 + 128 + 128 + 3];
netsnmp_cache_check_and_reload(swrun_cache);
- if ( !swrun_container || !name || !regexp.regex_ptr )
+ if ( !swrun_container || !name || !regexp.regex_ptr ) {
+#ifdef HAVE_PCRE2_H
+ pcre2_match_data_free(ndx_match);
+#endif
return 0; /* or -1 */
+ }
it = CONTAINER_ITERATOR( swrun_container );
while ((entry = (netsnmp_swrun_entry*)ITERATOR_NEXT( it )) != NULL) {
/* need to assemble full command back so regexps can get full picture */
sprintf(fullCommand, "%s %s", entry->hrSWRunPath, entry->hrSWRunParameters);
+#ifdef HAVE_PCRE2_H
+ found = pcre2_match(regexp.regex_ptr, (unsigned char *)fullCommand,
+ strlen(fullCommand), 0, 0, ndx_match, NULL);
+#elif HAVE_PCRE_H
found = pcre_exec(regexp.regex_ptr, NULL, fullCommand, strlen(fullCommand), 0, 0, found_ndx, 30);
+#endif
if (found > 0) {
i++;
}
diff --git a/agent/mibgroup/if-mib/data_access/interface.c b/agent/mibgroup/if-mib/data_access/interface.c
index 5d714e9895..eda9a17070 100644
--- a/agent/mibgroup/if-mib/data_access/interface.c
+++ b/agent/mibgroup/if-mib/data_access/interface.c
@@ -828,12 +828,8 @@ int netsnmp_access_interface_max_reached(const char *name)
int netsnmp_access_interface_include(const char *name)
{
netsnmp_include_if_list *if_ptr;
-#if defined(HAVE_PCRE2_H)
- //pcre_exec->pcre2_match
- //ovector->pcre2_match_data
- pcre2_match_data *ndx_match;
- ndx_match = pcre2_match_data_create(3, NULL);
- int *found_ndx = pcre2_get_ovector_pointer(ndx_match);
+#if defined(HAVE_PCRE2_H)
+ pcre2_match_data *ndx_match = pcre2_match_data_create(3, NULL);
#elif defined(HAVE_PCRE_H)
int found_ndx[3];
#endif
@@ -851,8 +847,8 @@ int netsnmp_access_interface_include(const char *name)
for (if_ptr = include_list; if_ptr; if_ptr = if_ptr->next) {
#if defined(HAVE_PCRE2_H)
- if (pcre2_match(if_ptr->regex_ptr, name, strlen(name), 0, 0,
- ndx_match, NULL) >= 0) {
+ if (pcre2_match(if_ptr->regex_ptr, (const unsigned char *)name,
+ strlen(name), 0, 0, ndx_match, NULL) >= 0) {
pcre2_match_data_free(ndx_match);
return TRUE;
}
@@ -981,11 +977,13 @@ _parse_include_if_config(const char *token, char *cptr)
netsnmp_include_if_list *if_ptr, *if_new;
char *name, *st;
#if defined(HAVE_PCRE2_H)
- //we can only get the message upon calling pcre2_error_message.
- // so an additional variable is required.
+ /*
+ * We can only get the message upon calling pcre2_error_message.
+ * so an additional variable is required.
+ */
int pcre2_err_code;
- unsigned char pcre2_error[128];
- int pcre2_error_offset;
+ char pcre2_error[128];
+ size_t pcre2_error_offset;
#elif defined(HAVE_PCRE_H)
const char *pcre_error;
int pcre_error_offset;
@@ -1019,10 +1017,14 @@ _parse_include_if_config(const char *token, char *cptr)
goto err;
}
#if defined(HAVE_PCRE2_H)
- if_new->regex_ptr = pcre2_compile(if_new->name, PCRE2_ZERO_TERMINATED, 0,
- &pcre2_err_code, &pcre2_error_offset, NULL);
+ if_new->regex_ptr = pcre2_compile((const unsigned char *)if_new->name,
+ PCRE2_ZERO_TERMINATED, 0,
+ &pcre2_err_code, &pcre2_error_offset,
+ NULL);
if (!if_new->regex_ptr) {
- pcre2_get_error_message(pcre2_err_code, pcre2_error, 128);
+ pcre2_get_error_message(pcre2_err_code,
+ (unsigned char *)pcre2_error,
+ sizeof(pcre2_error));
config_perror(pcre2_error);
goto err;
}
diff --git a/agent/mibgroup/ucd-snmp/proc.c b/agent/mibgroup/ucd-snmp/proc.c
index f819122bc2..d10e428ecd 100644
--- a/agent/mibgroup/ucd-snmp/proc.c
+++ b/agent/mibgroup/ucd-snmp/proc.c
@@ -226,15 +226,17 @@ proc_parse_config(const char *token, char *cptr)
#if defined(HAVE_PCRE2_H) || defined(HAVE_PCRE_H)
cptr = skip_not_white(cptr);
if ((cptr = skip_white(cptr))) {
- DEBUGMSGTL(("ucd-snmp/regexp_proc", "Loading regex %s\n", cptr));
#ifdef HAVE_PCRE2_H
- unsigned char pcre2_error_msg[128];
+ char pcre2_error_msg[128];
int pcre2_err_code;
- int pcre2_error_offset;
+ size_t pcre2_error_offset;
+ DEBUGMSGTL(("ucd-snmp/regexp_proc", "Loading regex %s\n", cptr));
(*procp)->regexp.regex_ptr =
- pcre2_compile(cptr, PCRE2_ZERO_TERMINATED, 0, &pcre2_err_code, &pcre2_error_offset, NULL);
- pcre2_get_error_message(pcre2_err_code, pcre2_error_msg, 128);
+ pcre2_compile((const unsigned char *)cptr, PCRE2_ZERO_TERMINATED, 0, &pcre2_err_code, &pcre2_error_offset, NULL);
+ pcre2_get_error_message(pcre2_err_code,
+ (unsigned char *)pcre2_error_msg,
+ sizeof(pcre2_error_msg));
if ((*procp)->regexp.regex_ptr == NULL) {
config_perror(pcre2_error_msg);
}
--
2.43.2
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Niels Baggesen <nba@users.sourceforge.net>
Date: Mon, 22 May 2023 18:44:36 +0200
Subject: [PATCH 3/3] if-mib/data_access/interface.c: plug a leak with pcre2
(cherry picked from commit e5aadf1e78c624a8e4147d4b70a7795497a50e73)
---
agent/mibgroup/if-mib/data_access/interface.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/agent/mibgroup/if-mib/data_access/interface.c b/agent/mibgroup/if-mib/data_access/interface.c
index eda9a17070..82a77ab37b 100644
--- a/agent/mibgroup/if-mib/data_access/interface.c
+++ b/agent/mibgroup/if-mib/data_access/interface.c
@@ -829,7 +829,7 @@ int netsnmp_access_interface_include(const char *name)
{
netsnmp_include_if_list *if_ptr;
#if defined(HAVE_PCRE2_H)
- pcre2_match_data *ndx_match = pcre2_match_data_create(3, NULL);
+ pcre2_match_data *ndx_match;
#elif defined(HAVE_PCRE_H)
int found_ndx[3];
#endif
@@ -844,6 +844,9 @@ int netsnmp_access_interface_include(const char *name)
*/
return TRUE;
+#if defined(HAVE_PCRE2_H)
+ ndx_match = pcre2_match_data_create(3, NULL);
+#endif
for (if_ptr = include_list; if_ptr; if_ptr = if_ptr->next) {
#if defined(HAVE_PCRE2_H)
--
2.43.2

40
net-snmp/PKGBUILD
View File

@ -6,34 +6,40 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=net-snmp
pkgver=5.9.2
pkgrel=03
pkgver=5.9.4
pkgrel=02
pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using IPv4 w/o systemd & ipv6"
url="http://www.net-snmp.org/"
depends=('libnsl' 'libpcap' 'lm_sensors' 'pciutils' 'pcre2' 'perl')
depends=('libnsl' 'libpcap' 'lm_sensors' 'openssl' 'pciutils' 'pcre2' 'perl')
makedepends=('python-setuptools')
optdepends=('perl-term-readkey: for snmpcheck application'
'perl-tk: for snmpcheck and tkmib applications'
'python: for the python modules')
options=('!emptydirs' '!makeflags')
source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
${pkgname}-5.9.2-pcre2.patch)
0001-pcre2.patch)
# ${pkgname}-5.9.2-pcre2.patch)
# removed crap snmpd.service snmptrapd.service)
prepare() {
cd ${pkgname}-${pkgver}
patch -Np1 -i ../${pkgname}-5.9.2-pcre2.patch
# patch -Np1 -i ../${pkgname}-5.9.2-pcre2.patch
patch -Np1 -i ../0001-pcre2.patch
autoreconf -i
}
build() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr \
--sysconfdir=/etc --sbindir=/usr/bin \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
--sbindir=/usr/bin \
--mandir=/usr/share/man \
--enable-ucd-snmp-compatibility \
--disable-ipv6 \
--enable-blumenthal-aes \
--enable-ucd-snmp-compatibility \
--with-python-modules \
--with-default-snmp-version="3" \
--with-sys-contact="root@localhost" \
@ -59,14 +65,16 @@ arch=(x86_64)
license=('BSD')
validpgpkeys=('8AAA779B597B405BBC329B6376CF47B8A77C5329'
'27CAA4A32E371383A33ED0587D5F9576E0F81533'
'6E6718AEF1EB5C65C32D1B2A356BC0B552D53CAB'
'D0F8F495DA6160C44EFFBF10F07B9D2DACB19FD6') # Net-SNMP Administrators
#validpgpkeys=('8AAA779B597B405BBC329B6376CF47B8A77C5329'
# '27CAA4A32E371383A33ED0587D5F9576E0F81533'
# '6E6718AEF1EB5C65C32D1B2A356BC0B552D53CAB'
# 'D0F8F495DA6160C44EFFBF10F07B9D2DACB19FD6') # Net-SNMP Administrators
validpgpkeys=('27CAA4A32E371383A33ED0587D5F9576E0F81533') # Net-SNMP Administrators
sha256sums=(21e86b06c8b54639f915781c9bf6433a79da5b7aa109087ea47a9b5378a6c5fd # net-snmp-5.9.2.tar.gz
cac6e9c1d2201c1efadffc911524e1795bfa829aa278a45a856a4d0196a18e73 # net-snmp-5.9.2.tar.gz.asc
4671c9e0d0062ab5c2111ce2f027dfd360eae1351fbd7e500a0e627891693213) # net-snmp-5.9.2-pcre2.patch
## 07e375ac00bbc61351ee03fc26db0556bba37d25450fbd8449a0271d833c43c0 net-snmp-5.9.2-03-x86_64.pkg.tar.lz
sha256sums=(8b4de01391e74e3c7014beb43961a2d6d6fa03acc34280b9585f4930745b0544 # net-snmp-5.9.4.tar.gz
0a2b56249baee7be784abae5cd6b419700be439249c0e07be0993ee2d0037311 # net-snmp-5.9.4.tar.gz.asc
4671c9e0d0062ab5c2111ce2f027dfd360eae1351fbd7e500a0e627891693213) # 0001-pcre2.patch
## bfabf20175a1e210894b65e41f96fc7bf2b18d0d134fdd4b7d78e98562fe4ed5 net-snmp-5.9.4-02-x86_64.pkg.tar.lz
## 8b4de01391e74e3c7014beb43961a2d6d6fa03acc34280b9585f4930745b0544 net-snmp-5.9.4.tar.gz
0a2b56249baee7be784abae5cd6b419700be439249c0e07be0993ee2d0037311 net-snmp-5.9.4.tar.gz.asc

22
net-snmp/PKGBUILD-arch
View File

@ -2,26 +2,26 @@
# Contributor: Dale Blount <dale@archlinux.org>
pkgname=net-snmp
pkgver=5.9.2
pkgrel=3
pkgver=5.9.4
pkgrel=2
pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
arch=('x86_64')
url="http://www.net-snmp.org/"
license=('BSD')
depends=('libnsl' 'libpcap' 'lm_sensors' 'pciutils' 'pcre2' 'perl')
depends=('libnsl' 'libpcap' 'lm_sensors' 'openssl' 'pciutils' 'pcre2' 'perl')
makedepends=('python-setuptools')
optdepends=('perl-term-readkey: for snmpcheck application'
'perl-tk: for snmpcheck and tkmib applications'
'python: for the python modules')
options=('!emptydirs' '!makeflags')
source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
${pkgname}-5.9.2-pcre2.patch
0001-pcre2.patch
snmpd.service snmptrapd.service)
sha512sums=('d67810b15c4956a28ccb4d9a3870604bc94e71247d9a8d3a9959041268122b3500cf68a7912cfb01a6cff27f3f4364cbd106629ab80c12974f694b6c548bde59'
sha512sums=('a510fa91a21e9ddc86a12fd1d0bc6b356e63f3ea53f184d2e31439004d41d902390664134dc40b3b828eabb4282eaf3da628a07c4d480fa00eff7e700950c423'
'SKIP'
'16234f8bb66f6754d3b61752c2fd479676e504281e9857c72b44d99444aa95bb03263d0d93d1b9996daf760ed78344dcdcc7ab1f701dce9a5b51c7c7158a8f9d'
'4ed2428c04bfbbfba988c0a9222d880771a1022e0544d842b5bee52b88163e213d697cc2419d53dddc482ac2fc3e03929a349720ad73189f28bf47292d0d9c03'
'82b05b805db5f6870242ea4dfaa58de2865c367208cacfa4fc543c9f2a310d7229dee94ea6054d35c4bab69393f33fd367551727279da4411052589ed37bb4a4')
'f7c4bee084f5fb5a27b6447f6ac52a7e5b9541e048b53d23be5c22f2c6de5e72ba8978f381af54850f3c34fd35a9e73f1c5f58e116dbb03461035095509f5602'
'549f555205c303723e98d5c482abe73f20b8a6e8522ebeb5d197750752314d3930ebe08898e45fcc83646290df53d3244ae55b97779f88d206cc6179a58df606')
validpgpkeys=('27CAA4A32E371383A33ED0587D5F9576E0F81533'
'6E6718AEF1EB5C65C32D1B2A356BC0B552D53CAB'
'8AAA779B597B405BBC329B6376CF47B8A77C5329'
@ -29,17 +29,19 @@ validpgpkeys=('27CAA4A32E371383A33ED0587D5F9576E0F81533'
prepare() {
cd ${pkgname}-${pkgver}
patch -Np1 -i ../${pkgname}-5.9.2-pcre2.patch
patch -Np1 -i ../0001-pcre2.patch
autoreconf -i
}
build() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr \
./configure \
--prefix=/usr \
--sysconfdir=/etc --sbindir=/usr/bin \
--mandir=/usr/share/man \
--enable-ucd-snmp-compatibility \
--enable-blumenthal-aes \
--enable-ipv6 \
--enable-ucd-snmp-compatibility \
--with-python-modules \
--with-default-snmp-version="3" \
--with-sys-contact="root@localhost" \

5
net-snmp/key
View File

@ -1 +1,4 @@
gpg --recv-keys F07B9D2DACB19FD6
#gpg --recv-keys F07B9D2DACB19FD6
#gpg --recv-key 356BC0B552D53CAB
#gpg --recv-key 27CAA4A32E371383A33ED0587D5F9576E0F81533
gpg --recv-key 7D5F9576E0F81533

5
nut/PKGBUILD
View File

@ -7,7 +7,7 @@
pkgname=nut
pkgver=2.8.1
pkgrel=02
pkgrel=03
pkgdesc='A collection of programs which provide a common interface for monitoring and administering UPS, PDU and SCD hardware'
url=https://networkupstools.org/
depends=(gcc-libs glibc libtool libusb-compat neon net-snmp openssl)
@ -107,5 +107,4 @@ sha256sums=(SKIP # git
717e116aa93f42ccca901de920da3ff97407672003f721b4976caf525f3e5f08 # nut-openssl-1.1.patch
c2c7d3b72f94f9c7987ab047bba466923c63ddb80b468485f100b1e44997ec84) # nut-snmp-usb-order.patch
## e9cbd2ee1d1ab1d4fa31b6ca729c82689b63b30a7412a1a9f33d74815db8aaba nut-2.8.1-02-x86_64.pkg.tar.lz
## 2077917e450ac43ae51d171f66c6df248f148b87c8198cd884bc42e35d542b58 nut-2.8.1-03-x86_64.pkg.tar.lz

2
nut/PKGBUILD-arch
View File

@ -7,7 +7,7 @@
pkgname=nut
pkgver=2.8.1
pkgrel=2
pkgrel=3
pkgdesc='A collection of programs which provide a common interface for monitoring and administering UPS, PDU and SCD hardware'
arch=(x86_64)
url=https://networkupstools.org/

15
ostree/PKGBUILD
View File

@ -7,8 +7,8 @@
#_name=libostree
pkgname=ostree
_commit=2d2e0bddf3d4b662ef7f9a3eddb7814b57716cee # tags/v2024.4^{}
pkgver=2024.4
#_commit=2d2e0bddf3d4b662ef7f9a3eddb7814b57716cee # tags/v2024.4^{}
pkgver=2024.5
pkgrel=01
pkgdesc="Operating system and container binary deployment and upgrades - w/o systemd & avahi"
url="https://ostreedev.github.io/ostree/"
@ -17,7 +17,8 @@ makedepends=(curl e2fsprogs git glib2 gobject-introspection gpgme
gtk-doc libarchive libsoup libxslt mkinitcpio openssl python xz)
#checkdepends=(cpio elfutils gjs parallel python-yaml syslinux)
checkdepends=(cpio elfutils gjs parallel python-yaml syslinux)
source=(git+https://github.com/ostreedev/ostree#commit=$_commit
source=(git+https://github.com/ostreedev/ostree#tag=v$pkgver
#git+https://github.com/ostreedev/ostree#commit=$_commit
git+https://github.com/containers/composefs.git
git+https://github.com/mendsley/bsdiff
git+https://gitlab.gnome.org/GNOME/libglnx.git
@ -26,6 +27,12 @@ provides=(libostree-1.so)
# upstream ticket about chain of trust:
# https://github.com/ostreedev/ostree/issues/2349
pkgver() {
cd $pkgname
git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g'
}
prepare() {
cd $pkgname
@ -99,5 +106,5 @@ sha256sums=(SKIP
SKIP
6cc1e10db1f8c744eec5d128ad7bcd5aa92a8da167784f6727d832c9a4c545bb) # ostree-2023.1-use_fuse3.patch
## aa29df02cbf241402ddace3ea0960895ebd167f1967d026fe373569f15a68219 ostree-2024.4-01-x86_64.pkg.tar.lz
## cc995586885bcf85bc11c98a394a1499908f37377c84235672c7fafbbc2069dc ostree-2024.5-01-x86_64.pkg.tar.lz

12
ostree/PKGBUILD-arch
View File

@ -3,8 +3,7 @@
# Contributor: Mirco Tischler <mt-ml at gmx dot de>
pkgname=ostree
_commit=2d2e0bddf3d4b662ef7f9a3eddb7814b57716cee # tags/v2024.4^{}
pkgver=2024.4
pkgver=2024.5
pkgrel=1
pkgdesc="Operating system and container binary deployment and upgrades"
url="https://ostreedev.github.io/ostree/"
@ -50,13 +49,13 @@ checkdepends=(
)
provides=(libostree-1.so)
source=(
git+https://github.com/ostreedev/ostree#commit=$_commit
git+https://github.com/ostreedev/ostree#tag=v$pkgver
git+https://github.com/containers/composefs.git
git+https://github.com/mendsley/bsdiff
git+https://gitlab.gnome.org/GNOME/libglnx.git
$pkgname-2023.1-use_fuse3.patch
)
b2sums=('SKIP'
b2sums=('25dd16ad1356ec22807242a210f60482d28893250f9c23f861887406e5ba947fc2f41dfba2082dce7cbb3ea675f3b799a58dfda141c5ae8b537bd1393d942f47'
'SKIP'
'SKIP'
'SKIP'
@ -65,6 +64,11 @@ b2sums=('SKIP'
# https://github.com/ostreedev/ostree/issues/2349
validpgpkeys=('1CEC7A9DF7DA85ABEF843DC0A866D7CCAE087291') # Colin Walters <walters@redhat.com>
pkgver() {
cd $pkgname
git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g'
}
prepare() {
cd $pkgname

1
ostree/deps
View File

@ -15,5 +15,6 @@ syslinux
autoconf
automake
bison
graphite

9
pacman-contrib/PKGBUILD
View File

@ -6,8 +6,8 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=pacman-contrib
pkgver=1.10.4
pkgrel=04
pkgver=1.10.5
pkgrel=01
pkgdesc="Contributed scripts and tools for pacman systems w/o systemd"
url="https://gitlab.archlinux.org/pacman/pacman-contrib"
groups=( jobbot )
@ -56,12 +56,13 @@ package() {
arch=(x86_64)
license=('GPL')
license=('GPL-2.0-or-later')
validpgpkeys=('5134EF9EAF65F95B6BB1608E50FB9B273A9D0BB5' # Johannes Löthberg <johannes@kyriasis.com>
'04DC3FB1445FECA813C27EFAEA4F7B321A906AD9') # Daniel M. Capella <polyzen@archlinux.org>
b2sums=('0c1fcece9d61c9ef628cec37357375b78e44c67eef4ef8dfe6fd8451353ec3fd5f8d212e57d76f022ed9143b6906e161335351e2537951038d99f015e44a756b')
sha256sums=(SKIP) ## pacman-contrib.git
## da84a7965b51eda96045b362dba7c194d1d73cfa76d6ee88f1fd3fb7af297e13 pacman-contrib-1.10.4-04-x86_64.pkg.tar.lz
## decae4c8834dc929d3b2e096982b6b7cd688c780fb4ffc690067be5e82545d06 pacman-contrib-1.10.5-01-x86_64.pkg.tar.lz

8
pacman-contrib/PKGBUILD-arch
View File

@ -2,12 +2,12 @@
# Maintainer: Daniel M. Capella <polyzen@archlinux.org>
pkgname=pacman-contrib
pkgver=1.10.4
pkgrel=4
pkgver=1.10.5
pkgrel=1
pkgdesc='Contributed scripts and tools for pacman systems'
arch=('x86_64')
url=https://gitlab.archlinux.org/pacman/pacman-contrib
license=('GPL')
license=('GPL-2.0-or-later')
depends=('fakeroot' 'pacman' 'perl')
makedepends=('asciidoc' 'git')
optdepends=(
@ -18,7 +18,7 @@ optdepends=(
'vim: default merge program for pacdiff'
)
source=("git+$url.git#tag=v$pkgver")
b2sums=('SKIP')
b2sums=('0c1fcece9d61c9ef628cec37357375b78e44c67eef4ef8dfe6fd8451353ec3fd5f8d212e57d76f022ed9143b6906e161335351e2537951038d99f015e44a756b')
validpgpkeys=('04DC3FB1445FECA813C27EFAEA4F7B321A906AD9') # Daniel M. Capella <polyzen@archlinux.org>
# '5134EF9EAF65F95B6BB1608E50FB9B273A9D0BB5') # Johannes Löthberg <johannes@kyriasis.com>

1
pacman-contrib/key Normal file
View File

@ -0,0 +1 @@
gpg --recv-key EA4F7B321A906AD9

4
syslog-ng/PKGBUILD
View File

@ -7,7 +7,7 @@
pkgname=syslog-ng
pkgver=4.4.0
pkgrel=06
pkgrel=07
pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities - w/o google's grpc systemd and ipv6"
url="https://www.syslog-ng.com/products/open-source-log-management/"
depends=('awk' 'glib2' 'libnsl' 'json-c' 'curl' 'libnet' 'openssl' 'pcre2' 'protobuf' 'libcap')
@ -113,5 +113,5 @@ sha256sums=(583b147f3ec17fbc2dbbf31aafb1e3966237d7541313de5b41ea885dc16d932e #
d2e3328e2ac344ccddf1b38eab226f36c11ade1971c0c8c8ac8cd4d97c8b02e8 # syslog-ng.conf
93c935eca56854011ea9e353b7a1da662ad40b2e8452954c5b4b5a1d5b2d5317) # syslog-ng.logrotate
## 8ae140ba61ee3d461a1456dcd1ac307561faa21b18cbf2cd72706e198f642539 syslog-ng-4.4.0-06-x86_64.pkg.tar.lz
## d3d6808309e27c4c672bf6da0dfb13a1ab5ba73a95f83100e7d8c34a75d4d4d3 syslog-ng-4.4.0-07-x86_64.pkg.tar.lz

2
syslog-ng/PKGBUILD-arch
View File

@ -3,7 +3,7 @@
pkgname=syslog-ng
pkgver=4.4.0
pkgrel=6
pkgrel=7
pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
arch=('x86_64')
url="https://www.syslog-ng.com/products/open-source-log-management/"