From bc6e56dc6675fe52a37b9f8e342a7315fc70090b Mon Sep 17 00:00:00 2001 From: Krejzi Date: Wed, 1 Aug 2012 12:04:22 +0000 Subject: [PATCH] Removed TCP Wrappers. Inkscape 0.48.3.1 and VLC 2.0.3. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10486 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- {postlfs/security => archive}/tcpwrappers.xml | 0 general.ent | 12 +-- gnome/core/gdm.xml | 3 +- introduction/welcome/changelog.xml | 15 +++ multimedia/libdriv/esound.xml | 4 +- multimedia/videoutils/vlc.xml | 12 +-- networking/netprogs/nfs-utils.xml | 18 +--- networking/netprogs/rpcbind.xml | 12 --- postlfs/security/openssh.xml | 28 ++--- postlfs/security/security.xml | 1 - postlfs/security/stunnel.xml | 3 - pst/printing/cups.xml | 7 +- pst/printing/lprng.xml | 3 +- pst/scanning/sane.xml | 4 +- server/databases/mysql.xml | 5 +- server/mail/exim.xml | 3 +- server/mail/sendmail.xml | 1 - server/major/vsftpd.xml | 3 +- server/other/openldap.xml | 35 +++--- xsoft/other/inkscape.xml | 101 ++++++------------ 20 files changed, 94 insertions(+), 176 deletions(-) rename {postlfs/security => archive}/tcpwrappers.xml (100%) diff --git a/postlfs/security/tcpwrappers.xml b/archive/tcpwrappers.xml similarity index 100% rename from postlfs/security/tcpwrappers.xml rename to archive/tcpwrappers.xml diff --git a/general.ent b/general.ent index 6b7224f3be..9eca02adef 100644 --- a/general.ent +++ b/general.ent @@ -3,13 +3,13 @@ $LastChangedBy$ $Date$ --> - - + + - + @@ -175,11 +175,11 @@ $Date$ - @@ -1020,7 +1020,7 @@ $Date$ - + @@ -1113,7 +1113,7 @@ $Date$ - + + + July 31st, 2012 + + + [krejzi] - Inkscape 0.48.3.1. + + + [krejzi] - VLC 2.0.3. + + + [krejzi] - Removed TCP Wrappers. + + + + July 31st, 2012 diff --git a/multimedia/libdriv/esound.xml b/multimedia/libdriv/esound.xml index 63a8e92cc3..0eff086571 100644 --- a/multimedia/libdriv/esound.xml +++ b/multimedia/libdriv/esound.xml @@ -63,9 +63,7 @@ Optional - , - - , and + and (Required for building the html documentation) User Notes: diff --git a/multimedia/videoutils/vlc.xml b/multimedia/videoutils/vlc.xml index c63bf5e1d2..13dc778c01 100644 --- a/multimedia/videoutils/vlc.xml +++ b/multimedia/videoutils/vlc.xml @@ -5,13 +5,13 @@ %general-entities; + "http://download.videolan.org/pub/videolan/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz"> - - - - + "ftp://ftp.videolan.org/pub/videolan/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz"> + + + + ]> diff --git a/networking/netprogs/nfs-utils.xml b/networking/netprogs/nfs-utils.xml index e29a92466d..323a866324 100644 --- a/networking/netprogs/nfs-utils.xml +++ b/networking/netprogs/nfs-utils.xml @@ -70,11 +70,6 @@ (Runtime dependency) - Optional - - - - Optional for NFSv4 Support and @@ -182,7 +177,7 @@ make RPCSEC GSS (RPC Security). --without-tcp-wrappers: This option is - only needed if the optional is not installed. + needed because TCP Wrappers is not in BLFS. @@ -239,17 +234,6 @@ EOF - - tcpwrappers Configuration - - If you have installed and there - is a restrictive /etc/hosts.deny file, ensure you - have an entry in the /etc/hosts.allow file for access - from the rpcbind daemon. See the man page in section 5 for hosts_access for - details on creating appropriate rules. - - - diff --git a/networking/netprogs/rpcbind.xml b/networking/netprogs/rpcbind.xml index b39f6523e6..194a6f40dc 100644 --- a/networking/netprogs/rpcbind.xml +++ b/networking/netprogs/rpcbind.xml @@ -64,11 +64,6 @@ - Optional - - - - User Notes: @@ -112,13 +107,6 @@ make make install-rpcbind - - If you build rpcbind with - , be sure to allow it in - /etc/hosts.allow. For example: - -rpcbind: 127.0.0.1 - diff --git a/postlfs/security/openssh.xml b/postlfs/security/openssh.xml index fb6b8fdd45..c8f8020945 100644 --- a/postlfs/security/openssh.xml +++ b/postlfs/security/openssh.xml @@ -84,7 +84,6 @@ Optional , - , , , libedit @@ -95,7 +94,7 @@ Optional Runtime (Used only to gather entropy) - , + , and . @@ -123,17 +122,6 @@ groupadd -g 50 sshd && useradd -c 'sshd PrivSep' -d /var/lib/sshd -g sshd \ -s /bin/false -u 50 sshd - - OpenSSH is very sensitive to changes in the - linked OpenSSL libraries. If you recompile - OpenSSL, OpenSSH may - fail to start up. An alternative is to link against the static - OpenSSL library. To link against the static - library, execute the following command: - - -sed -i 's@-lcrypto@/usr/lib/libcrypto.a -ldl@' configure - Install OpenSSH by running the following commands: @@ -148,15 +136,11 @@ useradd -c 'sshd PrivSep' -d /var/lib/sshd -g sshd \ make - If you linked tcp_wrappers into the build using - the parameter, ensure you add - 127.0.0.1 to the sshd line in /etc/hosts.allow if you - have a restrictive /etc/hosts.deny file, or the test - suite will fail. Additionally, the testsuite requires an installed copy of - scp to complete the multiplexing tests. To run the test - suite, first copy the scp program to - /usr/bin, making sure that you back - up any existing copy first. + The testsuite requires an installed copy of scp to + complete the multiplexing tests. To run the test suite, first copy the + scp program to + /usr/bin, making sure that you + back up any existing copy first. diff --git a/postlfs/security/security.xml b/postlfs/security/security.xml index 355ca8e89d..3a3720f7a1 100644 --- a/postlfs/security/security.xml +++ b/postlfs/security/security.xml @@ -67,7 +67,6 @@ $Date$ - diff --git a/postlfs/security/stunnel.xml b/postlfs/security/stunnel.xml index 8112ce86a1..cfea3f7e96 100644 --- a/postlfs/security/stunnel.xml +++ b/postlfs/security/stunnel.xml @@ -75,9 +75,6 @@ Required - Optional - - User Notes: diff --git a/pst/printing/cups.xml b/pst/printing/cups.xml index 4e9c93afa6..7b4505f03c 100644 --- a/pst/printing/cups.xml +++ b/pst/printing/cups.xml @@ -68,8 +68,7 @@ Optional - - , + , , , @@ -80,11 +79,11 @@ , , , - , + , Xdg-utils, OpenSLP, libpaper, + url="http://packages.debian.org/source/sid/libpaper">libpaper, HTMLDOC, and Valgrind (optionally used if running the test suites) diff --git a/pst/printing/lprng.xml b/pst/printing/lprng.xml index cfb6a94ac0..ae2169e273 100644 --- a/pst/printing/lprng.xml +++ b/pst/printing/lprng.xml @@ -67,8 +67,7 @@ Optional , - , - , and + and krb4 User Notes: diff --git a/pst/scanning/sane.xml b/pst/scanning/sane.xml index 952207e8c4..6a54c58139 100644 --- a/pst/scanning/sane.xml +++ b/pst/scanning/sane.xml @@ -277,8 +277,8 @@ install -v -m644 doc/sane.png xscanimage-icon-48x48-2.png \ Configuration and setup of the 'saned' daemon The saned daemon is not meant to be used for - untrusted clients. You should provide - and/or protection to ensure only trusted + untrusted clients. You should provide + protection to ensure only trusted clients access the daemon. Due to the complex security requirements to ensure only trusted clients access the daemon, BLFS does not provide instructions to configure the saned daemon. If you diff --git a/server/databases/mysql.xml b/server/databases/mysql.xml index 6b371c36aa..53fde1f18c 100644 --- a/server/databases/mysql.xml +++ b/server/databases/mysql.xml @@ -88,8 +88,9 @@ Optional - and - libaio + + libaio + User Notes: diff --git a/server/mail/exim.xml b/server/mail/exim.xml index 30b4a15df0..647f407ecd 100644 --- a/server/mail/exim.xml +++ b/server/mail/exim.xml @@ -90,8 +90,7 @@ , , , - , - , and + and diff --git a/server/mail/sendmail.xml b/server/mail/sendmail.xml index 81aec12fad..00723be9bc 100644 --- a/server/mail/sendmail.xml +++ b/server/mail/sendmail.xml @@ -66,7 +66,6 @@ Optional , - , , , nph, and diff --git a/server/major/vsftpd.xml b/server/major/vsftpd.xml index 1c3018686e..a00b9b4be1 100644 --- a/server/major/vsftpd.xml +++ b/server/major/vsftpd.xml @@ -62,8 +62,7 @@ Optional , - , - , and + and diff --git a/server/other/openldap.xml b/server/other/openldap.xml index f05ba3e80e..256d99b477 100644 --- a/server/other/openldap.xml +++ b/server/other/openldap.xml @@ -107,14 +107,13 @@ or , OpenSLP, - , - and + and User Notes: - - + + @@ -177,11 +176,7 @@ make depend && make - To test the results, issue: make test. If you've - enabled tcp_wrappers, ensure you add 127.0.0.1 - to the slapd line in the - /etc/hosts.allow file if you have a restrictive - /etc/hosts.deny file. + To test the results, issue: make test. @@ -265,12 +260,6 @@ cp -v -R doc/guide/* \ SLPv2 support. Use this switch if you have installed OpenSLP. - - - : This parameter enables - TCP Wrappers support. Use this switch if you have installed - . - @@ -288,10 +277,12 @@ cp -v -R doc/guide/* \ Config Files - /etc/openldap/* + + /etc/openldap/* + - /etc/openldap/* + /etc/openldap/* @@ -318,10 +309,12 @@ cp -v -R doc/guide/* \ sortas="e-etc-openldap-ldap.conf">/etc/openldap/ldap.conf - Resources to assist you with topics such as choosing a directory - configuration, backend and database definitions, access control settings, - running as a user other than root - and setting a chroot environment include: + + Resources to assist you with topics such as choosing a directory + configuration, backend and database definitions, access control settings, + running as a user other than root + and setting a chroot environment include: + diff --git a/xsoft/other/inkscape.xml b/xsoft/other/inkscape.xml index 231a65623e..789ae4c17c 100644 --- a/xsoft/other/inkscape.xml +++ b/xsoft/other/inkscape.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> @@ -23,7 +23,7 @@ Inkscape-&inkscape-version; - Inkscape + Inkscape @@ -74,10 +74,6 @@ Additional Downloads - - Required patch: - - Optional patch: @@ -89,24 +85,26 @@ Required - , - , - , , - and - . + , + and + + + + Recommended + + Optional - , - , + , + , , , - , - , - and - Libwpg. + libwpg, + and + @@ -122,54 +120,23 @@ compiling with Poppler 0.20: -patch -p1 < ../inkscape-&inkscape-version;-poppler-0.20-1.patch +patch -Np1 -i ../inkscape-&inkscape-version;-poppler-0.20-1.patch - Fix a bug that would otherwise prevent compiling with - Libpng 1.5: + Fix a bug that will prevent from compiling with + libpng 1.5: sed -i 's/ptr->jmpbuf/jmpbuf(png_ptr)/' \ - src/{extension/internal/pdfinput/svg-builder,helper/png-write}.cpp - - - Fix a bug that would otherwise prevent compiling with - Libpng 1.5.7 or greater: - - -sed -i 's#if ( png_get_iCCP.*#if (0) {#' src/sp-image.cpp - - - If you have not installed fix - a bug that will otherwise break the build: - - -sed -i '/<io\/sys.h>/d - /preferences.h/a#include "io/sys.h"' src/color-profile.cpp - - - Fix a bug that would otherwise prevent compiling with - Gcc 4.7: - - -patch -p1 < ../inkscape-&inkscape-version;_gcc-4.7-1.patch - - - Fix many bugs that would otherwise prevent compiling with - Glib 2.32 or greater: - - -for thing in array convert dir error fileutils hash list macros main mem \ - messages quark slist strfuncs string types urifuncs utils -do sed -i "/^#include /s#/g${thing}##" $(grep -rl "include .glib/g${thing}" .) -done + src/{extension/internal/pdfinput/svg-builder,helper/png-write}.cpp && +sed -i 's#if ( png_get_iCCP.*#if (0) {#' src/sp-image.cpp Install Inkscape by running the following commands: -./configure --prefix=/usr --disable-lcms && +./configure --prefix=/usr && make @@ -181,16 +148,7 @@ make make install - - - Command Explanations - - - : This is required if you've not installed - . If you have installed - Lcms remove this option. - @@ -201,8 +159,12 @@ make Installed Directory - inkscape and inkview. - /usr/share/inkscape. + + inkscape and inkview + + + /usr/share/inkscape + @@ -234,6 +196,9 @@ make + + +