src/patches/libloc-0.9.1-merge-location-downloader-manpage-into-location-query.patch

   1 commit 889b932aa6172c96872be545af37d351f7c1c705
   2 Author: Michael Tremer <michael.tremer@ipfire.org>
   3 Date:   Wed Jun 3 17:10:35 2020 +0000
   4
   5     location-downloader: Merge man page into location-query
   6
   7     Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
   8
   9 diff --git a/Makefile.am b/Makefile.am
  10 index c0b1300..91f0436 100644
  11 --- a/Makefile.am
  12 +++ b/Makefile.am
  13 @@ -37,6 +37,9 @@ LIBLOC_CURRENT=0
  14  LIBLOC_REVISION=0
  15  LIBLOC_AGE=0
  16
  17 +pythondir = $(prefix)/lib/python3/dist-packages
  18 +pyexecdir = $(prefix)/lib/python$(PYTHON_VERSION)/lib-dynload
  19 +
  20  DISTCHECK_CONFIGURE_FLAGS = \
  21         --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
  22
  23 @@ -371,7 +374,6 @@ src_test_signature_LDADD = \
  24  # ------------------------------------------------------------------------------
  25
  26  MANPAGES = \
  27 -       man/location-downloader.8 \
  28         man/location-query.8
  29
  30  MANPAGES_TXT  = $(patsubst %.8,%.txt,$(MANPAGES))
  31 diff --git a/man/location-downloader.txt b/man/location-downloader.txt
  32 deleted file mode 100644
  33 index d733923..0000000
  34 --- a/man/location-downloader.txt
  35 +++ /dev/null
  36 @@ -1,61 +0,0 @@
  37 -= location-downloader(8)
  38 -
  39 -== NAME
  40 -location-downloader - Download a location database
  41 -
  42 -== SYNOPSIS
  43 -[verse]
  44 -`location-downloader update`
  45 -
  46 -== DESCRIPTION
  47 -The `location-downloader` command updates the local version of the
  48 -location database.
  49 -
  50 -== OPTIONS
  51 -
  52 ---database FILE::
  53 --d FILE::
  54 -       The path of the database which is being updated.
  55 -       +
  56 -       If this option is omitted, the system's database will be opened.
  57 -
  58 ---quiet::
  59 -       Enable quiet mode
  60 -
  61 ---debug::
  62 -       Enable debugging mode
  63 -
  64 -== COMMANDS
  65 -
  66 -'update'::
  67 -       This command will try to update the local database.
  68 -       +
  69 -       It will terminate with a return code of zero if the database has been
  70 -       successfully updated. 1 on error, 2 on invalid call and 3 if the
  71 -       database was already the latest version.
  72 -
  73 -'verify'::
  74 -       Verifies the downloaded database.
  75 -
  76 -'--help'::
  77 -       Shows a short help text on using this program.
  78 -
  79 -'--version'::
  80 -       Shows the program's version and exists.
  81 -
  82 -== EXIT CODES
  83 -The 'location-downloader' command will normally exit with code zero.
  84 -If there has been a problem and the requested action could not be performed,
  85 -the exit code is unequal to zero.
  86 -
  87 -== HOW IT WORKS
  88 -The downloader checks a DNS record for the latest version of the database.
  89 -It will then try to download a file with that version from a mirror server.
  90 -If the downloaded file is outdated, the next mirror will be tried until we
  91 -have found a file that is recent enough.
  92 -
  93 -== BUGS
  94 -Please report all bugs to the bugtracker at https://bugzilla.ipfire.org/.
  95 -
  96 -== AUTHORS
  97 -Michael Tremer
  98 diff --git a/man/location-query.txt b/man/location-query.txt
  99 index b91e8e1..acb43cd 100644
 100 --- a/man/location-query.txt
 101 +++ b/man/location-query.txt
 102 @@ -8,6 +8,8 @@ location-query - Query the location database
 103  `location-query lookup ADDRESS [ADDRESS...]`
 104  `location-query get-as ASN [ASN...]`
 105  `location-query search-as STRING`
 106 +`location-query update`
 107 +`location-query verify`
 108  `location-query list-networks-by-as ASN`
 109  `location-query list-networks-by-cc COUNTRY_CODE`
 110  `location-query list-networks-by-flags [--anonymous-proxy|--satellite-provider|--anycast]`
 111 @@ -47,6 +49,16 @@ or countries.
 112         +
 113         The search will be performed case-insensitively.
 114
 115 +'update'::
 116 +       This command will try to update the local database.
 117 +       +
 118 +       It will terminate with a return code of zero if the database has been
 119 +       successfully updated. 1 on error, 2 on invalid call and 3 if the
 120 +       database was already the latest version.
 121 +
 122 +'verify'::
 123 +       Verifies the downloaded database.
 124 +
 125  'list-networks-by-as [--family=[ipv6|ipv4]] [--output-format FORMAT] ASN'::
 126         Lists all networks which belong to this Autonomous System.
 127         +
 128 @@ -85,6 +97,12 @@ The 'location-query' command will normally exit with code zero.
 129  If there has been a problem and the requested action could not be performed,
 130  the exit code is unequal to zero.
 131
 132 +== HOW IT WORKS
 133 +The downloader checks a DNS record for the latest version of the database.
 134 +It will then try to download a file with that version from a mirror server.
 135 +If the downloaded file is outdated, the next mirror will be tried until we
 136 +have found a file that is recent enough.
 137 +
 138  == BUGS
 139  Please report all bugs to the bugtracker at https://bugzilla.ipfire.org/.
 140