upg cairo limine memcached rsync subversion xdg-desktop-portal-gtk
add procstatd
This commit is contained in:
parent
ce860229c3
commit
03c65bceec
|
|
@ -6,8 +6,8 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=cairo
|
||||
pkgver=1.17.8
|
||||
pkgrel=02
|
||||
pkgver=1.18.0
|
||||
pkgrel=01
|
||||
pkgdesc="2D graphics library with support for multiple output devices"
|
||||
url="https://cairographics.org/"
|
||||
arch=(x86_64)
|
||||
|
|
@ -15,7 +15,7 @@ depends=(lzo zlib libpng fontconfig freetype2 libx11 libxext libxrender libxcb
|
|||
glib2 pixman)
|
||||
makedepends=(valgrind git meson gtk-doc)
|
||||
#options=(debug) # uncomment this to have the debug package produced
|
||||
_commit=c3b672634f0635af1ad0ffa8c15b34fc7c1035cf # tags/1.17.8^0
|
||||
_commit=3909090108bb2db55330e3eb148aebe664735363 # tags/1.18.0^0
|
||||
source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit")
|
||||
|
||||
pkgver() {
|
||||
|
|
@ -28,9 +28,10 @@ prepare() {
|
|||
|
||||
# # FS#74354
|
||||
# patch -Np1 -i ../0001-Fix-type1-subset-indexing.patch
|
||||
# https://bugs.archlinux.org/task/77432
|
||||
# https://gitlab.freedesktop.org/cairo/cairo/-/issues/639
|
||||
git revert -n 47a21c6e30eef91db503a5a183d5c8cf558aaa56
|
||||
# # https://bugs.archlinux.org/task/77432
|
||||
# # https://gitlab.freedesktop.org/cairo/cairo/-/issues/639
|
||||
# git revert -n 47a21c6e30eef91db503a5a183d5c8cf558aaa56
|
||||
# this was used on 1.17.2
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -56,5 +57,5 @@ license=(LGPL MPL)
|
|||
|
||||
sha256sums=(SKIP)
|
||||
|
||||
# 471d5ee8d66159f7bf9ebdfd2f553312de2dc71cab63d37abb4c0557ca640b05 cairo-1.17.8-02-x86_64.pkg.tar.lz
|
||||
## 4b51ddf3543b113b44e9b5a76de3d4a8bf34b736caa882b1f2e2296ba5a7ac05 cairo-1.18.0-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,12 @@
|
|||
# Contributor: Brice Carpentier <brice@daknet.org>
|
||||
|
||||
pkgbase=cairo
|
||||
pkgname=(cairo cairo-docs)
|
||||
pkgver=1.17.8
|
||||
pkgrel=2
|
||||
pkgname=(
|
||||
cairo
|
||||
cairo-docs
|
||||
)
|
||||
pkgver=1.18.0
|
||||
pkgrel=1
|
||||
pkgdesc="2D graphics library with support for multiple output devices"
|
||||
url="https://cairographics.org/"
|
||||
arch=(x86_64)
|
||||
|
|
@ -32,9 +35,9 @@ makedepends=(
|
|||
meson
|
||||
valgrind
|
||||
)
|
||||
_commit=c3b672634f0635af1ad0ffa8c15b34fc7c1035cf # tags/1.17.8^0
|
||||
_commit=3909090108bb2db55330e3eb148aebe664735363 # tags/1.18.0^0
|
||||
source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit")
|
||||
sha256sums=('SKIP')
|
||||
b2sums=('SKIP')
|
||||
|
||||
pkgver() {
|
||||
cd cairo
|
||||
|
|
@ -43,10 +46,6 @@ pkgver() {
|
|||
|
||||
prepare() {
|
||||
cd cairo
|
||||
|
||||
# https://bugs.archlinux.org/task/77432
|
||||
# https://gitlab.freedesktop.org/cairo/cairo/-/issues/639
|
||||
git revert -n 47a21c6e30eef91db503a5a183d5c8cf558aaa56
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
# After joborun, eventually this made it to AUR, then extra for Arch
|
||||
|
||||
pkgname=limine
|
||||
pkgver=5.20230917.0
|
||||
pkgver=5.20230924.0
|
||||
pkgrel=01
|
||||
pkgdesc="An advanced, portable, multiprotocol bootloader"
|
||||
url="https://limine-bootloader.org/"
|
||||
|
|
@ -58,9 +58,10 @@ arch=(x86_64)
|
|||
|
||||
license=('BSD')
|
||||
|
||||
sha256sums=(2d9b55e798e951ebd3d4266303e9cefda2ee9f7055a3c877dc7e306f0e94ec91 # limine-5.20230917.0.tar.xz
|
||||
sha256sums=(d2961921fecbdff7a27d01c40ab8a9d8de49cc67914ed044a4c9d0c0b522bb2e # limine-5.20230924.0.tar.xz
|
||||
a70b1fd5981d8d7d024992a521fd78481a0a69f8311a768679fc732f5c03488a # limine.cfg
|
||||
15df8e06872a6cb89dfad3f99ad2b255dd1a54576e4343c954975e2ea48f28ab # bg.jpg
|
||||
c2897b54e8a54d81a61f929280f98b54786a506e5269fe474ebfac4c57c57a9f) # CONFIG.md
|
||||
|
||||
## 40b86f154ba6975ec5b2f7c07ab1b1c2a1c29015f2dac836a74920171fe1d11f limine-5.20230917.0-01-x86_64.pkg.tar.lz
|
||||
## 3cd58ff63313fc3afa32c53e813079a62fa7ac3f023679c32f3f873adbb92057 limine-5.20230924.0-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Contributor: Mintsuki <mintsuki@protonmail.com>
|
||||
|
||||
pkgname=limine
|
||||
pkgver=5.20230917.0
|
||||
pkgver=5.20230924.0
|
||||
pkgrel=1
|
||||
pkgdesc="An advanced, portable, multiprotocol bootloader"
|
||||
arch=('x86_64')
|
||||
|
|
@ -11,7 +11,7 @@ license=('BSD')
|
|||
depends=('glibc')
|
||||
makedepends=('nasm' 'mtools' 'llvm' 'lld' 'clang')
|
||||
source=("https://github.com/limine-bootloader/limine/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz")
|
||||
sha256sums=('2d9b55e798e951ebd3d4266303e9cefda2ee9f7055a3c877dc7e306f0e94ec91')
|
||||
sha256sums=('d2961921fecbdff7a27d01c40ab8a9d8de49cc67914ed044a4c9d0c0b522bb2e')
|
||||
|
||||
build() {
|
||||
cd "${pkgname}-${pkgver}"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=memcached
|
||||
pkgver=1.6.19
|
||||
pkgver=1.6.21
|
||||
pkgrel=01
|
||||
pkgdesc='Distributed memory object caching system w/o systemd'
|
||||
url='https://memcached.org/'
|
||||
|
|
@ -60,10 +60,10 @@ arch=(x86_64)
|
|||
|
||||
license=('GPL')
|
||||
|
||||
sha256sums=(2fd48b047146398b073a588e97917d9bc908ce51978580d8e0bedaa123b4c70d # memcached-1.6.19.tar.gz
|
||||
sha256sums=(c788980efc417dd5d93c442b1c8b8769fb2018896c29de3887d22a2f143da2ee # memcached-1.6.21.tar.gz
|
||||
228c4f536f3c9f9eee4e11226ec8846a22d4ba46c2d3bf2811413efcc322609a # memcached.sysusers
|
||||
c4d0ae2218b99a276ff6e0084ae81e66add0ca9347e4bde70e9172db6e44002a # memcached.tmpfiles
|
||||
7bfe200e3bb1435e9f0bf73c2aa6a643cf11aa9d90e8ea127cff21a711e4ecb0 # 0001-tests-enable-drop_privileges-by-default-for-better-s.patch
|
||||
027a83492f8fa0d5a2a99c0826d8d29547898e137a8330e8c4ca51502b8ada1a) # 0002-seccomp-extend-syscalls-tested-on-Linux-6.1-with-gli.patch
|
||||
|
||||
## 86579141c0bb8a680121481a79984cef65209e39987202d36ee8b5cf3a7ce663 memcached-1.6.19-01-x86_64.pkg.tar.lz
|
||||
## cd2ae6751aeb7d165c545cf1e62e0eb6f9edc477cb31ccbddb118669c25e65d4 memcached-1.6.21-01-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Contributor: Michael Irwin <6d6469@gmail.com>
|
||||
|
||||
pkgname=memcached
|
||||
pkgver=1.6.19
|
||||
pkgver=1.6.21
|
||||
pkgrel=1
|
||||
pkgdesc='Distributed memory object caching system'
|
||||
url='https://memcached.org/'
|
||||
|
|
@ -17,7 +17,7 @@ source=(https://www.memcached.org/files/${pkgname}-${pkgver}.tar.gz
|
|||
memcached.sysusers
|
||||
0001-tests-enable-drop_privileges-by-default-for-better-s.patch
|
||||
0001-seccomp-extend-syscalls-tested-on-Linux-6.1-with-gli.patch)
|
||||
sha512sums=('60d93065e0ef2b17e9da5370a497a4fbfc64c0af70e14fdfdab60c0c94c0b19e30da31d615e19565474c278141a4cb401c65fd79bd70947dd96a9fee81824a74'
|
||||
sha512sums=('9d8ba8964474e7ed40095e414747a3ce76860ee32b9d8bac19fc7932a79d4bb9947e4cbe810933b6d271f4b0ee5576e25089ca40f414b25faf9245733bfbd369'
|
||||
'dd21f49062054c601469f9abc9ee39a0f06c604e8805e7bc9bf2cfa65429962f93e7ac67764257c578fc15b1e75394956f350162c99b084c76a6e14d9331f31f'
|
||||
'960705ff74d25afed477e0b2a5872a3a4fb49ed3105a351f0d0224abc947778f9dbda81e80be94ab636da4a8411a9dd56a8fd4513e5b86a3096a14fa67f1548b'
|
||||
'e6ddcab9a6fee024072b6363ef60aa176ed258369bf3a17d475f19b1f410ffd6195b9c5737dc5b1371e8974b44bdbdaa109927acaeb54fb40302a5d67d7c13a8'
|
||||
|
|
|
|||
|
|
@ -1,3 +1,2 @@
|
|||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
#!/usr/bin/bash
|
||||
# JOBoRun : Jwm OpenBox Obarun RUNit
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
|
||||
# Website : https://pozol.eu
|
||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=procstatd
|
||||
pkgver=1.4.2
|
||||
pkgrel=012
|
||||
pkgdesc="A daemon that can be run either from userspace or inetd that can be queried via a simple API to parse various files in /proc"
|
||||
url="http://www.phy.duke.edu/brahma/"
|
||||
source=(https://downloads.sourceforge.net/herdtools/$pkgname.tar.gz
|
||||
procstatd-common-symbols.patch
|
||||
procstatd-Makefile.patch)
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir"/$pkgname
|
||||
patch -p1 -i ../procstatd-Makefile.patch
|
||||
patch -p1 -i ../procstatd-common-symbols.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir"/$pkgname
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir"/$pkgname
|
||||
make DESTDIR="$pkgdir/usr" install
|
||||
}
|
||||
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('GPL')
|
||||
|
||||
sha256sums=(c6157ae30de179d71c6c9c4d755b3a4bfd5637d08b27e8b2ab77ccddac4d9fa5 # procstatd.tar.gz
|
||||
fd66677589c6bcd14815fc82ee3eee1f6ccf6e5ab8fb1c7a34348a265a8a5c48 # procstatd-common-symbols.patch
|
||||
40fddf0af5f123b69bf97c64c03be1df8b7c4170cbbb2921da2869bbf5e79133) # procstatd-Makefile.patch
|
||||
|
||||
## ebd4e36e2e64021dfd430c1a59260216f6dfd0bf4e23fdab843636a5b209ef4c procstatd-1.4.2-012-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
|
||||
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
|
||||
# Maintainer: Jason Chu <jason@archlinux.org>
|
||||
|
||||
pkgname=procstatd
|
||||
pkgver=1.4.2
|
||||
pkgrel=12
|
||||
pkgdesc="A daemon that can be run either from userspace or inetd that can be queried via a simple API to parse various files in /proc"
|
||||
arch=('x86_64')
|
||||
license=('GPL')
|
||||
url="http://www.phy.duke.edu/brahma/"
|
||||
source=(https://downloads.sourceforge.net/herdtools/$pkgname.tar.gz
|
||||
procstatd-Makefile.patch
|
||||
procstatd-common-symbols.patch)
|
||||
sha512sums=('02f10a87f9325f0252786a598433596ad1dc2c6412ff8b6fe1f8e19a6e1425497bc0fcf0be085ed7be9434642c7a1f22d4f8018787ab2f6dffe0d1aa566dfcc5'
|
||||
'96b8cf197c4589cd602af4cb2860c6f33668789c54991e31060b69fe42aa66c11d86472d7bf2066281b324178752b9f88fc3c8a2787c459a6364b052d597e6a4'
|
||||
'b16266faa53d2e3d012dda8d94c42a49100759299b760cd75d7577f127ea576b6c85ea0f8b72a0cda49e6c2250a37f80ad7d775ab7716877d351f6a947a47da6')
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir"/$pkgname
|
||||
patch -p1 -i ../procstatd-Makefile.patch
|
||||
patch -p1 -i ../procstatd-common-symbols.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir"/$pkgname
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir"/$pkgname
|
||||
make DESTDIR="$pkgdir/usr" install
|
||||
}
|
||||
|
|
@ -0,0 +1 @@
|
|||
rm -rf {src,pkg,procstatd*.tar.gz*}
|
||||
|
|
@ -0,0 +1,74 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index c2a2599..bed7042 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -23,9 +23,7 @@
|
||||
# General definitions
|
||||
##########################
|
||||
CC=gcc
|
||||
-CFLAGS=-O3
|
||||
-COMPILE=$(CC) -c $(CFLAGS)
|
||||
-LINK=$(CC)
|
||||
+CFLAGS?=-O3
|
||||
|
||||
##########################
|
||||
# Tree point to install
|
||||
@@ -33,7 +31,7 @@ LINK=$(CC)
|
||||
##########################
|
||||
# INSTDIR=/usr/local
|
||||
# INSTDIR=/usr
|
||||
-INSTDIR=$(HOME)
|
||||
+DESTDIR=
|
||||
|
||||
##########################
|
||||
# Program name(s)
|
||||
@@ -41,7 +39,7 @@ INSTDIR=$(HOME)
|
||||
PROGRAM=procstatd
|
||||
WATCHMAN=watchman
|
||||
|
||||
-
|
||||
+all : $(PROGRAM)
|
||||
##########################
|
||||
# Source and object list
|
||||
##########################
|
||||
@@ -51,20 +49,19 @@ SRC=procstatd.c parsecl.c parse.c statlist.c senddata.c procutils.c \
|
||||
time.c users.c identity.c \
|
||||
ipcstuff.c filestuff.c jobslist.c quiklist.c
|
||||
OBJ=$(SRC:.c=.o)
|
||||
-
|
||||
##########################
|
||||
# Rule to make program
|
||||
##########################
|
||||
$(PROGRAM) : $(OBJ)
|
||||
- $(LINK) $(OBJ) -o $@
|
||||
+ $(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
|
||||
|
||||
##########################
|
||||
# Rule to make .o objects
|
||||
# Note sole .h dependency
|
||||
##########################
|
||||
-%.o : %.c procstatd.h
|
||||
- $(COMPILE) $< -o $@
|
||||
-
|
||||
+#%.o : %.c procstatd.h
|
||||
+# $(COMPILE) $< -o $@
|
||||
+$(SRC) : procstatd.h
|
||||
##########################
|
||||
# Rule to clean up
|
||||
##########################
|
||||
@@ -75,11 +72,8 @@ clean :
|
||||
# Rule to install.
|
||||
##########################
|
||||
install :
|
||||
- (strip $(PROGRAM);\
|
||||
- install -d $(INSTDIR)/sbin; \
|
||||
- install -d $(INSTDIR)/man/man8; \
|
||||
- install -m 755 $(PROGRAM) $(INSTDIR)/sbin; \
|
||||
- install -m 644 $(PROGRAM).8 $(INSTDIR)/man/man8; \
|
||||
- cd watchman; \
|
||||
- make install)
|
||||
+ install -d $(DESTDIR)/bin; \
|
||||
+ install -d $(DESTDIR)/share/man/man8; \
|
||||
+ install -m 755 $(PROGRAM) $(DESTDIR)/bin; \
|
||||
+ install -m 644 $(PROGRAM).8 $(DESTDIR)/share/man/man8
|
||||
|
||||
|
|
@ -0,0 +1,208 @@
|
|||
diff --git a/jobslist.c b/jobslist.c
|
||||
index 5c6e83c..fe09671 100644
|
||||
--- a/jobslist.c
|
||||
+++ b/jobslist.c
|
||||
@@ -2,6 +2,8 @@
|
||||
#include "procstatd.h"
|
||||
#include <dirent.h>
|
||||
|
||||
+int sendline(int fd, char *buffer, int length);
|
||||
+
|
||||
#define MAX_BUFFER 4096
|
||||
|
||||
static DIR* dp_proc = NULL;
|
||||
diff --git a/procstatd.c b/procstatd.c
|
||||
index 3cef9d8..980c73d 100644
|
||||
--- a/procstatd.c
|
||||
+++ b/procstatd.c
|
||||
@@ -21,6 +21,27 @@
|
||||
/* void fatal(const char *fmt, ...); */
|
||||
void sigchld_handler(int);
|
||||
char **outfields;
|
||||
+int sendline(int fd, char *buffer, int length);
|
||||
+int readline(int fd, char *buffer, int bufsize);
|
||||
+
|
||||
+int verbose;
|
||||
+int daemonmode,port;
|
||||
+int server_fd, serverlen, client_fd, clientlen;
|
||||
+int input_fd,output_fd,error_fd;
|
||||
+int buflen;
|
||||
+char outbuf[BUFLEN];
|
||||
+char hostname[BUFLEN];
|
||||
+char hostip[BUFLEN];
|
||||
+char clientname[BUFLEN];
|
||||
+char statbuf[BUFLEN];
|
||||
+char **fields; /* for parsing via parse() */
|
||||
+long int interval;
|
||||
+struct sockaddr_in serverINETaddress;
|
||||
+struct sockaddr_in clientINETaddress;
|
||||
+FILE *stat_fd[N_SOURCES];
|
||||
+FILE *sendstat_fd;
|
||||
+Stathash stats[N_STATS];
|
||||
+Kernel kernel;
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
diff --git a/procstatd.h b/procstatd.h
|
||||
index 5d2b07b..cd03e0a 100644
|
||||
--- a/procstatd.h
|
||||
+++ b/procstatd.h
|
||||
@@ -37,6 +37,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
+#include <sys/wait.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <utmp.h>
|
||||
@@ -82,24 +83,24 @@ int parse(char *, char **, int, int);
|
||||
* Standard globals. Note we cannot use outbuf for input/strtok as
|
||||
* strtok processes the line in place.
|
||||
*/
|
||||
- int verbose;
|
||||
- int daemonmode,port;
|
||||
- int server_fd, serverlen, client_fd, clientlen;
|
||||
- int input_fd,output_fd,error_fd;
|
||||
- int buflen;
|
||||
- char outbuf[BUFLEN];
|
||||
- char hostname[BUFLEN];
|
||||
- char hostip[BUFLEN];
|
||||
- char clientname[BUFLEN];
|
||||
- char statbuf[BUFLEN];
|
||||
- char **fields; /* for parsing via parse() */
|
||||
- long int interval;
|
||||
+extern int verbose;
|
||||
+extern int daemonmode,port;
|
||||
+extern int server_fd, serverlen, client_fd, clientlen;
|
||||
+extern int input_fd,output_fd,error_fd;
|
||||
+extern int buflen;
|
||||
+extern char outbuf[BUFLEN];
|
||||
+extern char hostname[BUFLEN];
|
||||
+extern char hostip[BUFLEN];
|
||||
+extern char clientname[BUFLEN];
|
||||
+extern char statbuf[BUFLEN];
|
||||
+extern char **fields; /* for parsing via parse() */
|
||||
+extern long int interval;
|
||||
|
||||
/*
|
||||
* Globals for socket pair creation
|
||||
*/
|
||||
- struct sockaddr_in serverINETaddress;
|
||||
- struct sockaddr_in clientINETaddress;
|
||||
+extern struct sockaddr_in serverINETaddress;
|
||||
+extern struct sockaddr_in clientINETaddress;
|
||||
|
||||
/*
|
||||
* IDENT MUST BE FIRST! This is because it isn't displayed with a unique
|
||||
@@ -221,8 +222,8 @@ int parse(char *, char **, int, int);
|
||||
N_MODES
|
||||
} Modes;
|
||||
|
||||
- FILE *stat_fd[N_SOURCES];
|
||||
- FILE *sendstat_fd;
|
||||
+extern FILE *stat_fd[N_SOURCES];
|
||||
+extern FILE *sendstat_fd;
|
||||
|
||||
/*
|
||||
* This is essential. This struct is the one true hash for each statistic.
|
||||
@@ -236,7 +237,7 @@ int parse(char *, char **, int, int);
|
||||
double rate; /* (current-previous)/time */
|
||||
} Stathash ;
|
||||
|
||||
- Stathash stats[N_STATS];
|
||||
+extern Stathash stats[N_STATS];
|
||||
|
||||
/*
|
||||
* To handle kernel revisions
|
||||
@@ -247,4 +248,4 @@ int parse(char *, char **, int, int);
|
||||
int revision;
|
||||
} Kernel ;
|
||||
|
||||
- Kernel kernel;
|
||||
+extern Kernel kernel;
|
||||
diff --git a/procutils.c b/procutils.c
|
||||
index b538818..b08d5d5 100644
|
||||
--- a/procutils.c
|
||||
+++ b/procutils.c
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
#include "procstatd.h"
|
||||
|
||||
+int sendline(int fd, char *buffer, int length);
|
||||
+
|
||||
void send_error(char *msg)
|
||||
{
|
||||
|
||||
diff --git a/quiklist.c b/quiklist.c
|
||||
index 7b46091..5c64510 100644
|
||||
--- a/quiklist.c
|
||||
+++ b/quiklist.c
|
||||
@@ -2,6 +2,8 @@
|
||||
#include "procstatd.h"
|
||||
#include <dirent.h>
|
||||
|
||||
+int sendline(int fd, char *buffer, int length);
|
||||
+
|
||||
static FILE* fpp_loadavg = NULL;
|
||||
static FILE* fpp_stat = NULL;
|
||||
|
||||
diff --git a/senddata.c b/senddata.c
|
||||
index f2a2d3c..8702379 100644
|
||||
--- a/senddata.c
|
||||
+++ b/senddata.c
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
#include "procstatd.h"
|
||||
|
||||
+int sendline(int fd, char *buffer, int length);
|
||||
+
|
||||
/*
|
||||
* send_statlist(buffer) prints (as in inetd), transmits (as in
|
||||
* the forking daemon), or broadcast the statistics evaluated with
|
||||
diff --git a/statlist.c b/statlist.c
|
||||
index bf1eb9c..d0da9b2 100644
|
||||
--- a/statlist.c
|
||||
+++ b/statlist.c
|
||||
@@ -18,6 +18,42 @@
|
||||
|
||||
#include "procstatd.h"
|
||||
|
||||
+void eval_filestuff();
|
||||
+void eval_ipcstuff();
|
||||
+void eval_proc_loadavg();
|
||||
+void eval_proc_lm78();
|
||||
+void eval_proc_meminfo();
|
||||
+void eval_proc_net_dev();
|
||||
+void eval_proc_sensors();
|
||||
+void eval_proc_stat();
|
||||
+void eval_proc_uptime();
|
||||
+void eval_time();
|
||||
+void eval_users();
|
||||
+void get_ipcstuff();
|
||||
+void get_proc_lm78();
|
||||
+void get_proc_loadavg();
|
||||
+void get_proc_meminfo();
|
||||
+void get_proc_net_dev();
|
||||
+void get_proc_sensors();
|
||||
+void get_proc_stat();
|
||||
+void get_proc_uptime();
|
||||
+void get_filestuff();
|
||||
+void get_time();
|
||||
+void get_users();
|
||||
+void init_filestuff();
|
||||
+void init_identity();
|
||||
+void init_proc_lm78();
|
||||
+void init_proc_loadavg();
|
||||
+void init_proc_meminfo();
|
||||
+void init_proc_net_dev();
|
||||
+void init_proc_sensors();
|
||||
+void init_proc_stat();
|
||||
+void init_proc_uptime();
|
||||
+void init_proc_version();
|
||||
+void init_time();
|
||||
+void init_users();
|
||||
+void init_ipcstuff();
|
||||
+
|
||||
/*
|
||||
* statlist routines are simple shells that initialize, retrieve, process,
|
||||
* and transmit statistics derived from /proc/* or various systems calls.
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
|
||||
|
||||
real 0m4.025s
|
||||
user 0m3.599s
|
||||
sys 0m0.631s
|
||||
|
||||
|
|
@ -8,13 +8,14 @@
|
|||
pkgname=rsync
|
||||
_tag='b13e7a8ef4fa430223f66403506fb821caae5cfd' # git rev-parse v${pkgver}
|
||||
pkgver=3.2.7
|
||||
pkgrel=04
|
||||
pkgrel=06
|
||||
pkgdesc='A fast and versatile file copying tool for remote and local files w/o systemd zstd ipv6'
|
||||
url='https://rsync.samba.org/'
|
||||
depends=('acl' 'libacl.so' 'lz4' 'openssl' 'popt' 'xxhash' 'libxxhash.so'
|
||||
'zlib' 'zstd')
|
||||
makedepends=('git' 'python-commonmark')
|
||||
optdepends=('python: for rrsync')
|
||||
optdepends=('python: for rrsync'
|
||||
'xinetd: instead of inetd')
|
||||
backup=('etc/rsyncd.conf'
|
||||
'etc/xinetd.d/rsync')
|
||||
#options=('debug') ### uncomment this to have the debug pkg produced
|
||||
|
|
@ -33,8 +34,7 @@ _reverts=(
|
|||
)
|
||||
|
||||
prepare() {
|
||||
|
||||
cd "$srcdir/rsync"
|
||||
cd $pkgname
|
||||
|
||||
local _c
|
||||
for _c in "${_backports[@]}"; do
|
||||
|
|
@ -52,7 +52,7 @@ prepare() {
|
|||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir/rsync"
|
||||
cd $pkgname
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
|
|
@ -67,12 +67,12 @@ build() {
|
|||
}
|
||||
|
||||
check() {
|
||||
cd "$srcdir/rsync"
|
||||
make test
|
||||
cd $pkgname
|
||||
make test
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir/rsync"
|
||||
cd $pkgname
|
||||
|
||||
make DESTDIR="$pkgdir" install
|
||||
install -Dm0644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf"
|
||||
|
|
@ -90,5 +90,4 @@ validpgpkeys=(0048C8B026D4C96F0E589C2F6C859FB14B96A8C5) # Wayne Davison <wayned@
|
|||
sha256sums=(SKIP
|
||||
733ccb571721433c3a6262c58b658253ca6553bec79c2bdd0011810bb4f2156b) # rsyncd.conf
|
||||
|
||||
## f19b62b7ff762d2b6acbe8a0d7615cc97e080d5701ff28ba950bfe345b2ae03d rsync-3.2.7-04-x86_64.pkg.tar.lz
|
||||
|
||||
## c3b57cfcd595d9e600adb074b6ba22c5c1b7ae0c81e745daa605bea4e6c5add2 rsync-3.2.7-06-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
# Maintainer: Christian Hesse <mail@eworm.de>
|
||||
# Maintainer: T.J. Townsend <blakkheim@archlinux.org>
|
||||
|
||||
pkgname=rsync
|
||||
_tag='b13e7a8ef4fa430223f66403506fb821caae5cfd' # git rev-parse v${pkgver}
|
||||
pkgver=3.2.7
|
||||
pkgrel=4
|
||||
pkgrel=6
|
||||
pkgdesc='A fast and versatile file copying tool for remote and local files'
|
||||
arch=('x86_64')
|
||||
url='https://rsync.samba.org/'
|
||||
|
|
@ -12,8 +13,7 @@ depends=('acl' 'libacl.so' 'lz4' 'openssl' 'popt' 'xxhash' 'libxxhash.so'
|
|||
'zlib' 'zstd')
|
||||
optdepends=('python: for rrsync')
|
||||
makedepends=('git' 'python-commonmark')
|
||||
backup=('etc/rsyncd.conf'
|
||||
'etc/xinetd.d/rsync')
|
||||
backup=('etc/rsyncd.conf')
|
||||
validpgpkeys=('0048C8B026D4C96F0E589C2F6C859FB14B96A8C5') # Wayne Davison <wayned@users.sourceforge.net>
|
||||
source=("git+https://github.com/WayneD/rsync#tag=${_tag}?signed"
|
||||
'rsyncd.conf')
|
||||
|
|
@ -27,7 +27,7 @@ _reverts=(
|
|||
)
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir/rsync"
|
||||
cd ${pkgname}
|
||||
|
||||
local _c
|
||||
for _c in "${_backports[@]}"; do
|
||||
|
|
@ -45,7 +45,7 @@ prepare() {
|
|||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir/rsync"
|
||||
cd ${pkgname}
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
|
|
@ -57,17 +57,16 @@ build() {
|
|||
}
|
||||
|
||||
check() {
|
||||
cd "$srcdir/rsync"
|
||||
cd ${pkgname}
|
||||
|
||||
make test
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir/rsync"
|
||||
cd ${pkgname}
|
||||
|
||||
make DESTDIR="$pkgdir" install
|
||||
install -Dm0644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf"
|
||||
install -Dm0644 packaging/lsb/rsync.xinetd "$pkgdir/etc/xinetd.d/rsync"
|
||||
install -Dm0644 packaging/systemd/rsync.service "$pkgdir/usr/lib/systemd/system/rsyncd.service"
|
||||
install -Dm0644 packaging/systemd/rsync.socket "$pkgdir/usr/lib/systemd/system/rsyncd.socket"
|
||||
install -Dm0644 packaging/systemd/rsync@.service "$pkgdir/usr/lib/systemd/system/rsyncd@.service"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname=subversion
|
||||
pkgver=1.14.2
|
||||
pkgrel=09
|
||||
pkgrel=010
|
||||
pkgdesc="A Modern Concurrent Version Control System"
|
||||
url="https://subversion.apache.org/"
|
||||
depends=('apr' 'apr-util' 'bash' 'dbus' 'expat' 'file' 'gcc-libs' 'glibc'
|
||||
|
|
@ -110,7 +110,7 @@ package() {
|
|||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('APACHE')
|
||||
license=('Apache-2.0')
|
||||
|
||||
validpgpkeys=('19BBCAEF7B19B280A0E2175E62D48FAD16A0DE01'
|
||||
'8BC4DAE0C5A4D65F404401074F7DBAA99A59B973'
|
||||
|
|
@ -138,6 +138,4 @@ sha256sums=(c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28 #
|
|||
ad2eeab9683aec61da6843b680a59d49c4e053017f5bf861a9f2f1384279689e # subversion-1.14.1-python-3.11-build.patch
|
||||
a6337d17005865703d5eaf9b10d2e80172189bf896dda20e2e63debfabf164c6) # subversion-1.14.2-swig-py-Fix-conditionals-by-SWIG-version-and-by-Pyth.patch
|
||||
|
||||
## c884c7ca09f960dabc083ccbbe2779a412ed2d077695a994b8764fcab2400b3e subversion-1.14.2-09-x86_64.pkg.tar.lz
|
||||
|
||||
|
||||
## 1aeddc313f11e87782a3019f2fa3ee0b898a71fb359cb5d2f694a17e493d2b0a subversion-1.14.2-010-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
pkgname=subversion
|
||||
pkgver=1.14.2
|
||||
pkgrel=9
|
||||
pkgrel=10
|
||||
pkgdesc="A Modern Concurrent Version Control System"
|
||||
arch=('x86_64')
|
||||
url="https://subversion.apache.org/"
|
||||
license=('APACHE')
|
||||
license=('Apache-2.0')
|
||||
depends=('apr' 'apr-util' 'bash' 'dbus' 'expat' 'file' 'gcc-libs' 'glibc' 'libsasl' 'libutf8proc' 'lz4' 'serf' 'sqlite'
|
||||
'systemd' 'zlib' )
|
||||
makedepends=('apache' 'python' 'python-py3c' 'perl' 'swig' 'java-environment>=8'
|
||||
|
|
@ -23,10 +23,9 @@ optdepends=('libsecret: for GNOME Keyring for auth credentials'
|
|||
'ruby: for some hook scripts')
|
||||
checkdepends=('ruby-test-unit')
|
||||
provides=('svn')
|
||||
backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
|
||||
backup=('etc/conf.d/svnserve')
|
||||
options=('!makeflags' '!emptydirs')
|
||||
source=(https://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc}
|
||||
svn
|
||||
svnserve.conf
|
||||
svnserve.tmpfiles
|
||||
svnserve.service
|
||||
|
|
@ -37,7 +36,6 @@ source=(https://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.as
|
|||
)
|
||||
sha512sums=('20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc'
|
||||
'SKIP'
|
||||
'3df59e92aa0314ff6adce26e2e1162bf2872ca03ff1f78891081a60e67b521b6046b4a2f85f718dcd27f9d5709594658817a09548cdb74e3976d371dbe47e7db'
|
||||
'f7f2ceac2446cc94ac2be3404083cc54a0f1f4d04d5301f600dfafca38819669bcffdfa45f1b90b9f3cdb042469385a764f11dc1a827f10c23ddf73b7ac6c9da'
|
||||
'7775f4da5003970c9ebdc2f696ba090df194a77d9daed791875488c943f72ae496b5f9cc6f3ff9f3f4de9f352a3b518137babdea38947d1a2d5dd16aa1844036'
|
||||
'8cc23ae71bd7ce7c337eaf12929f1af0a11b55250808e88f06397b874daf2efb9491c464be3d082d937a82c2b0b7c3ed06d6695cfd8a3fda1f803bbfd15837de'
|
||||
|
|
@ -116,9 +114,6 @@ package() {
|
|||
|
||||
## svnserve ...
|
||||
|
||||
# xinetd
|
||||
install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
|
||||
|
||||
# ... systemd
|
||||
install -D -m 644 "${srcdir}"/svnserve.service "${pkgdir}"/usr/lib/systemd/system/svnserve.service
|
||||
install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
|
||||
real 9m16.004s
|
||||
user 9m6.529s
|
||||
sys 0m32.849s
|
||||
real 8m33.512s
|
||||
user 8m23.743s
|
||||
sys 0m30.239s
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname=xdg-desktop-portal-gtk
|
||||
pkgver=1.14.1
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc="A backend implementation for xdg-desktop-portal using GTK"
|
||||
url="https://github.com/flatpak/xdg-desktop-portal-gtk"
|
||||
depends=(gtk3 gsettings-desktop-schemas)
|
||||
|
|
@ -15,7 +15,8 @@ makedepends=(xdg-desktop-portal python git)
|
|||
optdepends=("evince: Print preview")
|
||||
provides=(xdg-desktop-portal-impl)
|
||||
_commit=952005f6a7850a247d286f14838202f506b402b7 # tags/1.14.1^0
|
||||
source=("git+https://github.com/flatpak/xdg-desktop-portal-gtk#commit=$_commit")
|
||||
source=("git+https://github.com/flatpak/xdg-desktop-portal-gtk#commit=$_commit"
|
||||
gtk-portals.conf)
|
||||
|
||||
pkgver() {
|
||||
cd $pkgname
|
||||
|
|
@ -45,6 +46,10 @@ package() {
|
|||
cd $pkgname
|
||||
DESTDIR="$pkgdir" make install
|
||||
rm -rf $pkgdir/tmp # systemd.service stored there
|
||||
|
||||
# fix detection with x-d-p 1.18
|
||||
install -Dm644 ${srcdir}/gtk-portals.conf ${pkgdir}/usr/share/xdg-desktop-portal/gtk-portals.conf
|
||||
|
||||
}
|
||||
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
|
@ -53,6 +58,7 @@ arch=(x86_64)
|
|||
|
||||
license=(LGPL)
|
||||
|
||||
sha256sums=(SKIP)
|
||||
sha256sums=(SKIP
|
||||
7021091f9257d6db3599b0b9cec64ce22fe303500fdee36e1e50945ef83c2c88) # gtk-portals.conf
|
||||
|
||||
## 20729fc18ed319337d823cfbc569922ef21387c9f8c4d3b65f41edd5846f22c8 xdg-desktop-portal-gtk-1.14.1-01-x86_64.pkg.tar.lz
|
||||
## 0ca247ddba763358bd4bc133be3f9bcf796254e1a05ad9f1c5c6c9123c75bfad xdg-desktop-portal-gtk-1.14.1-02-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
pkgname=xdg-desktop-portal-gtk
|
||||
pkgver=1.14.1
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="A backend implementation for xdg-desktop-portal using GTK"
|
||||
url="https://github.com/flatpak/xdg-desktop-portal-gtk"
|
||||
arch=(x86_64)
|
||||
|
|
@ -14,8 +14,10 @@ makedepends=(xdg-desktop-portal python git)
|
|||
optdepends=("evince: Print preview")
|
||||
provides=(xdg-desktop-portal-impl)
|
||||
_commit=952005f6a7850a247d286f14838202f506b402b7 # tags/1.14.1^0
|
||||
source=("git+https://github.com/flatpak/xdg-desktop-portal-gtk#commit=$_commit")
|
||||
sha256sums=('SKIP')
|
||||
source=("git+https://github.com/flatpak/xdg-desktop-portal-gtk#commit=$_commit"
|
||||
gtk-portals.conf)
|
||||
sha256sums=('SKIP'
|
||||
'7021091f9257d6db3599b0b9cec64ce22fe303500fdee36e1e50945ef83c2c88')
|
||||
|
||||
pkgver() {
|
||||
cd $pkgname
|
||||
|
|
@ -41,6 +43,9 @@ check() {
|
|||
package() {
|
||||
cd $pkgname
|
||||
DESTDIR="$pkgdir" make install
|
||||
|
||||
# fix detection with x-d-p 1.18
|
||||
install -Dm644 ${srcdir}/gtk-portals.conf ${pkgdir}/usr/share/xdg-desktop-portal/gtk-portals.conf
|
||||
}
|
||||
|
||||
# vim:set sw=2 sts=-1 et:
|
||||
|
|
|
|||
|
|
@ -4,6 +4,10 @@ gtk3
|
|||
gsettings-desktop-schemas
|
||||
python
|
||||
git
|
||||
|
||||
autoconf
|
||||
gettext
|
||||
xdg-desktop-portal-gtk
|
||||
libglvnd
|
||||
at-spi2-core
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
[preferred]
|
||||
default=gtk
|
||||
Loading…
Reference in New Issue