diff options
| -rw-r--r-- | buildtools/build-freebsd-rp-port.py | 24 | ||||
| -rwxr-xr-x | rcynic/installation-scripts/freebsd/rc.d.rcynic | 2 | ||||
| -rw-r--r-- | rcynic/static-rsync/Makefile.in | 3 | ||||
| -rw-r--r-- | rpkid/Makefile.in | 18 |
4 files changed, 28 insertions, 19 deletions
diff --git a/buildtools/build-freebsd-rp-port.py b/buildtools/build-freebsd-rp-port.py index a3b8cac6..9b9fb75c 100644 --- a/buildtools/build-freebsd-rp-port.py +++ b/buildtools/build-freebsd-rp-port.py @@ -91,10 +91,10 @@ BUILD_DEPENDS+= makedepend>0:${PORTSDIR}/devel/makedepend # For rcynic-html RUN_DEPENDS+= rrdtool>0:${PORTSDIR}/databases/rrdtool -# Just want relying party tools, and have to whack rcynic jail -# location to something acceptable to FreeBSD package system. +# Just want relying party tools, try to use system OpenSSL if we can. -CONFIGURE_ARGS= --disable-ca-tools --with-rcynic-jail=/usr/local/var/rcynic +CONFIGURE_ARGS= --disable-ca-tools +CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" # This is not necessary at the moment because "make install" does # all the same things. This is here as a reminder in case that changes. @@ -143,6 +143,7 @@ bin/print_rpki_manifest bin/rtr-origin bin/scan_roas etc/rc.d/rcynic +@cwd / var/rcynic/bin/rcynic var/rcynic/bin/rcynic-html var/rcynic/bin/rsync @@ -157,9 +158,13 @@ var/rcynic/etc/rcynic.conf.sample f.write('''\ @exec mkdir -p %D/var/rcynic/var @dirrm var/rcynic/var +@exec mkdir -p %D/var/rcynic/run +@dirrm var/rcynic/run +@unexec rm -f %D/var/rcynic/etc/localtime %D/var/rcynic/etc/resolv.conf @dirrm var/rcynic/etc/trust-anchors @dirrm var/rcynic/etc @exec mkdir -p %D/var/rcynic/dev +@unexec if [ -c %D/var/rcynic/dev/null ] ; then umount %D/var/rcynic/dev; fi @dirrm var/rcynic/dev @exec mkdir -p %D/var/rcynic/data @dirrm var/rcynic/data @@ -180,7 +185,7 @@ with open(os.path.join(base, "pkg-install"), "w") as f: /bin/test "X$2" = 'XPRE-INSTALL' && exit 0 -: ${jaildir="${DESTDIR}/usr/local/var/rcynic"} +: ${jaildir="${DESTDIR}/var/rcynic"} : ${jailuser="rcynic"} : ${jailgroup="rcynic"} : ${setupcron="NO"} @@ -285,10 +290,9 @@ with open(os.path.join(base, "pkg-message"), "w") as f: print "Writing", f.name f.write('''\ -You may need to customize /usr/local/var/rcynic/etc/rcynic.conf. -If you did not install your own trust anchors, a default set of SAMPLE -trust anchors may have been installed for you, but you, the relying -party, are the only one who can decide whether you trust those -anchors. rcynic will not do anything useful without good trust -anchors. +You may need to customize /var/rcynic/etc/rcynic.conf. If you did not +install your own trust anchors, a default set of SAMPLE trust anchors +may have been installed for you, but you, the relying party, are the +only one who can decide whether you trust those anchors. rcynic will +not do anything useful without good trust anchors. ''') diff --git a/rcynic/installation-scripts/freebsd/rc.d.rcynic b/rcynic/installation-scripts/freebsd/rc.d.rcynic index 69c97ce6..73e6efda 100755 --- a/rcynic/installation-scripts/freebsd/rc.d.rcynic +++ b/rcynic/installation-scripts/freebsd/rc.d.rcynic @@ -12,7 +12,7 @@ name="rcynic" start_cmd="rcynic_start" stop_cmd="rcynic_stop" -: ${rcynic_jaildir="/usr/local/var/rcynic"} +: ${rcynic_jaildir="/var/rcynic"} : ${rcynic_user="rcynic"} : ${rcynic_group="rcynic"} diff --git a/rcynic/static-rsync/Makefile.in b/rcynic/static-rsync/Makefile.in index 9c8556e0..8a433c7b 100644 --- a/rcynic/static-rsync/Makefile.in +++ b/rcynic/static-rsync/Makefile.in @@ -13,6 +13,9 @@ BIN_LOG = > ../build.log 2>&1 BIN = rsync +abs_top_srcdir = @abs_top_srcdir@ +abs_top_builddir = @abs_top_builddir@ + all: ${BIN} ${BIN}: ${DIRNAME}/${BIN} diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index 6a92433e..c384f4b4 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -43,13 +43,15 @@ SETUP_PY = \ AC_CFLAGS='${CFLAGS}' \ AC_LDFLAGS='${LDFLAGS}' \ AC_LIBS='${LIBS}' \ - AC_SBINDIR='${DESTDIR}${sbindir}' \ + AC_SBINDIR='${sbindir}' \ AC_SCRIPTS='${SCRIPTS}' \ AC_ABS_BUILDDIR='${abs_builddir}' \ - AC_LIBEXECDIR='${DESTDIR}${libexecdir}' \ + AC_LIBEXECDIR='${libexecdir}' \ AC_AUX_SCRIPTS='${AUX_SCRIPTS}' \ ${PYTHON} setup.py +SETUP_PY_ROOT = `${PYTHON} -c 'import sys; print "--root " + sys.argv[1] if sys.argv[1] else ""' '${DESTDIR}'` + POW_SO = rpki/POW/_POW.so SCRIPTS = rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd \ @@ -108,7 +110,7 @@ clean:: rm -f ${SCRIPTS} ${AUX_SCRIPTS} ${SETTINGS} ${BUILD_SCRIPTS} install:: - ${SETUP_PY} install --record installed + ${SETUP_PY} install ${SETUP_PY_ROOT} --record installed @echo @echo "== Default configuration file location is ${sysconfdir}/rpki.conf ==" @echo @@ -209,24 +211,24 @@ all install clean test distclean deinstall uninstall installation-manifest:: COMPILE_PYTHON = \ rm -f $@; \ AC_PYTHON_INTERPRETER='${PYTHON}' \ - AC_RPKI_CONFIG_DIR='${DESTDIR}${sysconfdir}' \ + AC_RPKI_CONFIG_DIR='${sysconfdir}' \ ${PYTHON} ${abs_top_srcdir}/buildtools/make-python-executable.py <$? >$@; \ chmod 555 $@ COMPILE_DJANGO = \ rm -f $@; \ AC_PYTHON_INTERPRETER='${PYTHON}' \ - AC_PYTHONPATH='${DESTDIR}${sysconfdir}/rpki' \ + AC_PYTHONPATH='${sysconfdir}/rpki' \ ${PYTHON} ${abs_top_srcdir}/buildtools/make-django-script.py <$? >$@; \ chmod 555 $@ COMPILE_SETTINGS = \ rm -f $@; \ AC_SECRET_KEY='${SECRET_KEY}' \ - AC_LOCALSTATEDIR='${DESTDIR}${localstatedir}' \ - AC_DATAROOTDIR='${DESTDIR}${datarootdir}' \ + AC_LOCALSTATEDIR='${localstatedir}' \ + AC_DATAROOTDIR='${datarootdir}' \ AC_DJANGO_DIR='${DJANGO_DIR}' \ - AC_SYSCONFDIR='${DESTDIR}${sysconfdir}' \ + AC_SYSCONFDIR='${sysconfdir}' \ ${PYTHON} ${abs_top_srcdir}/buildtools/subst-vars.py <$? >$@ rpki-sql-backup: rpki-sql-backup.py |