From a499ee54f561336f069a7f664a11c4970c9248bc Mon Sep 17 00:00:00 2001 From: gobo72 Date: Mon, 10 Sep 2012 04:36:00 +0000 Subject: [PATCH] =?utf8?q?Mise=20=C3=A0=20jour=20stage3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- config/dependencies | 1 + config/packages-list | 121 ++++++++++++------------ functions/fpkg | 2 +- stage3/bootscripts/{portmap => rpcbind} | 4 +- stage3/hv-install-1 | 15 +-- stage3/packages-update | 43 +++++---- stage3/pkg/Linux-PAM | 11 +-- stage3/pkg/alsa-lib | 7 -- stage3/pkg/bind | 58 +++++------- stage3/pkg/libtirpc | 20 ++++ stage3/pkg/nfs-utils | 2 +- stage3/pkg/openssl | 2 +- stage3/pkg/portmap | 7 -- stage3/pkg/rpcbind | 9 ++ stage3/pkg/subversion | 11 +++ stage3/pkg/usbutils | 10 -- stage3/pkg/xvidcore | 2 +- 17 files changed, 171 insertions(+), 154 deletions(-) rename stage3/bootscripts/{portmap => rpcbind} (96%) delete mode 100644 stage3/pkg/alsa-lib create mode 100644 stage3/pkg/libtirpc delete mode 100644 stage3/pkg/portmap create mode 100644 stage3/pkg/rpcbind diff --git a/config/dependencies b/config/dependencies index a3bca56..fc00573 100644 --- a/config/dependencies +++ b/config/dependencies @@ -48,6 +48,7 @@ ${LIBTIFF}: ${XORG} ${GIFLIB}: ${XORG} ${LCMS}: ${LIBTIFF} ${LIBJPEG} ${PYTHON} +# LIBMNG doest not work with lcms2 ${LIBMNG}: ${LCMS} ${LIBJPEG} ${FONTCONFIG}: ${FREETYPE} ${EXPAT} diff --git a/config/packages-list b/config/packages-list index 53b7027..28aedd4 100644 --- a/config/packages-list +++ b/config/packages-list @@ -7,25 +7,25 @@ ABIWORD="abiword-2.8.6" ACK="ack-1.94" ACPID="acpid-2.0.9" AGG="agg-2.5" -ALSA_LIB="alsa-lib-1.0.24.1" -ALSA_PLUGINS="alsa-plugins-1.0.24" -ALSA_UTILS="alsa-utils-1.0.24.2" -APR="apr-1.4.5" +ALSA_LIB="alsa-lib-1.0.25" +ALSA_PLUGINS="alsa-plugins-1.0.25" +ALSA_UTILS="alsa-utils-1.0.25" +APR="apr-1.4.6" APR_UTIL="apr-util-1.4.1" AVR_GDB="gdb-6.4" AVRDUDE="avrdude-5.1" ATK="atk-2.4.0" ATKMM="atkmm-2.22.6" -AUDIOFILE="audiofile-0.3.2" +AUDIOFILE="audiofile-0.3.4" AUTOCONF="autoconf-2.69" AUTOMAKE="automake-1.12.2" BABL="babl-0.1.6" BASH="bash-4.2" -BC="bc-1.06" +BC="bc-1.06.95" BDWGC="bdwgc-7_2alpha5-20110107" BISON="bison-2.5" -BIND="bind-9.8.1-P1" +BIND="bind-9.9.1-P2" BINUTILS="binutils-2.22" ARM_BINUTILS=${BINUTILS} AVR_BINUTILS=${BINUTILS} @@ -41,12 +41,12 @@ CKERMIT="ckermit-8.0.211" CHORDPACK="chordpack-0.8.2" CLAMAV="clamav-0.93.3" CLOOG="cloog-0.16.3" -COLORDIFF="colordiff-1.0.9" +COLORDIFF="colordiff-1.0.10" COREUTILS="coreutils-8.16" CPIO="cpio-2.11" CUPS="cups-1.4.8" CUPS_PDF="cups-pdf-2.5.1" -CURL="curl-7.23.1" +CURL="curl-7.27.0" CVS="cvs-1.11.23" DBUS="dbus-1.4.16" @@ -76,23 +76,23 @@ UCLIBC="uClibc-0.9.30.1" EMACS="emacs-24.1" ESOUND="esound-0.2.37" EVINCE="evince-2.32.0" -EXPAT="expat-2.0.1" +EXPAT="expat-2.1.0" FCRON="fcron-3.0.6" FETCHMAIL="fetchmail-6.3.12" FFMPEG="ffmpeg-0.10.2" -FFTW="fftw-3.3" +FFTW="fftw-3.3.2" FIREFOX="firefox-12.0" FILE_PKG="file-5.11" FINDUTILS="findutils-4.4.2" FIRMWARE_B43_LPPHY="broadcom-wl-4.178.10.4" FLAC="flac-1.2.1" FLEX="flex-2.5.35" -FONTCONFIG="fontconfig-2.8.0" +FONTCONFIG="fontconfig-2.10.1" FONTFORGE="fontforge_full-20110222" -FREETYPE="freetype-2.4.8" -FRIBIDI="fribidi-0.10.9" -FUSE="fuse-2.8.6" +FREETYPE="freetype-2.4.10" +FRIBIDI="fribidi-0.19.2" +FUSE="fuse-2.9.1" B43_FWCUTTER="b43-fwcutter-013" GAWK="gawk-4.0.1" @@ -116,7 +116,7 @@ GHOSTSCRIPT_FONTS_STD="ghostscript-fonts-std-8.11" GHOSTSCRIPT_FONTS_OTHER="ghostscript-fonts-other-6.0" GIFLIB="giflib-4.1.6" GIMP="gimp-2.6.12" -GIT="git-1.7.11.4" +GIT="git-1.7.12" GLIB="glib-2.32.1" GLIBMM="glibmm-2.32.0" GLITZ="glitz-0.5.6" @@ -126,8 +126,8 @@ GNOME_KEYRING="gnome-keyring-2.32.1" GNOME_ICON_THEME="gnome-icon-theme-2.30.3" GNOME_MEDIA="gnome-media-2.32.0" GNUMERIC="gnumeric-1.10.17" -GNUPG="gnupg-1.4.11" -GNUTLS="gnutls-3.0.7" +GNUPG="gnupg-1.4.12" +GNUTLS="gnutls-3.0.22" GOBJECT_INSTROSPECTION="gobject-introspection-1.32.1" GOFFICE="goffice-0.8.17" GPERF="gperf-3.0.4" @@ -145,7 +145,7 @@ GST_FFMPEG="gst-ffmpeg-0.10.13" GTK="gtk+-2.24.10" GTK_ENGINES="gtk-engines-2.20.2" GTKMM="gtkmm-2.24.2" -GUILE="guile-2.0.5" +GUILE="guile-2.0.6" GUITARTEX="guitartex-hv-r119" GUTENPRINT="gutenprint-5.2.5" GVFS="gvfs-1.12.3" @@ -163,22 +163,23 @@ IMLIB2="imlib-1.4.2" INDENT="indent-2.2.10" INETUTILS="inetutils-1.9.1" INKSCAPE="inkscape-0.48.3.1" -INTLTOOL="intltool-0.50.0" +INTLTOOL="intltool-0.50.2" IPROUTE2="iproute2-3.3.0" -IPTABLES="iptables-1.4.14" +IPTABLES="iptables-1.4.15" ISO_CODES="iso-codes-3.23" JACK="jack-audio-connection-kit-0.121.3" JASPER="jasper-1.900.1" KBD="kbd-1.15.3" -KERBEROS5="krb5-1.10" +KERBEROS5="krb5-1.10.3" KERNEL="linux-3.4.7" KVM="kvm-84" LADSPA="ladspa_sdk" -LAME="lame-3.99.3" +LAME="lame-3.99.5" LCMS="lcms-1.19" +LCMS2="lcms2-2.3" LESS="less-444" LESSTIF="lesstif-0.95.2" LFS_BOOTSCRIPTS="lfs-bootscripts-20070813" @@ -188,7 +189,7 @@ BOOST="boost_1_45_0" LIBCROCO="libcroco-0.6.2" LIBDVDCSS="libdvdcss-1.2.11" LIBDVDREAD="libdvdread-4.2.0" -LIBEXIF="libexif-0.6.19" +LIBEXIF="libexif-0.6.21" LIBEVENT="libevent-2.0.12-stable" LIBFAAD2="faad2-2.7" LIBFAAC="faac-1.28" @@ -200,14 +201,14 @@ LIBGLADE="libglade-2.6.4" LIBGPG_ERROR="libgpg-error-1.10" LIBGSF="libgsf-1.14.19" LIBID3TAG="libid3tag-0.15.1b" -LIBJPEG="libjpeg-8c" +LIBJPEG="libjpeg-8d" LIBMAD="libmad-0.15.1b" LIBMNG="libmng-1.0.10" LIBNOTIFY="libnotify-0.4.4" LIBOGG="libogg-1.3.0" LIBOIL="liboil-0.3.17" -LIBOPENJPEG="openjpeg_v1_4_sources_r697" -LIBPCAP="libpcap-1.1.1" +LIBOPENJPEG="openjpeg-1.5.0" +LIBPCAP="libpcap-1.3.0" LIBPIPELINE="libpipeline-1.2.1" LIBPNG="libpng-1.5.12" LIBPTHREAD_STUBS="libpthread-stubs-0.3" @@ -217,24 +218,26 @@ LIBSIGCPP="libsigc++-2.2.10" LIBSNDFILE="libsndfile-1.0.25" LIBSPF2="libspf2-1.2.5" LIBSPECTRE="libspectre-0.2.6" -LIBTASN1="libtasn1-2.10" +LIBTASN1="libtasn1-2.13" LIBTHEORA="libtheora-1.1.1" +LIBTIRPC="libtirpc-0.2.2" +RPCNIS_HEADERS="rpcnis-headers" LIBTOOL="libtool-2.4.2" -LIBVORBIS="libvorbis-1.3.2" -VORBIS_TOOLS="vorbis-tools-1.2.0" +LIBVORBIS="libvorbis-1.3.3" +VORBIS_TOOLS="vorbis-tools-1.4.0" LIBVPX="libvpx-v1.0.0" LIBUNISTRING="libunistring-0.9.3" -LIBUSB="libusb-1.0.8" -LIBUSB_COMPAT="libusb-compat-0.1.3" +LIBUSB="libusb-1.0.9" +LIBUSB_COMPAT="libusb-compat-0.1.4" LIBWNCK="libwnck-2.30.6" LIBXKLAVIER="libxklavier-5.0" -LIBXML2="libxml2-2.7.8" +LIBXML2="libxml2-2.8.0" LIBXSLT="libxslt-1.1.26" LILYPOND="lilypond-2.14.2" LLVM="llvm-3.1" LTSP_UTILS="ltsp-utils-0.25-0" LUA="lua-5.1.4" -LYNX="lynx2.8.7rel.2" +LYNX="lynx2.8.8dev.10" MAKE_PACKAGE="make-3.82" MAN_DB="man-db-2.6.2" @@ -248,34 +251,34 @@ MPC="mpc-0.9" MPFR="mpfr-3.1.0" MSMTP="msmtp-1.4.29" MUTT="mutt-1.5.21" -MYSQL="mysql-5.5.17" +MYSQL="mysql-5.5.27" NANO="nano-2.2.6" -NASM="nasm-2.09.10" +NASM="nasm-2.10.04" NCURSES="ncurses-5.9" NEON="neon-0.29.6" -NETTLE="nettle-2.4" +NETTLE="nettle-2.5" NEWLIB="newlib-1.16.0" NFS_UTILS="nfs-utils-1.2.5" -NMAP="nmap-5.51" +NMAP="nmap-6.01" OPENJADE="openjade-1.3.2" OPENLDAP="openldap-2.4.23" OPENSP="OpenSP-1.5.2" -OPENSSH="openssh-5.9p1" -OPENSSL="openssl-1.0.0e" +OPENSSH="openssh-6.0p1" +OPENSSL="openssl-1.0.1c" OPENSSL_ROOT_CERTS="BLFS-ca-bundle-3.12.8.0" PAM="Linux-PAM-1.1.5" PANGO="pango-1.30.0" PANGOMM="pangomm-2.28.4" -PARTED="parted-3.0" +PARTED="parted-3.1" PATCH_PACKAGE="patch-2.6.1" -PCIUTILS="pciutils-3.1.8" +PCIUTILS="pciutils-3.1.10" MENU_CACHE="menu-cache-0.3.2" LIBFM="libfm-0.1.16" PCMANFM="pcmanfm-0.9.10" -PCRE="pcre-8.12" +PCRE="pcre-8.31" PERL="perl-5.14.2" PERL_MOD_PDL="PDL-2.4.9" PERL_MOD_PARSE_REDESCENT="Parse-RecDescent-1.965001" @@ -310,16 +313,18 @@ QT="qt-everywhere-opensource-src-4.7.1" RALENTI="ralenti-0.1" READLINE="readline-6.2" REISERFSPROGS="reiserfsprogs-3.6.21" +RPCBIND="rpcbind-0.2.0" RSYNC="rsync-3.0.9" RUBBERBAND="rubberband-1.7.0" SAMBA="samba-3.0.21c" SANE_BACKENDS="sane-backends-1.0.22" XSANE="xsane-0.998" -SASL2="cyrus-sasl-2.1.23" +SASL2="cyrus-sasl-2.1.25" +SCREEN="screen-4.0.3" SDL="SDL-1.2.14" SED="sed-4.2.1" -SENDMAIL="sendmail-8.14.4" +SENDMAIL="sendmail-8.14.5" SENDMAIL_GID="bin" SGML_COMMON="sgml-common-0.6.3" SGML_DTD3_VER="3.1" @@ -333,13 +338,13 @@ SPAMASSASSIN="Mail-SpamAssassin-3.3.1" SPEEX="speex-1.2rc1" SPLINT="splint-3.1.1" SPLIX="splix-2.0.0" -SQLITE="sqlite-autoconf-3071100" +SQLITE="sqlite-autoconf-3071300" SQUIRRELMAIL="squirrelmail-1.5.1" STARTUP_NOTIFICATION="startup-notification-0.9" -STRACE="strace-4.6" -SUBVERSION="subversion-1.7.5" +STRACE="strace-4.7" +SUBVERSION="subversion-1.7.6" SYLPHEED="sylpheed-3.2.0" -SUDO="sudo-1.8.2" +SUDO="sudo-1.8.5p3" SYSKLOGD="sysklogd-1.5" SYSVINIT="sysvinit-2.88dsf" @@ -348,23 +353,23 @@ TALLOC="talloc-2.0.7" TANGO_ICON_THEME="tango-icon-theme-0.8.90" TANGO_ICON_THEME_EXTRAS="tango-icon-theme-extras-0.1.0" TAR_PACKAGE="tar-1.26" -TCPDUMP="tcpdump-4.2.1" -TCL="tcl8.5.10-src" +TCPDUMP="tcpdump-4.3.0" +TCL="tcl8.5.12-src" TCPWRAPPERS="tcp_wrappers_7.6" TEXLIVE="texlive-20100722-source" TEXLIVE_TEXMF="texlive-20100722-texmf" TEXINFO="texinfo-4.13a" TFTP_HPA="tftp-hpa-0.49" -TIFF="tiff-4.0.0" +TIFF="tiff-4.0.2" TK="tk8.5.9-src" TRANSMISSION="transmission-2.33" UDEV="udev-182" UML_UTILITIES="uml_utilities_20070815" -UNRAR="unrar-3.9.10" +UNRAR="unrar-4.2.4" UNZIP="unzip-6.0" UPSTART="upstart-0.6.3" -USBUTILS="usbutils_005.orig" +USBUTILS="usbutils-006" UTIL_LINUX="util-linux-2.20.1" UW_IMAP="imap-2007e" @@ -373,7 +378,7 @@ VIEWNIOR="viewnior-1.1" VLC="vlc-2.0.3" VTE="vte-0.28.2" -WGET="wget-1.13.4" +WGET="wget-1.14" WHICH="which-2.20" WINDOWMAKER="WindowMaker-0.92.0" WINDOWMAKER_EXTRA="WindowMaker-extra-0.1" @@ -406,11 +411,11 @@ XCB_UTIL="xcb-util-0.3.9" LIBXCB="libxcb-1.8.1" XARCHIVER="xarchiver-0.5.2" -XINETD="xinetd-2.3.14" -XMLTO="xmlto-0.0.23" +XINETD="xinetd-2.3.15" +XMLTO="xmlto-0.0.25" XMLTOMAN="xmltoman-0.4" XTERM="xterm-276" -XVIDCORE="xvidcore-1.2.2" +XVIDCORE="xvidcore-1.3.2" XZ_UTILS="xz-5.0.3" YASM="yasm-1.1.0" diff --git a/functions/fpkg b/functions/fpkg index 296bad8..e142766 100644 --- a/functions/fpkg +++ b/functions/fpkg @@ -484,7 +484,7 @@ fpkg() fi if [ -z "${FILE_EXT}" ]; then # Default file extension is tar.gz - FILE_EXT="tar.gz" + FILE_EXT="tar.xz" fi ;; gnome) diff --git a/stage3/bootscripts/portmap b/stage3/bootscripts/rpcbind similarity index 96% rename from stage3/bootscripts/portmap rename to stage3/bootscripts/rpcbind index 86796d5..21800f8 100755 --- a/stage3/bootscripts/portmap +++ b/stage3/bootscripts/rpcbind @@ -1,6 +1,6 @@ #!/bin/sh -# portmap +# rpcbind # Needed by both the NFS server and client # Source functions library @@ -11,7 +11,7 @@ log_script_name "$0 $*" # Load global network parameters source /etc/sysconfig/network/network-parameters -DAEMON=/sbin/portmap +DAEMON=/sbin/rpcbind DAEMON_DESC="RPC port mapper" DAEMON_OPTS="" diff --git a/stage3/hv-install-1 b/stage3/hv-install-1 index eb8620f..8f0a3fa 100755 --- a/stage3/hv-install-1 +++ b/stage3/hv-install-1 @@ -9,13 +9,14 @@ init_log_file ipkg ${WHICH} ipkg -m acnb ${REISERFSPROGS} ipkg -m acnb ${POPT} +CFLAGS="${CFLAGS} -fPIC" ipkg -m acnb ${LIBTIRPC} ipkg ${PAM} ipkg -m noac ${OPENSSL} ipkg ${WGET} "--with-ssl=openssl" ipkg -m noac ${PCIUTILS} ipkg -m acnb ${LIBUSB} ipkg ${LIBUSB_COMPAT} -ipkg -s usbutils ${USBUTILS} +ipkg ${USBUTILS} "--disable-zlib --datadir=/usr/share/misc" ipkg -j ${FCRON} ipkg ${OPENSSH} ipkg -s lynx ${LYNX} @@ -37,12 +38,11 @@ ipkg ${PCRE} "--docdir=/usr/share/doc/pcre \ # Networking ipkg -m noac -s tcp_wrappers ${TCPWRAPPERS} -ipkg -m noac ${PORTMAP} -ipkg -m acnb ${NFS_UTILS} "\ +ipkg -m acnb ${RPCBIND} "--bindir=/sbin" +LIBS="-lpthread" ipkg -m acnb ${NFS_UTILS} "\ --disable-nfsv4 \ --disable-nfsv41 \ --sbindir=/sbin \ - --disable-tirpc \ --disable-gss" ipkg ${XINETD} if [ "x${USE_DYNAMIC_DNS}" = "xyes" ]; then @@ -70,6 +70,8 @@ ipkg -m noac ${UNZIP} ipkg -m noac ${UNRAR} ipkg ${CPIO} +ipkg ${SCREEN} + ipkg ${PARTED} "--disable-device-mapper" ipkg ${BC} "--with-readline" INIT_D_PATH=/etc/rc.d/init.d \ @@ -94,7 +96,7 @@ ipkg -m acnb ${SGML_COMMON} ipkg -m noac -s sgml-dtd3 ${SGML_DTD3} ipkg -m noac -s sgml-dtd4 ${SGML_DTD4} ipkg ${OPENSP} -ipkg -m acnb ${OPENJADE} +ipkg -m acnb ${OPENJADE} "--enable-splibdir=/usr/lib" ipkg -m noac ${DOCBOOK_DSSSL} ipkg -m noac ${SGML_SPM} ipkg ${DOCBOOK_UTILS} @@ -109,6 +111,7 @@ ipkg ${XMLTO} ipkg ${LIBPNG} ipkg ${TIFF} ipkg -m acnb ${LCMS} +ipkg ${LCMS2} ipkg ${LIBJPEG} "--enable-static --enable-shared" ipkg -m acnb ${LIBOPENJPEG} ipkg ${LIBART} @@ -133,7 +136,7 @@ ipkg ${GUILE} \ --enable-regex ipkg ${LIBGPG_ERROR} ipkg ${LIBGCRYPT} -ipkg ${NETTLE} +ipkg ${NETTLE} "--libdir=/usr/lib" ipkg -m acnb ${GNUTLS} # Mail diff --git a/stage3/packages-update b/stage3/packages-update index 9ba68ba..024dc97 100755 --- a/stage3/packages-update +++ b/stage3/packages-update @@ -13,15 +13,17 @@ fpkg -m gnu ${WHICH} fpkg -s "software/utils/pciutils" ${PCIUTILS} ${KERNEL_URL} fpkg -m sf -e "tar.bz2" ${LIBUSB} fpkg -m sf -e "tar.bz2" -s "libusb" ${LIBUSB_COMPAT} -fpkg ${USBUTILS} "http://ftp.de.debian.org/debian/pool/main/u/usbutils" -fpkg -s "linux/utils/fs/reiserfs" ${REISERFSPROGS} ${KERNEL_URL} +fpkg -e "tar.xz" -s "linux/utils/usb/usbutils" ${USBUTILS} ${KERNEL_URL} +fpkg ${REISERFSPROGS} "ftp://anduin.linuxfromscratch.org/BLFS/svn/r" fpkg -e "tar.gz" ${POPT} "http://rpm5.org/files/popt" -fpkg -s "linux/libs/pam/library" ${PAM} ${KERNEL_URL} +fpkg -m sf ${LIBTIRPC} +fpkg ${RPCNIS_HEADERS} "http://anduin.linuxfromscratch.org/other" +fpkg ${PAM} "https://fedorahosted.org/releases/l/i/linux-pam" fpkg -e "tar.gz" -f "${FCRON}.src" ${FCRON} "http://fcron.free.fr/archives" fpkg -e "tar.gz" ${OPENSSL} "ftp://ftp.openssl.org/source" fpkg ${OPENSSL_ROOT_CERTS} "http://anduin.linuxfromscratch.org/files/BLFS" fpkg -e "tar.gz" ${OPENSSH} "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable" -fpkg ${LYNX} "http://lynx.isc.org/current" +fpkg ${LYNX} "ftp://lynx.isc.org/current" fpkg -m sf ${EXPAT} fpkg -m apa ${APR} fpkg -m apa -s apr ${APR_UTIL} @@ -30,20 +32,20 @@ fpkg -m sf -s "tcl" ${TCL} fpkg -e "tar.gz" ${SQLITE} "http://www.sqlite.org" fpkg ${SUBVERSION} "http://mirror.csclub.uwaterloo.ca/apache/subversion" fpkg -e "tar.gz" ${SUDO} "http://www.sudo.ws/sudo/dist" -fpkg -m sf -e "tar.bz2" ${STRACE} +fpkg -m sf -e "tar.xz" ${STRACE} fpkg -m sf ${PCRE} fpkg -m gnu ${WGET} fpkg -e "tar.gz" ${TCPWRAPPERS} "ftp://ftp.porcupine.org/pub/security" -fpkg -e "tar.gz" ${PORTMAP} "http://neil.brown.name/portmap" -fpkg -s "linux/utils/nfs" ${NFS_UTILS} ${KERNEL_URL} +fpkg -m sf ${RPCBIND} +fpkg -m sf -s "nfs" ${NFS_UTILS} fpkg -e "tar.gz" ${XINETD} "http://www.xinetd.org" fpkg -m sf ${DDCLIENT} fpkg -e "tar.gz" ${LIBPCAP} ${TCPDUMP_URL} fpkg -e "tar.gz" ${TCPDUMP} ${TCPDUMP_URL} fpkg ${NMAP} "http://download.insecure.org/nmap/dist" fpkg -e "tar.gz" -s "$(get_pkg_ver ${BIND})" ${BIND} \ - "http://gd.tuwien.ac.at/infosys/servers/isc/bind9" + "ftp://ftp.isc.org/isc/bind9" fpkg ${IPTABLES} "http://www.netfilter.org/projects/iptables/files" fpkg ${CURL} "http://curl.haxx.se/download" fpkg -e "tar.gz" ${RSYNC} "http://samba.org/ftp/rsync/src" @@ -57,11 +59,13 @@ fpkg -f "unzip$(get_pkg_ver ${UNZIP} | sed 's!\.!!g')" -s "infozip" \ fpkg -f "unrarsrc-$(get_pkg_ver ${UNRAR})" -e "tar.gz" ${UNRAR} \ "http://www.rarlab.com/rar" fpkg -m gnu ${CPIO} +fpkg -m gnu ${SCREEN} fpkg -m gnu ${PARTED} -fpkg -m gnu ${BC} +fpkg -e "tar.bz2" ${BC} "http://alpha.gnu.org/gnu/bc" fpkg -m sf ${FUSE} -fpkg ${DOSFSTOOLS} "http://www.daniel-baumann.ch/software/dosfstools" +fpkg -e "tar.gz" ${DOSFSTOOLS} "http://fossies.org/linux/misc" + fpkg -e "tar.gz" ${GIT} "http://git-core.googlecode.com/files" fpkg -e "tar.gz" "git-manpages-$(get_pkg_ver ${GIT})" \ "http://git-core.googlecode.com/files" @@ -73,7 +77,7 @@ fpkg -m pm -s "C/CH/CHORNY" ${PERL_MOD_XML_PARSER} # Utilities fpkg -m hv ${ACK} -fpkg -m hv -e "tar.gz" ${COLORDIFF} +fpkg -e "tar.gz" ${COLORDIFF} "http://colordiff.sourceforge.net" fpkg -e "tar.gz" ${INTLTOOL} "http://launchpad.net/intltool/trunk/$(get_pkg_ver ${INTLTOOL})/+download" @@ -86,7 +90,8 @@ fpkg -m sf ${OPENJADE} fpkg -m hv ${SGML_SPM} fpkg -m sf -s "docbook" ${DOCBOOK_DSSSL} fpkg -e "tar.gz" ${DOCBOOK_UTILS} \ - "http://sources-redhat.mirrors.redwire.net/docbook-tools/new-trials/SOURCES" + "http://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES" +## "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES" fpkg -e "tar.gz" ${LIBXML2} "http://xmlsoft.org/sources" fpkg -e "tar.gz" ${LIBXSLT} "http://xmlsoft.org/sources" fpkg -m hv ${DOCBOOK_XML} @@ -96,7 +101,7 @@ fpkg ${XMLTO} "https://fedorahosted.org/releases/x/m/xmlto" fpkg -f "jpegsrc.v$(get_pkg_ver ${LIBJPEG})" -e "tar.gz" ${LIBJPEG} \ "http://www.ijg.org/files" -fpkg -e "tgz" ${LIBOPENJPEG} "http://openjpeg.googlecode.com/files" +fpkg -e "tar.gz" ${LIBOPENJPEG} "http://openjpeg.googlecode.com/files" fpkg -m sf ${LIBPNG} fpkg -m gnome ${LIBART} @@ -105,8 +110,8 @@ fpkg -e "tar.gz" ${FRIBIDI} "http://fribidi.org/download" fpkg -m fd -o "icon-theme" ${HICOLOR_ICON_THEME} fpkg -e "tar.gz" ${TIFF} "http://download.osgeo.org/libtiff" fpkg -m sf ${GIFLIB} -fpkg -m sf ${LCMS} - +fpkg -m sf -s "lcms" ${LCMS} +fpkg -m sf -s "lcms" ${LCMS2} fpkg -m sf ${LIBMNG} fpkg -m sf ${FREETYPE} @@ -123,7 +128,7 @@ fpkg -m gnu ${GUILE} fpkg -s "libgpg-error" ${LIBGPG_ERROR} ${GNUPG_URL} fpkg -s "libgcrypt" ${LIBGCRYPT} ${GNUPG_URL} fpkg -e "tar.gz" ${NETTLE} "http://www.lysator.liu.se/~nisse/archive" -fpkg -s "gnutls" ${GNUTLS} ${GNUPG_URL} +fpkg -e "tar.xz" -s "gnutls" ${GNUTLS} ${GNUPG_URL} fpkg -e "tar.gz" ${SASL2} "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail" fpkg -e "tgz" ${OPENLDAP} \ @@ -154,7 +159,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the fpkg -e "tgz" ${LADSPA} "http://www.ladspa.org/download" fpkg -e "tar.gz" ${LIBOGG} "http://downloads.xiph.org/releases/ogg" - fpkg ${LIBVORBIS} "http://downloads.xiph.org/releases/vorbis" + fpkg -e "tar.gz" ${LIBVORBIS} \ + "http://downloads.xiph.org/releases/vorbis" fpkg -m sf ${FLAC} fpkg -e "tar.gz" ${LIBSNDFILE} "http://www.mega-nerd.com/libsndfile/files" @@ -171,8 +177,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the fpkg ${XVIDCORE} "http://downloads.xvid.org/downloads" fpkg -e "tar.gz" ${AUDIOFILE} "http://www.68k.org/~michael/audiofile" - fpkg -e "tar.gz" -f "pa_stable_v19_20071207" ${PORTAUDIO} \ - "http://www.portaudio.com/archives" + fpkg -e "tgz" ${PORTAUDIO} "http://www.portaudio.com/archives" fpkg -e "tar.gz" ${VAMP} "http://code.soundsoftware.ac.uk/attachments/download/224" fpkg -e "tar.gz" ${FFTW} "http://www.fftw.org" diff --git a/stage3/pkg/Linux-PAM b/stage3/pkg/Linux-PAM index 9a9f766..94138e8 100644 --- a/stage3/pkg/Linux-PAM +++ b/stage3/pkg/Linux-PAM @@ -8,9 +8,9 @@ hvconfig_pre() ${CONFIGURE_OPTS} \ --libdir=/lib \ --sbindir=/lib/security \ - --enable-securedir=/lib/security \ + --docdir=/usr/share/doc/${PACKAGE} \ --enable-shared \ - --docdir=/usr/share/doc/${PACKAGE}" + --enable-read-both-confs" } hvbuild_post() @@ -29,13 +29,12 @@ hvbuild_post() done fi - mkdir -p /etc/pam.d + install -v -m755 -d /etc/pam.d cat > /etc/pam.d/other << EOF # /etc/pam.d/other - -auth required pam_unix.so nullok +auth required pam_unix.so nullok account required pam_unix.so session required pam_unix.so -password required pam_unix.so nullok +password required pam_unix.so nullok EOF } diff --git a/stage3/pkg/alsa-lib b/stage3/pkg/alsa-lib deleted file mode 100644 index 87332ba..0000000 --- a/stage3/pkg/alsa-lib +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -hvconfig_pre() -{ - CONFIGURE_OPTS=" \ - --enable-static" -} diff --git a/stage3/pkg/bind b/stage3/pkg/bind index bc22cfa..0b4db36 100644 --- a/stage3/pkg/bind +++ b/stage3/pkg/bind @@ -11,43 +11,49 @@ hvbuild_post() { # Enable the execute bit to prevent a warning when using ldd to check # library dependencies. - chmod 755 /usr/lib/lib{bind9,isc{,cc,cfg},lwres,dns}.so.*.?.? - - # Generation of a key for use in the named.conf and rdnc.conf files using - # the rndc-confgen command. If the option "-r /dev/random" is not specified, - # the source of randomness is the keyboard and the command will wait - # forever for keyboard input before continuing. - BINDKEY=$(rndc-confgen -b 512 -r /dev/random | grep -m 1 "secret" | cut -d '"' -f 2) + chmod -v 0755 /usr/lib/lib{bind9,isc{,cc,cfg},lwres,dns}.so.*.?.? cd /srv/named - mkdir -p dev etc/namedb/{pz,slave} var/run usr/lib + mkdir -p dev etc/namedb/{pz,slave} usr/lib/engines var/run/named rm -f /srv/named/dev/null mknod /srv/named/dev/null c 1 3 rm -f /srv/named/dev/random mknod /srv/named/dev/random c 1 8 chmod 666 /srv/named/dev/{null,random} - cp /etc/localtime /srv/named/etc + cp /etc/localtime etc + touch managed-keys.bind + + # Needed to solve bug: + # initializing DST: openssl failure + cp -a /usr/lib/engines/libgost.so usr/lib/engines + + # Generation of a key for use in the named.conf and rdnc.conf files using + # the rndc-confgen command. + # If the option "-r /dev/random" is specified, the source of randomness is + # the keyboard/mouse and the command will wait forever for input before + # continuing. + # A counterpart to /dev/random is /dev/urandom ("unlocked"/non-blocking + # random) which reuses the internal pool to produce more pseudo-random + # bits. This means that the call will not block, but the output may contain + # less entropy than the corresponding read from /dev/random. + rndc-confgen -b 512 -r /dev/urandom > /etc/rndc.conf # Creating the named.conf file from which named will read the location of # zone files, root name servers and secure DNS keys. - cat > /srv/named/etc/named.conf << "EOF" + sed '/conf/d;/^#/!d;s:^# ::' /etc/rndc.conf > /srv/named/etc/named.conf + cat >> /srv/named/etc/named.conf << "EOF" options { directory "/etc/namedb"; pid-file "/var/run/named.pid"; statistics-file "/var/run/named.stats"; }; -controls { - inet 127.0.0.1 allow { localhost; } keys { rndc_key; }; -}; -key "rndc_key" { - algorithm hmac-md5; - secret "_BIND_KEY_"; -}; + zone "." { type hint; file "root.hints"; }; + zone "0.0.127.in-addr.arpa" { type master; file "pz/127.0.0"; @@ -90,20 +96,6 @@ logging { }; }; EOF - sed -i -e "s!_BIND_KEY_!${BINDKEY}!g" /srv/named/etc/named.conf - - cat > /etc/rndc.conf << "EOF" -key rndc_key { -algorithm "hmac-md5"; - secret - "_BIND_KEY_"; - }; -options { - default-server localhost; - default-key rndc_key; -}; -EOF - sed -i -e "s!_BIND_KEY_!${BINDKEY}!g" /etc/rndc.conf cat > /srv/named/etc/namedb/pz/127.0.0 << "EOF" $TTL 3D @@ -146,10 +138,6 @@ L.ROOT-SERVERS.NET. 6D IN A 198.32.64.12 M.ROOT-SERVERS.NET. 6D IN A 202.12.27.33 EOF - # Needed to solve bug: - # initializing DST: openssl failure - cp -a /usr/lib/engines /srv/named/usr/lib - chown -R named.named /srv/named # Bootscript diff --git a/stage3/pkg/libtirpc b/stage3/pkg/libtirpc new file mode 100644 index 0000000..1bd59f5 --- /dev/null +++ b/stage3/pkg/libtirpc @@ -0,0 +1,20 @@ +#!/bin/bash + +hvconfig_pre() +{ + # Glibc-2.14 and later do not install NIS and RPC related headers by + # default. If needed, install them here: + if [ ! -r /usr/include/rpc/rpc.h ]; then + decompress_package ${RPCNIS_HEADERS} /usr/include + fi + + # Need autoreconf after applying patch + cd /tmp/${PACKAGE} + autoreconf +} + +hvbuild_post() +{ + mv -v /usr/lib/libtirpc.so.* /lib + ln -sfv ../../lib/libtirpc.so.1.0.10 /usr/lib/libtirpc.so +} diff --git a/stage3/pkg/nfs-utils b/stage3/pkg/nfs-utils index e1d6321..9fa78b8 100644 --- a/stage3/pkg/nfs-utils +++ b/stage3/pkg/nfs-utils @@ -5,7 +5,7 @@ hvbuild_post() cat > /etc/exports << "EOF" # NFS file systems export list # -# An entry in /etc/exports will typically look like this: +# An entry in /etc/exports will typically look like this: # directory machine1(option11,option12) machine2(option21,option22) #/root 192.168.0.0/24(rw,sync,no_root_squash) diff --git a/stage3/pkg/openssl b/stage3/pkg/openssl index 132dc4f..d8cbc8f 100644 --- a/stage3/pkg/openssl +++ b/stage3/pkg/openssl @@ -17,7 +17,7 @@ hvbuild() MAKEDEPPROG=gcc CC=gcc make # Install man pages in /usr/share/man instead of /etc/ssl/man - make MANDIR=/usr/share/man install + make MANDIR=/usr/share/man LIBDIR=lib install install -v -d -m755 /usr/share/doc/${PACKAGE} cp -v -r doc/{HOWTO,README,*.{txt,html,gif}} \ /usr/share/doc/${PACKAGE} diff --git a/stage3/pkg/portmap b/stage3/pkg/portmap deleted file mode 100644 index e09ed7b..0000000 --- a/stage3/pkg/portmap +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -hvbuild_post() -{ - install -v -m740 ${SCRDIR}/bootscripts/portmap /etc/rc.d/init.d - bootscript_add_rc3 portmap 10 75 -} diff --git a/stage3/pkg/rpcbind b/stage3/pkg/rpcbind new file mode 100644 index 0000000..71a0b02 --- /dev/null +++ b/stage3/pkg/rpcbind @@ -0,0 +1,9 @@ +#!/bin/bash + +hvbuild_post() +{ + sed -i -e 's/^sunrpc/rpcbind/' /etc/services + + install -v -m740 ${SCRDIR}/bootscripts/rpcbind /etc/rc.d/init.d + bootscript_add_rc3 rpcbind 10 75 +} diff --git a/stage3/pkg/subversion b/stage3/pkg/subversion index 822867f..6a1a135 100644 --- a/stage3/pkg/subversion +++ b/stage3/pkg/subversion @@ -8,6 +8,17 @@ hvconfig_pre() hv_useradd -c SvnServer -d /dev/null -g ${SVN_USER} -s /bin/false ${SVN_USER} } +hvbuild() +{ + ${HVMAKE} + + # Build perl bindings (needed by git-svn) + ${HVMAKE} swig-pl + + ${HVMAKE} install + ${HVMAKE} install-swig-pl +} + hvbuild_post() { # Creating repositories directory diff --git a/stage3/pkg/usbutils b/stage3/pkg/usbutils index 4793705..e98ab51 100644 --- a/stage3/pkg/usbutils +++ b/stage3/pkg/usbutils @@ -1,15 +1,5 @@ #!/bin/bash -hvconfig_pre() -{ - cd ${LFS_TMP}/${PACKAGE} - ./autogen.sh - make distclean - CONFIGURE_OPTS="\ - ${CONFIGURE_OPTS} \ - --disable-zlib" -} - hvbuild_post() { install -v -m644 ${SCRDIR}/misc/update-usbids /etc/fcron/fcron.d diff --git a/stage3/pkg/xvidcore b/stage3/pkg/xvidcore index 987d97c..9c54a40 100644 --- a/stage3/pkg/xvidcore +++ b/stage3/pkg/xvidcore @@ -9,7 +9,7 @@ hvconfig() hvbuild_post() { - chmod -v 755 /usr/lib/libxvidcore.so.4.2 + chmod -v 755 /usr/lib/libxvidcore.so.4.3 ln -v -sf libxvidcore.so.4.2 /usr/lib/libxvidcore.so.4 ln -v -sf libxvidcore.so.4 /usr/lib/libxvidcore.so } -- 2.20.1