cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

astmanproxy: update to a very slightly newer version, switch from self-rolled tarball

Browse Source 
to GH_*, tidy makefile and patches. (there's a slightly more active fork that fixes a
few things but needs fixing to not use gnu extensions :/)
This commit is contained in:
sthen 2020-03-20 10:51:21 +00:00
parent 62aea85f26
commit 23a72bc428
8 changed files with 45 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
telephony/astmanproxy/Makefile
View File

@ -1,8 +1,13 @@
# $OpenBSD: Makefile,v 1.8 2019/06/03 16:06:57 sthen Exp $
# $OpenBSD: Makefile,v 1.9 2020/03/20 10:51:21 sthen Exp $
COMMENT = proxy for Asterisk Manager Interface
DISTNAME = astmanproxy-1.22pre081119
REVISION = 1
# there is a slightly more active fork in davies147/astmanproxy, but it needs
# fixing to not use gnu extensions
GH_ACCOUNT = davetroy
GH_PROJECT = astmanproxy
GH_COMMIT = f4b952a717b7e982b585bf0daa86398add394a88
DISTNAME = astmanproxy-1.22pre20081208
CATEGORIES = telephony
@ -15,25 +20,23 @@ PERMIT_PACKAGE = Yes
WANTLIB = c crypto pthread ssl
# mirrored from git repository
MASTER_SITES = https://spacehopper.org/mirrors/
MAKE_ENV = CFLAGS="${CFLAGS}"
MAKE_FLAGS = CC="${CC}" SYSCONFDIR=${SYSCONFDIR} \
LIBDIR=${WRKINST}/${PREFIX}/lib/astmanproxy \
MODDIR=${PREFIX}/lib/astmanproxy/modules \
MODDIR_REAL=${WRKINST}/${PREFIX}/lib/astmanproxy/modules \
CONFDIR=${SYSCONFDIR}/astmanproxy \
CONFDIR_REAL=${WRKINST}/${PREFIX}/share/examples/astmanproxy \
PERMDIR=${SYSCONFDIR}/astmanproxy \
PERMDIR_REAL=${WRKINST}/${PREFIX}/share/examples/astmanproxy
PERMDIR=${SYSCONFDIR}/astmanproxy
FAKE_FLAGS = PREFIX=${PREFIX}
FAKE_FLAGS = PREFIX=${PREFIX} \
MODDIR=${WRKINST}${PREFIX}/lib/astmanproxy/modules \
CONFDIR_REAL=${WRKINST}/${PREFIX}/share/examples/astmanproxy \
PERMDIR_REAL=${WRKINST}/${PREFIX}/share/examples/astmanproxy
USE_GMAKE = Yes
NO_TEST = Yes
ALL_TARGET = astmanproxy
DEBUG_PACKAGES = ${BUILD_PACKAGES}
pre-configure:
${SUBST_CMD} ${WRKSRC}/configs/astmanproxy.conf

4
telephony/astmanproxy/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (astmanproxy-1.22pre081119.tar.gz) = dlBg4KRK8D06h3O5rqjx/+QT2wVpMmNbH3KHnqFVi0I=
SIZE (astmanproxy-1.22pre081119.tar.gz) = 60208
SHA256 (astmanproxy-1.22pre20081208-f4b952a7.tar.gz) = NC1SRDicsf4OD6mKqp1OgGY9YK43rVsYpAvVQxCNLjg=
SIZE (astmanproxy-1.22pre20081208-f4b952a7.tar.gz) = 60213

50
telephony/astmanproxy/patches/patch-Makefile
View File

