Bugfix 459316 for 4.5.18; Thanks to Thomas D.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBB80F419010E3EC3

7 files changed, 253 insertions, 6 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 23cdae38f827..e5d4362fddf4 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.245 2013/08/29 18:58:57 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.246 2013/09/22 13:16:04 constanze Exp $
+
+*shorewall-4.5.18-r1 (22 Sep 2013)
+
+  22 Sep 2013; Constanze Hausner <constanze@gentoo.org>
+  +files/4.5.18-r1/shorewall.conf-SUBSYSLOCK.patch,
+  +files/4.5.18-r1/shorewall.initd, +files/4.5.18-r1/shorewallrc_new,
+  +shorewall-4.5.18-r1.ebuild, +files/4.5.18-r1/shorewall.systemd:
+  Bugfix 459316 for 4.5.18; Thanks to Thomas D.
 
   29 Aug 2013; Constanze Hausner <constanze@gentoo.org> metadata.xml:
   Added Thomas D. as new maintainer
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index a4f7847312c5..70d682bb5347 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 4.5.18-r1/shorewall.conf-SUBSYSLOCK.patch 700 SHA256 81ea118b54d7801eab04e70d21df0545be4c9680c2981de7ade727d8401363ca SHA512 2099951583f1fff3d90b7693c99ce61a77262ee2935a1b0ea3c81357c1c74874f49cd104d652e63b2ba9530db77b584c6ae0c33e7556bfd0c190d3765b15a993 WHIRLPOOL d26a2e9bdf8b04286dbfe7204a8e736b2c2464cd22efe10f5819bff84c5ee08621e35e934581fc5a112d9370f8307c1835b265b951ae573106d5ba730a1fd5fe
+AUX 4.5.18-r1/shorewall.initd 2823 SHA256 94a766154c830d8c698ca4cd6c1b70243821efa940e89fa020a5733a19fb7850 SHA512 e72cd7ce37769d5c4b68d948955a9c36de9b9c842a0350d323aec2bbaa885f45da68ba8a8ea2c2e81cb14d4e6ace726f7b538632671db186f0858ad2b1dc886a WHIRLPOOL ccf43e58a61276a5ba55f8247d2d99fba79c623f521c10ef40cb77581689596419126134622a81268d2eef6aac6ce5b7ea4676cc889dc754d278dca7e0abe2b6
+AUX 4.5.18-r1/shorewall.systemd 450 SHA256 7af76981195a12e4cf0181f710d606e53d1964fd5cd033a4db489f8eb98a8495 SHA512 181c701b8aa6a18f21b578a536841616424bff96e220fb06de991d6c7ebd0209ce672d9a1f0b44976c2fe98b5638d0fcc5f6823c6f0bfef81afb2817609a7cc0 WHIRLPOOL af6666199890f43f81a2b67c89e3b06cf081ae4351e24925e92c8f24164be81f5d2fcedaafc262eda672733e809a1a2a4f3042375893eafa0bd58de28c1cb966
+AUX 4.5.18-r1/shorewallrc_new 1893 SHA256 f24c31f70e1de7b802d8fdb400833885df2a04a1fe15a0b53e828cd877995de1 SHA512 ad0b4aa60ef414ba279fc425995ebc088b7a6913ba4748cd205542fec7555ea6bd2cb31cb109d9eb11767ee259cda9aa2a05f979269a54c905bb59a3cc4c014e WHIRLPOOL d37ec5e41ba96a3e54ea6bcdb10f0623518949360b5553387669d2bdcbbd5d22836b176d566a21efcfafb854605cbde960b19a69b9c486a54ee5a659e78afb81
 AUX 4.5.19/shorewall.conf-SUBSYSLOCK.patch 700 SHA256 81ea118b54d7801eab04e70d21df0545be4c9680c2981de7ade727d8401363ca SHA512 2099951583f1fff3d90b7693c99ce61a77262ee2935a1b0ea3c81357c1c74874f49cd104d652e63b2ba9530db77b584c6ae0c33e7556bfd0c190d3765b15a993 WHIRLPOOL d26a2e9bdf8b04286dbfe7204a8e736b2c2464cd22efe10f5819bff84c5ee08621e35e934581fc5a112d9370f8307c1835b265b951ae573106d5ba730a1fd5fe
 AUX 4.5.19/shorewall.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
 AUX 4.5.19/shorewall.initd 2943 SHA256 5c0006795938b81df9a097b7b1495fd477383b933d91de358254f80a86e8e806 SHA512 597cb7e269eda3165c24c5ac5f57e97a716e0d373abdd88cd55ac877bed5551553b89236105b5d657c10571d9f70d5ff7c83e71667c7446405a06be46ba679e3 WHIRLPOOL 045bc29eba691c1a760a566d1b58c211527d2f24f4b3750b07f0b6731a9ab9f750cda118eaacea42abc231358548c73247fd3de971544ca5ea94510d3d4c9b76
