aboutsummaryrefslogtreecommitdiffstats
path: root/security/rkhunter/files/patch-installer.sh
blob: a39c8caf93843b6746d4801c295ee073bec28c56 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
--- ./installer.sh.orig 2012-04-27 00:10:12.000000000 +0200
+++ ./installer.sh  2012-07-03 23:56:30.000000000 +0200
@@ -392,7 +392,7 @@
    RKHINST_ETC_DIR="${SYSCONFIGDIR}"
    RKHINST_BIN_DIR="${BINDIR}"
    RKHINST_SCRIPT_DIR="${LIBDIR}/${APPNAME}/scripts"
-   RKHINST_MAN_DIR="${SHAREDIR}/man/man8"
+   RKHINST_MAN_DIR="${PREFIX}/man/man8"
 
    if [ "${RKHINST_LAYOUT}" = "oldschool" ]; then
        RKHINST_DB_DIR="${VARDIR}/${APPNAME}/db"
@@ -406,12 +406,12 @@
    elif [ "${RKHINST_LAYOUT}" = "TXZ" ]; then
        RKHINST_DB_DIR="${VARDIR}/lib/${APPNAME}/db"
        RKHINST_TMP_DIR="${VARDIR}/lib/${APPNAME}/tmp"
-       RKHINST_DOC_DIR="${PREFIX}/doc/${APPNAME}-${APPVERSION}"
+       RKHINST_DOC_DIR="${PREFIX}/doc/${APPNAME}"
        RKHINST_MAN_DIR="${PREFIX}/man/man8"
    else
        RKHINST_DB_DIR="${VARDIR}/lib/${APPNAME}/db"
        RKHINST_TMP_DIR="${VARDIR}/lib/${APPNAME}/tmp"
-       RKHINST_DOC_DIR="${SHAREDIR}/doc/${APPNAME}-${APPVERSION}"
+       RKHINST_DOC_DIR="${SHAREDIR}/doc/${APPNAME}"
    fi
 
    RKHINST_LANG_DIR="${RKHINST_DB_DIR}/i18n"
@@ -1076,22 +1076,6 @@
        fi
    done
 
-
-   # Application
-   for FILE in ${RKHINST_BIN_FILES}; do
-       if [ -f "${RKHINST_BIN_DIR}/${FILE}" ]; then
-           rm -f "${RKHINST_BIN_DIR}/${FILE}" >/dev/null 2>&1
-           ERRCODE=$?
-
-           if [ $ERRCODE -eq 0 ]; then
-               echo " Removing ${RKHINST_BIN_DIR}/${FILE}: OK"
-           else
-               echo " Removing ${RKHINST_BIN_DIR}/${FILE}: FAILED: Code $ERRCODE"
-           fi
-       fi
-   done
-
-
    # Configuration file
    for FILE in ${RKHINST_ETC_FILE}; do
        if [ -f "${RKHINST_ETC_DIR}/${FILE}" ]; then