From dcf0e25966e70b114ea22bbc65c576f0d6249bb0 Mon Sep 17 00:00:00 2001
From: George Boudreau <georgeb@linuxfromscratch.org>
Date: Fri, 16 Feb 2007 15:28:30 +0000
Subject: [PATCH] bug hunt in custom package examples

---
 custom/examples/950-bc               |  3 +++
 custom/examples/951-glib             |  3 +++
 custom/examples/952-mc               |  4 +++-
 custom/examples/960-pppd             |  8 ++++---
 custom/examples/961-openssl          | 15 ++++++++-----
 custom/examples/963-gpm              |  4 +++-
 custom/examples/963-lynx             | 25 +++++++++++++--------
 custom/examples/964-hdcpcd           |  4 +++-
 custom/examples/997-nasm             | 33 ++++++++++++++++++++++++++++
 custom/examples/998-syslinux         |  8 ++++---
 custom/examples/999-blfs_bootscripts |  4 +++-
 custom/template                      |  3 +++
 12 files changed, 89 insertions(+), 25 deletions(-)
 create mode 100644 custom/examples/997-nasm

diff --git a/custom/examples/950-bc b/custom/examples/950-bc
index 57d5313..e70d3dc 100644
--- a/custom/examples/950-bc
+++ b/custom/examples/950-bc
@@ -6,6 +6,9 @@ PKG_VERSION="1.06"
 PKG_FILE="bc-1.06.tar.gz"
 URL="http://ftp.gnu.org/gnu/bc/${PKG_FILE}"
 MD5="d44b5dddebd8a7a7309aea6c36fda117"
