Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Apr 2006 07:53:17 +0200
From:      "Andreas Kohn" <andreas@syndrom23.de>
To:        "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org>
Cc:        MrL0Lz@gmail.com
Subject:   ports/95336: [PATCH] security/openvpn-admin: install missing file + smaller fixes
Message-ID:  <1144216397.26258@klamath.syndrom23.de>
Resent-Message-ID: <200604050600.k3560XIE092841@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         95336
>Category:       ports
>Synopsis:       [PATCH] security/openvpn-admin: install missing file + smaller fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 05 06:00:32 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Andreas Kohn
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 7.0-CURRENT #41: Fri Mar 17 12:01:02 CET 2006
    root@klamath.syndrom23.de:/usr/obj/usr/src/sys/KLAMATH



>Description:


When trying security/openvpn-admin, I found a few small and one big problem:
1. openvpn-admin.exe wasn't installed, so it wouldn't run (the big problem :D)
The patch also does (the small problems):
2. grammar improvement for BROKEN= message
3. remove USE_REINPLACE
4. make openvpn-admin search for its configuration files in ${PREFIX}/etc/openvpn, and pre-create that directory. It will contain user data after use, so only @dirrmtry to remove it.
5.  install openvpn-admin into ${PREFIX}/sbin/, to stick to the original installation logic, and in the same course also install openvpn-admin.pam without extension.

This is still not perfect, but I now need to fix my VPN first before continuing to play with the client side :)

Maintainer is Cc'd.



>How-To-Repeat:


Install and run openvpn-admin :)


>Fix:


--- openvpn-admin-1.9.2-fixes.diff begins here ---
Index: Makefile
===================================================================
RCS file: /storage/freebsd/cvs/ports/security/openvpn-admin/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	26 Feb 2006 21:53:33 -0000	1.3
+++ Makefile	4 Apr 2006 20:01:04 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	openvpn-admin
 PORTVERSION=	1.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openvpnadmin
@@ -24,22 +24,26 @@
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=	"Some dependencies doesn't build on FreeBSD < 5.x"
+BROKEN=	"Some dependencies don't build on FreeBSD < 5.x"
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/bin/iconv,${LOCALBASE}/bin/iconv,g' \
 		${WRKSRC}/intltool-merge.in
+	@${REINPLACE_CMD} -e 's,/etc/openvpn,${PREFIX}/etc/openvpn,' \
+		${WRKSRC}/src/Configuration.cs
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/openvpn-admin ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/openvpn-admin.pam ${PREFIX}/etc/pam.d
+	${INSTALL_SCRIPT} ${WRKSRC}/openvpn-admin ${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/openvpn-admin.pam ${PREFIX}/etc/pam.d/openvpn-admin
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/openvpn-admin.desktop ${DATADIR}
+	${MKDIR} ${PREFIX}/lib/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/src/openvpn-admin.exe ${PREFIX}/lib/${PORTNAME}
+	${MKDIR} ${PREFIX}/etc/openvpn
 
 .include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /storage/freebsd/cvs/ports/security/openvpn-admin/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	22 Dec 2005 09:58:44 -0000	1.1
+++ pkg-plist	4 Apr 2006 20:06:27 -0000
@@ -1,4 +1,7 @@
-bin/openvpn-admin
-etc/pam.d/openvpn-admin.pam
+sbin/openvpn-admin
+lib/openvpn-admin/openvpn-admin.exe
+etc/pam.d/openvpn-admin
 %%DATADIR%%/openvpn-admin.desktop
 @dirrm %%DATADIR%%
+@dirrm lib/openvpn-admin
+@dirrmtry etc/openvpn
--- openvpn-admin-1.9.2-fixes.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1144216397.26258>