X-Git-Url: https://git.tld-linux.org/?p=packages%2Fsyslog-ng.git;a=blobdiff_plain;f=man-paths.patch;h=13f0b97322d7df009c1157616003c331559775a8;hp=703a6c369362933ad27a0b282844ec47f39d8c57;hb=39261fbb5903f57b19fae2257ee756ac6c123753;hpb=0b47fab1b64b82651fa62b7008b4a36f95272a88

diff --git a/man-paths.patch b/man-paths.patch
index 703a6c3..13f0b97 100644
--- a/man-paths.patch
+++ b/man-paths.patch
@@ -1,67 +1,117 @@
---- syslog-ng-3.4.3/doc/man.bak/loggen.1.xml	2013-08-13 12:24:20.000000000 +0300
-+++ syslog-ng-3.4.3/doc/man/loggen.1.xml	2013-09-30 21:42:33.729604012 +0300
-@@ -264,7 +264,7 @@
-     <refsect1>
+diff -urN syslog-ng-syslog-ng-3.12.1.org/doc/man/dqtool.1.xml syslog-ng-syslog-ng-3.12.1/doc/man/dqtool.1.xml
+--- syslog-ng-syslog-ng-3.12.1.org/doc/man/dqtool.1.xml	2017-09-20 19:52:33.000000000 +0200
++++ syslog-ng-syslog-ng-3.12.1/doc/man/dqtool.1.xml	2017-11-02 15:38:22.086100359 +0100
+@@ -83,7 +83,7 @@
+     <refsection>
        <title>Files</title>
        <para>
--        <filename moreinfo="none">/opt/syslog-ng/bin/loggen</filename>
-+        <filename moreinfo="none">/usr/bin/loggen</filename>
+-        <filename>/opt/syslog-ng/bin/dqtool</filename>
++        <filename>/usr/bin/dqtool</filename>
        </para>
-     </refsect1>
-     <refsect1>
---- syslog-ng-3.4.3/doc/man.bak/pdbtool.1.xml	2013-08-13 12:24:20.000000000 +0300
-+++ syslog-ng-3.4.3/doc/man/pdbtool.1.xml	2013-09-30 21:42:33.729604012 +0300
-@@ -302,10 +302,10 @@
-     <refsect1>
+     </refsection>
+     <refsection>
+diff -urN syslog-ng-syslog-ng-3.12.1.org/doc/man/loggen.1.xml syslog-ng-syslog-ng-3.12.1/doc/man/loggen.1.xml
+--- syslog-ng-syslog-ng-3.12.1.org/doc/man/loggen.1.xml	2017-09-20 19:52:33.000000000 +0200
++++ syslog-ng-syslog-ng-3.12.1/doc/man/loggen.1.xml	2017-11-02 15:38:22.086100359 +0100
+@@ -249,7 +249,7 @@
+     <refsection>
        <title>Files</title>
        <para>
--        <filename moreinfo="none">/opt/syslog-ng/bin/pdbtool</filename>
-+        <filename moreinfo="none">/usr/bin/pdbtool</filename>
+-        <filename>/opt/syslog-ng/bin/loggen</filename>
++        <filename>/usr/bin/loggen</filename>
+       </para>
+     </refsection>
+     <refsection>
+diff -urN syslog-ng-syslog-ng-3.12.1.org/doc/man/pdbtool.1.xml syslog-ng-syslog-ng-3.12.1/doc/man/pdbtool.1.xml
+--- syslog-ng-syslog-ng-3.12.1.org/doc/man/pdbtool.1.xml	2017-09-20 19:52:33.000000000 +0200
++++ syslog-ng-syslog-ng-3.12.1/doc/man/pdbtool.1.xml	2017-11-02 15:38:22.089433782 +0100
+@@ -425,10 +425,10 @@
+     <refsection>
+       <title>Files</title>
+       <para>
+-        <filename>/opt/syslog-ng/</filename>
++        <filename>/usr/share/</filename>
        </para>
        <para>
