12 files changed, 40 insertions, 42 deletions
diff --git a/source/a/util-linux-ng/slack-desc b/source/a/util-linux-ng/slack-desc
deleted file mode 100644
index e149d7b84..000000000
--- a/source/a/util-linux-ng/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-             |-----handy-ruler------------------------------------------------|
-util-linux-ng: util-linux-ng (a huge collection of essential utilities) 
-util-linux-ng: 
-util-linux-ng: The util-linux package is a huge collection of random utilities
-util-linux-ng: that are essential to run a Linux system.  This is a fork of
-util-linux-ng: the original util-linux, based on version 2.13-pre7.
-util-linux-ng: 
-util-linux-ng: http://kernel.org/~kzak/util-linux-ng/
-util-linux-ng: 
-util-linux-ng: 
-util-linux-ng: 
-util-linux-ng: 
diff --git a/source/a/util-linux-ng/adjtimex_1.23-1.diff b/source/a/util-linux/adjtimex_1.23-1.diff
index 8c250157e..8c250157e 100644
--- a/source/a/util-linux-ng/adjtimex_1.23-1.diff
+++ b/source/a/util-linux/adjtimex_1.23-1.diff
diff --git a/source/a/util-linux-ng/doinst.sh b/source/a/util-linux/doinst.sh
index 678c228f1..678c228f1 100644
--- a/source/a/util-linux-ng/doinst.sh
+++ b/source/a/util-linux/doinst.sh
diff --git a/source/a/util-linux-ng/net-tools.diff b/source/a/util-linux/net-tools.diff
index a19af2026..a19af2026 100644
--- a/source/a/util-linux-ng/net-tools.diff
+++ b/source/a/util-linux/net-tools.diff
diff --git a/source/a/util-linux-ng/net-tools_1.60-19.diff b/source/a/util-linux/net-tools_1.60-19.diff
index f754f02d5..f754f02d5 100644
--- a/source/a/util-linux-ng/net-tools_1.60-19.diff
+++ b/source/a/util-linux/net-tools_1.60-19.diff
diff --git a/source/a/util-linux-ng/scsi_ioctl.h b/source/a/util-linux/scsi_ioctl.h
index edb952538..edb952538 100644
--- a/source/a/util-linux-ng/scsi_ioctl.h
+++ b/source/a/util-linux/scsi_ioctl.h
diff --git a/source/a/util-linux-ng/setserial-rc.serial.diff b/source/a/util-linux/setserial-rc.serial.diff
index 248d253bd..248d253bd 100644
--- a/source/a/util-linux-ng/setserial-rc.serial.diff
+++ b/source/a/util-linux/setserial-rc.serial.diff
diff --git a/source/a/util-linux-ng/setserial-undef_TIOCGHAYESESP.diff b/source/a/util-linux/setserial-undef_TIOCGHAYESESP.diff
index 97f078437..97f078437 100644
--- a/source/a/util-linux-ng/setserial-undef_TIOCGHAYESESP.diff
+++ b/source/a/util-linux/setserial-undef_TIOCGHAYESESP.diff
diff --git a/source/a/util-linux/slack-desc b/source/a/util-linux/slack-desc
new file mode 100644
index 000000000..efa70e344
--- /dev/null
+++ b/source/a/util-linux/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+          |-----handy-ruler------------------------------------------------|
+util-linux: util-linux (a huge collection of essential utilities) 
+util-linux:
+util-linux: The util-linux package is a huge collection of random utilities
+util-linux: that are essential to run a Linux system.
+util-linux:
+util-linux: http://kernel.org/~kzak/util-linux/
+util-linux:
+util-linux:
+util-linux:
+util-linux:
+util-linux:
diff --git a/source/a/util-linux-ng/util-linux-ng.SlackBuild b/source/a/util-linux/util-linux.SlackBuild
index 386487aba..424199144 100755
--- a/source/a/util-linux-ng/util-linux-ng.SlackBuild
+++ b/source/a/util-linux/util-linux.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,9 +20,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Slackware build script for util-linux-ng
+# Slackware build script for util-linux
 
-VERSION=${VERSION:-$(echo util-linux-ng*.tar.?z* | cut -d - -f 4  | rev | cut -f 3- -d . | rev)}
+VERSION=${VERSION:-$(echo util-linux*.tar.?z* | cut -d - -f 3  | rev | cut -f 3- -d . | rev)}
 BUILD=${BUILD:-1}
 
 ADJTIMEXVERS=1.23
@@ -55,14 +55,14 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-util-linux-ng
+PKG=$TMP/package-util-linux
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP || exit 1
-rm -rf util-linux-ng-$VERSION
-tar xvf $CWD/util-linux-ng-$VERSION.tar.xz || exit 1
-cd util-linux-ng-$VERSION || exit 1
+rm -rf util-linux-$VERSION
+tar xvf $CWD/util-linux-$VERSION.tar.xz || exit 1
+cd util-linux-$VERSION || exit 1
 chown -R root.root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -85,7 +85,7 @@ find . \
 # Changing the fdisk -l output (this was done prior to util-linux-ng) broke
 # our installation scripts, so we have changed the name of partition type
 # 83 back to "Linux swap":