@ -1,15 +1,8 @@
$OpenBSD: patch-Makefile,v 1.2 2017/04/12 11:59:25 sthen Exp $
--- Makefile.orig Wed Jun 24 08:58:23 2009
+++ Makefile Wed Apr 12 12:58:13 2017
@@ -11,7 +11,7 @@ PERMDIR:=/etc/asterisk
PERMDIR_REAL := $(DESTDIR)/etc/asterisk
DISTDIR:=/var/www/html/astmanproxy
-LIBDIR := $(DESTDIR)/usr/lib/astmanproxy
+LIBDIR ?= $(DESTDIR)/usr/lib/astmanproxy
CONFFILE := astmanproxy.conf
PERMFILE := astmanproxy.users
$OpenBSD: patch-Makefile,v 1.3 2020/03/20 10:51:21 sthen Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -27,7 +27,8 @@ SOBJS := $(HANDLERS:%=%.so)
LIBS := -lssl
@ -20,7 +13,7 @@ $OpenBSD: patch-Makefile,v 1.2 2017/04/12 11:59:25 sthen Exp $
ifeq (${OSARCH},Darwin)
LIBS+=-lresolv
@@ -48,16 +49,21 @@ ifeq (${OSARCH},Darwin)
@@ -48,8 +49,13 @@ ifeq (${OSARCH},Darwin)
MKTEMP=/usr/bin/mktemp
else
#These are used for all but Darwin
@ -34,19 +27,8 @@ $OpenBSD: patch-Makefile,v 1.2 2017/04/12 11:59:25 sthen Exp $
+endif
ASTLINK=-Wl,-E
SOLINK=-shared -Xlinker -x
- LOGDIR=/var/log/asterisk
- CERTDIR := /var/lib/asterisk/certs
- MKTEMP=/bin/mktemp
+ LOGDIR ?= /var/log/asterisk
+ CERTDIR ?= /var/lib/asterisk/certs
endif
MODDIR := $(LIBDIR)/modules
+MODDIR_REAL := $(LIBDIR)/modules
DEFINES:='-DPROXY_VERSION="$(VERSION)"' '-DCDIR="$(CONFDIR)"' '-DCFILE="$(CONFFILE)"'
DEFINES+='-DMDIR="$(MODDIR)"' '-DPDIR="$(PERMDIR)"' '-DPFILE="$(PERMFILE)"'
@@ -137,12 +143,12 @@ certificate:
LOGDIR=/var/log/asterisk
@@ -137,7 +143,7 @@ certificate:
fi
@ -55,19 +37,3 @@ $OpenBSD: patch-Makefile,v 1.2 2017/04/12 11:59:25 sthen Exp $
install -d $(BINDIR)
install astmanproxy $(BINDIR)
install -d $(LIBDIR)
- install -d $(MODDIR)
- install $(SOBJS) $(MODDIR)
+ install -d $(MODDIR_REAL)
+ install $(SOBJS) $(MODDIR_REAL)
install -d $(CONFDIR_REAL)
if [ ! -f $(CONF_TARGET) ]; then \
install ./configs/$(CONFFILE) $(CONF_TARGET); \
@@ -154,7 +160,7 @@ install: uninstall all
uninstall:
rm -f $(BINDIR)/astmanproxy
- cd $(MODDIR); rm -f $(SOBJS)
+ cd $(MODDIR_REAL); rm -f $(SOBJS)
@echo "Successfully uninstalled!"
dist: clean

8
telephony/astmanproxy/patches/patch-configs_astmanproxy_conf
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-configs_astmanproxy_conf,v 1.1.1.1 2009/10/13 11:10:41 sthen Exp $
--- configs/astmanproxy.conf.orig Sat Jul 1 16:42:35 2006
+++ configs/astmanproxy.conf Fri Jan 18 15:15:48 2008
$OpenBSD: patch-configs_astmanproxy_conf,v 1.2 2020/03/20 10:51:21 sthen Exp $
Index: configs/astmanproxy.conf
--- configs/astmanproxy.conf.orig
+++ configs/astmanproxy.conf
@@ -37,13 +37,13 @@ asteriskwritetimeout=100
clientwritetimeout=200

8
telephony/astmanproxy/patches/patch-configs_ssl_conf
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-configs_ssl_conf,v 1.2 2012/03/08 12:13:00 ajacoutot Exp $
--- configs/ssl.conf.orig Wed Jun 24 03:58:23 2009
+++ configs/ssl.conf Tue Mar 6 15:32:31 2012
$OpenBSD: patch-configs_ssl_conf,v 1.3 2020/03/20 10:51:21 sthen Exp $
Index: configs/ssl.conf
--- configs/ssl.conf.orig
+++ configs/ssl.conf
@@ -9,7 +9,7 @@
# other options under the root_ca_distinguished_name section.

2
telephony/astmanproxy/patches/patch-src_astmanproxy_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_astmanproxy_c,v 1.1 2018/04/25 20:13:04 naddy Exp $
$OpenBSD: patch-src_astmanproxy_c,v 1.2 2020/03/20 10:51:21 sthen Exp $
Index: src/astmanproxy.c
--- src/astmanproxy.c.orig

8
telephony/astmanproxy/patches/patch-src_include_endian_h
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-src_include_endian_h,v 1.2 2015/05/01 17:40:58 ajacoutot Exp $
--- src/include/endian.h.orig Fri Jan 18 11:11:28 2008
+++ src/include/endian.h Fri Jan 18 11:13:09 2008
$OpenBSD: patch-src_include_endian_h,v 1.3 2020/03/20 10:51:21 sthen Exp $
Index: src/include/endian.h
--- src/include/endian.h.orig
+++ src/include/endian.h
@@ -29,9 +29,11 @@
#include <endian.h>
#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)

10
telephony/astmanproxy/pkg/PLIST
View File

@ -1,12 +1,12 @@
@comment $OpenBSD: PLIST,v 1.2 2009/10/13 11:13:04 sthen Exp $
@comment $OpenBSD: PLIST,v 1.3 2020/03/20 10:51:21 sthen Exp $
@newgroup _astmanproxy:640
@newuser _astmanproxy:640:_astmanproxy:daemon:asterisk management proxy user:/nonexistent:/sbin/nologin
lib/astmanproxy/
lib/astmanproxy/modules/
lib/astmanproxy/modules/csv.so
lib/astmanproxy/modules/http.so
lib/astmanproxy/modules/standard.so
lib/astmanproxy/modules/xml.so
@so lib/astmanproxy/modules/csv.so
@so lib/astmanproxy/modules/http.so
@so lib/astmanproxy/modules/standard.so
@so lib/astmanproxy/modules/xml.so
@bin sbin/astmanproxy
share/doc/astmanproxy/
share/doc/astmanproxy/README