Clean up rcynic installation, run rcynicng instead of (old) rcynic, clean up rcynic-cron.

NB: rpkigui-rcynic is currently broken and is therefore disabled in rcynic-cron.
This needs to be fixed, but it was broken on this branch in any case, no real
point in holding up the rest of this waiting for it.

svn path=/branches/tk705/; revision=6321

1 files changed, 16 insertions, 122 deletions

diff --git a/configure b/configure
index bdb1e1fa..aebc5964 100755
--- a/configure
+++ b/configure
@@ -636,17 +636,9 @@ CA_INSTALL_TARGETS
 RTR_ORIGIN_INSTALL_TARGETS
 RCYNIC_INSTALL_TARGETS
 RCYNIC_HTML_DIR
-RCYNIC_STATIC_RSYNC
+RCYNIC_CONF_DATA
 RPKI_GROUP
 RPKI_USER
-RCYNIC_CRON_USER
-RCYNIC_CONF_TA_DIR
-RCYNIC_CONF_DATA
-RCYNIC_CONF_RSYNC
-RCYNIC_BIN_RCYNIC
-RCYNIC_TA_DIR
-RCYNIC_CONF_FILE
-RCYNIC_JAIL_DIRS
 SUDO
 RSYNC
 TRANG
@@ -656,7 +648,6 @@ AWK
 XSLTPROC
 PYTHON
 POW_LDFLAGS
-LD_STATIC_FLAG
 EGREP
 GREP
 CPP
@@ -724,7 +715,6 @@ CA_MAKE_RULES'
 ac_user_opts='
 enable_option_checking
 with_system_openssl
-enable_rcynic_jail
 enable_openssl_asm
 enable_ca_tools
 enable_rp_tools
@@ -736,6 +726,7 @@ enable_runtime_dependencies
 enable_python
 enable_django
 enable_rpki_rtr
+enable_rcynic_jail
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1361,7 +1352,6 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-rcynic-jail    Run rcynic in chroot jail
   --disable-openssl-asm   Don't let OpenSSL build assembler code
   --disable-ca-tools      Don't build any of the CA tools
   --disable-rp-tools      Don't build any of the relying party tools
@@ -1378,6 +1368,7 @@ Optional Features:
   --disable-python        (Obsolete, do not use)
   --disable-django        (Obsolete, do not use)
   --disable-rpki-rtr      (Obsolete, do not use)
+  --enable-rcynic-jail    (Obsolete, do not use)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1385,8 +1376,7 @@ Optional Packages:
   --with-system-openssl   Link against system copy of OpenSSL
 
 Some influential environment variables:
-  RCYNIC_DIR  Where to put output files from rcynic and rpki-rtr; also
-              controls jail location for --enable-rcynic-jail
+  RCYNIC_DIR  Where to put output files from rcynic and rpki-rtr
   APACHE_VERSION
               Version of Apache httpd, mostly used on FreeBSD where it
               determines some of the directory names
@@ -2427,13 +2417,6 @@ else
   with_system_openssl=auto
 fi
 
-# Check whether --enable-rcynic_jail was given.
-if test "${enable_rcynic_jail+set}" = set; then :
-  enableval=$enable_rcynic_jail;
-else
-  enable_rcynic_jail=no
-fi
-
 # Check whether --enable-openssl_asm was given.
 if test "${enable_openssl_asm+set}" = set; then :
   enableval=$enable_openssl_asm;
@@ -2511,6 +2494,11 @@ if test "${enable_rpki_rtr+set}" = set; then :
   enableval=$enable_rpki_rtr; as_fn_error $? "--disable-rpki-rtr is obsolete.  Please see the --disable-rp-tools option" "$LINENO" 5
 fi
 
+# Check whether --enable-rcynic_jail was given.
+if test "${enable_rcynic_jail+set}" = set; then :
+  enableval=$enable_rcynic_jail; as_fn_error $? "--enable-rcynic-jail is obsolete." "$LINENO" 5
+fi
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3827,33 +3815,6 @@ _ACEOF
 
 
 
