fangfrisch 1.9.0.dev5__tar.gz → 1.9.0.dev6__tar.gz

{fangfrisch-1.9.0.dev5/fangfrisch.egg-info → fangfrisch-1.9.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fangfrisch
-Version: 1.9.0.dev5
+Version: 1.9.0.dev6
 Summary: Update and verify unofficial Clam Anti-Virus signatures
 Home-page: https://github.com/rseichter/fangfrisch
 Author: Ralph Seichter

fangfrisch-1.9.0.dev6/docs/Makefile

@@ -0,0 +1,32 @@
+# vim: ts=4 sw=4 noet
+adoc_opts	= -o $@
+cf_combined	= combined.conf
+cf_example	= example.conf
+cf_internal	= internal.conf
+fangfrisch	= ../local/fangfrisch
+out_html	= index.html
+out_pdf		= fangfrisch.pdf
+sources		= fangfrisch.adoc $(cf_combined) $(cf_example) $(cf_internal) ../contrib/fangfrisch-has-news.sh usage.txt
+
+.PHONY:	all clean force
+
+all: $(out_html) $(out_pdf)
+
+$(cf_combined): $(cf_example)
+	$(fangfrisch) -c $< dumpconf > $@
+
+$(cf_internal):
+	$(fangfrisch) -c /dev/null dumpconf > $@
+
+$(out_html): $(sources)
+	asciidoctor -a toc=right $(adoc_opts) $<
+
+$(out_pdf): $(sources)
+	asciidoctor-pdf -a toc=preamble $(adoc_opts) $<
+
+clean:
+	/bin/rm $(out_html) $(out_pdf) || true
+
+force:
+	rm -f $(cf_combined) $(cf_internal)
+	make

{fangfrisch-1.9.0.dev5 → fangfrisch-1.9.0.dev6}/docs/combined.conf

@@ -13,10 +13,10 @@ on_update_timeout = 42
 [fangfrischnews]
 interval = 12h
 local_directory = /tmp
-max_size = 50KB
-script = /path/to/script/fangfrisch-has-news.sh
-on_update_exec = sh -c "[ ! -r ${script} ] || ${script} ${local_directory}"
-prefix = http://mirror.sentries.org/fangfrisch/
+max_size = 100KB
+script = /path/to/fangfrisch-has-news.sh
+on_update_exec = [ ! -x ${script} ] || ${script} ${local_directory}
+prefix = https://www.seichter.de/fangfrisch/
 url_alerts = ${prefix}fangfrisch_alerts.txt
 url_news = ${prefix}fangfrisch_news.txt
 

{fangfrisch-1.9.0.dev5 → fangfrisch-1.9.0.dev6}/docs/fangfrisch.adoc

@@ -1,6 +1,6 @@
 # Fangfrisch
 Ralph Seichter <fangfrisch@seichter.de>
-v1.9.0.dev5, {docdate}
+v1.9.0.dev6, {docdate}
 :copyright: © 2020-2024 Ralph Seichter
 :encoding: UTF-8
 :hyphens: en
@@ -377,9 +377,9 @@ This will only enable Fangfrisch to occasionally download small text files, noth
 You will not need to read the content, nor will anything else happen, unless you modify the `script` option.
 Here is an example script which you could use to have downloaded news items mailed to you.
 It needs to be readable for the user account running Fangfrisch, and the sender/recipient addresses obviously have to be adapted.
-For your convenience, the latest version of the script can be downloaded https://raw.githubusercontent.com/rseichter/fangfrisch/master/contrib/process-news.sh[here].
+For your convenience, the latest version of the script can be downloaded https://raw.githubusercontent.com/rseichter/fangfrisch/master/contrib/fangfrisch-has-news.sh[here].
 ----
-include::../contrib/process-news.sh[]
+include::../contrib/fangfrisch-has-news.sh[]
 ----
 
 [[dbstructure]]

{fangfrisch-1.9.0.dev5 → fangfrisch-1.9.0.dev6}/docs/fangfrisch.pdf

@@ -7,8 +7,8 @@
 /Keywords (antivirus, clamav, fangfrisch, freshclam, refresh, update)
 /Creator (Asciidoctor PDF 2.3.11, based on Prawn 2.4.0)
 /Producer (Ralph Seichter)
-/ModDate (D:20240301154044+01'00')
-/CreationDate (D:20240301160535+01'00')
+/ModDate (D:20240301205503+01'00')
+/CreationDate (D:20240302003350+01'00')
 >>
 endobj
 2 0 obj
@@ -8744,7 +8744,7 @@ endobj
 [72 0 R /XYZ 0 151.43 null]
 endobj
 79 0 obj
-<< /Length 10760
+<< /Length 10726
 >>
 stream
 q
@@ -9398,7 +9398,7 @@ ET
 BT
 59.24 139.505 Td
 /F3.0 11 Tf
-<6d61785f73697a65203d2035304b42> Tj
+<6d61785f73697a65203d203130304b42> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -9409,7 +9409,7 @@ ET
 BT
 59.24 124.765 Td
 /F3.0 11 Tf
-<736372697074203d202f706174682f746f2f7363726970742f66616e676672697363682d6861732d6e6577732e7368> Tj
+<736372697074203d202f706174682f746f2f66616e676672697363682d6861732d6e6577732e7368> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -9420,7 +9420,7 @@ ET
 BT
 59.24 110.025 Td
 /F3.0 11 Tf
-<6f6e5f7570646174655f65786563203d207368202d6320225b2021202d7220247b7363726970747d205d207c7c20247b7363726970747d20247b6c6f63616c5f6469726563746f72797d22> Tj
+<6f6e5f7570646174655f65786563203d205b2021202d7820247b7363726970747d205d207c7c20247b7363726970747d20247b6c6f63616c5f6469726563746f72797d> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -9431,7 +9431,7 @@ ET
 BT
 59.24 95.285 Td
 /F3.0 11 Tf
-<707265666978203d20687474703a2f2f6d6972726f722e73656e74726965732e6f72672f66616e676672697363682f> Tj
+<707265666978203d2068747470733a2f2f7777772e73656963687465722e64652f66616e676672697363682f> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -10762,7 +10762,7 @@ endobj
 >>
 endobj
 91 0 obj
-<< /Length 8617
+<< /Length 8583
 >>
 stream
 q
@@ -10996,7 +10996,7 @@ ET
 BT
 59.24 534.185 Td
 /F3.0 11 Tf
-<6d61785f73697a65203d2035304b42> Tj
+<6d61785f73697a65203d203130304b42> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -11007,7 +11007,7 @@ ET
 BT
 59.24 519.445 Td
 /F3.0 11 Tf
-<736372697074203d202f706174682f746f2f7363726970742f66616e676672697363682d6861732d6e6577732e7368> Tj
+<736372697074203d202f706174682f746f2f66616e676672697363682d6861732d6e6577732e7368> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -11018,7 +11018,7 @@ ET
 BT
 59.24 504.705 Td
 /F3.0 11 Tf
-<6f6e5f7570646174655f65786563203d207368202d6320225b2021202d7220247b7363726970747d205d207c7c20247b7363726970747d20247b6c6f63616c5f6469726563746f72797d22> Tj
+<6f6e5f7570646174655f65786563203d205b2021202d7820247b7363726970747d205d207c7c20247b7363726970747d20247b6c6f63616c5f6469726563746f72797d> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -11029,7 +11029,7 @@ ET
 BT
 59.24 489.965 Td
 /F3.0 11 Tf
-<707265666978203d20687474703a2f2f6d6972726f722e73656e74726965732e6f72672f66616e676672697363682f> Tj
+<707265666978203d2068747470733a2f2f7777772e73656963687465722e64652f66616e676672697363682f> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -12690,7 +12690,7 @@ endobj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
-/URI (https://raw.githubusercontent.com/rseichter/fangfrisch/master/contrib/process-news.sh)
+/URI (https://raw.githubusercontent.com/rseichter/fangfrisch/master/contrib/fangfrisch-has-news.sh)
 >>
 /Subtype /Link
 /Rect [112.9725 91.08 135.81 105.36]
@@ -12698,7 +12698,7 @@ endobj
 >>
 endobj
 102 0 obj
-<< /Length 7774
+<< /Length 7798
 >>
 stream
 q
@@ -13175,7 +13175,7 @@ ET
 BT
 59.24 130.765 Td
 /F3.0 11 Tf
-<ca20202020202020646f6e65203c203c2866696e6420222464697222202d747970652066202d6e616d65202266616e676672697363682a2e74787422202d7072696e743029> Tj
+<ca20202020202020646f6e65203c203c2866696e6420222464697222202d6d617864657074682031202d747970652066202d6e616d65202266616e676672697363682a2e74787422202d7072696e743029> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -14916,133 +14916,133 @@ xref
 0000125491 00000 n 
 0000125535 00000 n 
 0000125579 00000 n 
-0000136393 00000 n 
-0000136784 00000 n 
-0000136828 00000 n 
-0000137032 00000 n 
-0000137233 00000 n 
-0000137277 00000 n 
-0000147219 00000 n 
-0000147549 00000 n 
-0000157492 00000 n 
-0000157863 00000 n 
-0000157907 00000 n 
-0000158032 00000 n 
-0000166702 00000 n 
-0000167061 00000 n 
-0000167189 00000 n 
-0000177731 00000 n 
-0000178061 00000 n 
-0000189375 00000 n 
-0000189747 00000 n 
-0000189791 00000 n 
-0000190223 00000 n 
-0000190560 00000 n 
-0000190788 00000 n 
-0000198616 00000 n 
-0000198948 00000 n 
-0000208504 00000 n 
-0000208873 00000 n 
-0000208919 00000 n 
-0000208965 00000 n 
-0000209090 00000 n 
-0000209218 00000 n 
-0000209354 00000 n 
-0000209490 00000 n 
-0000209619 00000 n 
-0000209752 00000 n 
-0000209893 00000 n 
-0000210035 00000 n 
-0000210179 00000 n 
-0000210325 00000 n 
-0000210460 00000 n 
-0000210647 00000 n 
-0000210785 00000 n 
-0000210922 00000 n 
-0000211062 00000 n 
-0000211204 00000 n 
-0000211338 00000 n 
-0000211472 00000 n 
-0000211608 00000 n 
-0000211746 00000 n 
-0000211888 00000 n 
-0000212031 00000 n 
-0000212157 00000 n 
-0000212287 00000 n 
-0000212420 00000 n 
-0000212554 00000 n 
-0000212680 00000 n 
-0000212807 00000 n 
-0000212929 00000 n 
-0000213054 00000 n 
-0000213180 00000 n 
-0000213308 00000 n 
-0000213455 00000 n 
-0000213603 00000 n 
-0000213743 00000 n 
-0000213884 00000 n 
-0000214035 00000 n 
-0000214188 00000 n 
-0000214320 00000 n 
-0000214452 00000 n 
-0000214581 00000 n 
-0000214709 00000 n 
-0000214835 00000 n 
-0000214960 00000 n 
-0000215090 00000 n 
-0000215220 00000 n 
-0000215359 00000 n 
-0000215497 00000 n 
-0000215575 00000 n 
-0000215724 00000 n 
-0000215915 00000 n 
-0000216081 00000 n 
-0000216277 00000 n 
-0000216490 00000 n 
-0000216704 00000 n 
-0000216948 00000 n 
-0000217142 00000 n 
-0000217362 00000 n 
-0000217579 00000 n 
-0000217777 00000 n 
-0000218009 00000 n 
-0000218189 00000 n 
-0000218371 00000 n 
-0000218595 00000 n 
-0000218751 00000 n 
-0000218944 00000 n 
-0000219182 00000 n 
-0000219406 00000 n 
-0000219664 00000 n 
-0000219920 00000 n 
-0000220184 00000 n 
-0000220416 00000 n 
-0000220676 00000 n 
-0000220865 00000 n 
-0000221149 00000 n 
-0000221193 00000 n 
-0000221467 00000 n 
-0000221741 00000 n 
-0000230942 00000 n 
-0000231161 00000 n 
-0000232516 00000 n 
-0000233431 00000 n 
-0000244144 00000 n 
-0000244358 00000 n 
-0000245713 00000 n 
-0000246629 00000 n 
-0000253194 00000 n 
-0000253407 00000 n 
-0000254762 00000 n 
-0000255677 00000 n 
-0000260585 00000 n 
-0000260809 00000 n 
-0000262164 00000 n 
+0000136359 00000 n 
+0000136750 00000 n 
+0000136794 00000 n 
+0000136998 00000 n 
+0000137199 00000 n 
+0000137243 00000 n 
+0000147185 00000 n 
+0000147515 00000 n 
+0000157458 00000 n 
+0000157829 00000 n 
+0000157873 00000 n 
+0000157998 00000 n 
+0000166634 00000 n 
+0000166993 00000 n 
+0000167121 00000 n 
+0000177663 00000 n 
+0000177993 00000 n 
+0000189307 00000 n 
+0000189679 00000 n 
+0000189723 00000 n 
+0000190155 00000 n 
+0000190492 00000 n 
+0000190727 00000 n 
+0000198579 00000 n 
+0000198911 00000 n 
+0000208467 00000 n 
+0000208836 00000 n 
+0000208882 00000 n 
+0000208928 00000 n 
+0000209053 00000 n 
+0000209181 00000 n 
+0000209317 00000 n 
+0000209453 00000 n 
+0000209582 00000 n 
+0000209715 00000 n 
+0000209856 00000 n 
+0000209998 00000 n 
+0000210142 00000 n 
+0000210288 00000 n 
+0000210423 00000 n 
+0000210610 00000 n 
+0000210748 00000 n 
+0000210885 00000 n 
+0000211025 00000 n 
+0000211167 00000 n 
+0000211301 00000 n 
+0000211435 00000 n 
+0000211571 00000 n 
+0000211709 00000 n 
+0000211851 00000 n 
+0000211994 00000 n 
+0000212120 00000 n 
+0000212250 00000 n 
+0000212383 00000 n 
+0000212517 00000 n 
+0000212643 00000 n 
+0000212770 00000 n 
+0000212892 00000 n 
+0000213017 00000 n 
+0000213143 00000 n 
+0000213271 00000 n 
+0000213418 00000 n 
+0000213566 00000 n 
+0000213706 00000 n 
+0000213847 00000 n 
+0000213998 00000 n 
+0000214151 00000 n 
+0000214283 00000 n 
+0000214415 00000 n 
+0000214544 00000 n 
+0000214672 00000 n 
+0000214798 00000 n 
+0000214923 00000 n 
+0000215053 00000 n 
+0000215183 00000 n 
+0000215322 00000 n 
+0000215460 00000 n 
+0000215538 00000 n 
+0000215687 00000 n 
+0000215878 00000 n 
+0000216044 00000 n 
+0000216240 00000 n 
+0000216453 00000 n 
+0000216667 00000 n 
+0000216911 00000 n 
+0000217105 00000 n 
+0000217325 00000 n 
+0000217542 00000 n 
+0000217740 00000 n 
+0000217972 00000 n 
+0000218152 00000 n 
+0000218334 00000 n 
+0000218558 00000 n 
+0000218714 00000 n 
+0000218907 00000 n 
+0000219145 00000 n 
+0000219369 00000 n 
+0000219627 00000 n 
+0000219883 00000 n 
+0000220147 00000 n 
+0000220379 00000 n 
+0000220639 00000 n 
+0000220828 00000 n 
+0000221112 00000 n 
+0000221156 00000 n 
+0000221430 00000 n 
+0000221704 00000 n 
+0000230905 00000 n 
+0000231124 00000 n 
+0000232479 00000 n 
+0000233394 00000 n 
+0000244107 00000 n 
+0000244321 00000 n 
+0000245676 00000 n 
+0000246592 00000 n 
+0000253157 00000 n 
+0000253370 00000 n 
+0000254725 00000 n 
+0000255640 00000 n 
+0000260548 00000 n 
+0000260772 00000 n 
+0000262127 00000 n 
 trailer
 << /Size 202
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-263079
+263042
 %%EOF

{fangfrisch-1.9.0.dev5 → fangfrisch-1.9.0.dev6}/docs/index.html

@@ -442,7 +442,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div class="details">
 <span id="author" class="author">Ralph Seichter</span><br>
 <span id="email" class="email"><a href="mailto:fangfrisch@seichter.de">fangfrisch@seichter.de</a></span><br>
-<span id="revnumber">version 1.9.0.dev5,</span>
+<span id="revnumber">version 1.9.0.dev6,</span>
 <span id="revdate">2024-03-01</span>
 </div>
 <div id="toc" class="toc2">
@@ -1082,10 +1082,10 @@ max_size = 10MB
 [fangfrischnews]
 interval = 12h
 local_directory = /tmp
-max_size = 50KB
-script = /path/to/script/fangfrisch-has-news.sh
-on_update_exec = sh -c "[ ! -r ${script} ] || ${script} ${local_directory}"
-prefix = http://mirror.sentries.org/fangfrisch/
+max_size = 100KB
+script = /path/to/fangfrisch-has-news.sh
+on_update_exec = [ ! -x ${script} ] || ${script} ${local_directory}
+prefix = https://www.seichter.de/fangfrisch/
 url_alerts = ${prefix}fangfrisch_alerts.txt
 url_news = ${prefix}fangfrisch_news.txt
 
@@ -1210,10 +1210,10 @@ on_update_timeout = 42
 [fangfrischnews]
 interval = 12h
 local_directory = /tmp
-max_size = 50KB
-script = /path/to/script/fangfrisch-has-news.sh
-on_update_exec = sh -c "[ ! -r ${script} ] || ${script} ${local_directory}"
-prefix = http://mirror.sentries.org/fangfrisch/
+max_size = 100KB
+script = /path/to/fangfrisch-has-news.sh
+on_update_exec = [ ! -x ${script} ] || ${script} ${local_directory}
+prefix = https://www.seichter.de/fangfrisch/
 url_alerts = ${prefix}fangfrisch_alerts.txt
 url_news = ${prefix}fangfrisch_news.txt
 
@@ -1344,7 +1344,7 @@ enabled = yes
 You will not need to read the content, nor will anything else happen, unless you modify the <code>script</code> option.
 Here is an example script which you could use to have downloaded news items mailed to you.
 It needs to be readable for the user account running Fangfrisch, and the sender/recipient addresses obviously have to be adapted.
-For your convenience, the latest version of the script can be downloaded <a href="https://raw.githubusercontent.com/rseichter/fangfrisch/master/contrib/process-news.sh">here</a>.</p>
+For your convenience, the latest version of the script can be downloaded <a href="https://raw.githubusercontent.com/rseichter/fangfrisch/master/contrib/fangfrisch-has-news.sh">here</a>.</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -1394,7 +1394,7 @@ report_news() {
 			(( counter+=1 ))
 			echo -e "\n### $fn:\n" &gt;&gt;"$body"
 			cat "$fn" &gt;&gt;"$body"
-		done &lt; &lt;(find "$dir" -type f -name "fangfrisch*.txt" -print0)
+		done &lt; &lt;(find "$dir" -maxdepth 1 -type f -name "fangfrisch*.txt" -print0)
 	done
 	if [ $counter -gt 0 ]; then
 		print_header
@@ -1450,8 +1450,8 @@ fangfrisch --conf /etc/fangfrisch.conf dumpmappings | awk '{print $3}' | xargs /
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 1.9.0.dev5<br>
-Last updated 2024-03-01 15:40:44 +0100
+Version 1.9.0.dev6<br>
+Last updated 2024-03-01 20:55:03 +0100
 </div>
 </div>
 </body>

{fangfrisch-1.9.0.dev5 → fangfrisch-1.9.0.dev6}/docs/internal.conf

@@ -9,10 +9,10 @@ max_size = 10MB
 [fangfrischnews]
 interval = 12h
 local_directory = /tmp
-max_size = 50KB
-script = /path/to/script/fangfrisch-has-news.sh
-on_update_exec = sh -c "[ ! -r ${script} ] || ${script} ${local_directory}"
-prefix = http://mirror.sentries.org/fangfrisch/
+max_size = 100KB
+script = /path/to/fangfrisch-has-news.sh
+on_update_exec = [ ! -x ${script} ] || ${script} ${local_directory}
+prefix = https://www.seichter.de/fangfrisch/
 url_alerts = ${prefix}fangfrisch_alerts.txt
 url_news = ${prefix}fangfrisch_news.txt
 

{fangfrisch-1.9.0.dev5 → fangfrisch-1.9.0.dev6}/fangfrisch/__init__.py

@@ -16,7 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Fangfrisch. If not, see <https://www.gnu.org/licenses/>.
 """
-__version__ = '1.9.0.dev5'
+__version__ = '1.9.0.dev6'
 
 
 class ClamavItem:

{fangfrisch-1.9.0.dev5 → fangfrisch-1.9.0.dev6}/fangfrisch/config/fangfrischnews.py

@@ -26,10 +26,10 @@ fangfrischnews = {
     'fangfrischnews': {
         INTERVAL: '12h',
         LOCAL_DIR: '/tmp',
-        MAX_SIZE: '50KB',
-        'script': '/path/to/script/fangfrisch-has-news.sh',
-        ON_UPDATE_EXEC: f'sh -c "[ ! -r ${{script}} ] || ${{script}} ${{{LOCAL_DIR}}}"',
-        PREFIX: r'http://mirror.sentries.org/fangfrisch/',
+        MAX_SIZE: '100KB',
+        'script': '/path/to/fangfrisch-has-news.sh',
+        ON_UPDATE_EXEC: f'[ ! -x ${{script}} ] || ${{script}} ${{{LOCAL_DIR}}}',
+        PREFIX: r'https://www.seichter.de/fangfrisch/',
         'url_alerts': f'${{{PREFIX}}}fangfrisch_alerts.txt',
         'url_news': f'${{{PREFIX}}}fangfrisch_news.txt',
     }

{fangfrisch-1.9.0.dev5 → fangfrisch-1.9.0.dev6}/fangfrisch/task.py

@@ -52,6 +52,6 @@ def add_task(tasks: List[Task], command: str, timeout: int) -> Optional[Task]:
             log_debug(f"Ignoring duplicate: {command}")
             return None
     task = Task(command=command, timeout=timeout)
-    log_debug(task)
     tasks.append(task)
+    log_debug(f'{task} added')
     return task

{fangfrisch-1.9.0.dev5 → fangfrisch-1.9.0.dev6/fangfrisch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fangfrisch
-Version: 1.9.0.dev5
+Version: 1.9.0.dev6
 Summary: Update and verify unofficial Clam Anti-Virus signatures
 Home-page: https://github.com/rseichter/fangfrisch
 Author: Ralph Seichter

{fangfrisch-1.9.0.dev5 → fangfrisch-1.9.0.dev6}/setup.cfg

@@ -24,7 +24,7 @@ project_urls =
 	Source = https://github.com/rseichter/fangfrisch
 	Tracker = https://github.com/rseichter/fangfrisch/issues
 url = https://github.com/rseichter/fangfrisch
-version = 1.9.0.dev5
+version = 1.9.0.dev6
 
 [options]
 install_requires = 

fangfrisch-1.9.0.dev5/docs/Makefile

@@ -1,33 +0,0 @@
-# vim:ts=4:noet
-
-asciidoctor_opts = -o $@ -v
-ff = ../local/fangfrisch
-cf_combined = combined.conf
-cf_example = example.conf
-cf_internal = internal.conf
-out_html = index.html
-out_pdf = fangfrisch.pdf
-sources = fangfrisch.adoc $(cf_combined) $(cf_example) $(cf_internal) usage.txt
-
-.PHONY:	all clean force
-
-all: $(out_html) $(out_pdf)
-
-$(cf_combined): $(cf_example)
-	$(ff) -c $< dumpconf > $@
-
-$(cf_internal):
-	$(ff) -c /dev/null dumpconf > $@
-
-$(out_html): $(sources)
-	asciidoctor -a toc=right $(asciidoctor_opts) $<
-
-$(out_pdf): $(sources)
-	asciidoctor-pdf -a toc=preamble $(asciidoctor_opts) $<
-
-clean:
-	/bin/rm $(out_html) $(out_pdf) || true
-
-force:
-	rm -f $(cf_combined) $(cf_internal)
-	make