From 6697b0e94ccfc6287d71431f27863629fa9c610e Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Sun, 28 Dec 2014 00:16:13 -0500 Subject: [PATCH] Fix invalid installation location for p7zip --- config/packages-list | 2 +- stage3/hv-install-1 | 2 +- stage3/packages-update | 2 +- .../common/p7zip_9.20.1-permissions.patch | 141 ++++++++++++++++++ stage3/pkg/p7zip | 5 +- 5 files changed, 147 insertions(+), 5 deletions(-) create mode 100644 stage3/patches/common/p7zip_9.20.1-permissions.patch diff --git a/config/packages-list b/config/packages-list index b019ed6..3896448 100644 --- a/config/packages-list +++ b/config/packages-list @@ -466,4 +466,4 @@ YASM="yasm-1.3.0" ZIP="zip-3.0" ZLIB="zlib-1.2.8" -P7ZIP="p7zip_9.20.1_src_all" +P7ZIP="p7zip_9.20.1" diff --git a/stage3/hv-install-1 b/stage3/hv-install-1 index 842a424..2054516 100755 --- a/stage3/hv-install-1 +++ b/stage3/hv-install-1 @@ -77,7 +77,7 @@ ipkg -m acnb ${MYSQL} ipkg -m noac ${ZIP} ipkg -m noac ${UNZIP} ipkg -m noac ${UNRAR} -ipkg -m noac ${P7ZIP} +ipkg -m noac -s p7zip ${P7ZIP} ipkg -m noac ${PBZIP2} ipkg ${CPIO} "\ --bindir=/bin \ diff --git a/stage3/packages-update b/stage3/packages-update index 8efb093..0ec7999 100755 --- a/stage3/packages-update +++ b/stage3/packages-update @@ -61,7 +61,7 @@ fpkg -f "unzip$(get_pkg_ver ${UNZIP} | sed 's!\.!!g')" -s "infozip" \ -e "tar.gz" ${UNZIP} ${SOURCEFORGE_URL} fpkg -f "unrarsrc-$(get_pkg_ver ${UNRAR})" -e "tar.gz" ${UNRAR} \ "http://www.rarlab.com/rar" -fpkg -m sf -s "p7zip" ${P7ZIP} +fpkg -m sf -s "p7zip" -f "${P7ZIP}_src_all" ${P7ZIP} fpkg -e "tar.gz" ${PBZIP2} "http://compression.ca/pbzip2" fpkg -m gnu ${CPIO} fpkg -m gnu ${SCREEN} diff --git a/stage3/patches/common/p7zip_9.20.1-permissions.patch b/stage3/patches/common/p7zip_9.20.1-permissions.patch new file mode 100644 index 0000000..42b746f --- /dev/null +++ b/stage3/patches/common/p7zip_9.20.1-permissions.patch @@ -0,0 +1,141 @@ +diff -Naur p7zip_9.20.1.orig/install.sh p7zip_9.20.1.new/install.sh +--- p7zip_9.20.1.orig/install.sh 2011-03-16 15:32:56.000000000 -0400 ++++ p7zip_9.20.1.new/install.sh 2014-12-28 00:05:15.249963765 -0500 +@@ -9,10 +9,10 @@ + cp bin/${prg} "${DEST_DIR}${DEST_SHARE}/${prg}" + chmod 777 "${DEST_DIR}${DEST_SHARE}/${prg}" + strip "${DEST_DIR}${DEST_SHARE}/${prg}" +- chmod 555 "${DEST_DIR}${DEST_SHARE}/${prg}" ++ chmod 755 "${DEST_DIR}${DEST_SHARE}/${prg}" + echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/${prg}" + echo "\"${DEST_SHARE}/${prg}\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/${prg}" +- chmod 555 "${DEST_DIR}${DEST_BIN}/${prg}" ++ chmod 755 "${DEST_DIR}${DEST_BIN}/${prg}" + fi + } + +@@ -94,21 +94,21 @@ + cp bin/7zCon.sfx "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" + chmod 777 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" + strip "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" +- chmod 555 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" ++ chmod 755 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" + fi + + if [ -x bin/7z.so ] + then + echo "- installing ${DEST_DIR}${DEST_SHARE}/7z.so" + cp bin/7z.so "${DEST_DIR}${DEST_SHARE}/7z.so" +- chmod 555 "${DEST_DIR}${DEST_SHARE}/7z.so" ++ chmod 755 "${DEST_DIR}${DEST_SHARE}/7z.so" + fi + + if [ -d bin/Codecs ] + then + echo "- installing ${DEST_DIR}${DEST_SHARE}/Codecs" + cp -r bin/Codecs "${DEST_DIR}${DEST_SHARE}/" +- chmod 555 "${DEST_DIR}${DEST_SHARE}"/*/* ++ chmod 755 "${DEST_DIR}${DEST_SHARE}"/*/* + fi + + else +@@ -117,7 +117,7 @@ + echo "- installing ${DEST_DIR}${DEST_BIN}/7za" + mkdir -p "${DEST_DIR}${DEST_BIN}" + cp bin/7za "${DEST_DIR}${DEST_BIN}/7za" +- chmod 555 "${DEST_DIR}${DEST_BIN}/7za" ++ chmod 755 "${DEST_DIR}${DEST_BIN}/7za" + fi + + if [ -x bin/7zr ] +@@ -125,7 +125,7 @@ + echo "- installing ${DEST_DIR}${DEST_BIN}/7zr" + mkdir -p "${DEST_DIR}${DEST_BIN}" + cp bin/7zr "${DEST_DIR}${DEST_BIN}/7zr" +- chmod 555 "${DEST_DIR}${DEST_BIN}/7zr" ++ chmod 755 "${DEST_DIR}${DEST_BIN}/7zr" + fi + fi + +@@ -134,27 +134,27 @@ + then + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1" + sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1" +- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1" ++ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1" + + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1" + sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1" +- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1" ++ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1" + + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1" + sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1" +- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" ++ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" + else + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1" + grep -v "{DEST_SHARE_DOC}" man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1" +- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1" ++ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1" + + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1" + grep -v "{DEST_SHARE_DOC}" man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1" +- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1" ++ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1" + + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1" + grep -v "{DEST_SHARE_DOC}" man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1" +- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" ++ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" + fi + + if [ -f README ] +@@ -162,7 +162,7 @@ + echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/README" + mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" + cp README "${DEST_DIR}${DEST_SHARE_DOC}/README" +- chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/README" ++ chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/README" + fi + + if [ -f ChangeLog ] +@@ -170,7 +170,7 @@ + echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" + mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" + cp ChangeLog "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" +- chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" ++ chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" + fi + + if [ -d DOCS ] +@@ -178,8 +178,8 @@ + echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS" + mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" + cp -r DOCS "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" +- find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 555 {} \; +- find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 444 {} \; ++ find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 755 {} \; ++ find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 644 {} \; + fi + + use_lang="n" +@@ -188,7 +188,7 @@ + then + use_lang="o" + cp GUI/p7zipForFilemanager "${DEST_DIR}${DEST_BIN}/" +- chmod 555 "${DEST_DIR}${DEST_BIN}/" ++ chmod 755 "${DEST_DIR}${DEST_BIN}/" + fi + + if [ -x bin/7zFM ] +@@ -200,7 +200,7 @@ + then + echo "- installing Lang in ${DEST_DIR}${DEST_SHARE}" + cp -r GUI/Lang "${DEST_DIR}${DEST_SHARE}/" +- find "${DEST_DIR}${DEST_SHARE}/Lang" -type d -exec chmod 555 {} \; +- find "${DEST_DIR}${DEST_SHARE}/Lang" -type f -exec chmod 444 {} \; ++ find "${DEST_DIR}${DEST_SHARE}/Lang" -type d -exec chmod 755 {} \; ++ find "${DEST_DIR}${DEST_SHARE}/Lang" -type f -exec chmod 644 {} \; + fi + diff --git a/stage3/pkg/p7zip b/stage3/pkg/p7zip index 9821a3f..d8063d0 100644 --- a/stage3/pkg/p7zip +++ b/stage3/pkg/p7zip @@ -2,6 +2,7 @@ hvbuild() { - ${HVMAKE} - ${HVMAKE} -n DEST_HOME=/usr install + ${HVMAKE} all3 + ${HVMAKE} DEST_HOME=/usr \ + DEST_MAN=/usr/share/man install } -- 2.20.1