Sun Jul 22 22:38:36 UTC 2012

Howdy!  Lots of shiny stuff here, including the long awaited Xfce 4.10!
Thanks to Robby Workman for the initial set of build scripts, and lots
of testing (plus some very helpful notes about things such as the proper
build order).  I'm calling this a beta (finally!), and it's really very
close to what we expect to release.  Test away.
BTW, Mercury leaves retrograde on August 8th, position 01:26 Leo.  ;-)
a/aaa_elflibs-14.0-x86_64-3.txz:  Rebuilt.
  Fixed missing libz.so.1.
a/lvm2-2.02.96-x86_64-4.txz:  Rebuilt.
  Recompiled for udev-182.
a/sysvinit-scripts-2.0-noarch-3.txz:  Rebuilt.
  Show the date after setting the system clock.
  Thanks to Darrell Anderson.
  Shut down udev in rc.6.  Thanks to Robby Workman.
  In rc.S, determine the actual root partition and insert it into /etc/mtab
  so that "/dev/root" isn't shown when booting a kernel without an initrd.
  I should have fixed this years ago.
a/udev-182-x86_64-1.txz:  Upgraded.
  Well, udev in this devel cycle has certainly been interesting!  A fair
  number of odd bug reports have been coming in, and we hadn't really been
  able to get a handle on the source of the issues.  Quite some time ago
  we started testing udev-182, and noticed that it caused some issues with
  the persistent net and cd rules.  There'd sometimes be two entries per
  device, so a machine with a single Ethernet card might come up showing the
  card as eth1, with two rules in 70-persistent-net.rules (eth0 and eth1).
  We tested a lot of udev versions trying to determine where the problem
  started, and it seemed to begin with version 176, the first one that
  used libkmod rather than calling out to module-init-tools to load modules.
  Asking upstream about it, they suggested that we just turn the generation
  of persistent rules off.  They'd already turned it off by default.  "Make
  'em make rules!" seemed to be the answer, and since I remember well why
  the autogeneration of net and CD rules came about, I wasn't really happy
  with that answer.  After deploying the "safe" upgrade to 175, we got a
  couple of reports of this same issue happening (though none of us could
  reproduce the issue with 175).  Robby ended up making some patches to
  the rule writing scripts for udev-182 that were able to stop the doubling
  up of rules, but the devices themselves would still be misnumbered on the
  first boot without rules, and would then be correct after a reboot.
    Last week I sat down determined to figure out where the race condition
  was.  After endless reboots with various tests, I got the idea to put my
  network modules on the initrd and have it shell out so that I could take
  a look at them.  What I found was that the rules were generated correctly
  on the initrd.  Well, that was a surprise, but I must have had some kind
  of hunch to even try a test like that.  On another hunch, I ran
  "pstree -c -p | grep udevd" on the running system.  Heh.  There it was.
  We had been running two copies of udevd, and they were fighting it out.
  At some point along the line, udevd was changed.  It used to be that if
  you tried to start a second copy it wouldn't start, and would exit with
  status 1, and our rc.udev script relied on this behavior.  Fixing the
  problem was considerably easier than finding it...  rworkman and I made
  some changes in rc.udev to check if udevd was already running instead
  of expecting it to check for itself.  Another change was required to
  cause it to write out rules if they didn't exist already, and then to
  read them back in (otherwise optical symlinks were still missing on first
  boot without rules).  There's still one issue that was also present with
  udev-175, which is that a hotplugged optical drive won't get symlinks
  unless it has been in at boot and had rules generated for it then.
  Otherwise, things are looking considerably better.  Firmware is loading
  correctly, rules are autogenerated properly again, and several devices
  that were missing in /dev have returned.
    So, there's the story.  Maybe more than you really wanted to know.  ;-)
  Thanks to rworkman for his help on this.  Please report any new problems.
  And if anyone knows how to get symlinks working for a hotplugged optical
  drive like they did in udev-165, a fix would be most appreciated.
a/udisks2-1.98.0-x86_64-1.txz:  Added.
ap/foomatic-filters-4.0.12-x86_64-1.txz:  Upgraded.
ap/gutenprint-5.2.9-x86_64-1.txz:  Upgraded.
ap/slackpkg-2.82.0-noarch-6.tgz:  Rebuilt.
  Support XFCE series.  Note that slackpkg will upgrade itself, but it still
  won't know about the XFCE series during that run, so you'll need to run it
  a second time to install Xfce.
