Corrections git man pages

diff --git a/stage2/cis-openssh b/stage2/cis-openssh
index 172c073..c418771 100755 (executable)
--- a/stage2/cis-openssh
+++ b/stage2/cis-openssh
@@ -21,6 +21,8 @@ cd ${LFS_TMP}/${1}-build
 ../${1}/configure \
     --prefix=/usr \
     --sysconfdir=/etc/ssh \
+    --datadir=/usr/share/sshd \
+    --with-pam \
     --libexecdir=/usr/lib/openssh \
     --with-md5-passwords \
     --with-privsep-path=/var/lib/sshd

diff --git a/stage3/cis-git-manpages b/stage3/cis-git-manpages
deleted file mode 100755 (executable)
index 35ad050..0000000
--- a/stage3/cis-git-manpages
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-set -o errexit
-
-# First argument of this script is the package name.
-# Remaining arguments are additional configure options.
-
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
-
-PACKAGE=${1}
-shift
-CONFIGURE_OPTS=${*}
-
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
-
-# Applying patches (if any)
-apply_patches ${PACKAGE}
-
-cd ${LFS_TMP}/${PACKAGE}
-cp -a * /usr/share/man
-
-exit $?

diff --git a/stage3/cis-mysql b/stage3/cis-mysql
index 2cc93ce..799f74b 100755 (executable)
--- a/stage3/cis-mysql
+++ b/stage3/cis-mysql
@@ -15,7 +15,7 @@ hv_groupadd mysql
 hv_useradd -c mysql -d /dev/null -g mysql -s /bin/false mysql
 
 cd ${LFS_TMP}/${1}
-CPPFLAGS="-D_GNU_SOURCE" ./configure \
+./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/sbin \
@@ -23,18 +23,20 @@ CPPFLAGS="-D_GNU_SOURCE" ./configure \
     --enable-thread-safe-client \
     --enable-assembler \
     --enable-local-infile \
-    --with-named-thread-libs=-lpthread \
     --with-unix-socket-path=/var/run/mysql/mysql.sock \
     --without-debug \
-    --without-bench \
-    --without-readline
-make testdir=/usr/lib/mysql/mysql-test
-make testdir=/usr/lib/mysql/mysql-test install
+    --without-readline \
+    --with-plugins=innobase,myisam \
+    --with-extra-charsets=all \
+    --with-ssl
+make benchdir_root=/tmp/mysql-bench install
+rm -rf /tmp/mysql
 cd /usr/lib
-ln -sf mysql/libmysqlclient{,_r}.so* .
+ln -v -sf mysql/libmysqlclient{,_r}.so* .
 
 # Copying default configuration file.
-cp /usr/share/mysql/my-medium.cnf /etc/my.cnf
+install -v -m644 /usr/share/mysql/my-medium.cnf /etc/my.cnf
+sed -i -e s/^skip-federated/#skip-federated/ /etc/my.cnf
 
 mysql_install_db --user=mysql
 chgrp mysql /srv/mysql{,/test,/mysql}

diff --git a/stage3/cis-pm b/stage3/cis-pm
index 2d3a525..8cb4309 100755 (executable)
--- a/stage3/cis-pm
+++ b/stage3/cis-pm
@@ -2,19 +2,24 @@
 set -o errexit
 
 # First argument of this script is the package name.
+# Remaining arguments are additional configure options.
 
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
 source ../functions
 source ../packages-list
 
+PACKAGE=${1}
+shift
+CONFIGURE_OPTS=${*}
+
 # Applying patches (if any)
-apply_patches ${1}
+apply_patches ${PACKAGE}
 
 cd ${LFS_TMP}/${1}
 # The option "-n" is used to avoid having to answer a question and accept the
 # default configuration.
-perl Makefile.PL -n
+perl Makefile.PL -n ${CONFIGURE_OPTS}
 make
 make install
 ldconfig

diff --git a/stage3/cis-pm-net-dns b/stage3/cis-pm-net-dns
deleted file mode 100755 (executable)
index d9a6f57..0000000
--- a/stage3/cis-pm-net-dns
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-set -o errexit
-
-# First argument of this script is the package name.
-
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
-
-# Applying patches (if any)
-apply_patches ${1}
-
-cd ${LFS_TMP}/${1}
-# The option "-n" is used to avoid having to answer a question and accept the
-# default configuration.
-perl Makefile.PL -n --no-online-tests
-make
-make install
-ldconfig
-
-exit $?

diff --git a/stage3/stage3-additions b/stage3/stage3-additions
index 4bf271a..abc4847 100755 (executable)
--- a/stage3/stage3-additions
+++ b/stage3/stage3-additions
@@ -18,6 +18,9 @@ fi
 
 init_log_file
 
+# Scripts directory
+export SCRDIR=$(pwd)
+
 ipkg_ac   ${CPIO}
 
 exit $?

diff --git a/stage3/stage3-install b/stage3/stage3-install
index 81e9da2..bf8d7a5 100755 (executable)
--- a/stage3/stage3-install
+++ b/stage3/stage3-install
@@ -20,6 +20,9 @@ fi
 
 init_log_file
 
+# Scripts directory
+export SCRDIR=$(pwd)
+
 ipkg_ac    ${PCRE} \
     --docdir=/usr/share/doc/pcre \
     --enable-utf8 \
@@ -34,7 +37,7 @@ if [ "x${USE_DYNAMIC_DNS}" = "xyes" ]; then
     # For updating dynamic DNS entries.
     ipkg_cust ${DDCLIENT} cis-ddclient
 fi
-ipkg_ac    ${LIBPCAP} "--enable-yydebug"
+ipkg_ac_nb ${LIBPCAP}
 ipkg_ac    ${TCPDUMP}
 ipkg_ac_nb ${NMAP}
 ipkg_cust  ${BIND} cis-bind
@@ -58,11 +61,11 @@ INIT_D_PATH=/etc/rc.d/init.d \
 ipkg_cust  ${DOSFSTOOLS} cis-dosfstools
 ipkg_ac    ${CVS} "--disable-server"
 ipkg_ac_nb ${GIT}
-ipkg_cust  ${GIT_MANPAGES} cis-git-manpages
+rscr once "Installing ${GIT_MANPAGES}" decompress_package ${GIT_MANPAGES} /usr/share/man
 
 # Graphic libraries without X-Window dependencies
 ipkg_ac    ${LIBJPEG} "--enable-static --enable-shared"
-ipkg_cust  ${LIBOPENJPEG}
+ipkg_ac    ${LIBOPENJPEG}
 ipkg_ac    ${LIBPNG}
 ipkg_ac    ${LIBART}
 ipkg_ac    ${LIBEXIF}
@@ -132,7 +135,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg_pm    ${PERL_MOD_DIGEST_SHA1}
     ipkg_pm    ${PERL_MOD_URI}
     ipkg_pm    ${PERL_MOD_LWP}
-    ipkg_cust  ${PERL_MOD_NET_DNS} cis-pm-net-dns
+    ipkg_pm    ${PERL_MOD_NET_DNS} --no-online-tests
 
     # Needed by OpenOffice ???
     ipkg_pm    ${PERL_MOD_ARCHIVE_ZIP}