ports/154537: [PATCH] net/ssltunnel-server: avoid CONFLICTS between -client and -server, use ETCDIR
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Sat Feb 5 22:20:13 UTC 2011
>Number: 154537
>Category: ports
>Synopsis: [PATCH] net/ssltunnel-server: avoid CONFLICTS between -client and -server, use ETCDIR
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 05 22:20:12 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 8.2-PRERELEASE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Fri Jan 14 04:36:31 CST 2011
>Description:
- Avoid CONFLICTS between ssltunnel-client and ssltunnel-server
Both of them install LISEZ-MOI and README to DOCSDIR.
- Add OPTIONS: TCPWRAPPERS
- Use ETCDIR
- Use bsd.port.options.mk
- Cosmetic changes
Port maintainer (utisoft at gmail.com) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- ssltunnel-server-1.18_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/ssltunnel-server/Makefile,v
retrieving revision 1.7
diff -u -u -r1.7 Makefile
--- Makefile 11 Nov 2010 07:51:49 -0000 1.7
+++ Makefile 5 Feb 2011 22:08:59 -0000
@@ -7,6 +7,7 @@
PORTNAME= ssltunnel
PORTVERSION= 1.18
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.hsc.fr/ressources/outils/ssltunnel/download/
PKGNAMESUFFIX= -server
@@ -15,13 +16,16 @@
COMMENT= PPP over SSL virtual private networking (server part)
LICENSE= BSD
+
+OPTIONS= TCPWRAPPERS "libwrap support" off
+
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-client
+CONFIGURE_ARGS= --disable-client
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if defined(WITH_TCPWRAPPERS)
-CONFIGURE_ARGS+= --with-libwrap
+CONFIGURE_ARGS+=--with-libwrap
.endif
post-patch:
@@ -36,11 +40,11 @@
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
- ${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
- ${INSTALL_MAN} ${WRKSRC}/LISEZ-MOI ${DOCSDIR}
+ ${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}/server.README
+ ${INSTALL_MAN} ${WRKSRC}/LISEZ-MOI ${DOCSDIR}/server.LISEZ-MOI
.endif
${INSTALL_SCRIPT} ${WRKSRC}/server/pppserver.sh ${PREFIX}/etc/rc.d/ssltunnel.sh.sample
- ${INSTALL_DATA} ${WRKSRC}/server/users.new ${PREFIX}/etc/ssltunnel/users.sample
+ ${INSTALL_DATA} ${WRKSRC}/server/users.new ${ETCDIR}/users.sample
@${CAT} ${PKGMESSAGE} | ${SED} "s|PREFIX|${PREFIX}|g"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/ssltunnel-server/pkg-plist,v
retrieving revision 1.2
diff -u -u -r1.2 pkg-plist
--- pkg-plist 16 Aug 2004 15:43:58 -0000 1.2
+++ pkg-plist 5 Feb 2011 22:08:59 -0000
@@ -1,11 +1,11 @@
etc/rc.d/ssltunnel.sh.sample
- at unexec if cmp -s %D/etc/ssltunnel/tunnel.conf %D/etc/ssltunnel/tunnel.conf.default; then rm -f %D/etc/ssltunnel/tunnel.conf; fi
- at unexec if cmp -s %D/etc/ssltunnel/users %D/etc/ssltunnel/users.sample; then rm -f %D/etc/ssltunnel/users; fi
-etc/ssltunnel/tunnel.conf.default
-etc/ssltunnel/users.sample
+ at unexec if cmp -s %D/%%ETCDIR%%/tunnel.conf %D/%%ETCDIR%%/tunnel.conf.default; then rm -f %D/%%ETCDIR%%/tunnel.conf; fi
+ at unexec if cmp -s %D/%%ETCDIR%%/users %D/%%ETCDIR%%/users.sample; then rm -f %D/%%ETCDIR%%/users; fi
+%%ETCDIR%%/tunnel.conf.default
+%%ETCDIR%%/users.sample
libexec/pppserver
sbin/pppwho
-%%PORTDOCS%%%%DOCSDIR%%/LISEZ-MOI
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/server.LISEZ-MOI
+%%PORTDOCS%%%%DOCSDIR%%/server.README
%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm etc/ssltunnel
+ at dirrmtry %%ETCDIR%%
--- ssltunnel-server-1.18_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list