From 86944f4755fc06e861f176f5748828d0ea48fb34 Mon Sep 17 00:00:00 2001 From: Jonathan McCrohan Date: Thu, 19 Apr 2012 00:57:52 +0100 Subject: Revert "Switch to reconf-inetd" This reverts commit fe4cdcdcadcc772088946d2c29263bc4dcb27555. Revert pending #669317. --- debian/control | 2 +- debian/nyancat-server.install | 2 -- debian/nyancat-server.postinst | 9 +++++++++ debian/nyancat-server.postrm | 26 ++++++++++++++++++++++++++ debian/reconf-inetd/nyancat-server.tcp | 1 - debian/reconf-inetd/nyancat-server.tcp6 | 1 - 6 files changed, 36 insertions(+), 5 deletions(-) delete mode 100644 debian/nyancat-server.install create mode 100644 debian/nyancat-server.postinst create mode 100644 debian/nyancat-server.postrm delete mode 100644 debian/reconf-inetd/nyancat-server.tcp delete mode 100644 debian/reconf-inetd/nyancat-server.tcp6 diff --git a/debian/control b/debian/control index 2fc1a48..261f56c 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Description: Animated terminal Nyancat Package: nyancat-server Architecture: all -Depends: nyancat, openbsd-inetd | inet-superserver, reconf-inetd, ${misc:Depends} +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 diff --git a/debian/nyancat-server.install b/debian/nyancat-server.install deleted file mode 100644 index afd8833..0000000 --- a/debian/nyancat-server.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/reconf-inetd/nyancat-server.tcp usr/share/reconf-inetd/ -debian/reconf-inetd/nyancat-server.tcp6 usr/share/reconf-inetd/ 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..9b2af53 --- /dev/null +++ b/debian/nyancat-server.postrm @@ -0,0 +1,26 @@ +#!/bin/sh + +set -e + +case "$1" in + purge) + if [ -x /usr/sbin/update-inetd ]; then + update-inetd --remove nyancat + fi + ;; + remove) + if [ -x /usr/sbin/update-inetd ]; then + update-inetd --disable nyancat + fi + ;; + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + *) + echo "$0: unknown action \"$1\"" + exit 0 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/reconf-inetd/nyancat-server.tcp b/debian/reconf-inetd/nyancat-server.tcp deleted file mode 100644 index 47f4f81..0000000 --- a/debian/reconf-inetd/nyancat-server.tcp +++ /dev/null @@ -1 +0,0 @@ -## telnet stream tcp nowait nobody /usr/bin/nyancat nyancat -t diff --git a/debian/reconf-inetd/nyancat-server.tcp6 b/debian/reconf-inetd/nyancat-server.tcp6 deleted file mode 100644 index 060cb4e..0000000 --- a/debian/reconf-inetd/nyancat-server.tcp6 +++ /dev/null @@ -1 +0,0 @@ -## telnet stream tcp6 nowait nobody /usr/bin/nyancat nyancat -t -- cgit v1.2.3