diff options
| -rw-r--r-- | buildtools/debian-package-skeleton.py | 38 | ||||
| -rw-r--r-- | rtr-origin/Makefile.in | 4 | ||||
| -rw-r--r-- | rtr-origin/rules.darwin.mk | 4 | ||||
| -rw-r--r-- | rtr-origin/rules.freebsd.mk | 4 | ||||
| -rw-r--r-- | rtr-origin/rules.linux.mk | 21 | ||||
| -rw-r--r-- | rtr-origin/rules.unknown.mk | 4 |
6 files changed, 72 insertions, 3 deletions
diff --git a/buildtools/debian-package-skeleton.py b/buildtools/debian-package-skeleton.py index e872b768..e169fd2c 100644 --- a/buildtools/debian-package-skeleton.py +++ b/buildtools/debian-package-skeleton.py @@ -8,6 +8,38 @@ os.makedirs('debian') with open('debian/changelog', "wb") as f: f.write('''\ +rpki (0.5059) UNRELEASED; urgency=low + * Not using MANIFEST.in. + -- sra <sra@rpki.net> Sun, 24 Feb 2013 03:24:07 -0000 + +rpki (0.5060) UNRELEASED; urgency=low + * First build, then install, doh. + -- sra <sra@rpki.net> Sun, 24 Feb 2013 03:33:30 -0000 + +rpki (0.5059) UNRELEASED; urgency=low + * Not using MANIFEST.in. + -- sra <sra@rpki.net> Sun, 24 Feb 2013 03:24:07 -0000 + +rpki (0.5058) UNRELEASED; urgency=low + * inetd/xinetd listener for rpki-rtr on source code installation, + also needed for Ubuntu package. + -- sra <sra@rpki.net> Sun, 24 Feb 2013 03:22:00 -0000 + +rpki (0.5057) UNRELEASED; urgency=low + * Add dependency on xinetd. + -- sra <sra@rpki.net> Sat, 23 Feb 2013 13:25:46 -0000 + +rpki (0.5056) UNRELEASED; urgency=low + * More post-installation: add rpki-rtr listener to /etc/services and + /etc/inetd.conf, create a few missing directories. + -- sra <sra@rpki.net> Sat, 23 Feb 2013 12:22:10 -0000 + +rpki (0.5054) UNRELEASED; urgency=low + * Hack to use pip to install recent versions of Django and South. + Probably should be replaced by our own APT repository at some + point, but this seems to work. + -- sra <sra@rpki.net> Fri, 22 Feb 2013 03:48:54 -0000 + rpki (0.5051) UNRELEASED; urgency=low * Pull from trunk. -- sra <sra@rpki.net> Thu, 21 Feb 2013 01:17:22 -0000 @@ -608,6 +640,7 @@ with open('debian/rpki-rp.install', "wb") as f: f.write('''\ etc/rcynic.conf etc/rpki/trust-anchors +etc/xinetd.d/rpki-rtr usr/bin var/rcynic ''') @@ -682,6 +715,10 @@ setup_rcynic_cron() { crontab -u rcynic - } +setup_rpki_rtr_listener() { + killall -HUP xinetd +} + # summary of how this script can be called: # * <postinst> `configure' <most-recently-configured-version> # * <old-postinst> `abort-upgrade' <new version> @@ -701,6 +738,7 @@ case "$1" in setup_rcynic_user setup_rcynic_ownership setup_rcynic_cron + setup_rpki_rtr_listener ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/rtr-origin/Makefile.in b/rtr-origin/Makefile.in index ef15ac4c..9eb2ac55 100644 --- a/rtr-origin/Makefile.in +++ b/rtr-origin/Makefile.in @@ -34,12 +34,10 @@ clean: install: all ${RTR_ORIGIN_INSTALL_TARGETS} -install-always: +install-binary: if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -m 555 -d ${DESTDIR}${bindir}; fi ${INSTALL} -m 555 ${BIN} ${DESTDIR}${bindir}/${BIN} -install-postconf: install-listener - deinstall uninstall: rm -f ${DESTDIR}${bindir}/${BIN} diff --git a/rtr-origin/rules.darwin.mk b/rtr-origin/rules.darwin.mk index 570b704a..1230db92 100644 --- a/rtr-origin/rules.darwin.mk +++ b/rtr-origin/rules.darwin.mk @@ -1,5 +1,9 @@ # $Id$ +install-always: install-binary + +install-postconf: install-listener + install-listener: @echo "No rule for $@ on this platform (yet), you'll have to do that yourself if it matters." diff --git a/rtr-origin/rules.freebsd.mk b/rtr-origin/rules.freebsd.mk index 5db4cb72..4cb21f3b 100644 --- a/rtr-origin/rules.freebsd.mk +++ b/rtr-origin/rules.freebsd.mk @@ -1,5 +1,9 @@ # $Id$ +install-always: install-binary + +install-postconf: install-listener + install-listener: .FORCE @if /usr/bin/egrep -q '^rpki-rtr' /etc/services ; \ then \ diff --git a/rtr-origin/rules.linux.mk b/rtr-origin/rules.linux.mk index e6840f47..72b5c3c9 100644 --- a/rtr-origin/rules.linux.mk +++ b/rtr-origin/rules.linux.mk @@ -1,5 +1,10 @@ # $Id$ +install-always: install-binary install-listener + +install-postconf: + @true + # Only need to make listener if not already present install-listener: ${DESTDIR}/etc/xinetd.d/rpki-rtr @@ -8,6 +13,21 @@ ${DESTDIR}/etc/xinetd.d/rpki-rtr: @${AWK} 'BEGIN { \ print "service rpki-rtr"; \ print "{"; \ + print " type = UNLISTED"; \ + print " flags = IPv4"; \ + print " socket_type = stream"; \ + print " protocol = tcp"; \ + print " port = ${RPKI_RTR_PORT}"; \ + print " wait = no"; \ + print " user = nobody"; \ + print " server = /usr/bin/rtr-origin"; \ + print " server_args = --server /var/rpki-rtr"; \ + print "}"; \ + print ""; \ + print "service rpki-rtr"; \ + print "{"; \ + print " type = UNLISTED"; \ + print " flags = IPv6"; \ print " socket_type = stream"; \ print " protocol = tcp"; \ print " port = ${RPKI_RTR_PORT}"; \ @@ -17,5 +37,6 @@ ${DESTDIR}/etc/xinetd.d/rpki-rtr: print " server_args = --server /var/rpki-rtr"; \ print "}"; \ }' >xinetd.rpki-rtr + ${INSTALL} -d ${DESTDIR}/etc/xinetd.d ${INSTALL} -m 644 xinetd.rpki-rtr $@ rm xinetd.rpki-rtr diff --git a/rtr-origin/rules.unknown.mk b/rtr-origin/rules.unknown.mk index 58c412a3..fb16e93a 100644 --- a/rtr-origin/rules.unknown.mk +++ b/rtr-origin/rules.unknown.mk @@ -1,4 +1,8 @@ # $Id$ +install-always: install-binary + +install-postconf: install-listener + install-listener: @echo "Don't know how to make $@ on this platform"; exit 1 |