-# We'd like to build rcynic as a static binary if we can, because that
-# makes it much simpler to run rcynic in a chroot jail, but we don't
-# know how to do it on all platforms, so we try the hack we know, and
-# if that doesn't work, oh well.
-#
-# Sadly, it's even worse than this, because there are platforms like
-# Fedora where the compiler and linker support -static just fine, but
-# the default libraries do not, and if you start down the primrose
-# path of installing the necessary libraries, you eventually hit a
-# wall where one of the static libraries you downloaded depends on
-# something that's not available as a static library, ie, you lose.
-#
-# So for now I'm just going to make this a FreeBSD-only option.
-# Feh. Those of you who choose to use other platforms are welcome to
-# fix this and send me the patch, if you care.
-
-
-case $host_os in
-	freebsd*)
-		LD_STATIC_FLAG='-static'
-		;;
-	*)
-		LD_STATIC_FLAG=''
-		;;
-esac
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler and linker support -Wl,-Bsymbolic" >&5
 $as_echo_n "checking whether compiler and linker support -Wl,-Bsymbolic... " >&6; }
 old_LDFLAGS="$LDFLAGS"
@@ -4551,13 +4512,9 @@ fi
 
 if test "X$RCYNIC_DIR" = "X"
 then
-	rcynic_base_dir='/var/rcynic'
-else
-	rcynic_base_dir="${RCYNIC_DIR}"
+	RCYNIC_DIR='/var/rcynic'
 fi
 
-RCYNIC_DIR='${DESTDIR}'"${rcynic_base_dir}"
-
 # APACHE_VERSION is another "precious" argument to this script.  It
 # mostly matters on FreeBSD, where most things involving Apache encode
 # the Apache version number into their filenames.
@@ -4595,56 +4552,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5
 $as_echo "$msg" >&6; }
 
-# Figure out whether to run rcynic in a chroot jail, which determines
-# a bunch of other settings.
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build chroot jail for rcynic" >&5
-$as_echo_n "checking whether to build chroot jail for rcynic... " >&6; }
-
-case $enable_rcynic_jail in
-	yes)
-		use_rcynic_jail=yes
-		RCYNIC_CONF_FILE='${RCYNIC_DIR}/etc/rcynic.conf'
-		RCYNIC_TA_DIR='${RCYNIC_DIR}/etc/trust-anchors'
-		RCYNIC_BIN_RCYNIC='${RCYNIC_DIR}/bin/rcynic'
-		RCYNIC_CONF_RSYNC='/bin/rsync'
-		RCYNIC_CONF_DATA='/data'
-		RCYNIC_CONF_TA_DIR='/etc/trust-anchors'
-		RCYNIC_CRON_USER='root'
-		RCYNIC_JAIL_DIRS='${RCYNIC_DIR}/bin ${RCYNIC_DIR}/dev ${RCYNIC_DIR}/etc'
-		if test "X$host_os" = "Xlinux"
-		then
-			RCYNIC_JAIL_DIRS="$RCYNIC_JAIL_DIRS "'${RCYNIC_DIR}/lib ${RCYNIC_DIR}/lib64 ${RCYNIC_DIR}/usr/lib'
-		fi
-		;;
-	no)
-		use_rcynic_jail=no
-		RCYNIC_CONF_FILE='${DESTDIR}${sysconfdir}/rcynic.conf'
-		RCYNIC_TA_DIR='${DESTDIR}${sysconfdir}/rpki/trust-anchors'
-		RCYNIC_BIN_RCYNIC='${DESTDIR}${bindir}/rcynic'
-		RCYNIC_CONF_RSYNC="${RSYNC}"
-		RCYNIC_CONF_DATA="${rcynic_base_dir}/data"
-		RCYNIC_CONF_TA_DIR='${sysconfdir}/rpki/trust-anchors'
-		RCYNIC_CRON_USER='${RPKI_USER}'
-		RCYNIC_JAIL_DIRS=''
-		;;
-	*)
-		as_fn_error $? "Unrecognized value for --enable-rcynic-jail: $enable_rcynic_jail" "$LINENO" 5
-		;;
-esac
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_rcynic_jail" >&5
-$as_echo "$use_rcynic_jail" >&6; }
-
 # Perhaps there should be a way to set these, but for now just
 # wire them in here so at least they're consistent in all Makefiles.
 