@@ -13,16 +17,17 @@ DIST shorewall-4.5.18.tar.bz2 470187 SHA256 81bbcb2cc24d0b54769fb153cb472d78e6ee
 DIST shorewall-4.5.19.tar.bz2 475805 SHA256 91368877973411c5a6228a22a5d5bcac03aca42cc56c3cd95a3775ca964d0756 SHA512 0c3346a0f15b25051102a9a9d3e0d08a8bea3138c541fc32987278e569bb2f58c8d147b61cb095b694935c799207c5c6409c66ffd7667f07ad88bc60db68845e WHIRLPOOL 950d972b0570cc4586fb7b39a3017b37a2261ed08228a9032f6868258595a28236d3f36f8461a3404f91fb7a3972f57054af0b7c33f2427d7e1778219d0e45da
 DIST shorewall-docs-html-4.5.18.tar.bz2 4022828 SHA256 a98263059952ed50b826eb1787e18eccff09f41fa8f5d70f705ce39660b0c835 SHA512 790b89c3ee885a70daf62d145fcc3e1fb15871abcc9e8a868154c982e264a46acd8dfba81986604de60eb1c375b080d52992b6435b15b3cca91ab3afb895708f WHIRLPOOL 72c73ed925f3289978bfdfd8490bd617c0d39190ce874583773f04ec16d5710d007fd2edaef80b20e7b504e58df0d7bcf09595ee228a0948500295b848c333b3
 DIST shorewall-docs-html-4.5.19.tar.bz2 4033970 SHA256 7be6ebfa73a52151137201e098588ff6e67aa6fc21cf530a0fba564eeb8e77d1 SHA512 8ce06db614a6114cfe2c5c78acfaf111cba0ae5aa488df3879af6b5ecb20205ee453e308a7299e5df243a71067f93dcd8f4cf5faefbd8729ba11acee35cf34e0 WHIRLPOOL b55f90c6f9ca28cccddfb7bd899ce5815573db3ff4b4deabe454c6f30a9b01196ec4609d5251413d9761a28944a6acb19b6748c4dd41ea58fe2fa8da9845ed49