l/GConf-3.2.5-x86_64-1.txz:  Added.
l/gcr-3.4.1-x86_64-1.txz:  Added.
l/glade3-3.8.1-x86_64-1.txz:  Added.
l/glib-networking-2.32.3-x86_64-1.txz:  Added.
l/gnome-keyring-3.4.1-x86_64-1.txz:  Added.
l/gsettings-desktop-schemas-3.4.2-noarch-1.txz:  Added.
l/gvfs-1.12.3-x86_64-1.txz:  Added.
l/js185-1.0.0-x86_64-1.txz:  Added.
l/keybinder-0.3.0-x86_64-1.txz:  Added.
l/libcanberra-0.29-x86_64-1.txz:  Added.
l/libgnome-keyring-3.4.1-x86_64-1.txz:  Added.
l/libproxy-0.4.7-x86_64-1.txz:  Added.
l/libsoup-2.38.1-x86_64-1.txz:  Added.
l/libtasn1-2.12-x86_64-1.txz:  Added.
l/loudmouth-1.4.3-x86_64-3.txz:  Rebuilt.
  Rebuilt with --enable-debug=yes, which I hear disables debugging messages on
  the console.  Go figure.  :-)  Thanks to Youjie Zhou.
l/media-player-info-17-noarch-1.txz:  Added.
l/mozilla-nss-3.13.5-x86_64-2.txz:  Rebuilt.
  Added nspr-config and nss-config.
  Removed unneeded binaries in /usr/bin.
  Removed config files in /usr/include/nspr/md.
l/sound-theme-freedesktop-0.7-noarch-1.txz:  Added.
n/php-5.4.5-x86_64-1.txz:  Upgraded.
  Fixed potential overflow in _php_stream_scandir (CVE-2012-2688).
  (Thanks to Jason Powell, Stas)
  For more information, see:
    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-2688
  (* Security fix *)
xap/network-manager-applet-0.9.4.1-x86_64-1.txz:  Added.
xap/xfce-4.6.2-x86_64-5.txz:  Removed.
xfce/Terminal-0.4.8-x86_64-1.txz:  Added.
xfce/Thunar-1.4.0-x86_64-1.txz:  Added.
xfce/exo-0.8.0-x86_64-1.txz:  Added.
xfce/garcon-0.2.0-x86_64-1.txz:  Added.
xfce/gtk-xfce-engine-3.0.0-x86_64-1.txz:  Added.
xfce/libxfce4ui-4.10.0-x86_64-1.txz:  Added.
xfce/libxfce4util-4.10.0-x86_64-1.txz:  Added.
xfce/libxfcegui4-4.10.0-x86_64-1.txz:  Added.
xfce/orage-4.8.3-x86_64-1.txz:  Added.
xfce/thunar-volman-0.8.0-x86_64-1.txz:  Upgraded.
xfce/tumbler-0.1.25-x86_64-1.txz:  Added.
xfce/xfce4-appfinder-4.10.0-x86_64-1.txz:  Added.
xfce/xfce4-clipman-plugin-1.2.3-x86_64-1.txz:  Added.
xfce/xfce4-dev-tools-4.10.0-x86_64-1.txz:  Added.
xfce/xfce4-mixer-4.8.0-x86_64-1.txz:  Added.
xfce/xfce4-notifyd-0.2.2-x86_64-1.txz:  Upgraded.
xfce/xfce4-panel-4.10.0-x86_64-1.txz:  Added.
xfce/xfce4-power-manager-1.2.0-x86_64-1.txz:  Upgraded.
xfce/xfce4-screenshooter-1.8.1-x86_64-1.txz:  Added.
xfce/xfce4-session-4.10.0-x86_64-1.txz:  Added.
xfce/xfce4-settings-4.10.0-x86_64-1.txz:  Added.
xfce/xfce4-systemload-plugin-1.1.0-x86_64-1.txz:  Added.
xfce/xfce4-taskmanager-1.0.0-x86_64-1.txz:  Added.
xfce/xfce4-volumed-0.1.13-x86_64-1.txz:  Added.
xfce/xfce4-weather-plugin-0.7.4-x86_64-1.txz:  Added.
xfce/xfconf-4.10.0-x86_64-1.txz:  Added.
xfce/xfdesktop-4.10.0-x86_64-1.txz:  Added.
xfce/xfwm4-4.10.0-x86_64-1.txz:  Added.
xfce/xfwm4-themes-4.10.0-x86_64-1.txz:  Added.
isolinux/initrd.img:  Rebuilt.
  Support XFCE series.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
  Support XFCE series.

