Date: Sun, 10 Apr 2016 09:41:20 +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: r412909 - in head: ports-mgmt/portshaker-config security/broccoli security/john security/scanhill security/snort security/trousers sysutils/logstash-forwarder sysutils/screen-legacy sys... Message-ID: <201604100941.u3A9fKnv042633@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun Apr 10 09:41:20 2016 New Revision: 412909 URL: https://svnweb.freebsd.org/changeset/ports/412909 Log: Convert to @sample Modified: head/ports-mgmt/portshaker-config/pkg-plist head/security/broccoli/pkg-plist head/security/john/pkg-plist head/security/scanhill/pkg-plist head/security/snort/pkg-plist head/security/trousers/pkg-plist head/sysutils/logstash-forwarder/pkg-plist head/sysutils/screen-legacy/pkg-plist head/sysutils/wemux/pkg-plist Modified: head/ports-mgmt/portshaker-config/pkg-plist ============================================================================== --- head/ports-mgmt/portshaker-config/pkg-plist Sun Apr 10 09:40:26 2016 (r412908) +++ head/ports-mgmt/portshaker-config/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) @@ -1,6 +1,4 @@ -@unexec if cmp -s %D/etc/portshaker.conf.sample-config %D/etc/portshaker.conf; then rm -f %D/etc/portshaker.conf; fi -etc/portshaker.conf.sample-config -@exec if [ ! -f %D/etc/portshaker.conf ] ; then cp -p %D/%F %B/portshaker.conf; fi +@sample etc/portshaker.conf.sample-config etc/portshaker.conf etc/portshaker.d/bsd_sharp etc/portshaker.d/bsd_sharp_releng_2_0 etc/portshaker.d/bsd_sharp_releng_2_2 Modified: head/security/broccoli/pkg-plist ============================================================================== --- head/security/broccoli/pkg-plist Sun Apr 10 09:40:26 2016 (r412908) +++ head/security/broccoli/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) @@ -1,7 +1,5 @@ bin/broccoli-config -@unexec cmp -s %D/etc/broccoli.conf.example %D/etc/broccoli.conf && rm -f %D/etc/broccoli.conf || true -etc/broccoli.conf.example -@exec test -f %D/etc/broccoli.conf || cp -p %D/etc/broccoli.conf.example %D/etc/broccoli.conf +@sample etc/broccoli.conf.example etc/broccoli.conf include/broccoli.h lib/libbroccoli.a lib/libbroccoli.so Modified: head/security/john/pkg-plist ============================================================================== --- head/security/john/pkg-plist Sun Apr 10 09:40:26 2016 (r412908) +++ head/security/john/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) @@ -1,9 +1,7 @@ bin/john bin/unshadow bin/xtract -@unexec if cmp -s %D/etc/john.conf %D/etc/john.conf.default; then rm -f %D/etc/john.conf; fi -etc/john.conf.default -@exec [ -f %B/john.conf ] || cp %B/%f %B/john.conf +@sample etc/john.conf.default etc/john.conf %%DATADIR%%/all.chr %%DATADIR%%/alnum.chr %%DATADIR%%/alpha.chr Modified: head/security/scanhill/pkg-plist ============================================================================== --- head/security/scanhill/pkg-plist Sun Apr 10 09:40:26 2016 (r412908) +++ head/security/scanhill/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) @@ -1,4 +1,2 @@ bin/scanhill -@unexec if cmp -s %D/etc/scanhill.conf-dist %D/etc/scanhill.conf; then rm -f %D/etc/scanhill.conf; fi -etc/scanhill.conf-dist -@exec [ -f %B/scanhill.conf ] || cp -f %B/%f %B/scanhill.conf +@sample etc/scanhill.conf-dist etc/scanhill.conf Modified: head/security/snort/pkg-plist ============================================================================== --- head/security/snort/pkg-plist Sun Apr 10 09:40:26 2016 (r412908) +++ head/security/snort/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) @@ -4,36 +4,16 @@ bin/u2boat bin/u2spewfoo %%APPID%%bin/u2openappid %%APPID%%bin/u2streamer -@unexec if cmp -s %D/etc/snort/classification.config-sample %D/etc/snort/classification.config; then rm -f %D/etc/snort/classification.config; fi -etc/snort/classification.config-sample -@exec if [ ! -f %D/etc/snort/classification.config ] ; then cp -p %D/%F %B/classification.config; fi -@unexec if cmp -s %D/etc/snort/gen-msg.map-sample %D/etc/snort/gen-msg.map; then rm -f %D/etc/snort/gen-msg.map; fi -etc/snort/gen-msg.map-sample -@exec if [ ! -f %D/etc/snort/gen-msg.map ] ; then cp -p %D/%F %B/gen-msg.map; fi -@unexec if cmp -s %D/etc/snort/preproc_rules/decoder.rules %D/etc/snort/preproc_rules/decoder.rules; then rm -f %D/etc/snort/preproc_rules/decoder.rules;fi -etc/snort/preproc_rules/decoder.rules-sample -@exec if [ ! -f %D/etc/snort/preproc_rules/decoder.rules ] ; then cp -p %D/%F %B/decoder.rules; fi -@unexec if cmp -s %D/etc/snort/preproc_rules/preprocessor.rules %D/etc/snort/preproc_rules/preprocessor.rules; then rm -f %D/etc/snort/preproc_rules/preprocessor.rules;fi -etc/snort/preproc_rules/preprocessor.rules-sample -@exec if [ ! -f %D/etc/snort/preproc_rules/preprocessor.rules ] ; then cp -p %D/%F %B/preprocessor.rules; fi -@unexec if cmp -s %D/etc/snort/preproc_rules/sensitive-data.rules %D/etc/snort/preproc_rules/sensitive-data.rules; then rm -f %D/etc/snort/preproc_rules/sensitive-data.rules;fi -etc/snort/preproc_rules/sensitive-data.rules-sample -@exec if [ ! -f %D/etc/snort/preproc_rules/decoder.rules ] ; then cp -p %D/%F %B/; fi -@unexec if cmp -s %D/etc/snort/reference.config-sample %D/etc/snort/reference.config; then rm -f %D/etc/snort/reference.config; fi -etc/snort/reference.config-sample -@exec if [ ! -f %D/etc/snort/reference.config ] ; then cp -p %D/%F %B/reference.config; fi -@unexec if cmp -s %D/etc/snort/snort.conf-sample %D/etc/snort/snort.conf; then rm -f %D/etc/snort/snort.conf; fi -etc/snort/snort.conf-sample -@exec if [ ! -f %D/etc/snort/snort.conf ] ; then cp -p %D/%F %B/snort.conf; fi -@unexec if cmp -s %D/etc/snort/threshold.conf-sample %D/etc/snort/threshold.conf; then rm -f %D/etc/snort/threshold.conf; fi -etc/snort/threshold.conf-sample -@exec if [ ! -f %D/etc/snort/threshold.conf ] ; then cp -p %D/%F %B/threshold.conf; fi -@unexec if cmp -s %D/etc/snort/unicode.map-sample %D/etc/snort/unicode.map; then rm -f %D/etc/snort/unicode.map; fi -etc/snort/unicode.map-sample -@exec if [ ! -f %D/etc/snort/unicode.map ] ; then cp -p %D/%F %B/unicode.map; fi -@unexec if cmp -s %D/etc/snort/file_magic.conf-sample %D/etc/snort/file_magic.conf; then rm -f %D/etc/snort/file_magic.conf; fi -etc/snort/file_magic.conf-sample -@exec if [ ! -f %D/etc/snort/file_magic.conf ] ; then cp -p %D/%F %B/file_magic.conf; fi +@sample etc/snort/classification.config-sample etc/snort/classification.config +@sample etc/snort/gen-msg.map-sample etc/snort/gen-msg.map +@sample etc/snort/preproc_rules/decoder.rules-sample etc/snort/preproc_rules/decoder.rules +@sample etc/snort/preproc_rules/preprocessor.rules-sample etc/snort/preproc_rules/preprocessor.rules +@sample etc/snort/preproc_rules/sensitive-data.rules-sample etc/snort/preproc_rules/sensitive-data.rules +@sample etc/snort/reference.config-sample etc/snort/reference.config +@sample etc/snort/snort.conf-sample etc/snort/snort.conf +@sample etc/snort/threshold.conf-sample etc/snort/threshold.conf +@sample etc/snort/unicode.map-sample etc/snort/unicode.map +@sample etc/snort/file_magic.conf-sample etc/snort/file_magic.conf include/snort/dynamic_output/bitop.h include/snort/dynamic_output/ipv6_port.h include/snort/dynamic_output/obfuscation.h Modified: head/security/trousers/pkg-plist ============================================================================== --- head/security/trousers/pkg-plist Sun Apr 10 09:40:26 2016 (r412908) +++ head/security/trousers/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) @@ -119,13 +119,5 @@ man/man3/Tspi_TPM_StirRandom.3.gz man/man3/Tspi_TPM_TakeOwnership.3.gz man/man5/tcsd.conf.5.gz man/man8/tcsd.8.gz -@unexec cmp -s %D/etc/tcsd.conf %D/etc/tcsd.conf.dist && rm -f %D/etc/tcsd.conf || true -@owner _tss -@group _tss -@mode 0600 -etc/tcsd.conf.dist -@exec [ -f %D/etc/tcsd.conf ] || cp -p %D/etc/tcsd.conf.dist %D/etc/tcsd.conf -@owner -@group -@mode +@sample(_tss,_tss,0600) etc/tcsd.conf.dist etc/tcsd.conf @dir(_tss,_tss,0700) var/lib/tpm Modified: head/sysutils/logstash-forwarder/pkg-plist ============================================================================== --- head/sysutils/logstash-forwarder/pkg-plist Sun Apr 10 09:40:26 2016 (r412908) +++ head/sysutils/logstash-forwarder/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) @@ -1,4 +1,2 @@ bin/logstash-forwarder -@unexec if cmp -s %D/etc/logstash-forwarder.conf.example %D/etc/logstash-forwarder.conf; then rm -f %D/etc/logstash-forwarder.conf; fi -etc/logstash-forwarder.conf.example -@exec if [ ! -f %D/etc/logstash-forwarder.conf ] ; then cp -p %D/%F %B/logstash-forwarder.conf; fi +@sample etc/logstash-forwarder.conf.example etc/logstash-forwarder.conf Modified: head/sysutils/screen-legacy/pkg-plist ============================================================================== --- head/sysutils/screen-legacy/pkg-plist Sun Apr 10 09:40:26 2016 (r412908) +++ head/sysutils/screen-legacy/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) @@ -1,8 +1,6 @@ bin/screen %%MAN%%man/man1/screen.1.gz -@unexec if cmp -s %D/etc/screenrc %D/%%EXAMPLESDIR%%/screenrc; then rm -f %D/etc/screenrc; else echo If permanently deleting this package, %%PREFIX%%/etc/screenrc must be removed manually; fi -%%EXAMPLESDIR%%/screenrc -@exec [ -f %D/etc/screenrc ] || cp %B/%f %D/etc/screenrc +@sample %%EXAMPLESDIR%%/screenrc etc/screenrc %%DATADIR%%/utf8encodings/01 %%DATADIR%%/utf8encodings/02 %%DATADIR%%/utf8encodings/03 Modified: head/sysutils/wemux/pkg-plist ============================================================================== --- head/sysutils/wemux/pkg-plist Sun Apr 10 09:40:26 2016 (r412908) +++ head/sysutils/wemux/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) @@ -1,4 +1,2 @@ bin/wemux -@unexec if cmp -s %D/etc/wemux.conf %D/etc/wemux.conf.example ; then rm -f %D/etc/wemux.conf ; fi -etc/wemux.conf.example -@exec if [ ! -f %D/etc/wemux.conf ]; then cp -p %D/%F %B/wemux.conf; fi +@sample etc/wemux.conf.example etc/wemux.conf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604100941.u3A9fKnv042633>