--        <filename moreinfo="none">/opt/syslog-ng/etc/syslog-ng/syslog-ng.conf</filename>
-+        <filename moreinfo="none">/etc/syslog-ng/syslog-ng.conf</filename>
+-        <filename>/opt/syslog-ng/etc/syslog-ng.conf</filename>
++        <filename>//etc/syslog-ng/syslog-ng.conf</filename>
        </para>
-     </refsect1>
-     <refsect1>
---- syslog-ng-3.4.3/doc/man.bak/syslog-ng-ctl.1.xml	2013-08-13 12:24:20.000000000 +0300
-+++ syslog-ng-3.4.3/doc/man/syslog-ng-ctl.1.xml	2013-09-30 21:42:33.729604012 +0300
-@@ -120,7 +120,7 @@
-     <refsect1>
+     </refsection>
+     <refsection>
+diff -urN syslog-ng-syslog-ng-3.12.1.org/doc/man/syslog-ng.8.xml syslog-ng-syslog-ng-3.12.1/doc/man/syslog-ng.8.xml
+--- syslog-ng-syslog-ng-3.12.1.org/doc/man/syslog-ng.8.xml	2017-09-20 19:52:33.000000000 +0200
++++ syslog-ng-syslog-ng-3.12.1/doc/man/syslog-ng.8.xml	2017-11-02 15:38:22.089433782 +0100
+@@ -51,9 +51,9 @@
+               </listitem>
+             </itemizedlist>
+             <para>For example:</para>
+-            <synopsis>/opt/syslog-ng/sbin/syslog-ng -Fv --caps cap_sys_admin,cap_chown,cap_dac_override,cap_net_bind_service,cap_fowner=pi</synopsis>
++            <synopsis>/sbin/syslog-ng -Fv --caps cap_sys_admin,cap_chown,cap_dac_override,cap_net_bind_service,cap_fowner=pi</synopsis>
+             <para>Note that the capabilities are not case sensitive, the following command is also good: <command>
+-/opt/syslog-ng/sbin/syslog-ng -Fv --caps CAP_SYS_ADMIN,CAP_CHOWN,CAP_DAC_OVERRIDE,CAP_NET_BIND_SERVICE,CAP_FOWNER=pi</command></para>
++/sbin/syslog-ng -Fv --caps CAP_SYS_ADMIN,CAP_CHOWN,CAP_DAC_OVERRIDE,CAP_NET_BIND_SERVICE,CAP_FOWNER=pi</command></para>
+             <para>For details on the capability flags, see the following man pages: <filename>cap_from_text(3)</filename> and <filename>capabilities(7)</filename></para>
+           </listitem>
+         </varlistentry>
+@@ -306,10 +306,10 @@
+     <refsection>
        <title>Files</title>
        <para>
--        <filename moreinfo="none">/opt/syslog-ng/sbin/syslog-ng-ctl</filename>
-+        <filename moreinfo="none">/sbin/syslog-ng-ctl</filename>
+-        <filename>/opt/syslog-ng/</filename>
++        <filename>/usr/share/</filename>
        </para>
-     </refsect1>
-     <refsect1>
---- syslog-ng-3.4.3/doc/man.bak/syslog-ng.8.xml	2013-08-13 12:24:20.000000000 +0300
-+++ syslog-ng-3.4.3/doc/man/syslog-ng.8.xml	2013-09-30 21:42:33.729604012 +0300
-@@ -236,10 +236,10 @@
-     <refsect1>
+       <para>
+-        <filename>/opt/syslog-ng/etc/syslog-ng.conf</filename>
++        <filename>//etc/syslog-ng/syslog-ng.conf</filename>
+       </para>
+     </refsection>
+     <refsection>
+diff -urN syslog-ng-syslog-ng-3.12.1.org/doc/man/syslog-ng.conf.5.xml syslog-ng-syslog-ng-3.12.1/doc/man/syslog-ng.conf.5.xml
+--- syslog-ng-syslog-ng-3.12.1.org/doc/man/syslog-ng.conf.5.xml	2017-09-20 19:52:33.000000000 +0200
++++ syslog-ng-syslog-ng-3.12.1/doc/man/syslog-ng.conf.5.xml	2017-11-02 15:38:22.089433782 +0100
+@@ -427,10 +427,10 @@
+     <refsection>
        <title>Files</title>
        <para>