@@ -4653,12 +4560,7 @@ RPKI_USER=rpki
 RPKI_GROUP=rpki
 
 
-if test $use_rcynic_jail = yes && test "X$LD_STATIC_FLAG" != "X"
-then
-	RCYNIC_STATIC_RSYNC='static-rsync/rsync'
-else
-	RCYNIC_STATIC_RSYNC=''
-fi
+RCYNIC_CONF_DATA="${RCYNIC_DIR}/data"
 
 
 
@@ -4680,10 +4582,8 @@ esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_target_installation" >&5
 $as_echo "$enable_target_installation" >&6; }
 
-# rcynic jail setup is complicated enough that it's simplest to have
-# different rule sets for different platforms.  Icky, but....
-# rpki-rtr isn't as complicated, but has similar issues, same hack.
-# ca isn't as complicated either, but same hack.
+# Some bits of post-installation setup are complicated enough that
+# it's simplest to have different rule sets for different platforms.
 
 case $host_os in
 	darwin*)
@@ -4733,7 +4633,7 @@ $as_echo "$RCYNIC_HTML_DIR" >&6; }
 
 
 
-# Sort out which things to install, depending on rcynic jail status and whether
+# Sort out which things to install, depending on whether
 # we're doing final target installation.
 #
 # As things have evolved, this a bit repetitive.  Simplify someday, maybe.
@@ -4743,11 +4643,6 @@ RTR_ORIGIN_INSTALL_TARGETS='install-always'
 CA_INSTALL_TARGETS='install-always'
 CFG_INSTALL_TARGETS='install-always'
 
-if test $use_rcynic_jail = yes
-then
-	RCYNIC_INSTALL_TARGETS="$RCYNIC_INSTALL_TARGETS install-jailed"
-fi
-
 if test $enable_target_installation = yes
 then
 	RCYNIC_INSTALL_TARGETS="$RCYNIC_INSTALL_TARGETS install-postconf"
@@ -4871,7 +4766,7 @@ $as_echo "$as_me: WARNING: I can't find Python.h.  Python sources are required t
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: rcynic-html requires rrdtool." >&5
 $as_echo "$as_me: WARNING: rcynic-html requires rrdtool." >&2;}
 	fi
-	if test $use_rcynic_jail = no && test "X$RSYNC" = "X"
+	if test "X$RSYNC" = "X"
 	then
 		runtime_ok=no
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI relying party tools require rsync." >&5
@@ -5118,7 +5013,7 @@ fi
 
 if test $build_rp_tools = yes
 then
-	ac_config_files="$ac_config_files rp/Makefile rp/config/Makefile rp/rcynic/Makefile rp/rcynic/static-rsync/Makefile rp/utils/Makefile rp/rpki-rtr/Makefile"
+	ac_config_files="$ac_config_files rp/Makefile rp/config/Makefile rp/rcynic/Makefile rp/utils/Makefile rp/rpki-rtr/Makefile"
 
 fi
 
@@ -5874,7 +5769,6 @@ do
     "rp/Makefile") CONFIG_FILES="$CONFIG_FILES rp/Makefile" ;;
     "rp/config/Makefile") CONFIG_FILES="$CONFIG_FILES rp/config/Makefile" ;;
     "rp/rcynic/Makefile") CONFIG_FILES="$CONFIG_FILES rp/rcynic/Makefile" ;;
-    "rp/rcynic/static-rsync/Makefile") CONFIG_FILES="$CONFIG_FILES rp/rcynic/static-rsync/Makefile" ;;
     "rp/utils/Makefile") CONFIG_FILES="$CONFIG_FILES rp/utils/Makefile" ;;
     "rp/rpki-rtr/Makefile") CONFIG_FILES="$CONFIG_FILES rp/rpki-rtr/Makefile" ;;
     "ca/Makefile") CONFIG_FILES="$CONFIG_FILES ca/Makefile" ;;