I attached updates for nss and nspr as well as refreshed patches for
them. Also, I attached patch for wireless tools 29 upgrade. Someone
please review them and if possible, apply them.
I have been checking some instructions lately. For example, gstreamer
base plugins don't require liboil anymore. I believe gstreamer now uses
orc - oil runtime compiler for optimisations. I compiled gstreamer base
plugins without liboil and nothing was wrong. Since that package was
only dependency that liboil had, and it does not use it anymore I
suggest you remove it.
As I see gnome 3.2 has been successfully landed in the book. Now, I have
been compiling gnome 3.4 beta lately, and have done most of it. Good
news may be that there are not many new packages that will be required
to be added in the book if blfs decides to add gnome 3.4.
gnome-utils has been split to individual packages now and
gnome-settings-daemon has split libwacom into seperate package. Those
are only new packages that I noticed untill now. But, some of gnome 3.4
components rely on systemd (pam_systemd to be precise) for checking user
seats or whatever - stuff that consolekit did. Of course, consolekit can
be still choosen over systemd, but it looks broken without any desktop
manager. consolekit also requires using it's pam module for it to work
correctly in console mode (I never got that one, it still was broken to me).
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent (revision 9591)
+++ BOOK/general.ent (working copy)
@@ -208,7 +208,7 @@
<!ENTITY libtasn1-version "2.10">
<!ENTITY libunique-version "3.0.2">
<!ENTITY liboil-version "0.3.17">
-<!ENTITY nspr-version "4.8.9">
+<!ENTITY nspr-version "4.9">
<!ENTITY libffi-version "3.0.10">
<!ENTITY gobject-introspection-version "1.30.0">
<!ENTITY libgee-version "0.6.0">
Index: BOOK/general/genlib/nspr.xml
===================================================================
--- BOOK/general/genlib/nspr.xml (revision 9591)
+++ BOOK/general/genlib/nspr.xml (working copy)
@@ -6,9 +6,9 @@
<!ENTITY nspr-download-http "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz";>
<!ENTITY nspr-download-ftp "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz";>
- <!ENTITY nspr-md5sum "60770d45dc08c0f181b22cdfce5be3e8">
+ <!ENTITY nspr-md5sum "aa0c960b23a9d66a3c30c3e6ba80a99a">
<!ENTITY nspr-size "1.2 MB">
- <!ENTITY nspr-buildsize "21 MB">
+ <!ENTITY nspr-buildsize "15 MB">
<!ENTITY nspr-time "less than 0.1 SBU">
]>
diff -Naur nspr.orig/mozilla/nsprpub/config/config.mk nspr/mozilla/nsprpub/config/config.mk
--- nspr.orig/mozilla/nsprpub/config/config.mk 2011-10-13 16:00:06.000000000 +0200
+++ nspr/mozilla/nsprpub/config/config.mk 2012-02-26 21:08:22.581099923 +0100
@@ -183,6 +183,7 @@
RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include
RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin
RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib
+RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig
# autoconf.mk sets OBJ_SUFFIX to an error to avoid use before including
# this file
diff -Naur nspr.orig/mozilla/nsprpub/config/Makefile.in nspr/mozilla/nsprpub/config/Makefile.in
--- nspr.orig/mozilla/nsprpub/config/Makefile.in 2009-03-03 23:04:23.000000000 +0100
+++ nspr/mozilla/nsprpub/config/Makefile.in 2012-02-26 21:08:57.596831940 +0100
@@ -52,9 +52,10 @@
# autoconf.mk must be deleted last (from the top-level directory)
# because it is included by every makefile.
-DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config
+DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc
RELEASE_BINS = nspr-config
+RELEASE_PC = nspr.pc
include $(topsrcdir)/config/config.mk
diff -Naur nspr.orig/mozilla/nsprpub/config/nspr.pc.in nspr/mozilla/nsprpub/config/nspr.pc.in
--- nspr.orig/mozilla/nsprpub/config/nspr.pc.in 1970-01-01 01:00:00.000000000 +0100
+++ nspr/mozilla/nsprpub/config/nspr.pc.in 2012-02-26 21:09:18.895276581 +0100
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: NSPR
+Description: The Netscape Portable Runtime
+Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@
+Libs: -L${libdir} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -lpthread
+Cflags: -I${includedir}
+
diff -Naur nspr.orig/mozilla/nsprpub/config/rules.mk nspr/mozilla/nsprpub/config/rules.mk
--- nspr.orig/mozilla/nsprpub/config/rules.mk 2011-08-29 19:02:51.000000000 +0200
+++ nspr/mozilla/nsprpub/config/rules.mk 2012-02-26 21:11:07.934546111 +0100
@@ -207,7 +207,7 @@
rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE)
+$(LOOP_OVER_DIRS)
-install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS)
+install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC)
ifdef RELEASE_BINS
$(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir)
endif
@@ -217,6 +217,9 @@
ifdef RELEASE_LIBS
$(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
endif
+ifdef RELEASE_PC
+ $(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/
+endif
+$(LOOP_OVER_DIRS)
release:: export
@@ -268,6 +271,23 @@
fi
cp $(RELEASE_HEADERS) $(RELEASE_HEADERS_DEST)
endif
+ifdef RELEASE_PC
+ @echo "Copying pkg-config files to release directory"
+ @if test -z "$(BUILD_NUMBER)"; then \
+ echo "BUILD_NUMBER must be defined"; \
+ false; \
+ else \
+ true; \
+ fi
+ @if test ! -d $(RELEASE_PC_DEST); then \
+ rm -rf $(RELEASE_PC_DEST); \
+ $(NSINSTALL) -D $(RELEASE_PC_DEST);\
+ else \
+ true; \
+ fi
+ cp $(RELEASE_PC) $(RELEASE_PC_DEST)
+endif
+
+$(LOOP_OVER_DIRS)
alltags:
diff -Naur nspr.orig/mozilla/nsprpub/configure nspr/mozilla/nsprpub/configure
--- nspr.orig/mozilla/nsprpub/configure 2012-02-14 20:06:00.000000000 +0100
+++ nspr/mozilla/nsprpub/configure 2012-02-26 21:11:42.175256548 +0100
@@ -6694,6 +6694,7 @@
config/nsprincl.mk
config/nsprincl.sh
config/nspr-config
+ config/nspr.pc
lib/Makefile
lib/ds/Makefile
lib/libc/Makefile
diff -Naur nspr.orig/mozilla/nsprpub/configure.in nspr/mozilla/nsprpub/configure.in
--- nspr.orig/mozilla/nsprpub/configure.in 2012-02-14 20:06:00.000000000 +0100
+++ nspr/mozilla/nsprpub/configure.in 2012-02-26 21:11:58.948604196 +0100
@@ -3357,6 +3357,7 @@
config/nsprincl.mk
config/nsprincl.sh
config/nspr-config
+ config/nspr.pc
lib/Makefile
lib/ds/Makefile
lib/libc/Makefile
Index: BOOK/postlfs/security/nss.xml
===================================================================
--- BOOK/postlfs/security/nss.xml (revision 9591)
+++ BOOK/postlfs/security/nss.xml (working copy)
@@ -4,12 +4,12 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY nss-download-http "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_1_RTM/src/nss-&nss-version;.tar.gz";>
- <!ENTITY nss-download-ftp "ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_1_RTM/src/nss-&nss-version;.tar.gz";>
- <!ENTITY nss-md5sum "c500f96d33ba1390c8a35c667e05e542">
- <!ENTITY nss-size "5.7 MB">
- <!ENTITY nss-buildsize "44 MB (more than double this to run the test suite)">
- <!ENTITY nss-time "0.7 SBU (at least an additional 3.5 SBU to run the test suite)">
+ <!ENTITY nss-download-http "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_3_RTM/src/nss-&nss-version;.tar.gz";>
+ <!ENTITY nss-download-ftp "ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_3_RTM/src/nss-&nss-version;.tar.gz";>
+ <!ENTITY nss-md5sum "006cb82fa900e9e664b4b14a9b7810ca">
+ <!ENTITY nss-size "5.8 MB">
+ <!ENTITY nss-buildsize "70 MB (more than double this to run the test suite)">
+ <!ENTITY nss-time "1.0 SBU (at least an additional 3.5 SBU to run the test suite)">
]>
<sect1 id="nss" xreflabel="NSS-&nss-version;">
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent (revision 9591)
+++ BOOK/general.ent (working copy)
@@ -121,7 +121,7 @@
<!ENTITY liboauth-version "0.9.4">
<!ENTITY mitkrb-version "1.6">
<!ENTITY nettle-version "2.4">
-<!ENTITY nss-version "3.13.1">
+<!ENTITY nss-version "3.13.3">
<!ENTITY openssh-version "5.9p1">
<!ENTITY openssl-version "1.0.0g">
<!-- version no longer used, we take whatever mozilla is offering
diff -Naur nss.orig/mozilla/security/nss/config/Makefile nss/mozilla/security/nss/config/Makefile
--- nss.orig/mozilla/security/nss/config/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ nss/mozilla/security/nss/config/Makefile 2012-03-04 13:51:38.444453374 +0100
@@ -0,0 +1,40 @@
+CORE_DEPTH = ../..
+DEPTH = ../..
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
+PREFIX = /usr
+
+all: export libs
+
+export:
+ # Create the nss.pc file
+ mkdir -p $(DIST)/lib/pkgconfig
+ sed -e "s,@prefix@,$(PREFIX)," \
+ -e "s,@exec_prefix@,\$${prefix}," \
+ -e "s,@libdir@,\$${prefix}/lib," \
+ -e "s,@includedir@,\$${prefix}/include/nss," \
+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
+ nss.pc.in > nss.pc
+ chmod 0644 nss.pc
+ ln -sf ../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
+
+ # Create the nss-config script
+ mkdir -p $(DIST)/bin
+ sed -e "s,@prefix@,$(PREFIX)," \
+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
+ nss-config.in > nss-config
+ chmod 0755 nss-config
+ ln -sf ../../../security/nss/config/nss-config $(DIST)/bin
+
+libs:
+
+dummy: all export libs
+
diff -Naur nss.orig/mozilla/security/nss/config/nss-config.in nss/mozilla/security/nss/config/nss-config.in
--- nss.orig/mozilla/security/nss/config/nss-config.in 1970-01-01 01:00:00.000000000 +0100
+++ nss/mozilla/security/nss/config/nss-config.in 2012-03-04 13:51:38.445453395 +0100
@@ -0,0 +1,153 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@NSS_MAJOR_VERSION@
+minor_version=@NSS_MINOR_VERSION@
+patch_version=@NSS_PATCH_VERSION@
+
+usage()
+{
+ cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+ [--prefix[=DIR]]
+ [--exec-prefix[=DIR]]
+ [--includedir[=DIR]]
+ [--libdir[=DIR]]
+ [--version]
+ [--libs]
+ [--cflags]
+Dynamic Libraries:
+ nss
+ nssutil
+ smime
+ ssl
+ softokn
+EOF
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1 1>&2
+fi
+
+lib_nss=yes
+lib_nssutil=yes
+lib_smime=yes
+lib_ssl=yes
+lib_softokn=yes
+
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case $1 in
+ --prefix=*)
+ prefix=$optarg
+ ;;
+ --prefix)
+ echo_prefix=yes
+ ;;
+ --exec-prefix=*)
+ exec_prefix=$optarg
+ ;;
+ --exec-prefix)
+ echo_exec_prefix=yes
+ ;;
+ --includedir=*)
+ includedir=$optarg
+ ;;
+ --includedir)
+ echo_includedir=yes
+ ;;
+ --libdir=*)
+ libdir=$optarg
+ ;;
+ --libdir)
+ echo_libdir=yes
+ ;;
+ --version)
+ echo ${major_version}.${minor_version}.${patch_version}
+ ;;
+ --cflags)
+ echo_cflags=yes
+ ;;
+ --libs)
+ echo_libs=yes
+ ;;
+ nss)
+ lib_nss=yes
+ ;;
+ nssutil)
+ lib_nssutil=yes
+ ;;
+ smime)
+ lib_smime=yes
+ ;;
+ ssl)
+ lib_ssl=yes
+ ;;
+ softokn)
+ lib_softokn=yes
+ ;;
+ *)
+ usage 1 1>&2
+ ;;
+ esac
+ shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+ exec_prefix=`pkg-config --variable=exec_prefix nss`
+fi
+if test -z "$includedir"; then
+ includedir=`pkg-config --variable=includedir nss`
+fi
+if test -z "$libdir"; then
+ libdir=`pkg-config --variable=libdir nss`
+fi
+
+if test "$echo_prefix" = "yes"; then
+ echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+ echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+ echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+ echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+ echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+ libdirs="-L$libdir"
+ if test -n "$lib_nss"; then
+ libdirs="$libdirs -lnss${major_version}"
+ fi
+ if test -n "$lib_nssutil"; then
+ libdirs="$libdirs -lnssutil${major_version}"
+ fi
+ if test -n "$lib_smime"; then
+ libdirs="$libdirs -lsmime${major_version}"
+ fi
+ if test -n "$lib_ssl"; then
+ libdirs="$libdirs -lssl${major_version}"
+ fi
+ if test -n "$lib_softokn"; then
+ libdirs="$libdirs -lsoftokn${major_version}"
+ fi
+ echo $libdirs
+fi
+
diff -Naur nss.orig/mozilla/security/nss/config/nss.pc.in nss/mozilla/security/nss/config/nss.pc.in
--- nss.orig/mozilla/security/nss/config/nss.pc.in 1970-01-01 01:00:00.000000000 +0100
+++ nss/mozilla/security/nss/config/nss.pc.in 2012-03-04 13:51:38.447453438 +0100
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: NSS
+Description: Network Security Services
+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
+Requires: nspr >= 4.8
+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
+Cflags: -I${includedir}
+
diff -Naur nss.orig/mozilla/security/nss/Makefile nss/mozilla/security/nss/Makefile
--- nss.orig/mozilla/security/nss/Makefile 2011-11-05 23:59:15.000000000 +0100
+++ nss/mozilla/security/nss/Makefile 2012-03-04 13:51:38.447453438 +0100
@@ -78,7 +78,7 @@
# (7) Execute "local" rules. (OPTIONAL). #
#######################################################################
-nss_build_all: build_coreconf build_nspr build_dbm all
+nss_build_all: build_coreconf build_dbm all
nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
@@ -140,12 +140,6 @@
--with-dist-prefix='$(NSPR_PREFIX)' \
--with-dist-includedir='$(NSPR_PREFIX)/include'
-build_nspr: $(NSPR_CONFIG_STATUS)
- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE)
-
-clobber_nspr: $(NSPR_CONFIG_STATUS)
- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber
-
build_dbm:
ifdef NSS_DISABLE_DBM
@echo "skipping the build of DBM"
diff -Naur nss.orig/mozilla/security/nss/manifest.mn nss/mozilla/security/nss/manifest.mn
--- nss.orig/mozilla/security/nss/manifest.mn 2010-03-26 23:31:18.000000000 +0100
+++ nss/mozilla/security/nss/manifest.mn 2012-03-04 13:51:38.453453568 +0100
@@ -42,6 +42,6 @@
RELEASE = nss
-DIRS = lib cmd
+DIRS = lib cmd config
Index: BOOK/networking/netprogs/wireless-tools.xml
===================================================================
--- BOOK/networking/netprogs/wireless-tools.xml (revision 9591)
+++ BOOK/networking/netprogs/wireless-tools.xml (working copy)
@@ -4,11 +4,11 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY wireless-download-http "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.28.tar.gz";>
+ <!ENTITY wireless-download-http "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz";>
<!ENTITY wireless-download-ftp " ">
- <!ENTITY wireless-md5sum "599c94497f9c9073c7b052d3dcb7cd16">
- <!ENTITY wireless-size "249 KB">
- <!ENTITY wireless-buildsize "1.7 MB">
+ <!ENTITY wireless-md5sum "e06c222e186f7cc013fd272d023710cb">
+ <!ENTITY wireless-size "288 KB">
+ <!ENTITY wireless-buildsize "2.0 MB">
<!ENTITY wireless-time "less than 0.1 SBU">
]>
@@ -40,6 +40,8 @@
of tools allowing manipulation of the Wireless Extensions. They use a
textual interface to support the full Wireless Extension.</para>
+ &lfs70_checked;
+
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing='compact'>
<listitem>
@@ -107,21 +109,17 @@
<para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-<screen role="root"><userinput>make PREFIX=/usr install</userinput></screen>
+<screen role="root"><userinput>make PREFIX=/usr INSTALL_MAN=/usr/share/man install</userinput></screen>
</sect2>
-<!--
<sect2 role="commands">
<title>Command Explanations</title>
- <para><command>sed -i -e "s/__GNUC__ == 3/__GNUC__ > 3/"
- -e "s/__GNUC_MINOR__ < 4/& || __GNUC__ > 3/" iwlib.h</command>:
- This modification is necessary to properly compile inline functions
- with GCC4.</para>
+ <para><command>INSTALL_MAN=/usr/share/man</command>: Install manual pages
+ in /usr/share/man instead of /usr/man</para>
</sect2>
--->
<sect2 role="content">
<title>Contents</title>
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent (revision 9591)
+++ BOOK/general.ent (working copy)
@@ -480,7 +480,7 @@
<!ENTITY rsync-version "3.0.9">
<!ENTITY samba3-version "3.6.1">
<!ENTITY wget-version "1.13.4">
-<!ENTITY wireless-tools-version "28">
+<!ENTITY wireless-tools-version "29">
<!ENTITY wpa_supplicant-version "0.7.3">
<!-- Obsolete
--
http://linuxfromscratch.org/mailman/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
