From 39b419433059d68b4a8f75b356b9e8ab604e2a3b Mon Sep 17 00:00:00 2001 From: Jonathan McCrohan Date: Mon, 9 Apr 2012 13:14:54 +0100 Subject: Split package into nyancat and nyancat-server --- debian/README.Debian | 9 --------- debian/control | 16 +++++++++++++--- debian/nyancat-server.1 | 32 ++++++++++++++++++++++++++++++++ debian/nyancat-server.manpages | 1 + debian/nyancat-server.postinst | 9 +++++++++ debian/nyancat-server.postrm | 24 ++++++++++++++++++++++++ debian/nyancat.1 | 10 +++------- debian/nyancat.install | 1 + debian/nyancat.postinst | 9 --------- debian/nyancat.postrm | 24 ------------------------ 10 files changed, 83 insertions(+), 52 deletions(-) delete mode 100644 debian/README.Debian create mode 100644 debian/nyancat-server.1 create mode 100644 debian/nyancat-server.manpages create mode 100644 debian/nyancat-server.postinst create mode 100644 debian/nyancat-server.postrm create mode 100644 debian/nyancat.install delete mode 100644 debian/nyancat.postinst delete mode 100644 debian/nyancat.postrm diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index e57c8f9..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,9 +0,0 @@ -nyancat for Debian ------------------- - -For security and bandwidth reasons, the nyancat telnet server is not enabled by -by default. This still allows users to run nyancat locally though. - -To enable the telnet server, run 'update-inetd --enable nyancat'. - - -- Jonathan McCrohan Sun, 08 Apr 2012 15:00:42 +0100 diff --git a/debian/control b/debian/control index 88cfb6b..ac48c9f 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,18 @@ Homepage: https://github.com/klange/nyancat Package: nyancat Architecture: any -Depends: lsb-base, openbsd-inetd | inet-superserver, ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Animated terminal Nyancat - Nyancat is a program to display an animated poptart cat in your terminal. - Nyancat also supports inetd, allowing remote users to view Nyancat over + nyancat is a program to display an animated poptart cat in your terminal. + . + This is a standalone program only. To serve nyancat to many users, the + nyancat-server package is required. + +Package: nyancat-server +Architecture: all +Depends: nyancat, openbsd-inetd | inet-superserver, ${misc:Depends} +Conflicts: telnetd +Description: Animated terminal Nyancat server configurations + nyancat-server contains the configuations required to quickly set up a nyancat + server. This allows the animated poptart cat to be served to many users via telnet. diff --git a/debian/nyancat-server.1 b/debian/nyancat-server.1 new file mode 100644 index 0000000..93c3c04 --- /dev/null +++ b/debian/nyancat-server.1 @@ -0,0 +1,32 @@ +.TH NYANCAT-SERVER 1 "April, 2012" +.SH NAME +nyancat-server \- terminal-based Pop Tart Cat animation server +.SH DESCRIPTION +The +.B nyancat-server +package contains the inetd configuations required to serve nyancat via telnet. +.PP +For security and bandwidth reasons, the inetd server is disabled by default. +The server must be enabled manually using the inetd options below. +.SH OPTIONS +.TP +.B update-inetd --enable '.*/usr/bin/nyancat' +Enable the nyancat-server after the next restart. +.TP +.B update-inetd --disable '.*/usr/bin/nyancat' +Disable the nyancat-server after the next restart. +.SH SEE ALSO +.BR nyancat (1), +.BR inetd (8). +.SH HOMEPAGE +.PP +.B Homepage: +http://miku.acm.uiuc.edu/ +.PP +.B Repository: +https://github.com/klange/nyancat +.SH AUTHOR +nyancat was written by Kevin Lange. +.PP +This manual page was written by Jonathan McCrohan , +for the Debian project (and may be used by others). diff --git a/debian/nyancat-server.manpages b/debian/nyancat-server.manpages new file mode 100644 index 0000000..ef26d53 --- /dev/null +++ b/debian/nyancat-server.manpages @@ -0,0 +1 @@ +debian/nyancat-server.1 diff --git a/debian/nyancat-server.postinst b/debian/nyancat-server.postinst new file mode 100644 index 0000000..c723125 --- /dev/null +++ b/debian/nyancat-server.postinst @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +# Set up nyancat +update-inetd --group OTHER --add \ + '## telnet\t\tstream\ttcp\tnowait\tnobody\t/usr/bin/nyancat\tnyancat -t' + +#DEBHELPER# diff --git a/debian/nyancat-server.postrm b/debian/nyancat-server.postrm new file mode 100644 index 0000000..3f8b5d4 --- /dev/null +++ b/debian/nyancat-server.postrm @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +case "$1" in + purge) + if [ -x /usr/sbin/update-inetd ]; then + update-inetd --remove nyancat + fi + ;; + remove) + update-inetd --disable nyancat + ;; + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + *) + echo "$0: unknown action \"$1\"" + exit 0 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/nyancat.1 b/debian/nyancat.1 index bb95127..00b309f 100644 --- a/debian/nyancat.1 +++ b/debian/nyancat.1 @@ -5,9 +5,8 @@ nyancat \- terminal-based Pop Tart Cat animation .B nyancat [ -hitn ] [-f frames] .SH DESCRIPTION .B nyancat -is an animated, color, ANSI-text telnet server that renders a loop of the -classic Nyan Cat animation. nyancat can also be run as a standalone program -in a local terminal if telnet functionality is not required. +is an animated, color, ANSI-text program that renders a loop of the +classic Nyan Cat animation. .PP nyancat makes use of various ANSI escape sequences to render color, or in the case of a VT220, simply dumps text to the screen. @@ -52,10 +51,7 @@ Crop the animation to the given height. .B \-h, --help Show help message and exit. .SH SEE ALSO -.BR inetd (8). -.TP -For information on how to enable the telnet server, please refer to -.B /usr/share/doc/nyancat/README.debian +.BR nyancat-server (1). .SH HOMEPAGE .PP .B Homepage: diff --git a/debian/nyancat.install b/debian/nyancat.install new file mode 100644 index 0000000..11fd9e1 --- /dev/null +++ b/debian/nyancat.install @@ -0,0 +1 @@ +usr/bin/nyancat diff --git a/debian/nyancat.postinst b/debian/nyancat.postinst deleted file mode 100644 index c723125..0000000 --- a/debian/nyancat.postinst +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -e - -# Set up nyancat -update-inetd --group OTHER --add \ - '## telnet\t\tstream\ttcp\tnowait\tnobody\t/usr/bin/nyancat\tnyancat -t' - -#DEBHELPER# diff --git a/debian/nyancat.postrm b/debian/nyancat.postrm deleted file mode 100644 index 3f8b5d4..0000000 --- a/debian/nyancat.postrm +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - purge) - if [ -x /usr/sbin/update-inetd ]; then - update-inetd --remove nyancat - fi - ;; - remove) - update-inetd --disable nyancat - ;; - upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - *) - echo "$0: unknown action \"$1\"" - exit 0 - ;; -esac - -#DEBHELPER# - -exit 0 -- cgit v1.2.3