zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated blfs-tool dependencies.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2007-04-13 19:26:35 +00:00
parent 4a8430d1c4
commit 16938b0ee9
9 changed files with 61 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BLFS/libs/func_parser
View file

@ -29,8 +29,8 @@ inline_doc
{ {
cat << EOF cat << EOF
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" > "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
<book> <book>

8
blfs-tool
View file

@ -112,8 +112,8 @@ check_version "2004" "${tidyVer}"
XML_FILE="<?xml version='1.0' encoding='ISO-8859-1'?> XML_FILE="<?xml version='1.0' encoding='ISO-8859-1'?>
<?xml-stylesheet type='text/xsl' href='http://docbook.sourceforge.net/release/xsl/1.69.1/xhtml/docbook.xsl'?> <?xml-stylesheet type='text/xsl' href='http://docbook.sourceforge.net/release/xsl/1.69.1/xhtml/docbook.xsl'?>
<!DOCTYPE article PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN' <!DOCTYPE article PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
'http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd'> 'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd'>
<article> <article>
<title>Test file</title> <title>Test file</title>
<sect1> <sect1>
@ -123,9 +123,9 @@ XML_FILE="<?xml version='1.0' encoding='ISO-8859-1'?>
</article>" </article>"
if `echo $XML_FILE | xmllint -noout -postvalid - 2>/dev/null` ; then if `echo $XML_FILE | xmllint -noout -postvalid - 2>/dev/null` ; then
check_version "4.4" "4.4" "DocBook XML DTD" check_version "4.5" "4.5" "DocBook XML DTD"
else else
echo "Warning: not found a working DocBook XML DTD 4.4 installation" echo "Warning: not found a working DocBook XML DTD 4.5 installation"
exit 2 exit 2
fi fi

13
common/blfs-tool-deps/903-tidy
View file

@ -5,20 +5,9 @@
set -e set -e
cd $PKGDIR cd $PKGDIR
patch -Np1 -i ../tidy-051026-prevent_PRE_newlines-1.patch
sh build/gnuauto/setup.sh
./configure --prefix=/usr ./configure --prefix=/usr
make make
make install make install
(cd ../ && tar -xvf tidy_docs_051020.tgz) make -C htmldoc install_apidocs
cd htmldoc
tidy -xml-help > tidy-help.xml
tidy -xml-config > tidy-config.xml
xsltproc -o tidy.1 tidy1.xsl tidy-help.xml
xsltproc -o quickref.html quickref-html.xsl tidy-config.xml
cd ..
install -v -m644 htmldoc/tidy.1 /usr/share/man/man1
install -v -m755 -d /usr/share/doc/tidy-051020
cp -v -R htmldoc/* /usr/share/doc/tidy-051020
exit exit

1
common/blfs-tool-deps/904-unzip
View file

@ -5,6 +5,7 @@
set -e set -e
cd $PKGDIR cd $PKGDIR
patch -Np1 -i ../unzip-5.52-security_fix-1.patch
make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux
make prefix=/usr install make prefix=/usr install

54
common/blfs-tool-deps/905-docbook-xml
View file

@ -7,58 +7,58 @@ set -e
cd /sources cd /sources
mkdir docbook-xml mkdir docbook-xml
cd docbook-xml cd docbook-xml
unzip ../docbook-xml-4.4.zip unzip ../docbook-xml-4.5.zip
install -v -d -m755 /usr/share/xml/docbook/xml-dtd-4.4 install -v -d -m755 /usr/share/xml/docbook/xml-dtd-4.5
install -v -d -m755 /etc/xml install -v -d -m755 /etc/xml
chown -R root:root . chown -R root:root .
cp -v -af docbook.cat *.dtd ent/ *.mod \ cp -v -af docbook.cat *.dtd ent/ *.mod \
/usr/share/xml/docbook/xml-dtd-4.4 /usr/share/xml/docbook/xml-dtd-4.5
if [ ! -e /etc/xml/docbook ]; then if [ ! -e /etc/xml/docbook ]; then
xmlcatalog --noout --create /etc/xml/docbook xmlcatalog --noout --create /etc/xml/docbook
fi fi
xmlcatalog --noout --add "public" \ xmlcatalog --noout --add "public" \
"-//OASIS//DTD DocBook XML V4.4//EN" \ "-//OASIS//DTD DocBook XML V4.5//EN" \
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" \ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
/etc/xml/docbook /etc/xml/docbook
xmlcatalog --noout --add "public" \ xmlcatalog --noout --add "public" \
"-//OASIS//DTD DocBook XML CALS Table Model V4.4//EN" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
"file:///usr/share/xml/docbook/xml-dtd-4.4/calstblx.dtd" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
/etc/xml/docbook /etc/xml/docbook
xmlcatalog --noout --add "public" \ xmlcatalog --noout --add "public" \
"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
"file:///usr/share/xml/docbook/xml-dtd-4.4/soextblx.dtd" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
/etc/xml/docbook /etc/xml/docbook
xmlcatalog --noout --add "public" \ xmlcatalog --noout --add "public" \
"-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
"file:///usr/share/xml/docbook/xml-dtd-4.4/dbpoolx.mod" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
/etc/xml/docbook /etc/xml/docbook
xmlcatalog --noout --add "public" \ xmlcatalog --noout --add "public" \
"-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.4//EN" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
"file:///usr/share/xml/docbook/xml-dtd-4.4/dbhierx.mod" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
/etc/xml/docbook /etc/xml/docbook
xmlcatalog --noout --add "public" \ xmlcatalog --noout --add "public" \
"-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" \ "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
"file:///usr/share/xml/docbook/xml-dtd-4.4/htmltblx.mod" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
/etc/xml/docbook /etc/xml/docbook
xmlcatalog --noout --add "public" \ xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Notations V4.4//EN" \ "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
"file:///usr/share/xml/docbook/xml-dtd-4.4/dbnotnx.mod" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
/etc/xml/docbook /etc/xml/docbook
xmlcatalog --noout --add "public" \ xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Character Entities V4.4//EN" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
"file:///usr/share/xml/docbook/xml-dtd-4.4/dbcentx.mod" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
/etc/xml/docbook /etc/xml/docbook
xmlcatalog --noout --add "public" \ xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Additional General Entities V4.4//EN" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
"file:///usr/share/xml/docbook/xml-dtd-4.4/dbgenent.mod" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
/etc/xml/docbook /etc/xml/docbook
xmlcatalog --noout --add "rewriteSystem" \ xmlcatalog --noout --add "rewriteSystem" \
"http://www.oasis-open.org/docbook/xml/4.4" \ "http://www.oasis-open.org/docbook/xml/4.5" \
"file:///usr/share/xml/docbook/xml-dtd-4.4" \ "file:///usr/share/xml/docbook/xml-dtd-4.5" \
/etc/xml/docbook /etc/xml/docbook
xmlcatalog --noout --add "rewriteURI" \ xmlcatalog --noout --add "rewriteURI" \
"http://www.oasis-open.org/docbook/xml/4.4" \ "http://www.oasis-open.org/docbook/xml/4.5" \
"file:///usr/share/xml/docbook/xml-dtd-4.4" \ "file:///usr/share/xml/docbook/xml-dtd-4.5" \
/etc/xml/docbook /etc/xml/docbook
if [ ! -e /etc/xml/catalog ]; then if [ ! -e /etc/xml/catalog ]; then
xmlcatalog --noout --create /etc/xml/catalog xmlcatalog --noout --create /etc/xml/catalog
@ -79,7 +79,7 @@ xmlcatalog --noout --add "delegateURI" \
"http://www.oasis-open.org/docbook/" \ "http://www.oasis-open.org/docbook/" \
"file:///etc/xml/docbook" \ "file:///etc/xml/docbook" \
/etc/xml/catalog /etc/xml/catalog
for DTDVERSION in 4.1.2 4.2 4.3 for DTDVERSION in 4.1.2 4.2 4.3 4.4
do do
xmlcatalog --noout --add "public" \ xmlcatalog --noout --add "public" \
"-//OASIS//DTD DocBook XML V$DTDVERSION//EN" \ "-//OASIS//DTD DocBook XML V$DTDVERSION//EN" \
@ -87,11 +87,11 @@ do
/etc/xml/docbook /etc/xml/docbook
xmlcatalog --noout --add "rewriteSystem" \ xmlcatalog --noout --add "rewriteSystem" \
"http://www.oasis-open.org/docbook/xml/$DTDVERSION" \ "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \
"file:///usr/share/xml/docbook/xml-dtd-4.4" \ "file:///usr/share/xml/docbook/xml-dtd-4.5" \
/etc/xml/docbook /etc/xml/docbook
xmlcatalog --noout --add "rewriteURI" \ xmlcatalog --noout --add "rewriteURI" \
"http://www.oasis-open.org/docbook/xml/$DTDVERSION" \ "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \
"file:///usr/share/xml/docbook/xml-dtd-4.4" \ "file:///usr/share/xml/docbook/xml-dtd-4.5" \
/etc/xml/docbook /etc/xml/docbook
xmlcatalog --noout --add "delegateSystem" \ xmlcatalog --noout --add "delegateSystem" \
"http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \ "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \

3
common/blfs-tool-deps/908-links
View file

@ -8,5 +8,8 @@ cd $PKGDIR
./configure --prefix=/usr ./configure --prefix=/usr
make CFLAGS="-O2 -Wno-sign-compare -Wno-pointer-sign" make CFLAGS="-O2 -Wno-sign-compare -Wno-pointer-sign"
make install make install
install -v -d -m755 /usr/share/doc/links-2.1pre23
install -v -m644 doc/links_cal/* KEYS BRAILLE_HOWTO \
/usr/share/doc/links-2.1pre23
exit exit

5
common/libs/func_blfs_deps
View file

@ -18,12 +18,11 @@ add_blfs_deps_urls() { # No easy way to extract it.
if [[ "${DEP_TIDY}" = "y" ]] ; then if [[ "${DEP_TIDY}" = "y" ]] ; then
echo "${TIDY_URL} ${BLFS_SERVER}tidy/${TIDY_PKG} ${TIDY_MD5}" >> urls.lst echo "${TIDY_URL} ${BLFS_SERVER}tidy/${TIDY_PKG} ${TIDY_MD5}" >> urls.lst
echo "${TIDY_PATCH_URL} ${BLFS_SERVER}tidy/${TIDY_PATCH} ${TIDY_PATCH_MD5}" >> urls.lst
echo "${TIDY_DOCS_URL} ${BLFS_SERVER}tidy/${TIDY_DOCS} ${TIDY_DOCS_MD5}" >> urls.lst
fi fi
if [[ "${DEP_UNZIP}" = "y" ]] ; then if [[ "${DEP_UNZIP}" = "y" ]] ; then
echo "${UNZIP_URL} ${BLFS_SERVER}unzip/${UNZIP_PKG} ${UNZIP_MD5}" >> urls.lst echo "${UNZIP_URL} ${BLFS_SERVER}unzip/${UNZIP_PKG} ${UNZIP_MD5}" >> urls.lst
echo "${UZIP_PATCH_URL} ${BLFS_SERVER}unzip/${UNZIP_PATCH} ${UNZIP_PATCH_MD5}" >> urls.lst
fi fi
if [[ "${DEP_DBXML}" = "y" ]] ; then if [[ "${DEP_DBXML}" = "y" ]] ; then
@ -175,7 +174,7 @@ wrt_blfs_tool_targets() { #
# Touch the tracking file. # Touch the tracking file.
case $name in case $name in
tidy ) pkg_ver=tidy-051026 ;; tidy ) pkg_ver=html-tidy-cvs_20070326 ;;
unzip ) pkg_ver=unzip-5.52 ;; unzip ) pkg_ver=unzip-5.52 ;;
* ) pkg_ver=$(echo $pkg_tarball | sed -e 's/.tar.*//;s/.tgz//;s/.zip//') ;; * ) pkg_ver=$(echo $pkg_tarball | sed -e 's/.tar.*//;s/.tgz//;s/.zip//') ;;
esac esac

8
common/libs/func_check_version.sh
View file

@ -126,8 +126,8 @@ check_prerequisites() { #
# Check if the proper DocBook-XML-DTD and DocBook-XSL are correctly installed # Check if the proper DocBook-XML-DTD and DocBook-XSL are correctly installed
XML_FILE="<?xml version='1.0' encoding='ISO-8859-1'?> XML_FILE="<?xml version='1.0' encoding='ISO-8859-1'?>
<?xml-stylesheet type='text/xsl' href='http://docbook.sourceforge.net/release/xsl/1.69.1/xhtml/docbook.xsl'?> <?xml-stylesheet type='text/xsl' href='http://docbook.sourceforge.net/release/xsl/1.69.1/xhtml/docbook.xsl'?>
<!DOCTYPE article PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN' <!DOCTYPE article PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
'http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd'> 'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd'>
<article> <article>
<title>Test file</title> <title>Test file</title>
<sect1> <sect1>
@ -138,9 +138,9 @@ XML_FILE="<?xml version='1.0' encoding='ISO-8859-1'?>
if [[ -z "$DEP_DBXML" ]] ; then if [[ -z "$DEP_DBXML" ]] ; then
if `echo $XML_FILE | xmllint -noout -postvalid - 2>/dev/null` ; then if `echo $XML_FILE | xmllint -noout -postvalid - 2>/dev/null` ; then
check_version "4.4" "4.4" "DocBook XML DTD" check_version "4.5" "4.5" "DocBook XML DTD"
else else
echo "Warning: not found a working DocBook XML DTD 4.4 installation" echo "Warning: not found a working DocBook XML DTD 4.5 installation"
exit 2 exit 2
fi fi
fi fi

38
jhalfs
View file

@ -161,41 +161,37 @@ if [[ "${BLFS_TOOL}" = "y" ]] ; then
# Dependencies envars, to can update it more easy. # Dependencies envars, to can update it more easy.
# Tidy and Unzip version are harcoded also in wrt_blfs_tool_targets() # Tidy and Unzip version are harcoded also in wrt_blfs_tool_targets()
# libxml2 # libxml2
LIBXML_PKG="libxml2-2.6.26.tar.gz" LIBXML_PKG="libxml2-2.6.27.tar.gz"
LIBXML_URL="ftp://xmlsoft.org/libxml2/${LIBXML_PKG}" LIBXML_URL="ftp://xmlsoft.org/libxml2/${LIBXML_PKG}"
LIBXML_MD5="2d8d3805041edab967368b497642f981" LIBXML_MD5="f5806f5059ef7bd4d3fcf36cf116d1ef"
# libxslt # libxslt
LIBXSLT_PKG="libxslt-1.1.17.tar.gz" LIBXSLT_PKG="libxslt-1.1.20.tar.gz"
LIBXSLT_URL="ftp://xmlsoft.org/libxslt/${LIBXSLT_PKG}" LIBXSLT_URL="ftp://xmlsoft.org/libxslt/${LIBXSLT_PKG}"
LIBXSLT_MD5="fde6a7a93c0eb14cba628692fa3a1000" LIBXSLT_MD5="4ea2dc22a23bf2aa570f868aa86357f8"
# tidy # tidy
TIDY_PKG="tidy_src_051026.tgz" TIDY_PKG="tidy-cvs_20070326.tar.bz2"
TIDY_URL="http://tidy.sourceforge.net/src/${TIDY_PKG}" TIDY_URL="http://anduin.linuxfromscratch.org/files/BLFS/sources/${TIDY_PKG}"
TIDY_MD5="1e39fafd6808978871346658c8da1454" TIDY_MD5="468bfaa5cf917a8ecbe7834c13a61376"
# tidy patch
TIDY_PATCH="tidy-051026-prevent_PRE_newlines-1.patch"
TIDY_PATCH_URL="http://www.linuxfromscratch.org/patches/blfs/svn/${TIDY_PATCH}"
TIDY_PATCH_MD5="82f67f7af58fc2c945b3410ae655cc1a"
# tidy docs
TIDY_DOCS="tidy_docs_051020.tgz"
TIDY_DOCS_URL="http://tidy.sourceforge.net/docs/${TIDY_DOCS}"
TIDY_DOCS_MD5="86de2f198e57399c063d2567b2a25628"
# unzip # unzip
UNZIP_PKG="unzip552.tar.gz" UNZIP_PKG="unzip552.tar.gz"
UNZIP_URL="ftp://ftp.info-zip.org/pub/infozip/src/${UNZIP_PKG}" UNZIP_URL="http://downloads.sourceforge.net/infozip/${UNZIP_PKG}"
UNZIP_MD5="9d23919999d6eac9217d1f41472034a9" UNZIP_MD5="9d23919999d6eac9217d1f41472034a9"
# unzip security patch
UNZIP_PATCH="unzip-5.52-security_fix-1.patch"
UNZIP_PATCH_URL="http://www.linuxfromscratch.org/patches/blfs/svn/${UNZIP_PATCH}"
UNZIP_PATCH_MD5="00ebf64fdda2ad54ddfc619f85f328bb"
# DocBook XML DTD # DocBook XML DTD
DBXML_PKG="docbook-xml-4.4.zip" DBXML_PKG="docbook-xml-4.5.zip"
DBXML_URL="http://www.docbook.org/xml/4.4/${DBXML_PKG}" DBXML_URL="http://www.docbook.org/xml/4.5/${DBXML_PKG}"
DBXML_MD5="cbb04e9a700955d88c50962ef22c1634" DBXML_MD5="03083e288e87a7e829e437358da7ef9e"
# DocBook XSL # DocBook XSL
DBXSL_PKG="docbook-xsl-1.69.1.tar.bz2" DBXSL_PKG="docbook-xsl-1.69.1.tar.bz2"
DBXSL_URL="http://prdownloads.sourceforge.net/docbook/${DBXSL_PKG}" DBXSL_URL="http://prdownloads.sourceforge.net/docbook/${DBXSL_PKG}"
DBXSL_MD5="6ebd29a67f2dcc3f2220f475ee6f6552" DBXSL_MD5="6ebd29a67f2dcc3f2220f475ee6f6552"
# Links # Links
LINKS_PKG="links-2.1pre21.tar.bz2" LINKS_PKG="links-2.1pre23.tar.bz2"
LINKS_URL="http://links.twibright.com/download/${LINKS_PKG}" LINKS_URL="http://links.twibright.com/download/${LINKS_PKG}"
LINKS_MD5="7687e2c32e337e11c6e9d8cd8c5202c9" LINKS_MD5="4a1fb575c133eee821b9a1f8e9220b40"
# sudo # sudo
SUDO_PKG="sudo-1.6.8p12.tar.gz" SUDO_PKG="sudo-1.6.8p12.tar.gz"
SUDO_URL="http://www.courtesan.com/sudo/dist/${SUDO_PKG}" SUDO_URL="http://www.courtesan.com/sudo/dist/${SUDO_PKG}"