--        <filename moreinfo="none">/opt/syslog-ng/</filename>
-+        <filename moreinfo="none">/usr/share/syslog-ng</filename>
+-        <filename>/opt/syslog-ng/</filename>
++        <filename>/usr/share/</filename>
        </para>
        <para>
--        <filename moreinfo="none">/opt/syslog-ng/etc/syslog-ng.conf</filename>
-+        <filename moreinfo="none">/etc/syslog-ng.conf</filename>
+-        <filename>/opt/syslog-ng/etc/syslog-ng.conf</filename>
++        <filename>//etc/syslog-ng/syslog-ng.conf</filename>
        </para>
-     </refsect1>
-     <refsect1>
---- syslog-ng-3.4.3/doc/man.bak/syslog-ng.conf.5.xml	2013-08-13 12:24:20.000000000 +0300
-+++ syslog-ng-3.4.3/doc/man/syslog-ng.conf.5.xml	2013-09-30 21:42:33.729604012 +0300
-@@ -408,10 +408,10 @@
-     <refsect1>
+     </refsection>
+     <refsection>
+diff -urN syslog-ng-syslog-ng-3.12.1.org/doc/man/syslog-ng-ctl.1.xml syslog-ng-syslog-ng-3.12.1/doc/man/syslog-ng-ctl.1.xml
+--- syslog-ng-syslog-ng-3.12.1.org/doc/man/syslog-ng-ctl.1.xml	2017-09-20 19:52:33.000000000 +0200
++++ syslog-ng-syslog-ng-3.12.1/doc/man/syslog-ng-ctl.1.xml	2017-11-02 15:38:22.089433782 +0100
+@@ -139,7 +139,7 @@
+     <refsection>
        <title>Files</title>
        <para>
--        <filename moreinfo="none">/opt/syslog-ng/</filename>
-+        <filename moreinfo="none">/usr/share/syslog-ng/</filename>
+-        <filename>/opt/syslog-ng/sbin/syslog-ng-ctl</filename>
++        <filename>/sbin/syslog-ng-ctl</filename>
        </para>
+     </refsection>
+     <refsection>
+diff -urN syslog-ng-syslog-ng-3.12.1.org/doc/man/syslog-ng-debun.1.xml syslog-ng-syslog-ng-3.12.1/doc/man/syslog-ng-debun.1.xml
+--- syslog-ng-syslog-ng-3.12.1.org/doc/man/syslog-ng-debun.1.xml	2017-09-20 19:52:33.000000000 +0200
++++ syslog-ng-syslog-ng-3.12.1/doc/man/syslog-ng-debun.1.xml	2017-11-02 15:38:22.089433782 +0100
+@@ -59,7 +59,7 @@
+             <command>-R &lt;directory&gt;</command>
+           </term>
+           <listitem>
+-            <para>The directory where  is installed instead of <filename>/opt/syslog-ng</filename>.</para>
++            <para>The directory where  is installed instead of <filename>/usr/share</filename>.</para>
+           </listitem>
+         </varlistentry>
+         <varlistentry>
+@@ -211,7 +211,7 @@
+     <refsection>
+       <title>Files</title>
        <para>
--        <filename moreinfo="none">/opt/syslog-ng/etc/syslog-ng.conf</filename>
-+        <filename moreinfo="none">/etc/syslog-ng/syslog-ng.conf</filename>
+-        <filename>/opt/syslog-ng/bin/loggen</filename>
++        <filename>/usr/bin/loggen</filename>
        </para>
-     </refsect1>
-     <refsect1>
+     </refsection>
+     <refsection>