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

Tweak the OpenConnect port: update vpnc-script, enable NLS (gettext

Browse Source 
was already pulled in via libs, so no new deps), and avoid SEPARATE_BUILD
for now as the code to detect a version mismatch between binary and lib
in this version doesn't handle it.
This commit is contained in:
sthen 2012-11-08 16:44:21 +00:00
parent 9de96fd905
commit 9784f964f0
4 changed files with 133 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/openconnect/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2012/08/31 13:59:01 sthen Exp $
# $OpenBSD: Makefile,v 1.14 2012/11/08 16:44:21 sthen Exp $
COMMENT= client for Cisco AnyConnect SSL VPN
DISTNAME= openconnect-4.07
REVISION= 0
DIST_SUBDIR= openconnect
VPNC_SCRIPT= vpnc-script
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${VPNC_SCRIPT}:0
@ -26,7 +27,7 @@ WANTLIB += c gmp gnutls hogweed m nettle p11-kit proxy pthread
WANTLIB += stdc++ tasn1 xml2 z
MASTER_SITES= ftp://ftp.infradead.org/pub/openconnect/
MASTER_SITES0= http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/d19a327c74f824114c5c72101104891fe881a7da:/
MASTER_SITES0= http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/0e042c5ab78bd5dbeeb82b8570160c081fa8c3ff:/
# used to format html during build, USE_GROFF not needed
BUILD_DEPENDS= textproc/groff
@ -39,9 +40,10 @@ LIB_DEPENDS= security/gnutls \
net/libproxy>=0.4.6p7
FAKE_FLAGS= pkgdatadir=${PREFIX}/share/doc/openconnect
SEPARATE_BUILD= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -liconv"
CONFIGURE_ARGS= --with-vpnc-script=${SYSCONFDIR}/openconnect/vpnc-script \
--with-gnutls

4
net/openconnect/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (openconnect/openconnect-4.07.tar.gz) = FMrLF4E3FO0WxY28szzXdGPE48TlLpVei1mkODPTtvM=
SHA256 (openconnect/vpnc-script) = lKuQjXLkVKRUJVwp1Da11fjSGFEq+vrxH9mTcUsKVcY=
SHA256 (openconnect/vpnc-script) = h0WrNiURlrDItwcWPbmm5dguKHpbT0pysFOQDxS4qzc=
SIZE (openconnect/openconnect-4.07.tar.gz) = 1182237
SIZE (openconnect/vpnc-script) = 19098
SIZE (openconnect/vpnc-script) = 21882

