From 37c41cd7b2f8ed5126f63c8c550b2ddb95402713 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Tue, 24 May 2011 13:07:53 +0200 Subject: [PATCH] honeyd: removed capability to configure the prefix via 'Config' --- network/honeyd/config.in | 23 ----------------------- network/honeyd/honeyd.conf | 9 +++------ 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 network/honeyd/config.in diff --git a/network/honeyd/config.in b/network/honeyd/config.in deleted file mode 100644 index 92fe53432..000000000 --- a/network/honeyd/config.in +++ /dev/null @@ -1,23 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../honeyd/config.in -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. A copy of the -# GNU General Public License can be found in the file COPYING. -# --- SDE-COPYRIGHT-NOTE-END --- - - -if pkgcheck honeyd X -then - menu_begin MENU_PKG_HONEYD 'Honeyd Package Options' - text 'Install prefix for honeyd package' \ - SDECFG_PKG_HONEYD_PREFIX "opt/honeyd" - menu_end -fi - diff --git a/network/honeyd/honeyd.conf b/network/honeyd/honeyd.conf index 14c5b9235..6865bd963 100644 --- a/network/honeyd/honeyd.conf +++ b/network/honeyd/honeyd.conf @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../honeyd/honeyd.conf +# Copyright (C) 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -14,11 +15,7 @@ if [ $prefix_auto = 1 ] ; then - if [ "$SDECFG_PKG_HONEYD_PREFIX" ] ; then - prefix="$SDECFG_PKG_HONEYD_PREFIX" - else - prefix="opt/honeyd" - fi - set_confopt + prefix="opt/honeyd" + set_confopt fi