+EBUILD shorewall-4.5.18-r1.ebuild 1808 SHA256 2e8aae1f6eba7d1d47140edf43db5b7c3904a4a7e4a89f929d5ae57f9bee2ad9 SHA512 154336d1c055f0d668eef994d1a30f16734ec721ce424a55e63c45d4dffc4171dd97e7f2ff183e88c549b09e84889e0008391691833137bd252a257ed87815f0 WHIRLPOOL c14b1dce3f24924ec0dfd41fedf76eae9ee2bcd408a5ecac6cd7aa8746e9c6552e5f3c459d15d0272bbef4620d3856bb58353db28b04de402261336ee49c7996
 EBUILD shorewall-4.5.18.ebuild 1506 SHA256 ea8ec1f2f64ba52b3e356bd55442de01b0e45045bc653ae48151cc4c6a645ba2 SHA512 03920b6d37d6a243d6d39bfe5a5108aeae4c7a691138ce6b73d67de35dd444da6a221c268daa65a9f761dbc2cefb1189784a901a44e54aa77b9cd7260c4f40d7 WHIRLPOOL b1a30462e723dcbbeb2d4232066d5dd0739ea8499a3a8bc672cf8171804f025475ecbde8ed793ee6338602aa50711dbf34f3f26f609fc25a269be1f1009416e5
 EBUILD shorewall-4.5.19.ebuild 2972 SHA256 b75dd04f4fc1df875f1bb1f9177795438844f0c930f966e85de7b65c3d5de7e5 SHA512 48d5f0db9fcb527dca04c4d5c6c1afd5baafe8d92357718437d26b538da0d5d86deca1beb10c6db6321651c2564d524d7da1554c5c9c397d24e21407a057c596 WHIRLPOOL c1ee402589f46e3e40dedee1bd562c1195b8226206ac5e01bc7cfb7254af1a48d3c3f5e0df8045f1065120adbf3407a8da174ada71e50fe8a6f40ae50769a28b
-MISC ChangeLog 34803 SHA256 cb068a7aee3bef42384fbc39beba13e130b2e07d9e20a949e634481192ffa193 SHA512 e8adc3bdc60e4d316f19067ac5be4f18f9db95a75cee5bdb867bc6d99a95a6dc61c0b33205937dc2354788674a9fcf7f2476f07b4a37bb04c806022d48346c89 WHIRLPOOL f68f04a049da7d88b5d1b4b4afee96e9acbdb22117866d5db98dd87f2216f5cbf5c9edc40c9633521ca2309678cacd7e13c59822753d505681d4960c972f8eb8
+MISC ChangeLog 35133 SHA256 00197226f6f2308304e2fa547c6f4846ec71145c862d8a461c7bf5469f1dd3b0 SHA512 52e735e185d55a050ce12db4b0c03b65d541ba429f29c43bd9868cefac0089f977ea9f9cf4d731567ba8767f6e5c387bd7ccc44518e4c3aca9ffb3c8ab8f853e WHIRLPOOL 96b247a79cf24f81ad9bfc4f285ca6e157b23e87889f7b8176febbd936af89384f4d7f1df2a8b01a4670e6fd52f59f47b5ee66aa9761108285be0c9d10cd0063
 MISC metadata.xml 361 SHA256 ea12ad6e474c28d25b9203225c99d9a0336bd606fd3c2cd260c11d4982712357 SHA512 da1d88bdae3187e1c5d63b90da4fb2798f0a3f79558a57eb5ae0fab42eaa7268bfbd4102a870cbff73aa83c64bc1b10c1c7f71c01ee29f64772f7635e7da0ac9 WHIRLPOOL ae0b57811bf7617fb9cf3840a2e182d334a8303fda841c879c2791b893bd5515cae72fc0bb38f6554045bb531774798539f80b474a6152ebc04c31e5bc2f0464
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iL4EAREIAGYFAlIfmftfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iL4EAREIAGYFAlI+8JdfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
 bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
-ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsPHCwD/TRaJhev6AAWORWLXtPvCA91f
-/yKNhuswdp/DMmfApOoA/0Zf916702zMDwGoB7iWzQjPyhRFoGMh6tUX2zIBViFl
-=Mdac
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsP1DgD+KytvHe98KBevkJ40TEMP3GXj
+zy3p/3e89ysYqf6MGY8BAJYC1xmpzjxG8SS47fX1lR1LCXRzs4SDCGJXEXF7UK7H
+=75Wb
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall/files/4.5.18-r1/shorewall.conf-SUBSYSLOCK.patch b/net-firewall/shorewall/files/4.5.18-r1/shorewall.conf-SUBSYSLOCK.patch
new file mode 100644
index 000000000000..37a080adf999
--- /dev/null
+++ b/net-firewall/shorewall/files/4.5.18-r1/shorewall.conf-SUBSYSLOCK.patch
@@ -0,0 +1,22 @@
+--- configfiles/shorewall.conf	2013-06-24 22:07:38.000000000 +0200
++++ configfiles/shorewall.conf.new	2013-07-01 15:50:54.747711444 +0200
+@@ -85,7 +85,7 @@
+ 
+ SHOREWALL_SHELL=/bin/sh
+ 
+-SUBSYSLOCK=/var/lock/subsys/shorewall
++SUBSYSLOCK=/run/lock/shorewall
+ 
+ TC=
+ 
+--- configfiles/shorewall.conf.annotated	2013-06-27 20:32:22.000000000 +0200
++++ configfiles/shorewall.conf.annotated.new	2013-07-01 15:51:38.448332964 +0200
+@@ -444,7 +444,7 @@
+ #     or specified as a null value, /bin/sh is assumed. Using a light-weight
+ #     shell such as ash or dash can significantly improve performance.
+ # 
+-SUBSYSLOCK=/var/lock/subsys/shorewall
++SUBSYSLOCK=/run/lock/shorewall
+ #
+ # SUBSYSLOCK=[pathname]
+ # 
diff --git a/net-firewall/shorewall/files/4.5.18-r1/shorewall.initd b/net-firewall/shorewall/files/4.5.18-r1/shorewall.initd
new file mode 100644
index 000000000000..ae793fa6aa14
--- /dev/null
+++ b/net-firewall/shorewall/files/4.5.18-r1/shorewall.initd
@@ -0,0 +1,107 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.5.18-r1/shorewall.initd,v 1.1 2013/09/22 13:16:03 constanze Exp $
+
+description='The Shoreline Firewall, more commonly known as "Shorewall", is'
+description="${description} a high-level tool for configuring Netfilter."
+
+extra_commands="check clear"
+extra_started_commands="refresh reset"
+
+description_check="Checks if the configuration will compile or not."
+
+description_clear="Clear will remove all rules and chains installed by"
+description_clear="${description_clear} Shorewall. The firewall is then"
+description_clear="${description_clear} wide open and unprotected."
+
+description_refresh="The mangle table will be refreshed along with the"
+description_refresh="${description_refresh} blacklist chain (if any)."
+
+description_reset="All the packet and byte counters in the firewall are reset."
+
+depend() {
+	need net
+	provide firewall
+	after ulogd
+}
+
+status() {
+	local _retval
+	/sbin/shorewall status 1>/dev/null
+	_retval=$?
+	if [ ${_retval} = '0' ]; then
+		einfo 'status: started'
+		mark_service_started "${SVCNAME}"
+		return 0
+	else
+		einfo 'status: stopped'	
+		mark_service_stopped "${SVCNAME}"
+		return 3
+	fi
+}
+
+start() {
+	ebegin "Starting shorewall"
+	/sbin/shorewall start 1>/dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping shorewall"
+	/sbin/shorewall stop 1>/dev/null
+	eend $?
+}
+
+restart() {
+	# shorewall comes with its own control script that includes a
+	# restart function, so refrain from calling svc_stop/svc_start
+	# here.  Note that this comment is required to fix bug 55576;
+	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
+
+	ebegin "Restarting shorewall"
+	/sbin/shorewall status 1>/dev/null
+	if [ $? != 0 ] ; then
+	    svc_start
+	else
+		/sbin/shorewall restart 1>/dev/null
+	fi
+	eend $?
+}
+
+clear() {
+	# clear will remove all the rules and bring the system to an unfirewalled
+	# state. (21 Nov 2004 eldad)
+
+	ebegin "Clearing all shorewall rules and setting policy to ACCEPT"
+	/sbin/shorewall clear 1>/dev/null
+	eend $?
+}
+
+reset() {
+	# reset the packet and byte counters in the firewall
+
+	ebegin "Resetting the packet and byte counters in shorewall"
+	/sbin/shorewall reset 1>/dev/null
+	eend $?
+}
+
+refresh() {
+	# refresh the rules involving the broadcast addresses of firewall 
+	# interfaces, the black list, traffic control rules and 
+	# ECN control rules
+
+	ebegin "Refreshing shorewall rules"
+	/sbin/shorewall refresh 1>/dev/null
+	eend $?
+}
+
+check() {
+	# perform cursory validation of the zones, interfaces, hosts, rules
+	# and policy files. CAUTION: does not parse and validate the generated 
+	# iptables commands.
+
+	ebegin "Checking shorewall configuration"
+	/sbin/shorewall check 1>/dev/null
+	eend $?
+}
diff --git a/net-firewall/shorewall/files/4.5.18-r1/shorewall.systemd b/net-firewall/shorewall/files/4.5.18-r1/shorewall.systemd
new file mode 100644
index 000000000000..bd4638d5dfaf
--- /dev/null
+++ b/net-firewall/shorewall/files/4.5.18-r1/shorewall.systemd
@@ -0,0 +1,20 @@
+#
+#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
+#
+#     Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
+#
+[Unit]
+Description=Shorewall IPv4 firewall
+After=syslog.target
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/shorewall
+StandardOutput=syslog
+ExecStart=/sbin/shorewall $OPTIONS start
+ExecStop=/sbin/shorewall $OPTIONS stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/shorewall/files/4.5.18-r1/shorewallrc_new b/net-firewall/shorewall/files/4.5.18-r1/shorewallrc_new
new file mode 100644
index 000000000000..0f9301cfeb49
--- /dev/null
+++ b/net-firewall/shorewall/files/4.5.18-r1/shorewallrc_new
@@ -0,0 +1,22 @@
+#
+# Gentoo Shorewall 4.5 rc file
+#
+BUILD=                                  #Default is to detect the build system
+HOST=linux                              #Generic Linux
+PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
+SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
+LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
+PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
+CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
+SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
+MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
+INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
+INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
+INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
+ANNOTATED=                              #If non-zero, annotated configuration files are installed
+SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
+SYSCONFFILE=                            #Name of the distributed file to be installed in $SYSCONFDIR
+SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
+SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
+VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
+VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild b/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild
new file mode 100644
index 000000000000..2db3d46070e6
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild,v 1.1 2013/09/22 13:16:04 constanze Exp $
+
+EAPI="5"
+
+inherit eutils prefix systemd versionator
+
+# Select version (stable, RC, Beta):
+MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
+MY_PV_BASE=$(get_version_component_range 1-3)
+
+MY_P="${PN}-${MY_PV_BASE}"
+MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
+
+DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
+HOMEPAGE="http://www.shorewall.net/"
+SRC_URI="http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
+	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND=">=net-firewall/iptables-1.2.4
+	sys-apps/iproute2[-minimal]
+	dev-lang/perl
+	=net-firewall/shorewall-core-${PVR}"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cp "${FILESDIR}"/${PVR}/shorewallrc_new "${S}"/shorewallrc.gentoo || die "Copying shorewallrc_new failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying shorewall.initd failed"
+
+	epatch "${FILESDIR}"/${PVR}/shorewall.conf-SUBSYSLOCK.patch
+	epatch_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	keepdir /var/lib/shorewall
+
+	cd "${WORKDIR}/${P}"
+	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
+	systemd_newunit "${FILESDIR}"/${PVR}/shorewall.systemd 'shorewall.service'
+
+	dodoc changelog.txt releasenotes.txt
+	if use doc; then
+		dodoc -r Samples
+		cd "${WORKDIR}/${MY_P_DOCS}"
+		dohtml -r *
+	fi
+}