+for i in PATCH{1..10}; do
+   unset $i
+done
 
 ( cat << "xEOFx"
 sed -i '/PROTO.*readline/d' bc/scan.l &&
diff --git a/custom/examples/951-glib b/custom/examples/951-glib
index 2f3cd03..ddb0985 100644
--- a/custom/examples/951-glib
+++ b/custom/examples/951-glib
@@ -6,6 +6,9 @@ PKG_VERSION="1.2.10"
 PKG_FILE="glib-1.2.10.tar.gz"
 URL="http://gd.tuwien.ac.at/graphics/gimp/gtk/v1.2/${PKG_FILE}"
 MD5="6fe30dad87c77b91b632def29dd69ef9"
+for i in PATCH{1..10}; do
+   unset $i
+done
 PATCH1="http://www.linuxfromscratch.org/patches/blfs/svn/glib-1.2.10-gcc34-1.patch 0077a1cce5e8a2231ac5a9b08c6263ba"
 
 
diff --git a/custom/examples/952-mc b/custom/examples/952-mc
index 15defad..43af312 100644
--- a/custom/examples/952-mc
+++ b/custom/examples/952-mc
@@ -6,7 +6,9 @@ PKG_VERSION="4.6.1"
 PKG_FILE="mc-4.6.1.tar.gz"
 URL="http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/${PKG_FILE}"
 MD5="18b20db6e40480a53bac2870c56fc3c4"
-PATCH1=""
+for i in PATCH{1..10}; do
+   unset $i
+done
 
 ( cat << "xEOFx"
 ./configure --prefix=/usr &&
diff --git a/custom/examples/960-pppd b/custom/examples/960-pppd
index a4747eb..feacb91 100644
--- a/custom/examples/960-pppd
+++ b/custom/examples/960-pppd
@@ -9,9 +9,11 @@
 PKG="ppp"
 PKG_VERSION="2.4.4"
 PKG_FILE="ppp-${PKG_VERSION}.tar.gz"
-URL="ftp://ftp.samba.org/pub/ppp/${PKG_FILE}"
-MD5="83800762e266132218b204dfb428d29"
-PATCH1=""
+URL="http://samba.org/ftp/ppp/${PKG_FILE}"
+MD5="183800762e266132218b204dfb428d29"
+for i in PATCH{1..10}; do
+   unset $i
+done
 
 ( cat << "xEOFx"
 ./configure --prefix=/usr &&
diff --git a/custom/examples/961-openssl b/custom/examples/961-openssl
index 63a83c4..e928c7c 100644
--- a/custom/examples/961-openssl
+++ b/custom/examples/961-openssl
@@ -8,24 +8,27 @@
 #
 
 PKG="openssl"
-PKG_VERSION="0.9.8c"
+PKG_VERSION="0.9.8d"
 PKG_FILE="openssl-${PKG_VERSION}.tar.gz"
 URL="ftp://ftp.openssl.org/source/${PKG_FILE}"
-MD5="78454bec556bcb4c45129428a766c886"
-PATCH1=" http://www.linuxfromscratch.org/patches/blfs/svn/openssl-0.9.8c-fix_manpages-1.patch"
+MD5="8ed1853538e1d05a1f5ada61ebf8bffa"
+for i in PATCH{1..10}; do
+   unset $i
+done
+PATCH1=" http://www.linuxfromscratch.org/patches/blfs/svn/openssl-0.9.8d-fix_manpages-1.patch"
 
 ( cat << "xEOFx"
 
 sed -i -e 's/mcpu/march/' config
-patch -Np1 -i ../openssl-0.9.8c-fix_manpages-1.patch &&
+patch -Np1 -i ../openssl-0.9.8d-fix_manpages-1.patch &&
 ./config --openssldir=/etc/ssl --prefix=/usr shared &&
 make MANDIR=/usr/share/man
 
 make MANDIR=/usr/share/man install &&
 cp -v -r certs /etc/ssl &&
-install -v -d -m755 /usr/share/doc/openssl-0.9.8c &&
+install -v -d -m755 /usr/share/doc/openssl-0.9.8d &&
 cp -v -r doc/{HOWTO,README,*.{txt,html,gif}} \
-    /usr/share/doc/openssl-0.9.8c
+    /usr/share/doc/openssl-0.9.8d
     
 
 xEOFx
diff --git a/custom/examples/963-gpm b/custom/examples/963-gpm
index ec1f948..fce2d68 100644
--- a/custom/examples/963-gpm
+++ b/custom/examples/963-gpm
@@ -6,7 +6,9 @@ PKG_VERSION="1.20.1"
 PKG_FILE="gpm-${PKG_VERSION}.tar.bz2"
 URL="ftp://arcana.linux.it/pub/gpm/${PKG_FILE}"
 MD5="2c63e827d755527950d9d13fe3d87692"
-
+for i in PATCH{1..10}; do
+   unset $i
+done
 PATCH1=" http://www.linuxfromscratch.org/patches/blfs/svn/gpm-1.20.1-segfault-1.patch"
 PATCH2=" http://www.linuxfromscratch.org/patches/blfs/svn/gpm-1.20.1-silent-1.patch"
 
diff --git a/custom/examples/963-lynx b/custom/examples/963-lynx
index 9e8623a..45ac0da 100644
--- a/custom/examples/963-lynx
+++ b/custom/examples/963-lynx
@@ -5,21 +5,28 @@
 #
 
 PKG="lynx"
-PKG_VERSION="2.8.7"
+PKG_VERSION="2.8.6"
 PKG_FILE="lynx${PKG_VERSION}.tar.bz2"
-URL="ftp://lynx.isc.org/lynx2.8.5/${PKG_FILE}"
-MD5=""
-PATCH1=""
+URL="ftp://lynx.isc.org/lynx2.8.6/${PKG_FILE}"
+MD5="dc80497b7dda6a28fd80404684d27548"
+for i in PATCH{1..10}; do
+   unset $i
+done
 
 ( cat << "xEOFx"
 
-./configure --prefix=/usr --libdir=/etc \
-    --with-zlib --with-bzlib &&
+./configure --prefix=/usr \
+            --sysconfdir=/etc/lynx \
+            --datadir=/usr/share/doc/lynx-2.8.6 \
+            --with-zlib \
+            --with-bzlib \
+            --with-screen=ncursesw \
+            --enable-locale-charset &&
+
 make
 
-make docdir=/usr/share/doc/lynx-2.8.5/doc \
-    helpdir=/usr/share/doc/lynx-2.8.5/help install-full &&
-chgrp -v -R root /usr/share/doc/lynx-2.8.5/doc
+make install-full &&
+chgrp -v -R root /usr/share/doc/lynx-2.8.6/lynx_doc
 
 xEOFx
 ) > tmp
diff --git a/custom/examples/964-hdcpcd b/custom/examples/964-hdcpcd
index dd4a046..9f07569 100644
--- a/custom/examples/964-hdcpcd
+++ b/custom/examples/964-hdcpcd
@@ -11,7 +11,9 @@ PKG_VERSION="2.0.8"
 PKG_FILE="dhcpcd-${PKG_VERSION}.tar.bz2"
 URL="ftp://ftp.osuosl.org/pub/gentoo/distfiles/${PKG_FILE}"
 MD5="ec91c33b6d9cb46a42f9564e573fd249"
-PATCH1=""
+for i in PATCH{1..10}; do
+   unset $i
+done
 
 ( cat << "xEOFx"
 
diff --git a/custom/examples/997-nasm b/custom/examples/997-nasm
new file mode 100644
index 0000000..ebeee4c
--- /dev/null
+++ b/custom/examples/997-nasm
@@ -0,0 +1,33 @@
+#
+# $Id:$
+# NASM (Netwide Assembler) is an 80x86 assembler designed
+# for portability and modularity. It includes a
+# disassembler as well.
+
+PKG="nasm"
+PKG_VERSION="0.98.39"
+PKG_FILE="nasm-${PKG_VERSION}.tar.bz2"
+URL="http://downloads.sourceforge.net/nasm/${PKG_FILE}"
+MD5="2032ad44c7359f7a9a166a40a633e772"
+for i in PATCH{1..10}; do
+   unset $i
+done
+PATCH1="http://www.linuxfromscratch.org/patches/blfs/svn/nasm-0.98.39-security_fix-1.patch"
+
+( cat << "xEOFx"
+
+patch -Np1 -i ../nasm-0.98.39-security_fix-1.patch &&
+./configure --prefix=/usr &&
+make
+make -C rdoff/doc
+make -C rdoff/doc html
+
+make install &&
+make install_rdf &&
+install -v -m644 rdoff/doc/rdoff.info /usr/share/info &&
+install -v -m755 -d /usr/share/doc/nasm/html &&
+install -v -m644 rdoff/doc/v1-v2.txt /usr/share/doc/nasm &&
+cp -v -R rdoff/doc/rdoff /usr/share/doc/nasm/html
+
+xEOFx
+) > tmp
diff --git a/custom/examples/998-syslinux b/custom/examples/998-syslinux
index 9475c39..59d5f12 100644
--- a/custom/examples/998-syslinux
+++ b/custom/examples/998-syslinux
@@ -18,11 +18,13 @@
 #
 
 PKG="syslinux"
-PKG_VERSION="3.31"
+PKG_VERSION="3.36"
 PKG_FILE="syslinux-$PKG_VERSION}.tar.bz2"
 URL="http://www.kernel.org/pub/linux/utils/boot/syslinux/${PKG_FILE}"
-MD5="5faae89d18baf92e28bc820c62270db9"
-PATCH1=""
+MD5="d1bfdaa53d31f572f540be55d1480027"
+for i in PATCH{1..10}; do
+   unset $i
+done
 
 ( cat << "xEOFx"
 
diff --git a/custom/examples/999-blfs_bootscripts b/custom/examples/999-blfs_bootscripts
index 65a400c..0494477 100644
--- a/custom/examples/999-blfs_bootscripts
+++ b/custom/examples/999-blfs_bootscripts
@@ -6,7 +6,9 @@ PKG_VERSION="20060910"
 PKG_FILE="blfs-bootscripts-${PKG_VERSION}.tar.bz2"
 URL="http://www.linuxfromscratch.org/blfs/downloads/svn/${PKG_FILE}"
 MD5="e1715c58dc694bf474c4468e6bade3ad"
-PATCH1=""
+for i in PATCH{1..10}; do
+   unset $i
+done
 
 ( cat << "xEOFx"
 
diff --git a/custom/template b/custom/template
index 3343d49..f55201e 100644
--- a/custom/template
+++ b/custom/template
@@ -9,6 +9,9 @@ PKG_VERSION=""
 PKG_FILE=""
 URL=""
 MD5=""
+for i in PATCH{1..10}; do
+   unset $i
+done
 PATCH1=""
 
 ( cat << "xEOFx"