From e90a4db53dafbea9bf64b52bd304ffa35d88188f Mon Sep 17 00:00:00 2001 From: wener Date: Mon, 16 Mar 2020 16:49:32 +0800 Subject: community/dante: move from testing --- community/dante/APKBUILD | 48 +++++++++++++++++++++++++++ community/dante/dante-server.pre-install | 6 ++++ community/dante/ifdev.patch | 38 +++++++++++++++++++++ community/dante/sockd.confd | 2 ++ community/dante/sockd.initd | 19 +++++++++++ testing/dante/APKBUILD | 57 -------------------------------- testing/dante/dante-server.pre-install | 6 ---- testing/dante/ifdev.patch | 38 --------------------- testing/dante/sockd.confd | 2 -- testing/dante/sockd.initd | 19 ----------- 10 files changed, 113 insertions(+), 122 deletions(-) create mode 100644 community/dante/APKBUILD create mode 100644 community/dante/dante-server.pre-install create mode 100644 community/dante/ifdev.patch create mode 100644 community/dante/sockd.confd create mode 100644 community/dante/sockd.initd delete mode 100644 testing/dante/APKBUILD delete mode 100644 testing/dante/dante-server.pre-install delete mode 100644 testing/dante/ifdev.patch delete mode 100644 testing/dante/sockd.confd delete mode 100644 testing/dante/sockd.initd diff --git a/community/dante/APKBUILD b/community/dante/APKBUILD new file mode 100644 index 0000000000..44c18b697c --- /dev/null +++ b/community/dante/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: Paul Kilar +# Maintainer: Paul Kilar +pkgname=dante +pkgver=1.4.2 +pkgrel=3 +pkgdesc="Dante is SOCKS server and a SOCKS client" +url="https://www.inet.no/dante/" +arch="all" +license="BSD-3-Clause" +makedepends="bison flex" +install="$pkgname-server.pre-install" +subpackages="$pkgname-dev $pkgname-doc $pkgname-server" +source="http://www.inet.no/dante/files/dante-$pkgver.tar.gz + ifdev.patch + sockd.initd + sockd.confd + " + +prepare() { + default_prepare + update_config_guess +} + +build() { + subpackages="$pkgname-dev $pkgname-doc" + ac_cv_func_sched_setscheduler=no ./configure --prefix=/usr + make +} + +package() { + make install DESTDIR=$pkgdir +} + +server() { + depends= + cd "$builddir" + install -D -m644 "example/sockd.conf" "$subpkgdir/etc/sockd.conf" + install -D -m644 "$srcdir"/sockd.confd "$subpkgdir"/etc/conf.d/sockd + install -D -m755 "$srcdir"/sockd.initd "$subpkgdir"/etc/init.d/sockd + + install -d "$subpkgdir/usr/sbin" + mv "$pkgdir/usr/sbin/sockd" "$subpkgdir/usr/sbin/sockd" +} + +sha512sums="4d0588d3e138c80fac7ecf80a2d0ab0a2a3e7c9c847029af4eb50b59f35c86641085bf8e625d437cbb00d616ac444b98fdcf417da375fe32312ca420187ef21b dante-1.4.2.tar.gz +9fd824db09081e1ff81875e740c9ee4d529e986ce486cbb4270e02c061c0120898cbe57f70ed010cc6b81f1d700114732d8f84b2f055f43d5f3110f2f0e8ba23 ifdev.patch +9ec0c32f6bfb3fbd266f89ccb0ffff0356b88d679bf3099ff4c78e7f4ca78de9b8fb9f6ff136ca333f148c16f9fcb502ac3f5469c106494846e4aa3192d79c4e sockd.initd +09b744340c03369983a9b07e50215288e5a43d15497db479867132bee46f34a7a8e451c980e064f751ad50e5231d77fa5ae9fd5cf2efe3274ae50168bfceaa67 sockd.confd" diff --git a/community/dante/dante-server.pre-install b/community/dante/dante-server.pre-install new file mode 100644 index 0000000000..8bf90b40cf --- /dev/null +++ b/community/dante/dante-server.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S sockd 2>/dev/null +adduser -S -D -H -h /dev/null -s /sbin/nologin -G sockd -g sockd sockd 2>/dev/null + +exit 0 diff --git a/community/dante/ifdev.patch b/community/dante/ifdev.patch new file mode 100644 index 0000000000..541edefe03 --- /dev/null +++ b/community/dante/ifdev.patch @@ -0,0 +1,38 @@ +--- a/sockd/sockd_io.c.old 2017-05-10 19:57:20.672000000 +0000 ++++ b/sockd/sockd_io.c 2017-05-10 20:00:34.548000000 +0000 +@@ -2912,7 +2912,7 @@ siginfo(sig, si, sc) + int src_so_rcvbuf, dst_so_rcvbuf; + #endif /* HAVE_RECVBUF_IOCTL */ + +-#if HAVE_SENDBUF_IOCTL ++#ifdef HAVE_SENDBUF_IOCTL + int src_so_sndbuf, dst_so_sndbuf; + #endif /* HAVE_SENDBUF_IOCTL */ + +@@ -2960,7 +2960,7 @@ siginfo(sig, si, sc) + *src_bufferinfo = NUL; + *dst_bufferinfo = NUL; + +-#if HAVE_RECVBUF_IOCTL || HAVE_SENDBUF_IOCTL ++#if defined(HAVE_RECVBUF_IOCTL) || defined(HAVE_SENDBUF_IOCTL) + + havesocketinfo = 1; + +@@ -2987,7 +2987,7 @@ siginfo(sig, si, sc) + } + #endif /* HAVE_RECVBUF_IOCTL */ + +-#if HAVE_SENDBUF_IOCTL ++#ifdef HAVE_SENDBUF_IOCTL + if (havesocketinfo) { + if (ioctl(src->s, SENDBUF_IOCTLVAL, &src_so_sndbuf) != 0) { + swarn("%s: sendbuf size ioctl() on src-fd %d failed", +@@ -3005,7 +3005,7 @@ siginfo(sig, si, sc) + } + #endif /* HAVE_SENDBUF_IOCTL */ + +-#if HAVE_SENDBUF_IOCTL && HAVE_RECVBUF_IOCTL ++#ifdef HAVE_SENDBUF_IOCTL && HAVE_RECVBUF_IOCTL + if (havesocketinfo) { + snprintf(src_bufferinfo, sizeof(src_bufferinfo), + "%lu buffered (%lu + %lu + %lu)", diff --git a/community/dante/sockd.confd b/community/dante/sockd.confd new file mode 100644 index 0000000000..37628d38d0 --- /dev/null +++ b/community/dante/sockd.confd @@ -0,0 +1,2 @@ +# enter the sockd options +SOCKD_OPTS="-D" diff --git a/community/dante/sockd.initd b/community/dante/sockd.initd new file mode 100644 index 0000000000..f77df213ee --- /dev/null +++ b/community/dante/sockd.initd @@ -0,0 +1,19 @@ +#!/sbin/openrc-run +# +# startup script for sockd daemon +# + +depend() { + need net + after firewall + provide sockd + use dns +} + +command=/usr/sbin/sockd +pidfile=/var/run/${SVCNAME}.pid +command_args="${SOCKD_OPTS}" + +start_pre() { + $command -V +} diff --git a/testing/dante/APKBUILD b/testing/dante/APKBUILD deleted file mode 100644 index b8f3dad3ba..0000000000 --- a/testing/dante/APKBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# Contributor: Paul Kilar -# Maintainer: Paul Kilar -pkgname=dante -pkgver="1.4.2" -pkgrel=3 -pkgdesc="Dante is SOCKS server and a SOCKS client" -url="http://www.inet.no/dante/index.html" -arch="all" -license="BSD CMU" -depends="" -depends_dev="" -makedepends="bison flex" -install="$pkgname-server.pre-install" -options="libtool" -subpackages="$pkgname-dev $pkgname-doc $pkgname-server" -source="http://www.inet.no/dante/files/$pkgname-$pkgver.tar.gz -ifdev.patch -sockd.initd -sockd.confd" - -builddir="$srcdir"/$pkgname-$pkgver - -prepare() { - default_prepare || return 1 - update_config_guess || return 1 -} - -build() { - cd "$builddir" - subpackages="$pkgname-dev $pkgname-doc" - ac_cv_func_sched_setscheduler=no ./configure --prefix=/usr - make || return 1 -} - -package() { - cd "$builddir" - make install DESTDIR=$pkgdir || return 1 -} - -server() { - depends= - cd "$builddir" - install -D -m644 "example/sockd.conf" \ - "$subpkgdir/etc/sockd.conf" || return 1 - install -D -m644 "$srcdir"/sockd.confd \ - "$subpkgdir"/etc/conf.d/sockd || return 1 - install -D -m755 "$srcdir"/sockd.initd \ - "$subpkgdir"/etc/init.d/sockd || return 1 - - install -d "$subpkgdir/usr/sbin" - mv "$pkgdir/usr/sbin/sockd" "$subpkgdir/usr/sbin/sockd" -} - -sha512sums="4d0588d3e138c80fac7ecf80a2d0ab0a2a3e7c9c847029af4eb50b59f35c86641085bf8e625d437cbb00d616ac444b98fdcf417da375fe32312ca420187ef21b dante-1.4.2.tar.gz -9fd824db09081e1ff81875e740c9ee4d529e986ce486cbb4270e02c061c0120898cbe57f70ed010cc6b81f1d700114732d8f84b2f055f43d5f3110f2f0e8ba23 ifdev.patch -9ec0c32f6bfb3fbd266f89ccb0ffff0356b88d679bf3099ff4c78e7f4ca78de9b8fb9f6ff136ca333f148c16f9fcb502ac3f5469c106494846e4aa3192d79c4e sockd.initd -09b744340c03369983a9b07e50215288e5a43d15497db479867132bee46f34a7a8e451c980e064f751ad50e5231d77fa5ae9fd5cf2efe3274ae50168bfceaa67 sockd.confd" diff --git a/testing/dante/dante-server.pre-install b/testing/dante/dante-server.pre-install deleted file mode 100644 index 8bf90b40cf..0000000000 --- a/testing/dante/dante-server.pre-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -addgroup -S sockd 2>/dev/null -adduser -S -D -H -h /dev/null -s /sbin/nologin -G sockd -g sockd sockd 2>/dev/null - -exit 0 diff --git a/testing/dante/ifdev.patch b/testing/dante/ifdev.patch deleted file mode 100644 index 541edefe03..0000000000 --- a/testing/dante/ifdev.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/sockd/sockd_io.c.old 2017-05-10 19:57:20.672000000 +0000 -+++ b/sockd/sockd_io.c 2017-05-10 20:00:34.548000000 +0000 -@@ -2912,7 +2912,7 @@ siginfo(sig, si, sc) - int src_so_rcvbuf, dst_so_rcvbuf; - #endif /* HAVE_RECVBUF_IOCTL */ - --#if HAVE_SENDBUF_IOCTL -+#ifdef HAVE_SENDBUF_IOCTL - int src_so_sndbuf, dst_so_sndbuf; - #endif /* HAVE_SENDBUF_IOCTL */ - -@@ -2960,7 +2960,7 @@ siginfo(sig, si, sc) - *src_bufferinfo = NUL; - *dst_bufferinfo = NUL; - --#if HAVE_RECVBUF_IOCTL || HAVE_SENDBUF_IOCTL -+#if defined(HAVE_RECVBUF_IOCTL) || defined(HAVE_SENDBUF_IOCTL) - - havesocketinfo = 1; - -@@ -2987,7 +2987,7 @@ siginfo(sig, si, sc) - } - #endif /* HAVE_RECVBUF_IOCTL */ - --#if HAVE_SENDBUF_IOCTL -+#ifdef HAVE_SENDBUF_IOCTL - if (havesocketinfo) { - if (ioctl(src->s, SENDBUF_IOCTLVAL, &src_so_sndbuf) != 0) { - swarn("%s: sendbuf size ioctl() on src-fd %d failed", -@@ -3005,7 +3005,7 @@ siginfo(sig, si, sc) - } - #endif /* HAVE_SENDBUF_IOCTL */ - --#if HAVE_SENDBUF_IOCTL && HAVE_RECVBUF_IOCTL -+#ifdef HAVE_SENDBUF_IOCTL && HAVE_RECVBUF_IOCTL - if (havesocketinfo) { - snprintf(src_bufferinfo, sizeof(src_bufferinfo), - "%lu buffered (%lu + %lu + %lu)", diff --git a/testing/dante/sockd.confd b/testing/dante/sockd.confd deleted file mode 100644 index 37628d38d0..0000000000 --- a/testing/dante/sockd.confd +++ /dev/null @@ -1,2 +0,0 @@ -# enter the sockd options -SOCKD_OPTS="-D" diff --git a/testing/dante/sockd.initd b/testing/dante/sockd.initd deleted file mode 100644 index f77df213ee..0000000000 --- a/testing/dante/sockd.initd +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/openrc-run -# -# startup script for sockd daemon -# - -depend() { - need net - after firewall - provide sockd - use dns -} - -command=/usr/sbin/sockd -pidfile=/var/run/${SVCNAME}.pid -command_args="${SOCKD_OPTS}" - -start_pre() { - $command -V -} -- cgit v1.2.3