Date: Wed, 9 Jan 2013 11:06:33 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310136 - in head: net/scapy security/ipsec-tools Message-ID: <201301091106.r09B6Xs0047879@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Jan 9 11:06:32 2013 New Revision: 310136 URL: http://svnweb.freebsd.org/changeset/ports/310136 Log: Convert vanhu@ ports to new options framework Removed optionnal dependency on the deprecated py-visual for net/scapy Approved by: maintainer (vanhu) Modified: head/net/scapy/Makefile head/net/scapy/pkg-descr head/security/ipsec-tools/Makefile Modified: head/net/scapy/Makefile ============================================================================== --- head/net/scapy/Makefile Wed Jan 9 10:54:41 2013 (r310135) +++ head/net/scapy/Makefile Wed Jan 9 11:06:32 2013 (r310136) @@ -1,7 +1,4 @@ -# New ports collection makefile for: scapy -# Date created: 08 dec 2005 -# Whom: vanhu <vanhu@netasq.com> -# +# Created by: vanhu <vanhu@netasq.com> # $FreeBSD$ # # TODO: - configurable --enable-xxx for various additional dependancies @@ -23,57 +20,53 @@ MANCOMPRESSED= yes USE_PYTHON= 2.5+ USE_PYDISTUTILS=yes -OPTIONS= PYX "Support for PostScript and PDF graphs drawing" off \ - PYCRYPTO "Support for py-crypto for WEP decoding" off \ - PYGNUPLOT "Support for py-gnuplot wrapper to plot graphs" off \ - GRAPH "Support for graph generation and visualization" off \ - P0F_BASE "Support for p0f OS signatures database" off \ - QUESO_BASE "Support for queso OS signatures database" off \ - NMAP "Support for nmap OS signatures database" off \ - MANUF "Support for wireshark's MANUF MAC database" off \ - VPYTHON "Support for 3D representation of traceroute" off \ - SOX "Support for VoIP" off +OPTIONS_DEFINE= PYX PYCRYPTO PYGNUPLOT GRAPH P0F_BASE QUESO_BASE MMAP MANUF +PYX_DESC= PostScript and PDF graphs drawing +PYCRYPTO_DESC= Use py-crypto for WEP decoding +PYGNUPLOT_DESC= Use py-gnuplot wrapper to plot graphs +GRAPH_DESC= graph generation and visualization +P0F_BASE_DESC= p0f OS signatures database +QUESO_BASE_DESC= queso OS signatures database +NMAP_DESC= nmap OS signatures database +MANUF_DESC= wireshark's MANUF MAC database +SOX_DESC= Support for VoIP -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_PYX) +.if ${PORT_OPTIONS:MPYX} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pyx/__init__.py:${PORTSDIR}/graphics/py-PyX .endif -.if defined(WITH_PYCRYPTO) +.if ${PORT_OPTIONS:MPYCRYPTO} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto .endif -.if defined(WITH_PYGNUPLOT) +.if ${PORT_OPTIONS:MPYGNUPLOT} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Gnuplot/__init__.py:${PORTSDIR}/math/py-gnuplot .endif -.if defined(WITH_GRAPH) +.if ${PORT_OPTIONS:MGRAPH} RUN_DEPENDS+= ${LOCALBASE}/bin/MagickCore-config:${PORTSDIR}/graphics/ImageMagick RUN_DEPENDS+= ${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz .endif -.if defined(WITH_P0F_BASE) +.if ${PORT_OPTIONS:MP0F_BASE} RUN_DEPENDS+= ${LOCALBASE}/etc/p0f/p0f.fp:${PORTSDIR}/net-mgmt/p0f .endif -.if defined(WITH_QUESO_BASE) +.if ${PORT_OPTIONS:MQUESO_BASE} RUN_DEPENDS+= ${LOCALBASE}/etc/queso.conf.sample:${PORTSDIR}/net/queso .endif -.if defined(WITH_NMAP) +.if ${PORT_OPTIONS:MNMAP} RUN_DEPENDS+= ${LOCALBASE}/share/nmap/nmap-os-db:${PORTSDIR}/security/nmap .endif -.if defined(WITH_MANUF) +.if ${PORT_OPTIONS:MMANUF} RUN_DEPENDS+= ${LOCALBASE}/share/wireshark/manuf:${PORTSDIR}/net/wireshark .endif -.if defined(WITH_VPYTHON) -RUN_DEPENDS+= ${LOCALBASE}/bin/vpython:${PORTSDIR}/graphics/py-visual -.endif - -.if defined(WITH_SOX) +.if ${PORT_OPTIONS:MSOX} RUN_DEPENDS+= ${LOCALBASE}/bin/sox:${PORTSDIR}/audio/sox .endif @@ -85,4 +78,4 @@ post-patch: @${REINPLACE_CMD} "s,/etc/,${LOCALBASE}/etc/," \ ${WRKSRC}/scapy/modules/p0f.py ${WRKSRC}/scapy/modules/queso.py -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net/scapy/pkg-descr ============================================================================== --- head/net/scapy/pkg-descr Wed Jan 9 10:54:41 2013 (r310135) +++ head/net/scapy/pkg-descr Wed Jan 9 11:06:32 2013 (r310136) @@ -10,4 +10,4 @@ invalid frames, injecting your own 802.1 (VLAN hopping+ARP cache poisoning, VOIP decoding on WEP encrypted channel, ...), etc. -WWW: http://secdev.org/projects/scapy +WWW: http://secdev.org/projects/scapy Modified: head/security/ipsec-tools/Makefile ============================================================================== --- head/security/ipsec-tools/Makefile Wed Jan 9 10:54:41 2013 (r310135) +++ head/security/ipsec-tools/Makefile Wed Jan 9 11:06:32 2013 (r310136) @@ -1,7 +1,4 @@ -# New ports collection makefile for: ipsec-tools -# Date created: 20 dec 2004 -# Whom: vanhu -# +# Created by: vanhu # $FreeBSD$ # TODO: - libipsec issue ? @@ -35,22 +32,23 @@ STATEDIR= /var/db/racoon SUB_LIST+= STATEDIR=${STATEDIR} PLIST_SUB+= STATEDIR=${STATEDIR} -OPTIONS= DEBUG "enable Debug support" on \ - IPV6 "enable IPV6 support" on \ - ADMINPORT "enable Admin port" off \ - STATS "enable Statistics logging function" off \ - DPD "enable Dead Peer Detection" on \ - NATT "enable NAT-Traversal (kernel-patch required)" on \ - NATTF "require NAT-Traversal (fail without kernel-patch)" off \ - FRAG "enable IKE fragmentation payload support" on \ - HYBRID "enable Hybrid, Xauth and Mode-cfg support" on \ - PAM "enable PAM authentication (Xauth server)" off \ - RADIUS "enable Radius authentication (Xauth server)" off \ - LDAP "enable LDAP authentication (Xauth server)" off \ - GSSAPI "enable GSS-API authentication" off \ - SAUNSPEC "enable Unspecified SA mode" off \ - RC5 "enable RC5 encryption (patented)" off \ - IDEA "enable IDEA encryption (patented)" off +OPTIONS_DEFINE= DEBUG IPV6 ADMINPORT STATS DPD NATT NATTF FRAG HYBRID PAM \ + RADIUS LDAP GSSAPI SAUNSPEC RC5 IDEA DOCS +OPTIONS_DEFAULT= DEBUG DPD NATT FRAG HYBRID + +ADMINPORT_DESC= Enable Admin port +STATS_DESC= Statistics logging function +DPD_DESC= Dead Peer Detection +NATT_DESC= NAT-Traversal (kernel-patch required) +NATTF_DESC= require NAT-Traversal (fail without kernel-patch) +FRAG_DESC= IKE fragmentation payload support +HYBRID_DESC= Hybrid, Xauth and Mode-cfg support +SAUNSPEC_DESC= Unspecified SA mode +RC5_DESC= RC5 encryption (patented) +IDEA_DESC= IDEA encryption (patented) +PAM_DESC= PAM authentication (Xauth server) +RADIUS_DESC= Radius authentication (Xauth server) +LDAP_DESC= LDAP authentication (Xauth server) MAN3= ipsec_set_policy.3 ipsec_strerror.3 MAN5= racoon.conf.5 @@ -64,38 +62,38 @@ PORTDOCS= * EXTRA_PATCHES= ${FILESDIR}/patch8-utmp.diff .endif -.ifdef(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .else CONFIGURE_ARGS+= --disable-debug .endif -.ifdef(WITH_IPV6) +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif -.ifdef(WITH_ADMINPORT) +.if ${PORT_OPTIONS:MADMINPORT} CONFIGURE_ARGS+= --enable-adminport .else CONFIGURE_ARGS+= --disable-adminport .endif -.ifdef(WITH_STATS) +.if ${PORT_OPTIONS:MSTATS} CONFIGURE_ARGS+= --enable-stats .else CONFIGURE_ARGS+= --disable-stats .endif -.ifdef(WITH_DPD) +.if ${PORT_OPTIONS:MDPD} CONFIGURE_ARGS+= --enable-dpd .else CONFIGURE_ARGS+= --disable-dpd .endif -.ifdef(WITH_NATT) -. ifdef(WITH_NATTF) +.if ${PORT_OPTIONS:MNATT} +. if ${PORT_OPTIONS:MNATTF} CONFIGURE_ARGS+= --enable-natt=yes . else CONFIGURE_ARGS+= --enable-natt=kernel @@ -104,25 +102,25 @@ CONFIGURE_ARGS+= --enable-natt=kernel CONFIGURE_ARGS+= --disable-natt .endif -.ifdef(WITH_FRAG) +.if ${PORT_OPTIONS:MFRAG} CONFIGURE_ARGS+= --enable-frag .else CONFIGURE_ARGS+= --disable-frag .endif -.ifdef(WITH_HYBRID) +.if ${PORT_OPTIONS:MHYBRID} CONFIGURE_ARGS+= --enable-hybrid .else CONFIGURE_ARGS+= --disable-hybrid .endif -.ifdef(WITH_PAM) +.if ${PORT_OPTIONS:MPAM} CONFIGURE_ARGS+= --with-libpam .else CONFIGURE_ARGS+= --without-libpam .endif -.ifdef(WITH_GSSAPI) +.if ${PORT_OPTIONS:MGSSAPI} USE_ICONV= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -131,39 +129,39 @@ CONFIGURE_ARGS+= --enable-gssapi CONFIGURE_ARGS+= --disable-gssapi .endif -.ifdef(WITH_RADIUS) +.if ${PORT_OPTIONS:MRADIUS} CONFIGURE_ARGS+= --with-libradius .else CONFIGURE_ARGS+= --without-libradius .endif -.ifdef(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= YES CONFIGURE_ARGS+= --with-libldap=${LOCALBASE} .else CONFIGURE_ARGS+= --without-libldap .endif -.ifdef(WITH_SAUNSPEC) +.if ${PORT_OPTIONS:MSAUNSPEC} CONFIGURE_ARGS+= --enable-samode-unspec .else CONFIGURE_ARGS+= --disable-samode-unspec .endif -.ifdef(WITH_RC5) +.if ${PORT_OPTIONS:MRC5} CONFIGURE_ARGS+= --enable-rc5 .else CONFIGURE_ARGS+= --disable-rc5 .endif -.ifdef(WITH_IDEA) +.if ${PORT_OPTIONS:MIDEA} CONFIGURE_ARGS+= --enable-idea .else CONFIGURE_ARGS+= --disable-idea .endif .if ${OSVERSION} < 800000 -.ifdef(WITH_NATT) +.if ${PORT_OPTIONS:MNATT} pre-configure: @${ECHO_MSG} "===> -------------------------------------------------------------------------" @${ECHO_MSG} "===> ATTENTION: You need a kernel patch to enable NAT-Traversal functionality!" @@ -183,7 +181,7 @@ post-install: @${MKDIR} ${EXAMPLESDIR} @${RM} -f ${WRKSRC}/src/racoon/samples/*.in @${CP} -r ${WRKSRC}/src/racoon/samples/* ${EXAMPLESDIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MOCS} @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/src/racoon/doc/* ${DOCSDIR} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301091106.r09B6Xs0047879>