From: kruceter <kruceter@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] socklog: depend on ipsvd for ucspi-tcp service
Date: Wed, 28 Dec 2022 01:25:18 +0100 [thread overview]
Message-ID: <20221228002518.CUrDpHt1Hdrb0AqZy_ET6jTDIEj3MStaV3CkHnA1Wgo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41321@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 834 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages ipsvd
https://github.com/void-linux/void-packages/pull/41321
socklog: depend on ipsvd for ucspi-tcp service
cc: @leahneukirchen (socklog's maintainer)
Closes #41300.
### socklog
#### Testing the changes
- I tested the changes in this PR: **briefly**
### ipsvd
The build method is not much different from socklog (the same author).
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/41321.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ipsvd-41321.patch --]
[-- Type: text/x-diff, Size: 3894 bytes --]
From ebe519f6750b088eb31586cda3ef8256b8e72a30 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 28 Dec 2022 02:44:46 +0300
Subject: [PATCH 1/2] New package: ipsvd
---
srcpkgs/ipsvd/patches/cross.patch | 47 +++++++++++++++++++++++++++++++
srcpkgs/ipsvd/template | 40 ++++++++++++++++++++++++++
2 files changed, 87 insertions(+)
create mode 100644 srcpkgs/ipsvd/patches/cross.patch
create mode 100644 srcpkgs/ipsvd/template
diff --git a/srcpkgs/ipsvd/patches/cross.patch b/srcpkgs/ipsvd/patches/cross.patch
new file mode 100644
index 000000000000..3e729cf44315
--- /dev/null
+++ b/srcpkgs/ipsvd/patches/cross.patch
@@ -0,0 +1,47 @@
+chskshsgr must be built for the host.
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -194,17 +194,22 @@
+ case_diffb.o: case.h case_diffb.c compile
+ ./compile case_diffb.c
+
+-chkshsgr: chkshsgr.o load
+- ./load chkshsgr
++chkshsgr: chkshsgr.o loadhost
++ ./loadhost chkshsgr
+
+-chkshsgr.o: chkshsgr.c compile
+- ./compile chkshsgr.c
++chkshsgr.o: chkshsgr.c compilehost
++ ./compilehost chkshsgr.c
+
+ choose: choose.sh warn-auto.sh
+ rm -f choose
+ cat warn-auto.sh choose.sh >choose
+ chmod 555 choose
+
++compilehost:
++ cat warn-auto.sh > compilehost
++ @echo 'exec cc -c $${1+"$$@"}' >> compilehost
++ chmod 555 compilehost
++
+ coe.o: coe.c coe.h compile
+ ./compile coe.c
+
+@@ -351,6 +356,15 @@
+ sh print-ld.sh >load
+ chmod 555 load
+
++loadhost:
++ rm -f loadhost
++ @echo > loadhost
++ @echo 'systype="`cat systype`"' >> loadhost
++ @echo 'cat warn-auto.sh' >> loadhost
++ @echo 'main="$$1"; shift' >> loadhost
++ @echo 'exec cc -o "$$main" "$$main".o $${1+"$$@"}' >> loadhost
++ chmod 555 loadhost
++
+ lock_ex.o: compile hasflock.h lock.h lock_ex.c
+ ./compile lock_ex.c
+
diff --git a/srcpkgs/ipsvd/template b/srcpkgs/ipsvd/template
new file mode 100644
index 000000000000..c1e118fb4c40
--- /dev/null
+++ b/srcpkgs/ipsvd/template
@@ -0,0 +1,40 @@
+# Template file for 'ipsvd'
+pkgname=ipsvd
+version=1.0.0
+revision=1
+build_wrksrc="${pkgname}-${version}"
+short_desc="Set of internet protocol service daemons for Unix"
+maintainer="Krul Ceter <kruceter@proton.me>"
+license="BSD-3-Clause"
+homepage="http://smarden.org/ipsvd"
+distfiles="http://smarden.org/ipsvd/ipsvd-${version}.tar.gz"
+checksum=ef7a725bc85acb5d09ab57658385bb470b3e4da5a4ffc88b5da6c6bd37d01fad
+patch_args="-Np1 --directory=${build_wrksrc}"
+
+do_configure() {
+ echo "$CC $CFLAGS" > src/conf-cc
+ echo "$CC $LDFLAGS -Wl,-z -Wl,noexecstack" > src/conf-ld
+}
+
+do_build() {
+ package/compile
+}
+
+do_install() {
+ # sslio and sslsvd are not compiled (matrixssl is required).
+ rm -r man/{sslio,sslsvd}* doc/{sslio,sslsvd}*
+
+ for bin in command/*; do
+ vbin "$bin";
+ done
+
+ for man in man/*; do
+ vman "$man";
+ done
+
+ for doc in doc/*; do
+ vdoc "$doc";
+ done
+
+ vlicense package/COPYING
+}
From da888cc246859b3af37b82baa182508b3d208665 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 28 Dec 2022 02:52:37 +0300
Subject: [PATCH 2/2] socklog: depend on ipsvd for ucspi-tcp service; fix
license, fix build
The "license" variable was fixed to comply with xlint.
---
srcpkgs/socklog/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/socklog/template b/srcpkgs/socklog/template
index eec1260e4740..557c976d6de8 100644
--- a/srcpkgs/socklog/template
+++ b/srcpkgs/socklog/template
@@ -1,10 +1,11 @@
# Template file for 'socklog'
pkgname=socklog
version=2.1.0
-revision=5
+revision=6
+depends="ipsvd"
short_desc="Small and secure syslogd replacement for use with runit"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="BSD-3-Clause"
homepage="http://smarden.org/socklog/"
distfiles="http://smarden.org/socklog/socklog-${version}.tar.gz"
checksum=aa869a787ee004da4e5509b5a0031bcc17a4ab4ac650c2ce8d4e488123acb455
next prev parent reply other threads:[~2022-12-28 0:25 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-28 0:13 [PR PATCH] " kruceter
2022-12-28 0:25 ` kruceter [this message]
2022-12-28 0:27 ` [PR PATCH] [Updated] " kruceter
2022-12-28 19:47 ` leahneukirchen
2022-12-28 19:48 ` leahneukirchen
2022-12-28 20:58 ` [PR PATCH] [Updated] " kruceter
2022-12-29 3:00 ` New packages: ipsvd, socklog-ucspi sbromberger
2022-12-29 5:44 ` sbromberger
2022-12-29 5:45 ` sbromberger
2022-12-29 5:45 ` sbromberger
2022-12-29 8:00 ` kruceter
2022-12-29 16:32 ` leahneukirchen
2022-12-29 16:58 ` sbromberger
2022-12-29 22:32 ` kruceter
2022-12-29 22:33 ` [PR PATCH] [Updated] " kruceter
2023-01-02 15:19 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221228002518.CUrDpHt1Hdrb0AqZy_ET6jTDIEj3MStaV3CkHnA1Wgo@z \
--to=kruceter@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).