Hello community, here is the log from the commit of package issue-generator for openSUSE:Factory checked in at 2017-04-12 17:43:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/issue-generator (Old) and /work/SRC/openSUSE:Factory/.issue-generator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "issue-generator" Wed Apr 12 17:43:33 2017 rev:2 rq:483011 version:1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/issue-generator/issue-generator.changes 2016-12-16 11:54:51.951250186 +0100 +++ /work/SRC/openSUSE:Factory/.issue-generator.new/issue-generator.changes 2017-04-12 18:11:42.716172761 +0200 @@ -1,0 +2,6 @@ +Tue Mar 28 12:58:59 CEST 2017 - [email protected] + +- Update to version 1.3 + - make list of network interfaces configureable + +------------------------------------------------------------------- Old: ---- issue-generator-1.2.tar.bz2 New: ---- issue-generator-1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ issue-generator.spec ++++++ --- /var/tmp/diff_new_pack.kiBTWn/_old 2017-04-12 18:11:43.352082843 +0200 +++ /var/tmp/diff_new_pack.kiBTWn/_new 2017-04-12 18:11:43.356082278 +0200 @@ -1,7 +1,7 @@ # # spec file for package issue-generator # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,17 @@ Name: issue-generator -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 1.2 +Version: 1.3 Release: 0 Summary: Generates an issue files from different snippets License: GPL-2.0+ Group: System/Base -URL: https://github.com/thkukuk/issue-generator +Url: https://github.com/thkukuk/issue-generator +Source: %{name}-%{version}.tar.bz2 +BuildRequires: fdupes +Requires(post): %fillup_prereq +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Source: %name-%version.tar.bz2 %{?systemd_requires} %description @@ -36,18 +38,22 @@ %build %configure -make +make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT -ln -sf service $RPM_BUILD_ROOT/usr/sbin/rcissue-generator -ln -sf service $RPM_BUILD_ROOT/usr/sbin/rcissue-add-ssh-keys +make %{?_smp_mflags} DESTDIR=%{buildroot} install +ln -sf service %{buildroot}%{_sbindir}/rcissue-generator +ln -sf service %{buildroot}%{_sbindir}/rcissue-add-ssh-keys +mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +install -m 644 udev/sysconfig.issue-generator %{buildroot}%{_localstatedir}/adm/fillup-templates/ +%fdupes %{buildroot}%{_mandir} %pre %service_add_pre issue-generator.service issue-add-ssh-keys.service %post -/usr/bin/systemd-tmpfiles --create issue-generator.conf ||: +%{_bindir}/systemd-tmpfiles --create issue-generator.conf ||: +%{fillup_only -n issue-generator} %service_add_post issue-generator.service issue-add-ssh-keys.service %preun @@ -59,23 +65,25 @@ %files %defattr(-,root,root) %doc NEWS COPYING README.md -%dir /etc/issue.d -%dir /usr/lib/issue.d -%dir /usr/lib/tmpfiles.d -%dir /usr/lib/udev -%dir /usr/lib/udev/rules.d -/usr/lib/tmpfiles.d/issue-generator.conf -/usr/lib/udev/rules.d/90-issue-generator.rules -/usr/lib/systemd/system/issue-add-ssh-keys.service -/usr/lib/systemd/system/issue-generator.service -/usr/sbin/issue-generator -/usr/sbin/rcissue-generator -/usr/sbin/rcissue-add-ssh-keys -%doc %{_mandir}/man5/issue.d.5.gz -%doc %{_mandir}/man8/issue-generator.8.gz -%doc %{_mandir}/man8/90-issue-generator.rules.8.gz -%doc %{_mandir}/man8/issue-add-ssh-keys.service.8.gz -%doc %{_mandir}/man8/issue-generator.conf.8.gz -%doc %{_mandir}/man8/issue-generator.service.8.gz +%ghost %{_sysconfdir}/issue +%dir %{_sysconfdir}/issue.d +%dir %{_prefix}/lib/issue.d +%dir %{_prefix}/lib/tmpfiles.d +%dir %{_prefix}/lib/udev +%dir %{_prefix}/lib/udev/rules.d +%{_localstatedir}/adm/fillup-templates/sysconfig.issue-generator +%{_prefix}/lib/tmpfiles.d/issue-generator.conf +%{_prefix}/lib/udev/rules.d/90-issue-generator.rules +%{_prefix}/lib/systemd/system/issue-add-ssh-keys.service +%{_prefix}/lib/systemd/system/issue-generator.service +%{_sbindir}/issue-generator +%{_sbindir}/rcissue-generator +%{_sbindir}/rcissue-add-ssh-keys +%{_mandir}/man5/issue.d.5%{ext_man} +%{_mandir}/man8/issue-generator.8%{ext_man} +%{_mandir}/man8/90-issue-generator.rules.8%{ext_man} +%{_mandir}/man8/issue-add-ssh-keys.service.8%{ext_man} +%{_mandir}/man8/issue-generator.conf.8%{ext_man} +%{_mandir}/man8/issue-generator.service.8%{ext_man} %changelog ++++++ issue-generator-1.2.tar.bz2 -> issue-generator-1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/Makefile.in new/issue-generator-1.3/Makefile.in --- old/issue-generator-1.2/Makefile.in 2016-11-23 10:52:41.000000000 +0100 +++ new/issue-generator-1.3/Makefile.in 2017-03-28 12:55:56.000000000 +0200 @@ -207,6 +207,7 @@ ISSUEDIR = @ISSUEDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/NEWS new/issue-generator-1.3/NEWS --- old/issue-generator-1.2/NEWS 2016-11-23 10:52:37.000000000 +0100 +++ new/issue-generator-1.3/NEWS 2017-03-28 12:55:47.000000000 +0200 @@ -1,6 +1,9 @@ issue-generator NEWS -- history of user-visible changes. -Copyright (C) 2016 Thorsten Kukuk +Copyright (C) 2016, 2017 Thorsten Kukuk + +Version 1.3 +* Make list of shown network interfaces configureable Version 1.2 * Add README.md diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/configure new/issue-generator-1.3/configure --- old/issue-generator-1.2/configure 2016-11-23 10:52:41.000000000 +0100 +++ new/issue-generator-1.3/configure 2017-03-28 12:55:56.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for issue-generator 1.2. +# Generated by GNU Autoconf 2.69 for issue-generator 1.3. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -576,8 +576,8 @@ # Identity of this package. PACKAGE_NAME='issue-generator' PACKAGE_TARNAME='issue-generator' -PACKAGE_VERSION='1.2' -PACKAGE_STRING='issue-generator 1.2' +PACKAGE_VERSION='1.3' +PACKAGE_STRING='issue-generator 1.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -591,6 +591,7 @@ XML_CATALOG_FILE XMLLINT XSLTPROC +LN_S SYSTEMDDIR UDEVRULESDIR ISSUEDIR @@ -1209,7 +1210,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures issue-generator 1.2 to adapt to many kinds of systems. +\`configure' configures issue-generator 1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1275,7 +1276,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of issue-generator 1.2:";; + short | recursive ) echo "Configuration of issue-generator 1.3:";; esac cat <<\_ACEOF @@ -1355,7 +1356,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -issue-generator configure 1.2 +issue-generator configure 1.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1372,7 +1373,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by issue-generator $as_me 1.2, which was +It was created by issue-generator $as_me 1.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2235,7 +2236,7 @@ # Define the identity of the package. PACKAGE='issue-generator' - VERSION='1.2' + VERSION='1.3' cat >>confdefs.h <<_ACEOF @@ -2319,6 +2320,17 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } +fi + enable_man=yes # Extract the first word of "xsltproc", so it can be a program name with args. @@ -3081,7 +3093,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by issue-generator $as_me 1.2, which was +This file was extended by issue-generator $as_me 1.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3134,7 +3146,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -issue-generator config.status 1.2 +issue-generator config.status 1.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/configure.ac new/issue-generator-1.3/configure.ac --- old/issue-generator-1.2/configure.ac 2016-11-23 10:52:26.000000000 +0100 +++ new/issue-generator-1.3/configure.ac 2017-03-28 12:55:12.000000000 +0200 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(issue-generator, 1.2) +AC_INIT(issue-generator, 1.3) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([sbin/issue-generator.in]) AC_PREFIX_DEFAULT(/usr) @@ -34,6 +34,7 @@ AC_SUBST(SYSTEMDDIR) AC_PROG_INSTALL +AC_PROG_LN_S dnl dnl Check for xsltproc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/man/90-issue-generator.rules.8.html new/issue-generator-1.3/man/90-issue-generator.rules.8.html --- old/issue-generator-1.2/man/90-issue-generator.rules.8.html 1970-01-01 01:00:00.000000000 +0100 +++ new/issue-generator-1.3/man/90-issue-generator.rules.8.html 2017-03-28 12:56:19.000000000 +0200 @@ -0,0 +1,40 @@ +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>issue-generator</title><meta name="generator" content="DocBook XSL Stylesheets V1.78.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><style> + a.headerlink { + color: #c60f0f; + font-size: 0.8em; + padding: 0 4px 0 4px; + text-decoration: none; + visibility: hidden; + } + + a.headerlink:hover { + background-color: #c60f0f; + color: white; + } + + h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink { + visibility: visible; + } + </style><a href="issue-generator.index.html">Index </a><span style="float:right">issue-generator 1.3</span><hr><div class="refentry"><a name="issue-generator.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>issue-generator, issue-add-ssh-keys.service, issue-generator.service, 90-issue-generator.rules, issue-generator.conf — Creates a volatile and temporary issue file</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> [--prefix <em class="replaceable"><code>path</code></em>] [--help]</p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> network add | remove + <em class="replaceable"><code>interface</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> ssh add | remove </p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> --version </p></div><p><code class="filename">issue-add-ssh-keys.service</code></p><p><code class="filename">issue-generator.service</code></p></div><div class="refsect1"><a name="description"></a><h2 id="DESCRIPTION">DESCRIPTION<a class="headerlink" title="Permalink to this headline" href="#DESCRIPTION">¶</a></h2><p><span class="emphasis"><em>issue-generator</em></span> +creates a volatile and temporary +<a href="issue.5.html"><span class="citerefentry"><span class="refentrytitle">issue</span>(5)</span></a> +file based on the input files and location specified in +<a href="issue.d.5.html"><span class="citerefentry"><span class="refentrytitle">issue.d</span>(5)</span></a>. +</p><p>If invoked with no arguments, it applies all input files and creates a +temporary <code class="filename">issue</code> file as <code class="filename">/run/issue</code>. +<code class="filename">/etc/issue</code> should be symlink to this file.</p></div><div class="refsect1"><a name="options"></a><h2 id="OPTIONS">OPTIONS<a class="headerlink" title="Permalink to this headline" href="#OPTIONS">¶</a></h2><div class="variablelist"><dl class="variablelist"><dt id="--prefix path"><span class="term"><code class="option">--prefix</code> <em class="replaceable"><code>path</code></em></span><a class="headerlink" title="Permalink to this term" href="#--prefix%20path">¶</a></dt><dd><p>Add the prefix <code class="filename">path</code> to all used directories and files.</p></dd><dt id="network add|remove interface"><span class="term"><code class="option">network add|remove</code> <em class="replaceable"><code>interface</code></em></span><a class="headerlink" title="Permalink to this term" href="#network%20add%7Cremove%20interface">¶</a></dt><dd><p>Creates a deletes files of the format + <code class="filename">/run/issue.d/70-<em class="replaceable"><code>interface</code></em>.conf</code>. This + files contains the name of the <em class="replaceable"><code>interface</code></em> and + the escape codes for + <a href="agetty.8.html"><span class="citerefentry"><span class="refentrytitle">agetty</span>(8)</span></a> + to insert the IPv4 and IPv6 addresses.</p><p>By default, only network interfaces where the name starts with 'b' + or 'e' are added. Which interfaces are shown is configureable via a + regex expression in in the variable + <em class="replaceable"><code>NETWORK_INTERFACE_REGEX</code></em> in + <code class="filename">/etc/sysconfig/issue-generator</code>. + </p></dd><dt id="ssh add|remove"><span class="term"><code class="option">ssh add|remove</code></span><a class="headerlink" title="Permalink to this term" href="#ssh%20add%7Cremove">¶</a></dt><dd><p>Creates or deletes the file + <code class="filename">/run/issue.d/60-ssh_host_keys.conf</code> which contains + fingerprints of the public ssh keys of the host.</p></dd></dl></div></div><div class="refsect1"><a name="see_also"></a><h2 id="SEE ALSO">SEE ALSO<a class="headerlink" title="Permalink to this headline" href="#SEE%20ALSO">¶</a></h2><p><a href="issue.5.html"><span class="citerefentry"><span class="refentrytitle">issue</span>(5)</span></a>, +<a href="issue.d.5.html"><span class="citerefentry"><span class="refentrytitle">issue.d</span>(5)</span></a>, +<a href="agetty.8.html"><span class="citerefentry"><span class="refentrytitle">agetty</span>(8)</span></a></p></div></div></body></html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/man/Makefile.am new/issue-generator-1.3/man/Makefile.am --- old/issue-generator-1.2/man/Makefile.am 2016-11-02 09:34:46.000000000 +0100 +++ new/issue-generator-1.3/man/Makefile.am 2017-03-28 13:02:15.000000000 +0200 @@ -1,24 +1,63 @@ # -# Copyright (c) 2016 Thorsten Kukuk, Germany +# Copyright (c) 2016, 2017 Thorsten Kukuk, Germany # # Author: Thorsten Kukuk <[email protected]> # -CLEANFILES = issue.d.5 issue-generator.8 +CLEANFILES = $(MANS) $(DATA) issue-generator.index.xml -EXTRA_DIST = $(MANS) $(XMLS) +EXTRA_DIST = $(MANS) $(XMLS) $(DATA) custom-html.xsl \ + make-man-index.py xml_helper.py issue-generator.index.xml man_MANS = issue.d.5 issue-generator.8 issue-generator.service.8 \ issue-add-ssh-keys.service.8 90-issue-generator.rules.8 \ issue-generator.conf.8 +noinst_DATA = issue.d.5.html issue-generator.8.html \ + issue-generator.service.8.html issue-add-ssh-keys.service.8.html \ + 90-issue-generator.rules.8.html issue-generator.conf.8.html XMLS = issue.d.5.xml issue-generator.8.xml +XSLTPROC_FLAGS_HTML = \ + --nonet \ + --xinclude \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 \ + --stringparam issue-generator.version $(VERSION) \ + --stringparam chunker.output.encoding UTF-8 \ + $(srcdir)/custom-html.xsl + + if ENABLE_REGENERATE_MAN + +define html-alias + $(LN_S) -f $(notdir $<) $@ +endef + +issue-generator.index.xml: make-man-index.py $(XMLS) + python $(srcdir)/make-man-index.py $(srcdir)/$@ $(XMLS) + issue.d.5: issue.d.5.xml - $(XMLLINT) --nonet --xinclude --postvalid --noout $< $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< +issue.d.5.html: issue.d.5.xml custom-html.xsl + $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) $(XSLTPROC_FLAGS_HTML) $< + issue-generator.8: issue-generator.8.xml - $(XMLLINT) --nonet --xinclude --postvalid --noout $< $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< + +issue-generator.8.html: issue-generator.8.xml custom-html.xsl + $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) $(XSLTPROC_FLAGS_HTML) $< + +90-issue-generator.rules.8.html: issue-generator.8.html + $(html-alias) + +issue-generator.conf.8.html: issue-generator.8.html + $(html-alias) + +issue-generator.service.8.html: issue-generator.8.html + $(html-alias) + +issue-add-ssh-keys.service.8.html: issue-generator.8.html + $(html-alias) + endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/man/Makefile.in new/issue-generator-1.3/man/Makefile.in --- old/issue-generator-1.2/man/Makefile.in 2016-11-23 10:52:41.000000000 +0100 +++ new/issue-generator-1.3/man/Makefile.in 2017-03-28 13:02:21.000000000 +0200 @@ -15,10 +15,11 @@ @SET_MAKE@ # -# Copyright (c) 2016 Thorsten Kukuk, Germany +# Copyright (c) 2016, 2017 Thorsten Kukuk, Germany # # Author: Thorsten Kukuk <[email protected]> # + VPATH = @srcdir@ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' am__make_running_with_option = \ @@ -142,6 +143,7 @@ man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +DATA = $(noinst_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -164,6 +166,7 @@ ISSUEDIR = @ISSUEDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ @@ -225,13 +228,28 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -CLEANFILES = issue.d.5 issue-generator.8 -EXTRA_DIST = $(MANS) $(XMLS) +CLEANFILES = $(MANS) $(DATA) issue-generator.index.xml +EXTRA_DIST = $(MANS) $(XMLS) $(DATA) custom-html.xsl \ + make-man-index.py xml_helper.py issue-generator.index.xml + man_MANS = issue.d.5 issue-generator.8 issue-generator.service.8 \ issue-add-ssh-keys.service.8 90-issue-generator.rules.8 \ issue-generator.conf.8 +noinst_DATA = issue.d.5.html issue-generator.8.html \ + issue-generator.service.8.html issue-add-ssh-keys.service.8.html \ + 90-issue-generator.rules.8.html issue-generator.conf.8.html + XMLS = issue.d.5.xml issue-generator.8.xml +XSLTPROC_FLAGS_HTML = \ + --nonet \ + --xinclude \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 \ + --stringparam issue-generator.version $(VERSION) \ + --stringparam chunker.output.encoding UTF-8 \ + $(srcdir)/custom-html.xsl + all: all-am .SUFFIXES: @@ -390,7 +408,7 @@ done check-am: all-am check: check-am -all-am: Makefile $(MANS) +all-am: Makefile $(MANS) $(DATA) installdirs: for dir in "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -509,14 +527,37 @@ uninstall-am uninstall-man uninstall-man5 uninstall-man8 +@ENABLE_REGENERATE_MAN_TRUE@define html-alias +@ENABLE_REGENERATE_MAN_TRUE@ $(LN_S) -f $(notdir $<) $@ +@ENABLE_REGENERATE_MAN_TRUE@endef + +@[email protected]: make-man-index.py $(XMLS) +@ENABLE_REGENERATE_MAN_TRUE@ python $(srcdir)/make-man-index.py $(srcdir)/$@ $(XMLS) + @[email protected]: issue.d.5.xml -@ENABLE_REGENERATE_MAN_TRUE@ $(XMLLINT) --nonet --xinclude --postvalid --noout $< @ENABLE_REGENERATE_MAN_TRUE@ $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< +@[email protected]: issue.d.5.xml custom-html.xsl +@ENABLE_REGENERATE_MAN_TRUE@ $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) $(XSLTPROC_FLAGS_HTML) $< + @[email protected]: issue-generator.8.xml -@ENABLE_REGENERATE_MAN_TRUE@ $(XMLLINT) --nonet --xinclude --postvalid --noout $< @ENABLE_REGENERATE_MAN_TRUE@ $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< +@[email protected]: issue-generator.8.xml custom-html.xsl +@ENABLE_REGENERATE_MAN_TRUE@ $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) $(XSLTPROC_FLAGS_HTML) $< + +@[email protected]: issue-generator.8.html +@ENABLE_REGENERATE_MAN_TRUE@ $(html-alias) + +@[email protected]: issue-generator.8.html +@ENABLE_REGENERATE_MAN_TRUE@ $(html-alias) + +@[email protected]: issue-generator.8.html +@ENABLE_REGENERATE_MAN_TRUE@ $(html-alias) + +@[email protected]: issue-generator.8.html +@ENABLE_REGENERATE_MAN_TRUE@ $(html-alias) + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/man/custom-html.xsl new/issue-generator-1.3/man/custom-html.xsl --- old/issue-generator-1.2/man/custom-html.xsl 1970-01-01 01:00:00.000000000 +0100 +++ new/issue-generator-1.3/man/custom-html.xsl 2017-02-02 16:37:14.000000000 +0100 @@ -0,0 +1,241 @@ +<?xml version='1.0'?> <!--*-nxml-*--> + +<!-- + This file is based on the systemd custom-html.xsl file. + + Copyright 2011 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. +--> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"> + +<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/> +<!-- + - The docbook stylesheet injects empty anchor tags into generated HTML, identified by an auto-generated ID. + - Ask the docbook stylesheet to generate reproducible output when generating (these) ID values. + - This makes the output of this stylesheet reproducible across identical invocations on the same input, + - which is an easy and significant win for achieving reproducible builds. + - + - It may be even better to strip the empty anchors from the document output in addition to turning on consistent IDs, + - for this stylesheet contains its own custom ID logic (for generating permalinks) already. + --> +<xsl:param name="generate.consistent.ids" select="1"/> + +<!-- translate man page references to links to html pages --> +<xsl:template match="citerefentry[not(@project)]"> + <a> + <xsl:attribute name="href"> + <xsl:value-of select="refentrytitle"/> + <xsl:text>.</xsl:text> + <xsl:value-of select="manvolnum"/> + <xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:call-template name="inline.charseq"/> + </a> +</xsl:template> + +<xsl:template match="citerefentry[@project='man-pages'] | citerefentry[manvolnum='2'] | citerefentry[manvolnum='4']"> + <a> + <xsl:attribute name="href"> + <xsl:text>http://man7.org/linux/man-pages/man</xsl:text> + <xsl:value-of select="manvolnum"/> + <xsl:text>/</xsl:text> + <xsl:value-of select="refentrytitle"/> + <xsl:text>.</xsl:text> + <xsl:value-of select="manvolnum"/> + <xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:call-template name="inline.charseq"/> + </a> +</xsl:template> + +<xsl:template match="citerefentry[@project='systemd']"> + <a> + <xsl:attribute name="href"> + <xsl:text>https://www.freedesktop.org/software/systemd/man/</xsl:text> + <xsl:value-of select="refentrytitle"/> + <xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:call-template name="inline.charseq"/> + </a> +</xsl:template> + +<!-- + - helper template to do conflict resolution between various headings with the same inferred ID attribute/tag from the headerlink template + - this conflict resolution is necessary to prevent malformed HTML output (multiple ID attributes with the same value) + - and it fixes xsltproc warnings during compilation of HTML man pages + - + - A simple top-to-bottom numbering scheme is implemented for nodes with the same ID value to derive unique ID values for HTML output. + - It uses two parameters: + templateID the proposed ID string to use which must be checked for conflicts + keyNode the context node which 'produced' the given templateID. + - + - Conflicts are detected solely based on keyNode, templateID is not taken into account for that purpose. + --> +<xsl:template name="generateID"> + <!-- node which generatedID needs to assume as the 'source' of the ID --> + <xsl:param name="keyNode"/> + <!-- suggested value for generatedID output, a contextually meaningful ID string --> + <xsl:param name="templateID"/> + <xsl:variable name="conflictSource" select="preceding::refsect1/title|preceding::refsect1/info/title| + preceding::refsect2/title|preceding::refsect2/info/title| + preceding::varlistentry/term[1]"/> + <xsl:variable name="conflictCount" select="count($conflictSource[. = $keyNode])"/> + <xsl:choose> + <!-- special case conflictCount = 0 to preserve compatibility with URLs generated by previous versions of this XSL stylesheet where possible --> + <xsl:when test="$conflictCount = 0"> + <xsl:value-of select="$templateID"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat($templateID, $conflictCount)"/> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<!-- + - a helper template to abstract over the structure of generated subheading + permalink HTML output + - It helps reduce tedious repetition and groups all actual markup output (as opposed to URL/ID logic) in a single location. + --> +<xsl:template name="permalink"> + <xsl:param name="nodeType"/> <!-- local name of the element node to generate, e.g. 'h2' for <h2></h2> --> + <xsl:param name="nodeContent"/> <!-- nodeset to apply further templates to obtain the content of the subheading/term --> + <xsl:param name="linkTitle"/> <!-- value for title attribute of generated permalink, e.g. 'this is a permalink' --> + + <!-- parameters passed to generateID template, otherwise unused. --> + <xsl:param name="keyNode"/> + <xsl:param name="templateID"/> + + <!-- + - If stable URLs with fragment markers (references to the ID) turn out not to be important: + - generatedID could simply take the value of generate-id(), and various other helper templates may be dropped entirely. + - Alternatively, if xsltproc is patched to generate reproducible generate-id() output, the same simplifications can be + - applied at the cost of breaking compatibility with URLs generated from output of previous versions of this stylesheet. + --> + <xsl:variable name="generatedID"> + <xsl:call-template name="generateID"> + <xsl:with-param name="keyNode" select="$keyNode"/> + <xsl:with-param name="templateID" select="$templateID"/> + </xsl:call-template> + </xsl:variable> + + <xsl:element name="{$nodeType}"> + <xsl:attribute name="id"> + <xsl:value-of select="$generatedID"/> + </xsl:attribute> + <xsl:apply-templates select="$nodeContent"/> + <a class="headerlink" title="{$linkTitle}" href="#{$generatedID}">¶</a> + </xsl:element> +</xsl:template> + +<!-- simple wrapper around permalink to avoid repeating common info for each level of subheading covered by the permalink logic (h2, h3) --> +<xsl:template name="headerlink"> + <xsl:param name="nodeType"/> + <xsl:call-template name="permalink"> + <xsl:with-param name="nodeType" select="$nodeType"/> + <xsl:with-param name="linkTitle" select="'Permalink to this headline'"/> + <xsl:with-param name="nodeContent" select="node()"/> + <xsl:with-param name="keyNode" select="."/> + <!-- + - To retain compatibility with IDs generated by previous versions of the template, inline.charseq must be called. + - The purpose of that template is to generate markup (according to docbook documentation its purpose is to mark/format something as plain text). + - The only reason to call this template is to get the auto-generated text such as brackets ([]) before flattening it. + --> + <xsl:with-param name="templateID"> + <xsl:call-template name="inline.charseq"/> + </xsl:with-param> + </xsl:call-template> +</xsl:template> + +<xsl:template match="refsect1/title|refsect1/info/title"> + <!-- the ID is output in the block.object call for refsect1 --> + <xsl:call-template name="headerlink"> + <xsl:with-param name="nodeType" select="'h2'"/> + </xsl:call-template> +</xsl:template> + +<xsl:template match="refsect2/title|refsect2/info/title"> + <xsl:call-template name="headerlink"> + <xsl:with-param name="nodeType" select="'h3'"/> + </xsl:call-template> +</xsl:template> + +<xsl:template match="varlistentry"> + <xsl:call-template name="permalink"> + <xsl:with-param name="nodeType" select="'dt'"/> + <xsl:with-param name="linkTitle" select="'Permalink to this term'"/> + <xsl:with-param name="nodeContent" select="term"/> + <xsl:with-param name="keyNode" select="term[1]"/> + <!-- + - To retain compatibility with IDs generated by previous versions of the template, inline.charseq must be called. + - The purpose of that template is to generate markup (according to docbook documentation its purpose is to mark/format something as plain text). + - The only reason to call this template is to get the auto-generated text such as brackets ([]) before flattening it. + --> + <xsl:with-param name="templateID"> + <xsl:call-template name="inline.charseq"> + <xsl:with-param name="content" select="term[1]"/> + </xsl:call-template> + </xsl:with-param> + </xsl:call-template> + <dd> + <xsl:apply-templates select="listitem"/> + </dd> +</xsl:template> + + +<!-- add Index link at top of page --> +<xsl:template name="user.header.content"> + <style> + a.headerlink { + color: #c60f0f; + font-size: 0.8em; + padding: 0 4px 0 4px; + text-decoration: none; + visibility: hidden; + } + + a.headerlink:hover { + background-color: #c60f0f; + color: white; + } + + h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink { + visibility: visible; + } + </style> + + <a> + <xsl:attribute name="href"> + <xsl:text>issue-generator.index.html</xsl:text> + </xsl:attribute> + <xsl:text>Index </xsl:text> + </a> + + <span style="float:right"> + <xsl:text>issue-generator </xsl:text> + <xsl:value-of select="$issue-generator.version"/> + </span> + <hr/> +</xsl:template> + +<xsl:template match="literal"> + <xsl:text>"</xsl:text> + <xsl:call-template name="inline.monoseq"/> + <xsl:text>"</xsl:text> +</xsl:template> + +<!-- Switch things to UTF-8, ISO-8859-1 is soo yesteryear --> +<xsl:output method="html" encoding="UTF-8" indent="no"/> + +</xsl:stylesheet> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/man/issue-add-ssh-keys.service.8.html new/issue-generator-1.3/man/issue-add-ssh-keys.service.8.html --- old/issue-generator-1.2/man/issue-add-ssh-keys.service.8.html 1970-01-01 01:00:00.000000000 +0100 +++ new/issue-generator-1.3/man/issue-add-ssh-keys.service.8.html 2017-03-28 12:56:19.000000000 +0200 @@ -0,0 +1,40 @@ +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>issue-generator</title><meta name="generator" content="DocBook XSL Stylesheets V1.78.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><style> + a.headerlink { + color: #c60f0f; + font-size: 0.8em; + padding: 0 4px 0 4px; + text-decoration: none; + visibility: hidden; + } + + a.headerlink:hover { + background-color: #c60f0f; + color: white; + } + + h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink { + visibility: visible; + } + </style><a href="issue-generator.index.html">Index </a><span style="float:right">issue-generator 1.3</span><hr><div class="refentry"><a name="issue-generator.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>issue-generator, issue-add-ssh-keys.service, issue-generator.service, 90-issue-generator.rules, issue-generator.conf — Creates a volatile and temporary issue file</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> [--prefix <em class="replaceable"><code>path</code></em>] [--help]</p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> network add | remove + <em class="replaceable"><code>interface</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> ssh add | remove </p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> --version </p></div><p><code class="filename">issue-add-ssh-keys.service</code></p><p><code class="filename">issue-generator.service</code></p></div><div class="refsect1"><a name="description"></a><h2 id="DESCRIPTION">DESCRIPTION<a class="headerlink" title="Permalink to this headline" href="#DESCRIPTION">¶</a></h2><p><span class="emphasis"><em>issue-generator</em></span> +creates a volatile and temporary +<a href="issue.5.html"><span class="citerefentry"><span class="refentrytitle">issue</span>(5)</span></a> +file based on the input files and location specified in +<a href="issue.d.5.html"><span class="citerefentry"><span class="refentrytitle">issue.d</span>(5)</span></a>. +</p><p>If invoked with no arguments, it applies all input files and creates a +temporary <code class="filename">issue</code> file as <code class="filename">/run/issue</code>. +<code class="filename">/etc/issue</code> should be symlink to this file.</p></div><div class="refsect1"><a name="options"></a><h2 id="OPTIONS">OPTIONS<a class="headerlink" title="Permalink to this headline" href="#OPTIONS">¶</a></h2><div class="variablelist"><dl class="variablelist"><dt id="--prefix path"><span class="term"><code class="option">--prefix</code> <em class="replaceable"><code>path</code></em></span><a class="headerlink" title="Permalink to this term" href="#--prefix%20path">¶</a></dt><dd><p>Add the prefix <code class="filename">path</code> to all used directories and files.</p></dd><dt id="network add|remove interface"><span class="term"><code class="option">network add|remove</code> <em class="replaceable"><code>interface</code></em></span><a class="headerlink" title="Permalink to this term" href="#network%20add%7Cremove%20interface">¶</a></dt><dd><p>Creates a deletes files of the format + <code class="filename">/run/issue.d/70-<em class="replaceable"><code>interface</code></em>.conf</code>. This + files contains the name of the <em class="replaceable"><code>interface</code></em> and + the escape codes for + <a href="agetty.8.html"><span class="citerefentry"><span class="refentrytitle">agetty</span>(8)</span></a> + to insert the IPv4 and IPv6 addresses.</p><p>By default, only network interfaces where the name starts with 'b' + or 'e' are added. Which interfaces are shown is configureable via a + regex expression in in the variable + <em class="replaceable"><code>NETWORK_INTERFACE_REGEX</code></em> in + <code class="filename">/etc/sysconfig/issue-generator</code>. + </p></dd><dt id="ssh add|remove"><span class="term"><code class="option">ssh add|remove</code></span><a class="headerlink" title="Permalink to this term" href="#ssh%20add%7Cremove">¶</a></dt><dd><p>Creates or deletes the file + <code class="filename">/run/issue.d/60-ssh_host_keys.conf</code> which contains + fingerprints of the public ssh keys of the host.</p></dd></dl></div></div><div class="refsect1"><a name="see_also"></a><h2 id="SEE ALSO">SEE ALSO<a class="headerlink" title="Permalink to this headline" href="#SEE%20ALSO">¶</a></h2><p><a href="issue.5.html"><span class="citerefentry"><span class="refentrytitle">issue</span>(5)</span></a>, +<a href="issue.d.5.html"><span class="citerefentry"><span class="refentrytitle">issue.d</span>(5)</span></a>, +<a href="agetty.8.html"><span class="citerefentry"><span class="refentrytitle">agetty</span>(8)</span></a></p></div></div></body></html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/man/issue-generator.8 new/issue-generator-1.3/man/issue-generator.8 --- old/issue-generator-1.2/man/issue-generator.8 2016-11-02 09:35:36.000000000 +0100 +++ new/issue-generator-1.3/man/issue-generator.8 2017-03-28 12:56:19.000000000 +0200 @@ -1,13 +1,13 @@ '\" t .\" Title: issue-generator -.\" Author: [see the "AUTHOR" section] +.\" Author: Thorsten Kukuk <[email protected]> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 11/02/2016 +.\" Date: 03/28/2017 .\" Manual: issue-generator .\" Source: issue-generator .\" Language: English .\" -.TH "ISSUE\-GENERATOR" "8" "11/02/2016" "issue-generator" "issue-generator" +.TH "ISSUE\-GENERATOR" "8" "03/28/2017" "issue-generator" "issue-generator" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -73,6 +73,11 @@ and the escape codes for \fBagetty\fR(8) to insert the IPv4 and IPv6 addresses\&. +.sp +By default, only network interfaces where the name starts with \*(Aqb\*(Aq or \*(Aqe\*(Aq are added\&. Which interfaces are shown is configureable via a regex expression in in the variable +\fINETWORK_INTERFACE_REGEX\fR +in +/etc/sysconfig/issue\-generator\&. .RE .PP \fBssh add|remove\fR @@ -88,5 +93,6 @@ \fBagetty\fR(8) .SH "AUTHOR" .PP -\fBissue\-generator\fR -was written by Thorsten Kukuk <kukuk@suse\&.com>\&. +\fBThorsten Kukuk\fR <\&kukuk@suse\&.de\&> +.RS 4 +.RE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/man/issue-generator.8.html new/issue-generator-1.3/man/issue-generator.8.html --- old/issue-generator-1.2/man/issue-generator.8.html 1970-01-01 01:00:00.000000000 +0100 +++ new/issue-generator-1.3/man/issue-generator.8.html 2017-03-28 12:56:19.000000000 +0200 @@ -0,0 +1,40 @@ +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>issue-generator</title><meta name="generator" content="DocBook XSL Stylesheets V1.78.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><style> + a.headerlink { + color: #c60f0f; + font-size: 0.8em; + padding: 0 4px 0 4px; + text-decoration: none; + visibility: hidden; + } + + a.headerlink:hover { + background-color: #c60f0f; + color: white; + } + + h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink { + visibility: visible; + } + </style><a href="issue-generator.index.html">Index </a><span style="float:right">issue-generator 1.3</span><hr><div class="refentry"><a name="issue-generator.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>issue-generator, issue-add-ssh-keys.service, issue-generator.service, 90-issue-generator.rules, issue-generator.conf — Creates a volatile and temporary issue file</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> [--prefix <em class="replaceable"><code>path</code></em>] [--help]</p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> network add | remove + <em class="replaceable"><code>interface</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> ssh add | remove </p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> --version </p></div><p><code class="filename">issue-add-ssh-keys.service</code></p><p><code class="filename">issue-generator.service</code></p></div><div class="refsect1"><a name="description"></a><h2 id="DESCRIPTION">DESCRIPTION<a class="headerlink" title="Permalink to this headline" href="#DESCRIPTION">¶</a></h2><p><span class="emphasis"><em>issue-generator</em></span> +creates a volatile and temporary +<a href="issue.5.html"><span class="citerefentry"><span class="refentrytitle">issue</span>(5)</span></a> +file based on the input files and location specified in +<a href="issue.d.5.html"><span class="citerefentry"><span class="refentrytitle">issue.d</span>(5)</span></a>. +</p><p>If invoked with no arguments, it applies all input files and creates a +temporary <code class="filename">issue</code> file as <code class="filename">/run/issue</code>. +<code class="filename">/etc/issue</code> should be symlink to this file.</p></div><div class="refsect1"><a name="options"></a><h2 id="OPTIONS">OPTIONS<a class="headerlink" title="Permalink to this headline" href="#OPTIONS">¶</a></h2><div class="variablelist"><dl class="variablelist"><dt id="--prefix path"><span class="term"><code class="option">--prefix</code> <em class="replaceable"><code>path</code></em></span><a class="headerlink" title="Permalink to this term" href="#--prefix%20path">¶</a></dt><dd><p>Add the prefix <code class="filename">path</code> to all used directories and files.</p></dd><dt id="network add|remove interface"><span class="term"><code class="option">network add|remove</code> <em class="replaceable"><code>interface</code></em></span><a class="headerlink" title="Permalink to this term" href="#network%20add%7Cremove%20interface">¶</a></dt><dd><p>Creates a deletes files of the format + <code class="filename">/run/issue.d/70-<em class="replaceable"><code>interface</code></em>.conf</code>. This + files contains the name of the <em class="replaceable"><code>interface</code></em> and + the escape codes for + <a href="agetty.8.html"><span class="citerefentry"><span class="refentrytitle">agetty</span>(8)</span></a> + to insert the IPv4 and IPv6 addresses.</p><p>By default, only network interfaces where the name starts with 'b' + or 'e' are added. Which interfaces are shown is configureable via a + regex expression in in the variable + <em class="replaceable"><code>NETWORK_INTERFACE_REGEX</code></em> in + <code class="filename">/etc/sysconfig/issue-generator</code>. + </p></dd><dt id="ssh add|remove"><span class="term"><code class="option">ssh add|remove</code></span><a class="headerlink" title="Permalink to this term" href="#ssh%20add%7Cremove">¶</a></dt><dd><p>Creates or deletes the file + <code class="filename">/run/issue.d/60-ssh_host_keys.conf</code> which contains + fingerprints of the public ssh keys of the host.</p></dd></dl></div></div><div class="refsect1"><a name="see_also"></a><h2 id="SEE ALSO">SEE ALSO<a class="headerlink" title="Permalink to this headline" href="#SEE%20ALSO">¶</a></h2><p><a href="issue.5.html"><span class="citerefentry"><span class="refentrytitle">issue</span>(5)</span></a>, +<a href="issue.d.5.html"><span class="citerefentry"><span class="refentrytitle">issue.d</span>(5)</span></a>, +<a href="agetty.8.html"><span class="citerefentry"><span class="refentrytitle">agetty</span>(8)</span></a></p></div></div></body></html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/man/issue-generator.8.xml new/issue-generator-1.3/man/issue-generator.8.xml --- old/issue-generator-1.2/man/issue-generator.8.xml 2016-11-02 09:34:46.000000000 +0100 +++ new/issue-generator-1.3/man/issue-generator.8.xml 2017-03-28 12:52:48.000000000 +0200 @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd";> <!-- \-*\- nroff \-*\- --> -<!-- Copyright 2016 Thorsten Kukuk <[email protected]> --> +<!-- Copyright 2016, 2017 Thorsten Kukuk <[email protected]> --> <!-- This file is part of issue\-generator. --> @@ -17,12 +17,23 @@ <!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --> <!-- General Public License for more details. --> -<!-- You should have received a copy of the GNU General Public --> -<!-- License along with issue\-generator; see the file COPYING. If not, --> -<!-- write to the Free Software Foundation, Inc., 51 Franklin Street \- Suite 500, --> -<!-- Boston, MA 02111\-1307, USA. --> +<!-- You should have received a copy of the GNU General Public License --> +<!-- along with rebootmgr; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id='issue-generator8'> +<refentry id='issue-generator.8'> + <refentryinfo> + <title>issue-generator</title> + <productname>issue-generator</productname> + + <authorgroup> + <author> + <contrib></contrib> + <firstname>Thorsten</firstname> + <surname>Kukuk</surname> + <email>[email protected]</email> + </author> + </authorgroup> + </refentryinfo> <refmeta> <refentrytitle>issue-generator</refentrytitle> @@ -95,6 +106,12 @@ the escape codes for <citerefentry><refentrytitle>agetty</refentrytitle><manvolnum>8</manvolnum></citerefentry> to insert the IPv4 and IPv6 addresses.</para> + <para>By default, only network interfaces where the name starts with 'b' + or 'e' are added. Which interfaces are shown is configureable via a + regex expression in in the variable + <replaceable>NETWORK_INTERFACE_REGEX</replaceable> in + <filename>/etc/sysconfig/issue-generator</filename>. + </para> </listitem> </varlistentry> <varlistentry> @@ -114,11 +131,4 @@ <citerefentry><refentrytitle>agetty</refentrytitle><manvolnum>8</manvolnum></citerefentry></para> </refsect1> - <refsect1 id='author'> - <title>AUTHOR</title> - <para> - <command>issue-generator</command> was written by - Thorsten Kukuk <[email protected]>. - </para> - </refsect1> </refentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/man/issue-generator.conf.8.html new/issue-generator-1.3/man/issue-generator.conf.8.html --- old/issue-generator-1.2/man/issue-generator.conf.8.html 1970-01-01 01:00:00.000000000 +0100 +++ new/issue-generator-1.3/man/issue-generator.conf.8.html 2017-03-28 12:56:19.000000000 +0200 @@ -0,0 +1,40 @@ +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>issue-generator</title><meta name="generator" content="DocBook XSL Stylesheets V1.78.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><style> + a.headerlink { + color: #c60f0f; + font-size: 0.8em; + padding: 0 4px 0 4px; + text-decoration: none; + visibility: hidden; + } + + a.headerlink:hover { + background-color: #c60f0f; + color: white; + } + + h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink { + visibility: visible; + } + </style><a href="issue-generator.index.html">Index </a><span style="float:right">issue-generator 1.3</span><hr><div class="refentry"><a name="issue-generator.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>issue-generator, issue-add-ssh-keys.service, issue-generator.service, 90-issue-generator.rules, issue-generator.conf — Creates a volatile and temporary issue file</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> [--prefix <em class="replaceable"><code>path</code></em>] [--help]</p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> network add | remove + <em class="replaceable"><code>interface</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> ssh add | remove </p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> --version </p></div><p><code class="filename">issue-add-ssh-keys.service</code></p><p><code class="filename">issue-generator.service</code></p></div><div class="refsect1"><a name="description"></a><h2 id="DESCRIPTION">DESCRIPTION<a class="headerlink" title="Permalink to this headline" href="#DESCRIPTION">¶</a></h2><p><span class="emphasis"><em>issue-generator</em></span> +creates a volatile and temporary +<a href="issue.5.html"><span class="citerefentry"><span class="refentrytitle">issue</span>(5)</span></a> +file based on the input files and location specified in +<a href="issue.d.5.html"><span class="citerefentry"><span class="refentrytitle">issue.d</span>(5)</span></a>. +</p><p>If invoked with no arguments, it applies all input files and creates a +temporary <code class="filename">issue</code> file as <code class="filename">/run/issue</code>. +<code class="filename">/etc/issue</code> should be symlink to this file.</p></div><div class="refsect1"><a name="options"></a><h2 id="OPTIONS">OPTIONS<a class="headerlink" title="Permalink to this headline" href="#OPTIONS">¶</a></h2><div class="variablelist"><dl class="variablelist"><dt id="--prefix path"><span class="term"><code class="option">--prefix</code> <em class="replaceable"><code>path</code></em></span><a class="headerlink" title="Permalink to this term" href="#--prefix%20path">¶</a></dt><dd><p>Add the prefix <code class="filename">path</code> to all used directories and files.</p></dd><dt id="network add|remove interface"><span class="term"><code class="option">network add|remove</code> <em class="replaceable"><code>interface</code></em></span><a class="headerlink" title="Permalink to this term" href="#network%20add%7Cremove%20interface">¶</a></dt><dd><p>Creates a deletes files of the format + <code class="filename">/run/issue.d/70-<em class="replaceable"><code>interface</code></em>.conf</code>. This + files contains the name of the <em class="replaceable"><code>interface</code></em> and + the escape codes for + <a href="agetty.8.html"><span class="citerefentry"><span class="refentrytitle">agetty</span>(8)</span></a> + to insert the IPv4 and IPv6 addresses.</p><p>By default, only network interfaces where the name starts with 'b' + or 'e' are added. Which interfaces are shown is configureable via a + regex expression in in the variable + <em class="replaceable"><code>NETWORK_INTERFACE_REGEX</code></em> in + <code class="filename">/etc/sysconfig/issue-generator</code>. + </p></dd><dt id="ssh add|remove"><span class="term"><code class="option">ssh add|remove</code></span><a class="headerlink" title="Permalink to this term" href="#ssh%20add%7Cremove">¶</a></dt><dd><p>Creates or deletes the file + <code class="filename">/run/issue.d/60-ssh_host_keys.conf</code> which contains + fingerprints of the public ssh keys of the host.</p></dd></dl></div></div><div class="refsect1"><a name="see_also"></a><h2 id="SEE ALSO">SEE ALSO<a class="headerlink" title="Permalink to this headline" href="#SEE%20ALSO">¶</a></h2><p><a href="issue.5.html"><span class="citerefentry"><span class="refentrytitle">issue</span>(5)</span></a>, +<a href="issue.d.5.html"><span class="citerefentry"><span class="refentrytitle">issue.d</span>(5)</span></a>, +<a href="agetty.8.html"><span class="citerefentry"><span class="refentrytitle">agetty</span>(8)</span></a></p></div></div></body></html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/man/issue-generator.index.xml new/issue-generator-1.3/man/issue-generator.index.xml --- old/issue-generator-1.2/man/issue-generator.index.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/issue-generator-1.3/man/issue-generator.index.xml 2017-03-28 12:56:22.000000000 +0200 @@ -0,0 +1,19 @@ +<refentry id="issue-generator.index" conditional="HAVE_PYTHON"> + + <refentryinfo> + <title>issue-generator.index</title> + <productname>issue-generator</productname> + </refentryinfo> + + <refmeta> + <refentrytitle>issue-generator.index</refentrytitle> + <manvolnum>7</manvolnum> + </refmeta> + + <refnamediv> + <refname>issue-generator.index</refname> + <refpurpose>List all manpages from the issue-generator project</refpurpose> + </refnamediv> +<refsect1><title>9</title><para><citerefentry><refentrytitle>90-issue-generator.rules</refentrytitle><manvolnum>8</manvolnum></citerefentry> -- Creates a volatile and temporary issue file<sbr/></para></refsect1><refsect1><title>I</title><para><citerefentry><refentrytitle>issue-add-ssh-keys.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> -- Creates a volatile and temporary issue file<sbr/><citerefentry><refentrytitle>issue-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry> -- Creates a volatile and temporary issue file<sbr/><citerefentry><refentrytitle>issue-generator.conf</refentrytitle><manvolnum>8</manvolnum></citerefentry> -- Creates a volatile and temporary issue file<sbr/><citerefentry><refentrytitle>issue-generator.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> -- Creates a volatile and temporary issue file<sbr/><citerefentry><refentrytitle>issue.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> -- Configuration for creating an issue file<sbr/></para></refsect1><refsect1> + <para id="counts">This index contains 6 entries, referring to 2 individual manual pages.</para> + </refsect1></refentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/man/issue-generator.service.8.html new/issue-generator-1.3/man/issue-generator.service.8.html --- old/issue-generator-1.2/man/issue-generator.service.8.html 1970-01-01 01:00:00.000000000 +0100 +++ new/issue-generator-1.3/man/issue-generator.service.8.html 2017-03-28 12:56:19.000000000 +0200 @@ -0,0 +1,40 @@ +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>issue-generator</title><meta name="generator" content="DocBook XSL Stylesheets V1.78.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><style> + a.headerlink { + color: #c60f0f; + font-size: 0.8em; + padding: 0 4px 0 4px; + text-decoration: none; + visibility: hidden; + } + + a.headerlink:hover { + background-color: #c60f0f; + color: white; + } + + h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink { + visibility: visible; + } + </style><a href="issue-generator.index.html">Index </a><span style="float:right">issue-generator 1.3</span><hr><div class="refentry"><a name="issue-generator.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>issue-generator, issue-add-ssh-keys.service, issue-generator.service, 90-issue-generator.rules, issue-generator.conf — Creates a volatile and temporary issue file</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> [--prefix <em class="replaceable"><code>path</code></em>] [--help]</p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> network add | remove + <em class="replaceable"><code>interface</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> ssh add | remove </p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/issue-generator</code> --version </p></div><p><code class="filename">issue-add-ssh-keys.service</code></p><p><code class="filename">issue-generator.service</code></p></div><div class="refsect1"><a name="description"></a><h2 id="DESCRIPTION">DESCRIPTION<a class="headerlink" title="Permalink to this headline" href="#DESCRIPTION">¶</a></h2><p><span class="emphasis"><em>issue-generator</em></span> +creates a volatile and temporary +<a href="issue.5.html"><span class="citerefentry"><span class="refentrytitle">issue</span>(5)</span></a> +file based on the input files and location specified in +<a href="issue.d.5.html"><span class="citerefentry"><span class="refentrytitle">issue.d</span>(5)</span></a>. +</p><p>If invoked with no arguments, it applies all input files and creates a +temporary <code class="filename">issue</code> file as <code class="filename">/run/issue</code>. +<code class="filename">/etc/issue</code> should be symlink to this file.</p></div><div class="refsect1"><a name="options"></a><h2 id="OPTIONS">OPTIONS<a class="headerlink" title="Permalink to this headline" href="#OPTIONS">¶</a></h2><div class="variablelist"><dl class="variablelist"><dt id="--prefix path"><span class="term"><code class="option">--prefix</code> <em class="replaceable"><code>path</code></em></span><a class="headerlink" title="Permalink to this term" href="#--prefix%20path">¶</a></dt><dd><p>Add the prefix <code class="filename">path</code> to all used directories and files.</p></dd><dt id="network add|remove interface"><span class="term"><code class="option">network add|remove</code> <em class="replaceable"><code>interface</code></em></span><a class="headerlink" title="Permalink to this term" href="#network%20add%7Cremove%20interface">¶</a></dt><dd><p>Creates a deletes files of the format + <code class="filename">/run/issue.d/70-<em class="replaceable"><code>interface</code></em>.conf</code>. This + files contains the name of the <em class="replaceable"><code>interface</code></em> and + the escape codes for + <a href="agetty.8.html"><span class="citerefentry"><span class="refentrytitle">agetty</span>(8)</span></a> + to insert the IPv4 and IPv6 addresses.</p><p>By default, only network interfaces where the name starts with 'b' + or 'e' are added. Which interfaces are shown is configureable via a + regex expression in in the variable + <em class="replaceable"><code>NETWORK_INTERFACE_REGEX</code></em> in + <code class="filename">/etc/sysconfig/issue-generator</code>. + </p></dd><dt id="ssh add|remove"><span class="term"><code class="option">ssh add|remove</code></span><a class="headerlink" title="Permalink to this term" href="#ssh%20add%7Cremove">¶</a></dt><dd><p>Creates or deletes the file + <code class="filename">/run/issue.d/60-ssh_host_keys.conf</code> which contains + fingerprints of the public ssh keys of the host.</p></dd></dl></div></div><div class="refsect1"><a name="see_also"></a><h2 id="SEE ALSO">SEE ALSO<a class="headerlink" title="Permalink to this headline" href="#SEE%20ALSO">¶</a></h2><p><a href="issue.5.html"><span class="citerefentry"><span class="refentrytitle">issue</span>(5)</span></a>, +<a href="issue.d.5.html"><span class="citerefentry"><span class="refentrytitle">issue.d</span>(5)</span></a>, +<a href="agetty.8.html"><span class="citerefentry"><span class="refentrytitle">agetty</span>(8)</span></a></p></div></div></body></html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/man/issue.d.5 new/issue-generator-1.3/man/issue.d.5 --- old/issue-generator-1.2/man/issue.d.5 2016-11-02 09:35:36.000000000 +0100 +++ new/issue-generator-1.3/man/issue.d.5 2017-03-28 12:56:19.000000000 +0200 @@ -1,13 +1,13 @@ '\" t .\" Title: issue.d -.\" Author: [see the "AUTHOR" section] +.\" Author: Thorsten Kukuk <[email protected]> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 11/02/2016 +.\" Date: 03/28/2017 .\" Manual: issue-generator .\" Source: issue-generator .\" Language: English .\" -.TH "ISSUE\&.D" "5" "11/02/2016" "issue-generator" "issue\-generator" +.TH "ISSUE\&.D" "5" "03/28/2017" "issue-generator" "issue\-generator" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -68,3 +68,8 @@ .PP \fBissue\-generator\fR was written by Thorsten Kukuk <kukuk@suse\&.com>\&. +.SH "AUTHOR" +.PP +\fBThorsten Kukuk\fR <\&kukuk@suse\&.de\&> +.RS 4 +.RE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/man/issue.d.5.html new/issue-generator-1.3/man/issue.d.5.html --- old/issue-generator-1.2/man/issue.d.5.html 1970-01-01 01:00:00.000000000 +0100 +++ new/issue-generator-1.3/man/issue.d.5.html 2017-03-28 12:56:19.000000000 +0200 @@ -0,0 +1,43 @@ +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>issue.d</title><meta name="generator" content="DocBook XSL Stylesheets V1.78.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><style> + a.headerlink { + color: #c60f0f; + font-size: 0.8em; + padding: 0 4px 0 4px; + text-decoration: none; + visibility: hidden; + } + + a.headerlink:hover { + background-color: #c60f0f; + color: white; + } + + h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink { + visibility: visible; + } + </style><a href="issue-generator.index.html">Index </a><span style="float:right">issue-generator 1.3</span><hr><div class="refentry"><a name="issue.d.5"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>issue.d — Configuration for creating an issue file</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><p><code class="filename">/etc/issue.d/*</code></p><p><code class="filename">/run/issue.d/*</code></p><p><code class="filename">/usr/lib/issue.d/*</code></p></div><div class="refsect1"><a name="description"></a><h2 id="DESCRIPTION">DESCRIPTION<a class="headerlink" title="Permalink to this headline" href="#DESCRIPTION">¶</a></h2><p> + The file <code class="filename">/etc/issue</code> is read from + <a href="agetty.8.html"><span class="citerefentry"><span class="refentrytitle">agetty</span>(8)</span></a> + and similar tools and shown above the login prompt. While some of the + informations can be adjusted with variables, the file itself is static. To + display dynamic content, + <a href="issue-generator.1.html"><span class="citerefentry"><span class="refentrytitle">issue-generator</span>(1)</span></a> + generates a <code class="filename">/run/issue</code> file from different files. + </p><p> + Files in <code class="filename">/etc/issue.d</code> override files with the same + name in <code class="filename">/usr/lib/issue.d</code> and + <code class="filename">/run/issue.d</code>. Files in + <code class="filename">/run/issue.d</code> override files with the same name in + <code class="filename">/usr/lib/issue.d</code>. Packages should install their + configuration files in <code class="filename">/usr/lib/issue.d</code>. Files in + <code class="filename">/etc/issue.d</code> are reserved for the local + administrator, who may use this logic to override the files installed by + vendor packages. All configuration files are sorted by their filename + in lexicographic order, regardless of which of the directories they reside in. + </p></div><div class="refsect1"><a name="see_also"></a><h2 id="SEE ALSO">SEE ALSO<a class="headerlink" title="Permalink to this headline" href="#SEE%20ALSO">¶</a></h2><p> + <a href="agetty.8.html"><span class="citerefentry"><span class="refentrytitle">agetty</span>(8)</span></a>, + <a href="issue-generator.1.html"><span class="citerefentry"><span class="refentrytitle">issue-generator</span>(1)</span></a> + </p></div><div class="refsect1"><a name="author"></a><h2 id="AUTHOR">AUTHOR<a class="headerlink" title="Permalink to this headline" href="#AUTHOR">¶</a></h2><p> + <span class="emphasis"><em>issue-generator</em></span> + was written by Thorsten Kukuk <[email protected]>. + </p></div></div></body></html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/man/issue.d.5.xml new/issue-generator-1.3/man/issue.d.5.xml --- old/issue-generator-1.2/man/issue.d.5.xml 2016-11-02 09:34:46.000000000 +0100 +++ new/issue-generator-1.3/man/issue.d.5.xml 2017-02-02 16:41:22.000000000 +0100 @@ -17,12 +17,24 @@ <!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --> <!-- General Public License for more details. --> -<!-- You should have received a copy of the GNU General Public --> -<!-- License along with issue\-generator; see the file COPYING. If not, --> -<!-- write to the Free Software Foundation, Inc., 51 Franklin Street \- Suite 500, --> -<!-- Boston, MA 02111\-1307, USA. --> +<!-- You should have received a copy of the GNU General Public License --> +<!-- along with rebootmgr; If not, see <http://www.gnu.org/licenses/>. --> + +<refentry id='issue.d.5'> + <refentryinfo> + <title>issue.d</title> + <productname>issue-generator</productname> + + <authorgroup> + <author> + <contrib></contrib> + <firstname>Thorsten</firstname> + <surname>Kukuk</surname> + <email>[email protected]</email> + </author> + </authorgroup> + </refentryinfo> -<refentry id='issued5'> <refmeta> <refentrytitle>issue.d</refentrytitle> <manvolnum>5</manvolnum> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/man/make-man-index.py new/issue-generator-1.3/man/make-man-index.py --- old/issue-generator-1.2/man/make-man-index.py 1970-01-01 01:00:00.000000000 +0100 +++ new/issue-generator-1.3/man/make-man-index.py 2017-02-02 16:38:13.000000000 +0100 @@ -0,0 +1,123 @@ +# -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */ +# +# The original file is part of systemd. This one was modified for +# issue-generator. +# +# Copyright 2012 Lennart Poettering +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see <http://www.gnu.org/licenses/>. + +import collections +import sys +import re +from xml_helper import * + +MDASH = ' — ' if sys.version_info.major >= 3 else ' -- ' + +TEMPLATE = '''\ +<refentry id="issue-generator.index" conditional="HAVE_PYTHON"> + + <refentryinfo> + <title>issue-generator.index</title> + <productname>issue-generator</productname> + </refentryinfo> + + <refmeta> + <refentrytitle>issue-generator.index</refentrytitle> + <manvolnum>7</manvolnum> + </refmeta> + + <refnamediv> + <refname>issue-generator.index</refname> + <refpurpose>List all manpages from the issue-generator project</refpurpose> + </refnamediv> +</refentry> +''' + +SUMMARY = '''\ + <refsect1> + <para id='counts' /> + </refsect1> +''' + +COUNTS = '\ +This index contains {count} entries, referring to {pages} individual manual pages.' + + +def check_id(page, t): + id = t.getroot().get('id') + if not re.search('^' + id + '[.]', page): + raise ValueError("id='{}' is not the same as page name '{}'".format(id, page)) + +def make_index(pages): + index = collections.defaultdict(list) + for p in pages: + t = xml_parse(p) + check_id(p, t) + section = t.find('./refmeta/manvolnum').text + refname = t.find('./refnamediv/refname').text + purpose = ' '.join(t.find('./refnamediv/refpurpose').text.split()) + for f in t.findall('./refnamediv/refname'): + infos = (f.text, section, purpose, refname) + index[f.text[0].upper()].append(infos) + return index + +def add_letter(template, letter, pages): + refsect1 = tree.SubElement(template, 'refsect1') + title = tree.SubElement(refsect1, 'title') + title.text = letter + para = tree.SubElement(refsect1, 'para') + for info in sorted(pages, key=lambda info: str.lower(info[0])): + refname, section, purpose, realname = info + + b = tree.SubElement(para, 'citerefentry') + c = tree.SubElement(b, 'refentrytitle') + c.text = refname + d = tree.SubElement(b, 'manvolnum') + d.text = section + + b.tail = MDASH + purpose # + ' (' + p + ')' + + tree.SubElement(para, 'sbr') + +def add_summary(template, indexpages): + count = 0 + pages = set() + for group in indexpages: + count += len(group) + for info in group: + refname, section, purpose, realname = info + pages.add((realname, section)) + + refsect1 = tree.fromstring(SUMMARY) + template.append(refsect1) + + para = template.find(".//para[@id='counts']") + para.text = COUNTS.format(count=count, pages=len(pages)) + +def make_page(*xml_files): + template = tree.fromstring(TEMPLATE) + index = make_index(xml_files) + + for letter in sorted(index): + add_letter(template, letter, index[letter]) + + add_summary(template, index.values()) + + return template + +if __name__ == '__main__': + with open(sys.argv[1], 'wb') as f: + f.write(xml_print(make_page(*sys.argv[2:]))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/man/xml_helper.py new/issue-generator-1.3/man/xml_helper.py --- old/issue-generator-1.2/man/xml_helper.py 1970-01-01 01:00:00.000000000 +0100 +++ new/issue-generator-1.3/man/xml_helper.py 2016-10-26 09:44:38.000000000 +0200 @@ -0,0 +1,34 @@ +# -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */ +# +# This file is part of systemd. +# +# Copyright 2012-2013 Zbigniew Jędrzejewski-Szmek +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see <http://www.gnu.org/licenses/>. + +from lxml import etree as tree + +class CustomResolver(tree.Resolver): + def resolve(self, url, id, context): + if 'custom-entities.ent' in url: + return self.resolve_filename('man/custom-entities.ent', context) + +_parser = tree.XMLParser() +_parser.resolvers.add(CustomResolver()) +def xml_parse(page): + doc = tree.parse(page, _parser) + doc.xinclude() + return doc +def xml_print(xml): + return tree.tostring(xml, pretty_print=True, encoding='utf-8') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/sbin/Makefile.in new/issue-generator-1.3/sbin/Makefile.in --- old/issue-generator-1.2/sbin/Makefile.in 2016-11-23 10:52:41.000000000 +0100 +++ new/issue-generator-1.3/sbin/Makefile.in 2017-03-28 12:55:56.000000000 +0200 @@ -161,6 +161,7 @@ ISSUEDIR = @ISSUEDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/sbin/issue-generator.in new/issue-generator-1.3/sbin/issue-generator.in --- old/issue-generator-1.2/sbin/issue-generator.in 2016-11-14 14:09:32.000000000 +0100 +++ new/issue-generator-1.3/sbin/issue-generator.in 2017-03-28 11:38:20.000000000 +0200 @@ -52,6 +52,13 @@ usage 1; fi + if [ -f /etc/sysconfig/issue-generator ]; then + . /etc/sysconfig/issue-generator + else + NETWORK_INTERFACE_REGEX="^[be]" + fi + [[ ${3} =~ ${NETWORK_INTERFACE_REGEX} ]] || exit 0 + case "$2" in add) mkdir -p ${PREFIX}/run/issue.d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/systemd/Makefile.in new/issue-generator-1.3/systemd/Makefile.in --- old/issue-generator-1.2/systemd/Makefile.in 2016-11-23 10:52:41.000000000 +0100 +++ new/issue-generator-1.3/systemd/Makefile.in 2017-03-28 12:55:56.000000000 +0200 @@ -160,6 +160,7 @@ ISSUEDIR = @ISSUEDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/tests/Makefile.in new/issue-generator-1.3/tests/Makefile.in --- old/issue-generator-1.2/tests/Makefile.in 2016-11-23 10:52:41.000000000 +0100 +++ new/issue-generator-1.3/tests/Makefile.in 2017-03-28 12:55:56.000000000 +0200 @@ -336,6 +336,7 @@ ISSUEDIR = @ISSUEDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/tmpfiles.d/Makefile.in new/issue-generator-1.3/tmpfiles.d/Makefile.in --- old/issue-generator-1.2/tmpfiles.d/Makefile.in 2016-11-23 10:52:41.000000000 +0100 +++ new/issue-generator-1.3/tmpfiles.d/Makefile.in 2017-03-28 12:55:56.000000000 +0200 @@ -160,6 +160,7 @@ ISSUEDIR = @ISSUEDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/udev/90-issue-generator.rules new/issue-generator-1.3/udev/90-issue-generator.rules --- old/issue-generator-1.2/udev/90-issue-generator.rules 2016-11-02 09:34:46.000000000 +0100 +++ new/issue-generator-1.3/udev/90-issue-generator.rules 2017-03-28 11:31:21.000000000 +0200 @@ -1,2 +1,2 @@ -ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="[bew]*", RUN+="/usr/sbin/issue-generator network add $env{INTERFACE}" -ACTION=="remove", SUBSYSTEM=="net", ENV{INTERFACE}=="[bew]*", RUN+="/usr/sbin/issue-generator network del $env{INTERFACE}" +ACTION=="add", SUBSYSTEM=="net", RUN+="/usr/sbin/issue-generator network add $env{INTERFACE}" +ACTION=="remove", SUBSYSTEM=="net", RUN+="/usr/sbin/issue-generator network del $env{INTERFACE}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/udev/Makefile.am new/issue-generator-1.3/udev/Makefile.am --- old/issue-generator-1.2/udev/Makefile.am 2016-11-02 09:34:46.000000000 +0100 +++ new/issue-generator-1.3/udev/Makefile.am 2017-03-28 12:53:52.000000000 +0200 @@ -6,4 +6,4 @@ udevrules_DATA = 90-issue-generator.rules -EXTRA_DIST = $(DATA) +EXTRA_DIST = $(DATA) sysconfig.issue-generator diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/udev/Makefile.in new/issue-generator-1.3/udev/Makefile.in --- old/issue-generator-1.2/udev/Makefile.in 2016-11-23 10:52:41.000000000 +0100 +++ new/issue-generator-1.3/udev/Makefile.in 2017-03-28 12:55:56.000000000 +0200 @@ -160,6 +160,7 @@ ISSUEDIR = @ISSUEDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ @@ -223,7 +224,7 @@ top_srcdir = @top_srcdir@ udevrulesdir = @UDEVRULESDIR@ udevrules_DATA = 90-issue-generator.rules -EXTRA_DIST = $(DATA) +EXTRA_DIST = $(DATA) sysconfig.issue-generator all: all-am .SUFFIXES: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/issue-generator-1.2/udev/sysconfig.issue-generator new/issue-generator-1.3/udev/sysconfig.issue-generator --- old/issue-generator-1.2/udev/sysconfig.issue-generator 1970-01-01 01:00:00.000000000 +0100 +++ new/issue-generator-1.3/udev/sysconfig.issue-generator 2017-03-28 11:29:08.000000000 +0200 @@ -0,0 +1,9 @@ +## Path: System/Login +## Description: /etc/issue generator +## Type: string +## Default: "^[be]" +# +# Defines a regex, for which network interfaces +# /etc/issue should present the IP number +# +NETWORK_INTERFACE_REGEX="^[be]"