2 files changed, 161 insertions, 2 deletions

diff --git a/slackware64-current/source/l/mozilla-nss/mozilla-nss.SlackBuild b/slackware64-current/source/l/mozilla-nss/mozilla-nss.SlackBuild
index 94fce844e..8b7f66ebd 100755
--- a/slackware64-current/source/l/mozilla-nss/mozilla-nss.SlackBuild
+++ b/slackware64-current/source/l/mozilla-nss/mozilla-nss.SlackBuild
@@ -25,7 +25,7 @@ PKGNAM=mozilla-nss
 SRCNAM=nss
 VERSION=${VERSION:-3.13.5}
 NSPR=${NSPR:-4.9.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -93,13 +93,15 @@ cd -
 # Install all the needed stuff to the package dir:
 mkdir -p $PKG/usr/{bin,lib${LIBDIRSUFFIX},include/{nss,nspr}}
 cd mozilla/dist/$(uname -s)*
-  cp -pL bin/* $PKG/usr/bin/
+  cp -pL bin/{certutil,cmsutil,crlutil,modutil,pk12util,shlibsign,signtool,signver,ssltap} $PKG/usr/bin/
   cp -pL lib/* $PKG/usr/lib${LIBDIRSUFFIX}/
   chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/*.so*
   cp -rL include/* $PKG/usr/include/nspr/
   cp -rpL ../public/nss/*.h $PKG/usr/include/nss/
+  # Remove some things we do not need:
   rm -f $PKG/usr/bin/*.so
   rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a
+  rm -rf $PKG/usr/include/nspr/md
 cd -
 
 cd mozilla/security/nss/cmd/smimetools
@@ -108,6 +110,18 @@ cd mozilla/security/nss/cmd/smimetools
   sed -i -e 's#/usr/local/bin#/usr/bin#g' $PKG/usr/bin/smime
 cd -
 
+# Install nspr-config:
+cat mozilla/nsprpub/$(uname -s)*/config/nspr-config | sed -e "s,prefix=/usr/local,prefix=/usr,g" | sed -e "s,libdir=\${exec_prefix}/lib,libdir=\${exec_prefix}/lib${LIBDIRSUFFIX},g" > $PKG/usr/bin/nspr-config
+chmod 755 $PKG/usr/bin/nspr-config
+
+# Install nss-config:
+sed -e "s,@prefix@,/usr,g" \
+    -e "s,@MOD_MAJOR_VERSION@,$(printf $VERSION | cut -d. -f1),g" \
+    -e "s,@MOD_MINOR_VERSION@,$(printf $VERSION | cut -d. -f2),g" \
+    -e "s,@MOD_PATCH_VERSION@,$(printf $VERSION | cut -d. -f3),g" \
+    $CWD/nss-config.in > $PKG/usr/bin/nss-config
+chmod 755 $PKG/usr/bin/nss-config
+
 # Provide pkg-config files:
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
 cat <<EOT > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/mozilla-nss.pc 
diff --git a/slackware64-current/source/l/mozilla-nss/nss-config.in b/slackware64-current/source/l/mozilla-nss/nss-config.in
new file mode 100644
index 000000000..f8f893e71
--- /dev/null
+++ b/slackware64-current/source/l/mozilla-nss/nss-config.in
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_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
+	ssl
+	smime
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+lib_ssl=yes
+lib_smime=yes
+lib_nss=yes
+lib_nssutil=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
+      ;;
+    ssl)
+      lib_ssl=yes
+      ;;
+    smime)
+      lib_smime=yes
+      ;;
+    nss)
+      lib_nss=yes
+      ;;
+    nssutil)
+      lib_nssutil=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="-Wl,-rpath-link,$libdir -L$libdir"
+      if test -n "$lib_ssl"; then
+	libdirs="$libdirs -lssl${major_version}"
+      fi
+      if test -n "$lib_smime"; then
+	libdirs="$libdirs -lsmime${major_version}"
+      fi
+      if test -n "$lib_nss"; then
+	libdirs="$libdirs -lnss${major_version}"
+      fi
+      if test -n "$lib_nssutil"; then
+	libdirs="$libdirs -lnssutil${major_version}"
+      fi
+      echo $libdirs
+fi      
+