svn commit: r378333 - in head/security: bro broccoli
Kurt Jaeger
pi at FreeBSD.org
Mon Feb 2 22:25:26 UTC 2015
Author: pi
Date: Mon Feb 2 22:25:23 2015
New Revision: 378333
URL: https://svnweb.freebsd.org/changeset/ports/378333
QAT: https://qat.redports.org/buildarchive/r378333/
Log:
security/bro, security/broccoli: 2.3 -> 2.3.2
This updates bro and broccoli from 2.3 and 2.3.2, which is a security
update.
Changes to the bro port:
- Rework openssl option logic
- Remove obsolete
- pkgng related changes
Changes to the broccoli port:
- Remove unused DOCS option
- Enable PYTHON by default
- pkgng related changes
- Minor portlint changes
Changes in 2.3.2:
- DNP3: fix reachable assertion and buffer over-read/overflow.
CVE number pending. (Travis Emmert, Jon Siwek)
- Update binpac: Fix potential out-of-bounds memory reads in
generated code. CVE-2014-9586. (John Villamil and Chris Rohlf
- Yahoo Paranoids, Jon Siwek)
- BIT-1234: Fix build on systems that already have ntohll/htonll.
(Jon Siwek)
- BIT-1291: Delete prebuilt python bytecode files from git. (Jon Siwek)
- Adding call to new binpac::init() function. (Robin Sommer)
Changes in 2.3.1:
- Fix a reference counting bug in ListVal ctor. (Jon Siwek)
- Fix possible buffer over-read in DNS TSIG parsing. (Jon Siwek)
- Change EDNS parsing code to use rdlength more cautiously. (Jon Siwek)
- Fix null pointer dereference in OCSP verification code in
case no certificate is sent as part as the ocsp reply. Addresses
BIT-1212. (Johanna Amann)
- Fix OCSP reply validation. Addresses BIT-1212 (Johanna Amann)
- Make links in documentation templates protocol relative. (Johanna Amann)
PR: 197107
Submitted by: Craig Leres <leres at ee.lbl.gov> (maintainer)
Reviewed by: koobs
Modified:
head/security/bro/Makefile
head/security/bro/distinfo
head/security/bro/pkg-plist
head/security/broccoli/Makefile
head/security/broccoli/distinfo
head/security/broccoli/pkg-plist
Modified: head/security/bro/Makefile
==============================================================================
--- head/security/bro/Makefile Mon Feb 2 22:22:23 2015 (r378332)
+++ head/security/bro/Makefile Mon Feb 2 22:25:23 2015 (r378333)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= bro
-PORTVERSION= 2.3
-PORTREVISION= 2
+PORTVERSION= 2.3.2
CATEGORIES= security
MASTER_SITES= http://www.bro.org/downloads/release/
@@ -16,10 +15,10 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/bison:${
${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP
-SUB_LIST+= PYTHON_CMD="${PYTHON_CMD}"
-
USES= cmake:outsource perl5 python
+CMAKE_ARGS+= -D PYTHON_EXECUTABLE:PATH=${PYTHON_CMD}
+
SUB_FILES= pkg-message
NO_MTREE= yes
@@ -47,6 +46,8 @@ PLIST_SUB+= BROUSER="$(BROUSER)" BROGROU
USERS= ${BROUSER}
GROUPS= ${BROGROUP}
+USE_OPENSSL= yes
+
OPTIONS_DEFINE= BROCCOLI BROCTL DEBUG IPSUMDUMP LBL_CF LBL_HF PERFTOOLS PORTS_SSL
OPTIONS_DEFAULT=BROCCOLI BROCTL IPSUMDUMP LBL_CF LBL_HF PORTS_SSL
@@ -115,8 +116,13 @@ CMAKE_ARGS+= -D ENABLE_PERFTOOLS:BOOL=fa
.endif
.if ${PORT_OPTIONS:MPORTS_SSL}
-WITH_OPENSSL_PORT=yes
CMAKE_ARGS+= -D CMAKE_EXE_LINKER_FLAGS="${OPENSSL_LDFLAGS}"
+BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so:${PORTSDIR}/security/openssl
+RUN_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so:${PORTSDIR}/security/openssl
+.else
+.if defined(WITH_OPENSSL_PORT)
+IGNORE= the SSL option is requred when WITH_OPENSSL_PORT is enabled
+.endif
.endif
.if ${PORT_OPTIONS:MIPSUMDUMP}
Modified: head/security/bro/distinfo
==============================================================================
--- head/security/bro/distinfo Mon Feb 2 22:22:23 2015 (r378332)
+++ head/security/bro/distinfo Mon Feb 2 22:25:23 2015 (r378333)
@@ -1,2 +1,2 @@
-SHA256 (bro-2.3.tar.gz) = 46bb9f46fbe71b22afd12ad12e0eb32033fb991a2a60b3bc2d881750249b85cd
-SIZE (bro-2.3.tar.gz) = 10283001
+SHA256 (bro-2.3.2.tar.gz) = 2fe5fbda0a86b5a594116d567fd9a4c2458d30f1c6670ba8e1fac0bc8848c69b
+SIZE (bro-2.3.2.tar.gz) = 10290134
Modified: head/security/bro/pkg-plist
==============================================================================
--- head/security/bro/pkg-plist Mon Feb 2 22:22:23 2015 (r378332)
+++ head/security/bro/pkg-plist Mon Feb 2 22:25:23 2015 (r378333)
@@ -1,7 +1,5 @@
- at comment Note: pkg_install needs the mkdir's, pkgng ignores them
- at exec mkdir -p %D/logs
@exec chown %%BROUSER%%:%%BROGROUP%% %D/logs
-%%BROCTL%%@exec mkdir -p %D/spool/tmp
+%%BROCTL%%@exec chown %%BROUSER%%:%%BROGROUP%% %D/share/broctl/scripts
%%BROCTL%%@exec chown %%BROUSER%%:%%BROGROUP%% %D/spool
%%BROCTL%%@exec chown %%BROUSER%%:%%BROGROUP%% %D/spool/tmp
%%BROCTL%%@exec chown -R %%BROUSER%%:%%BROGROUP%% %D/spool/installed-scripts-do-not-touch
@@ -453,109 +451,108 @@ bin/bro-cut
%%BROCTL%%@unexec rm -f %D/spool/installed-scripts-do-not-touch/site/local-proxy.bro
%%BROCTL%%@unexec rm -f %D/spool/installed-scripts-do-not-touch/site/local-worker.bro
%%BROCTL%%@unexec rm -f %D/spool/installed-scripts-do-not-touch/site/local.bro
-%%BROCTL%%@dirrmtry spool/tmp
-%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch/site
-%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch/auto
-%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch
-%%BROCTL%%@dirrmtry spool
-%%BROCTL%%@dirrm %%DATADIR%%ctl/scripts/postprocessors
-%%BROCTL%%@dirrm %%DATADIR%%ctl/scripts/helpers
-%%BROCTL%%@dirrm %%DATADIR%%ctl/scripts
-%%BROCTL%%@dirrm %%DATADIR%%ctl
- at dirrm %%DATADIR%%/site
- at dirrm %%DATADIR%%/policy/tuning/defaults
- at dirrm %%DATADIR%%/policy/tuning
- at dirrm %%DATADIR%%/policy/protocols/ssl
- at dirrm %%DATADIR%%/policy/protocols/ssh
- at dirrm %%DATADIR%%/policy/protocols/smtp
- at dirrm %%DATADIR%%/policy/protocols/modbus
- at dirrm %%DATADIR%%/policy/protocols/http
- at dirrm %%DATADIR%%/policy/protocols/ftp
- at dirrm %%DATADIR%%/policy/protocols/dns
- at dirrm %%DATADIR%%/policy/protocols/dhcp
- at dirrm %%DATADIR%%/policy/protocols/conn
- at dirrm %%DATADIR%%/policy/protocols
- at dirrm %%DATADIR%%/policy/misc/detect-traceroute
- at dirrm %%DATADIR%%/policy/misc/app-stats/plugins
- at dirrm %%DATADIR%%/policy/misc/app-stats
- at dirrm %%DATADIR%%/policy/misc
- at dirrm %%DATADIR%%/policy/integration/collective-intel
- at dirrm %%DATADIR%%/policy/integration/barnyard2
- at dirrm %%DATADIR%%/policy/integration
- at dirrm %%DATADIR%%/policy/frameworks/software
- at dirrm %%DATADIR%%/policy/frameworks/signatures
- at dirrm %%DATADIR%%/policy/frameworks/packet-filter
- at dirrm %%DATADIR%%/policy/frameworks/intel/seen
- at dirrm %%DATADIR%%/policy/frameworks/intel
- at dirrm %%DATADIR%%/policy/frameworks/files
- at dirrm %%DATADIR%%/policy/frameworks/dpd
- at dirrm %%DATADIR%%/policy/frameworks/control
- at dirrm %%DATADIR%%/policy/frameworks/communication
- at dirrm %%DATADIR%%/policy/frameworks
- at dirrm %%DATADIR%%/policy
- at dirrm %%DATADIR%%/broxygen
-%%BROCTL%%@dirrm %%DATADIR%%/broctl
- at dirrm %%DATADIR%%/base/utils
- at dirrm %%DATADIR%%/base/protocols/tunnels
- at dirrm %%DATADIR%%/base/protocols/syslog
- at dirrm %%DATADIR%%/base/protocols/ssl
- at dirrm %%DATADIR%%/base/protocols/ssh
- at dirrm %%DATADIR%%/base/protocols/socks
- at dirrm %%DATADIR%%/base/protocols/snmp
- at dirrm %%DATADIR%%/base/protocols/smtp
- at dirrm %%DATADIR%%/base/protocols/radius
- at dirrm %%DATADIR%%/base/protocols/pop3
- at dirrm %%DATADIR%%/base/protocols/modbus
- at dirrm %%DATADIR%%/base/protocols/irc
- at dirrm %%DATADIR%%/base/protocols/http
- at dirrm %%DATADIR%%/base/protocols/ftp
- at dirrm %%DATADIR%%/base/protocols/dns
- at dirrm %%DATADIR%%/base/protocols/dnp3
- at dirrm %%DATADIR%%/base/protocols/dhcp
- at dirrm %%DATADIR%%/base/protocols/conn
- at dirrm %%DATADIR%%/base/protocols
- at dirrm %%DATADIR%%/base/misc
- at dirrm %%DATADIR%%/base/frameworks/tunnels
- at dirrm %%DATADIR%%/base/frameworks/sumstats/plugins
- at dirrm %%DATADIR%%/base/frameworks/sumstats
- at dirrm %%DATADIR%%/base/frameworks/software
- at dirrm %%DATADIR%%/base/frameworks/signatures
- at dirrm %%DATADIR%%/base/frameworks/reporter
- at dirrm %%DATADIR%%/base/frameworks/packet-filter
- at dirrm %%DATADIR%%/base/frameworks/notice/extend-email
- at dirrm %%DATADIR%%/base/frameworks/notice/actions
- at dirrm %%DATADIR%%/base/frameworks/notice
- at dirrm %%DATADIR%%/base/frameworks/logging/writers
- at dirrm %%DATADIR%%/base/frameworks/logging/postprocessors
- at dirrm %%DATADIR%%/base/frameworks/logging
- at dirrm %%DATADIR%%/base/frameworks/intel
- at dirrm %%DATADIR%%/base/frameworks/input/readers
- at dirrm %%DATADIR%%/base/frameworks/input
- at dirrm %%DATADIR%%/base/frameworks/files/magic
- at dirrm %%DATADIR%%/base/frameworks/files
- at dirrm %%DATADIR%%/base/frameworks/dpd
- at dirrm %%DATADIR%%/base/frameworks/control
- at dirrm %%DATADIR%%/base/frameworks/communication
- at dirrm %%DATADIR%%/base/frameworks/cluster/nodes
- at dirrm %%DATADIR%%/base/frameworks/cluster
- at dirrm %%DATADIR%%/base/frameworks/analyzer
- at dirrm %%DATADIR%%/base/frameworks
- at dirrm %%DATADIR%%/base/files/x509
- at dirrm %%DATADIR%%/base/files/unified2
- at dirrm %%DATADIR%%/base/files/hash
- at dirrm %%DATADIR%%/base/files/extract
- at dirrm %%DATADIR%%/base/files
- at dirrm %%DATADIR%%/base/bif/plugins
- at dirrm %%DATADIR%%/base/bif
- at dirrm %%DATADIR%%/base
- at dirrm %%DATADIR%%
-%%CLEANUP_PREFIX%%@dirrmtry share
- at dirrmtry logs
-%%BROCTL%%@dirrmtry lib/broctl/plugins
-%%BROCTL%%@dirrmtry lib/broctl/BroControl
-%%BROCTL%%@dirrmtry lib/broctl
-%%CLEANUP_PREFIX%%@dirrmtry lib
-%%CLEANUP_PREFIX%%@dirrmtry etc
-%%CLEANUP_PREFIX%%@dirrmtry bin
-%%CLEANUP_PREFIX%%@dirrmtry %D
+%%BROCTL%%@dir spool/tmp
+%%BROCTL%%@dir spool/installed-scripts-do-not-touch/site
+%%BROCTL%%@dir spool/installed-scripts-do-not-touch/auto
+%%BROCTL%%@dir spool/installed-scripts-do-not-touch
+%%BROCTL%%@dir spool
+%%BROCTL%%@dir %%DATADIR%%ctl/scripts/postprocessors
+%%BROCTL%%@dir %%DATADIR%%ctl/scripts/helpers
+%%BROCTL%%@dir %%DATADIR%%ctl/scripts
+%%BROCTL%%@dir %%DATADIR%%ctl
+ at dir %%DATADIR%%/site
+ at dir %%DATADIR%%/policy/tuning/defaults
+ at dir %%DATADIR%%/policy/tuning
+ at dir %%DATADIR%%/policy/protocols/ssl
+ at dir %%DATADIR%%/policy/protocols/ssh
+ at dir %%DATADIR%%/policy/protocols/smtp
+ at dir %%DATADIR%%/policy/protocols/modbus
+ at dir %%DATADIR%%/policy/protocols/http
+ at dir %%DATADIR%%/policy/protocols/ftp
+ at dir %%DATADIR%%/policy/protocols/dns
+ at dir %%DATADIR%%/policy/protocols/dhcp
+ at dir %%DATADIR%%/policy/protocols/conn
+ at dir %%DATADIR%%/policy/protocols
+ at dir %%DATADIR%%/policy/misc/detect-traceroute
+ at dir %%DATADIR%%/policy/misc/app-stats/plugins
+ at dir %%DATADIR%%/policy/misc/app-stats
+ at dir %%DATADIR%%/policy/misc
+ at dir %%DATADIR%%/policy/integration/collective-intel
+ at dir %%DATADIR%%/policy/integration/barnyard2
+ at dir %%DATADIR%%/policy/integration
+ at dir %%DATADIR%%/policy/frameworks/software
+ at dir %%DATADIR%%/policy/frameworks/signatures
+ at dir %%DATADIR%%/policy/frameworks/packet-filter
+ at dir %%DATADIR%%/policy/frameworks/intel/seen
+ at dir %%DATADIR%%/policy/frameworks/intel
+ at dir %%DATADIR%%/policy/frameworks/files
+ at dir %%DATADIR%%/policy/frameworks/dpd
+ at dir %%DATADIR%%/policy/frameworks/control
+ at dir %%DATADIR%%/policy/frameworks/communication
+ at dir %%DATADIR%%/policy/frameworks
+ at dir %%DATADIR%%/policy
+ at dir %%DATADIR%%/broxygen
+%%BROCTL%%@dir %%DATADIR%%/broctl
+ at dir %%DATADIR%%/base/utils
+ at dir %%DATADIR%%/base/protocols/tunnels
+ at dir %%DATADIR%%/base/protocols/syslog
+ at dir %%DATADIR%%/base/protocols/ssl
+ at dir %%DATADIR%%/base/protocols/ssh
+ at dir %%DATADIR%%/base/protocols/socks
+ at dir %%DATADIR%%/base/protocols/snmp
+ at dir %%DATADIR%%/base/protocols/smtp
+ at dir %%DATADIR%%/base/protocols/radius
+ at dir %%DATADIR%%/base/protocols/pop3
+ at dir %%DATADIR%%/base/protocols/modbus
+ at dir %%DATADIR%%/base/protocols/irc
+ at dir %%DATADIR%%/base/protocols/http
+ at dir %%DATADIR%%/base/protocols/ftp
+ at dir %%DATADIR%%/base/protocols/dns
+ at dir %%DATADIR%%/base/protocols/dnp3
+ at dir %%DATADIR%%/base/protocols/dhcp
+ at dir %%DATADIR%%/base/protocols/conn
+ at dir %%DATADIR%%/base/protocols
+ at dir %%DATADIR%%/base/misc
+ at dir %%DATADIR%%/base/frameworks/tunnels
+ at dir %%DATADIR%%/base/frameworks/sumstats/plugins
+ at dir %%DATADIR%%/base/frameworks/sumstats
+ at dir %%DATADIR%%/base/frameworks/software
+ at dir %%DATADIR%%/base/frameworks/signatures
+ at dir %%DATADIR%%/base/frameworks/reporter
+ at dir %%DATADIR%%/base/frameworks/packet-filter
+ at dir %%DATADIR%%/base/frameworks/notice/extend-email
+ at dir %%DATADIR%%/base/frameworks/notice/actions
+ at dir %%DATADIR%%/base/frameworks/notice
+ at dir %%DATADIR%%/base/frameworks/logging/writers
+ at dir %%DATADIR%%/base/frameworks/logging/postprocessors
+ at dir %%DATADIR%%/base/frameworks/logging
+ at dir %%DATADIR%%/base/frameworks/intel
+ at dir %%DATADIR%%/base/frameworks/input/readers
+ at dir %%DATADIR%%/base/frameworks/input
+ at dir %%DATADIR%%/base/frameworks/files/magic
+ at dir %%DATADIR%%/base/frameworks/files
+ at dir %%DATADIR%%/base/frameworks/dpd
+ at dir %%DATADIR%%/base/frameworks/control
+ at dir %%DATADIR%%/base/frameworks/communication
+ at dir %%DATADIR%%/base/frameworks/cluster/nodes
+ at dir %%DATADIR%%/base/frameworks/cluster
+ at dir %%DATADIR%%/base/frameworks/analyzer
+ at dir %%DATADIR%%/base/frameworks
+ at dir %%DATADIR%%/base/files/x509
+ at dir %%DATADIR%%/base/files/unified2
+ at dir %%DATADIR%%/base/files/hash
+ at dir %%DATADIR%%/base/files/extract
+ at dir %%DATADIR%%/base/files
+ at dir %%DATADIR%%/base/bif/plugins
+ at dir %%DATADIR%%/base/bif
+ at dir %%DATADIR%%/base
+ at dir %%DATADIR%%
+%%CLEANUP_PREFIX%%@dir share
+ at dir logs
+%%BROCTL%%@dir lib/broctl/plugins
+%%BROCTL%%@dir lib/broctl/BroControl
+%%BROCTL%%@dir lib/broctl
+%%CLEANUP_PREFIX%%@dir lib
+%%CLEANUP_PREFIX%%@dir etc
+%%CLEANUP_PREFIX%%@dir bin
%%BROCTL%%@exec su -fm %%BROUSER%% -c '%D/bin/broctl install'
Modified: head/security/broccoli/Makefile
==============================================================================
--- head/security/broccoli/Makefile Mon Feb 2 22:22:23 2015 (r378332)
+++ head/security/broccoli/Makefile Mon Feb 2 22:25:23 2015 (r378333)
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= broccoli
-PORTVERSION= 2.3
-PORTREVISION= 1
+PORTVERSION= 2.3.2
CATEGORIES= security
MASTER_SITES= http://www.bro.org/downloads/release/
DISTNAME= bro-${PORTVERSION}
MAINTAINER= leres at ee.lbl.gov
-COMMENT= The Bro Client Communications Library
+COMMENT= Bro Client Communications Library
LICENSE= BSD3CLAUSE
@@ -33,9 +32,11 @@ PLIST_SUB+= CLEANUP_PREFIX="@comment "
CMAKE_ARGS+= -D CMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
-D BRO_ETC_INSTALL_DIR:PATH=${PREFIX}/etc
-OPTIONS_DEFINE= DEBUG PYTHON RUBY DOCS
+OPTIONS_DEFINE= DEBUG PYTHON RUBY
OPTIONS_SUB=
+OPTIONS_DEFAULT= PYTHON
+
DEBUG_DESC= Compile in debugging mode
PYTHON_DESC= Build python bindings for broccoli
RUBY_DESC= Build ruby bindings for broccoli
@@ -50,15 +51,13 @@ RUBY_CMAKE_ON= -D RB_INSTALL_DIR:PATH=${
RUBY_CMAKE_OFF= -D DISABLE_RUBY_BINDINGS:BOOL=true
post-install::
+ @${MV} ${STAGEDIR}${PREFIX}/etc/broccoli.conf ${STAGEDIR}${PREFIX}/etc/broccoli.conf.example
.if defined(BRO_PREFIX) && empty(${PORT_OPTIONS:MPYTHON})
# Move lib/pythonX.X tree into BRO_PREFIX
${MV} ${STAGEDIR}${PYTHON_LIBDIR} ${STAGEDIR}${PREFIX}/lib
.endif
- @${MKDIR} ${STAGEDIR}${PREFIX}/etc
- @${MV} ${STAGEDIR}${PREFIX}/etc/broccoli.conf ${STAGEDIR}${PREFIX}/etc/broccoli.conf.example
-.if !empty(${PORT_OPTIONS:MPYTHON}) && defined(BRO_PREFIX)
- # bsd.python.mk isn't PREFIX-safe yet.
- @${MV} ${STAGEDIR}${PYTHON_LIBDIR} ${STAGEDIR}${PYTHONPREFIX_LIBDIR}
+.if defined(BRO_PREFIX)
+ ${FIND} ${STAGEDIR} -type d | ${XARGS} ${CHMOD} g-w
.endif
.include <bsd.port.mk>
Modified: head/security/broccoli/distinfo
==============================================================================
--- head/security/broccoli/distinfo Mon Feb 2 22:22:23 2015 (r378332)
+++ head/security/broccoli/distinfo Mon Feb 2 22:25:23 2015 (r378333)
@@ -1,2 +1,2 @@
-SHA256 (bro-2.3.tar.gz) = 46bb9f46fbe71b22afd12ad12e0eb32033fb991a2a60b3bc2d881750249b85cd
-SIZE (bro-2.3.tar.gz) = 10283001
+SHA256 (bro-2.3.2.tar.gz) = 2fe5fbda0a86b5a594116d567fd9a4c2458d30f1c6670ba8e1fac0bc8848c69b
+SIZE (bro-2.3.2.tar.gz) = 10290134
Modified: head/security/broccoli/pkg-plist
==============================================================================
--- head/security/broccoli/pkg-plist Mon Feb 2 22:22:23 2015 (r378332)
+++ head/security/broccoli/pkg-plist Mon Feb 2 22:25:23 2015 (r378333)
@@ -1,24 +1,22 @@
bin/broccoli-config
- at unexec cmp -s %D/etc/broccoli.conf.example %D/etc/broccoli.conf && rm %D/etc/broccoli.conf || true
+ at unexec cmp -s %D/etc/broccoli.conf.example %D/etc/broccoli.conf && rm -f %D/etc/broccoli.conf || true
etc/broccoli.conf.example
- at exec test -f %D/etc/broccoli.conf || cp -p %D/%F %D/etc/broccoli.conf
+ at exec test -f %D/etc/broccoli.conf || cp -p %D/etc/broccoli.conf.example %D/etc/broccoli.conf
include/broccoli.h
lib/libbroccoli.a
lib/libbroccoli.so
lib/libbroccoli.so.5
lib/libbroccoli.so.5.1.0
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_broccoli_intern.so
-%%PYTHON%%@unexec rm -f %%LOCALBASE%%/%%PYTHON_SITELIBDIR%%/broccoli.py
-%%PYTHON%%@unexec rm -f %%LOCALBASE%%/%%PYTHON_SITELIBDIR%%/broccoli.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/broccoli.py
+%%PYTHON%%@unexec rm -f %D/%%PYTHON_SITELIBDIR%%/broccoli.pyc
%%RUBY%%%%RUBY_SITELIBDIR%%/Broccoli/connection.rb
%%RUBY%%%%RUBY_SITELIBDIR%%/Broccoli/event.rb
%%RUBY%%%%RUBY_SITELIBDIR%%/Broccoli/record.rb
-%%RUBY%%%%RUBY_SITELIBDIR%%/broccoli.rb
-%%RUBY%%@dirrmtry %%RUBY_SITELIBDIR%%/Broccoli
%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/broccoli_ext.so
-%%CLEANUP_PREFIX%%%%PORTDOCS%%@dirrmtry share
-%%CLEANUP_PREFIX%%@dirrmtry lib
-%%CLEANUP_PREFIX%%@dirrmtry include
-%%CLEANUP_PREFIX%%@dirrmtry etc
-%%CLEANUP_PREFIX%%@dirrmtry bin
-%%CLEANUP_PREFIX%%@unexec rmdir %D || :
+%%RUBY%%%%RUBY_SITELIBDIR%%/broccoli.rb
+%%CLEANUP_PREFIX%%@dir share
+%%CLEANUP_PREFIX%%@dir lib
+%%CLEANUP_PREFIX%%@dir include
+%%CLEANUP_PREFIX%%@dir etc
+%%CLEANUP_PREFIX%%@dir bin
More information about the svn-ports-head
mailing list