27
net/openconnect/patches/patch-vpnc-script_in → net/openconnect/patches/patch-vpnc-script
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-vpnc-script_in,v 1.1.1.1 2011/12/08 13:55:28 sthen Exp $
--- vpnc-script.orig Thu Dec 8 13:18:54 2011
+++ vpnc-script Thu Dec 8 13:22:05 2011
@@ -59,7 +59,7 @@ if [ ! -d "/var/run/vpnc" ]; then
$OpenBSD: patch-vpnc-script,v 1.1 2012/11/08 16:44:21 sthen Exp $
--- vpnc-script.orig Thu Nov 8 16:22:19 2012
+++ vpnc-script Thu Nov 8 16:22:31 2012
@@ -89,7 +89,7 @@ if [ ! -d "/var/run/vpnc" ]; then
fi
# stupid SunOS: no blubber in /usr/local/bin ... (on stdout)
-IPROUTE="`which ip | grep '^/' 2> /dev/null`"
-IPROUTE="`which ip | grep '^/'`" 2> /dev/null
+IPROUTE="`which ip 2> /dev/null | grep '^/'`"
if [ "$OS" = "Linux" ]; then
ifconfig_syntax_ptp="pointopoint"
@@ -141,7 +141,7 @@ do_ifconfig() {
if ifconfig --help 2>&1 | grep BusyBox > /dev/null; then
ifconfig_syntax_inet=""
@@ -198,7 +198,7 @@ do_ifconfig() {
destroy_tun_device() {
case "$OS" in
@ -18,24 +18,23 @@ $OpenBSD: patch-vpnc-script_in,v 1.1.1.1 2011/12/08 13:55:28 sthen Exp $
+ NetBSD|FreeBSD|OpenBSD) # and probably others...
ifconfig "$TUNDEV" destroy
;;
SunOS)
@@ -266,7 +266,7 @@ else # use route command
esac
@@ -317,7 +317,7 @@ else # use route command
del_network_route() {
case "$OS" in
- Linux|NetBSD|Darwin|SunOS) # and probably others...
+ Linux|NetBSD|Darwin|SunOS|OpenBSD) # and probably others...
+ Linux|NetBSD|OpenBSD|Darwin|SunOS) # and probably others...
# routes are deleted automatically on device shutdown
return
;;
@@ -524,7 +524,9 @@ do_pre_init() {
@@ -603,6 +603,9 @@ do_pre_init() {
elif [ "$OS" = "NetBSD" ]; then
:
elif [ "$OS" = "OpenBSD" ]; then
- :
+ if ! ifconfig $TUNDEV > /dev/null; then
+ ifconfig $TUNDEV create
+ fi
:
elif [ "$OS" = "SunOS" ]; then
:
elif [ "$OS" = "Darwin" ]; then

114
net/openconnect/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2012/06/28 15:43:21 sthen Exp $
@comment $OpenBSD: PLIST,v 1.3 2012/11/08 16:44:21 sthen Exp $
include/openconnect.h
lib/libopenconnect.a
lib/libopenconnect.la
@ -45,3 +45,115 @@ share/examples/openconnect/vpnc-script
@sample ${SYSCONFDIR}/openconnect/
@mode 755
@sample ${SYSCONFDIR}/openconnect/vpnc-script
@mode
share/locale/ar/LC_MESSAGES/openconnect.mo
share/locale/as/LC_MESSAGES/openconnect.mo
share/locale/ast/LC_MESSAGES/openconnect.mo
share/locale/bg/LC_MESSAGES/openconnect.mo
share/locale/bg_BG/
share/locale/bg_BG/LC_MESSAGES/
share/locale/bg_BG/LC_MESSAGES/openconnect.mo
share/locale/bn/LC_MESSAGES/openconnect.mo
share/locale/bn_IN/LC_MESSAGES/openconnect.mo
share/locale/bs/LC_MESSAGES/openconnect.mo
share/locale/ca/LC_MESSAGES/openconnect.mo
share/locale/ca@valencia/LC_MESSAGES/openconnect.mo
share/locale/cs/LC_MESSAGES/openconnect.mo
share/locale/da/LC_MESSAGES/openconnect.mo
share/locale/de/LC_MESSAGES/openconnect.mo
share/locale/el/LC_MESSAGES/openconnect.mo
share/locale/en_GB/LC_MESSAGES/openconnect.mo
share/locale/en_US/
share/locale/en_US/LC_MESSAGES/
share/locale/en_US/LC_MESSAGES/openconnect.mo
share/locale/eo/LC_MESSAGES/openconnect.mo
share/locale/es/LC_MESSAGES/openconnect.mo
share/locale/es_CR/
share/locale/es_CR/LC_MESSAGES/
share/locale/es_CR/LC_MESSAGES/openconnect.mo
share/locale/es_MX/
share/locale/es_MX/LC_MESSAGES/
share/locale/es_MX/LC_MESSAGES/openconnect.mo
share/locale/et/LC_MESSAGES/openconnect.mo
share/locale/eu/LC_MESSAGES/openconnect.mo
share/locale/fa/LC_MESSAGES/openconnect.mo
share/locale/fi/LC_MESSAGES/openconnect.mo
share/locale/fr/LC_MESSAGES/openconnect.mo
share/locale/gd/
share/locale/gd/LC_MESSAGES/
share/locale/gd/LC_MESSAGES/openconnect.mo
share/locale/gl/LC_MESSAGES/openconnect.mo
share/locale/gu/LC_MESSAGES/openconnect.mo
share/locale/he/LC_MESSAGES/openconnect.mo
share/locale/hi/LC_MESSAGES/openconnect.mo
share/locale/hi_IN/
share/locale/hi_IN/LC_MESSAGES/
share/locale/hi_IN/LC_MESSAGES/openconnect.mo
share/locale/hu/LC_MESSAGES/openconnect.mo
share/locale/id/LC_MESSAGES/openconnect.mo
share/locale/it/LC_MESSAGES/openconnect.mo
share/locale/ja/LC_MESSAGES/openconnect.mo
share/locale/km/
share/locale/km/LC_MESSAGES/
share/locale/km/LC_MESSAGES/openconnect.mo
share/locale/kn/LC_MESSAGES/openconnect.mo
share/locale/ko/LC_MESSAGES/openconnect.mo
share/locale/ku/LC_MESSAGES/openconnect.mo
share/locale/lo/
share/locale/lo/LC_MESSAGES/
share/locale/lo/LC_MESSAGES/openconnect.mo
share/locale/lt/LC_MESSAGES/openconnect.mo
share/locale/lv/LC_MESSAGES/openconnect.mo
share/locale/ml/LC_MESSAGES/openconnect.mo
share/locale/mr/LC_MESSAGES/openconnect.mo
share/locale/ms/LC_MESSAGES/openconnect.mo
share/locale/ms_MY/
share/locale/ms_MY/LC_MESSAGES/
share/locale/ms_MY/LC_MESSAGES/openconnect.mo
share/locale/nb/LC_MESSAGES/openconnect.mo
share/locale/nl/LC_MESSAGES/openconnect.mo
share/locale/nn/LC_MESSAGES/openconnect.mo
share/locale/no/LC_MESSAGES/openconnect.mo
share/locale/or/LC_MESSAGES/openconnect.mo
share/locale/pa/LC_MESSAGES/openconnect.mo
share/locale/pl/LC_MESSAGES/openconnect.mo
share/locale/pt/LC_MESSAGES/openconnect.mo
share/locale/pt_BR/LC_MESSAGES/openconnect.mo
share/locale/pt_PT/
share/locale/pt_PT/LC_MESSAGES/
share/locale/pt_PT/LC_MESSAGES/openconnect.mo
share/locale/ro/LC_MESSAGES/openconnect.mo
share/locale/ru/LC_MESSAGES/openconnect.mo
share/locale/sk/LC_MESSAGES/openconnect.mo
share/locale/sl/LC_MESSAGES/openconnect.mo
share/locale/sq/LC_MESSAGES/openconnect.mo
share/locale/sr/LC_MESSAGES/openconnect.mo
share/locale/sr@latin/LC_MESSAGES/openconnect.mo
share/locale/sv/LC_MESSAGES/openconnect.mo
share/locale/ta/LC_MESSAGES/openconnect.mo
share/locale/te/LC_MESSAGES/openconnect.mo
share/locale/tg/
share/locale/tg/LC_MESSAGES/
share/locale/tg/LC_MESSAGES/openconnect.mo
share/locale/tg_TJ/
share/locale/tg_TJ/LC_MESSAGES/
share/locale/tg_TJ/LC_MESSAGES/openconnect.mo
share/locale/th/LC_MESSAGES/openconnect.mo
share/locale/tl/LC_MESSAGES/openconnect.mo
share/locale/tl_PH/
share/locale/tl_PH/LC_MESSAGES/
share/locale/tl_PH/LC_MESSAGES/openconnect.mo
share/locale/tr/LC_MESSAGES/openconnect.mo
share/locale/ug/LC_MESSAGES/openconnect.mo
share/locale/uk/LC_MESSAGES/openconnect.mo
share/locale/ur_PK/
share/locale/ur_PK/LC_MESSAGES/
share/locale/ur_PK/LC_MESSAGES/openconnect.mo
share/locale/vi/LC_MESSAGES/openconnect.mo
share/locale/vi_VN/
share/locale/vi_VN/LC_MESSAGES/
share/locale/vi_VN/LC_MESSAGES/openconnect.mo
share/locale/wa/LC_MESSAGES/openconnect.mo
share/locale/zh_CN/LC_MESSAGES/openconnect.mo
share/locale/zh_HK/LC_MESSAGES/openconnect.mo
share/locale/zh_TW/LC_MESSAGES/openconnect.mo