-zcat $CWD/util-linux-ng.fdisk-no-solaris.diff.gz | patch -p1 || exit 1
+zcat $CWD/util-linux.fdisk-no-solaris.diff.gz | patch -p1 || exit 1
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -95,15 +95,15 @@ CFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --infodir=/usr/info \
-  --docdir=/usr/doc/util-linux-ng-$VERSION \
+  --docdir=/usr/doc/util-linux-$VERSION \
   --disable-static \
   --enable-arch \
   --enable-agetty \
   --disable-init \
   --enable-kill \
-  --enable-rdev \
   --disable-last \
   --enable-mesg \
+  --enable-partx \
   --enable-raw \
   --enable-rename \
   --enable-reset \
@@ -113,6 +113,7 @@ CFLAGS="$SLKCFLAGS" \
   --enable-write \
   --enable-use-tty-group \
   --enable-libblkid \
+  --enable-libmount \
   --enable-libuuid \
   --disable-uuidd \
   --build=$ARCH-slackware-linux \
@@ -121,14 +122,16 @@ CFLAGS="$SLKCFLAGS" \
 make || exit 1
 make install DESTDIR=$PKG || make install DESTDIR=$PKG
 
-# Move the libblkid and libuuid libraries to /lib${LIBSUFFIX}
+# Move the libblkid, libmount, and libuuid libraries to /lib${LIBSUFFIX}
 mkdir -p $PKG/lib${LIBDIRSUFFIX}
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}
   mv libblkid.so.1* $PKG/lib${LIBDIRSUFFIX}
+  mv libmount.so.1* $PKG/lib${LIBDIRSUFFIX}
   mv libuuid.so.1* $PKG/lib${LIBDIRSUFFIX}
-  rm -f libblkid.so libuuid.so
-  ln -sf /lib${LIBDIRSUFFIX}/libblkid.so.1 libblkid.so
-  ln -sf /lib${LIBDIRSUFFIX}/libuuid.so.1 libuuid.so
+  rm -f libblkid.so libmount.so libuuid.so
+  ln -sf ../../lib${LIBDIRSUFFIX}/libblkid.so.1 libblkid.so
+  ln -sf ../../lib${LIBDIRSUFFIX}/libmount.so.1 libmount.so
+  ln -sf ../../lib${LIBDIRSUFFIX}/libuuid.so.1 libuuid.so
 )
 
 # Moving things around that have been in the same place
@@ -145,11 +148,6 @@ if [ -r $PKG/usr/sbin/fdformat ]; then
   )
 fi
 
-# Install (probably obsolete) rdev manually:
-cat ./sys-utils/rdev > $PKG/sbin/rdev
-chown root:root $PKG/sbin/rdev
-chmod 755 $PKG/sbin/rdev
-
 # Build ziptool
 cd $TMP || exit 1
 rm -rf ziptool-$ZIPTOOLVERS
@@ -251,7 +249,7 @@ cat setserial.8 | gzip -9c > $PKG/usr/man/man8/setserial.8.gz
   ln -s ../../bin/setterm .
 )
 
-cd $TMP/util-linux-ng-$VERSION # Go back home :)
+cd $TMP/util-linux-$VERSION # Go back home :)
 
 # Now let's add some important symlinks :)
 ( cd $PKG/sbin
@@ -296,15 +294,15 @@ fi
 rm $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
 
-mkdir -p $PKG/usr/doc/util-linux-ng-$VERSION
+mkdir -p $PKG/usr/doc/util-linux-$VERSION
 cp -a AUTHORS COPYING DEPRECATED NEWS README* TODO \
   docs/v${VERSION}-ReleaseNotes \
-  $PKG/usr/doc/util-linux-ng-$VERSION
+  $PKG/usr/doc/util-linux-$VERSION
 
 mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/util-linux-ng-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/util-linux-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/a/util-linux-ng/util-linux-ng.fdisk-no-solaris.diff b/source/a/util-linux/util-linux.fdisk-no-solaris.diff
index a3aa100e9..a3aa100e9 100644
--- a/source/a/util-linux-ng/util-linux-ng.fdisk-no-solaris.diff
+++ b/source/a/util-linux/util-linux.fdisk-no-solaris.diff
diff --git a/source/a/util-linux-ng/ziptool-fix_build.patch b/source/a/util-linux/ziptool-fix_build.patch
index a2d3d5157..a2d3d5157 100644
--- a/source/a/util-linux-ng/ziptool-fix_build.patch
+++ b/source/a/util-linux/ziptool-fix_build.patch