From 75a4a592e5ccda30715f93563d741b83e0dcf39e Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 25 Apr 2011 13:37:00 +0000
Subject: Slackware 13.37

Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!

Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

As always, thanks to the Slackware community for testing, suggestions,
and feedback.  :-)

Have fun!
---
 source/l/libcap/libcap-2.19.tar.bz2.sign                    |  8 --------
 source/l/libcap/libcap-2.20.tar.sign                        |  8 ++++++++
 source/l/libcap/libcap.SlackBuild                           | 10 ++--------
 .../l/libcap/libcap.capability.h.fix.broken.includes.diff   | 13 ++++++++-----
 4 files changed, 18 insertions(+), 21 deletions(-)
 delete mode 100644 source/l/libcap/libcap-2.19.tar.bz2.sign
 create mode 100644 source/l/libcap/libcap-2.20.tar.sign

(limited to 'source/l/libcap')

diff --git a/source/l/libcap/libcap-2.19.tar.bz2.sign b/source/l/libcap/libcap-2.19.tar.bz2.sign
deleted file mode 100644
index 23e2c3988..000000000
--- a/source/l/libcap/libcap-2.19.tar.bz2.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBLTn0myGugalF9Dw4RAkEcAJ9zpWMkph0bSL/WfNPHtIayydTUOQCeMoiN
-DC9y+17zdyaaieDE7aH2rfs=
-=YEBM
------END PGP SIGNATURE-----
diff --git a/source/l/libcap/libcap-2.20.tar.sign b/source/l/libcap/libcap-2.20.tar.sign
new file mode 100644
index 000000000..21c507225
--- /dev/null
+++ b/source/l/libcap/libcap-2.20.tar.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBNNtZOyGugalF9Dw4RAhNYAJ4hyECyyIeN/d8WBPq8xeosRuO5egCfQFdk
+SykdiTKqeb+JHeiCSI9GYTk=
+=Rz1c
+-----END PGP SIGNATURE-----
diff --git a/source/l/libcap/libcap.SlackBuild b/source/l/libcap/libcap.SlackBuild
index f77ad6e51..57cfc5844 100755
--- a/source/l/libcap/libcap.SlackBuild
+++ b/source/l/libcap/libcap.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -64,7 +64,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP 
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 zcat $CWD/libcap.capability.h.fix.broken.includes.diff.gz | patch -p1 || exit 1
@@ -86,12 +86,6 @@ chmod 755 $PKG/lib${LIBDIRSUFFIX}/libcap.so*
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-# Static libs are better placed under /usr:
-if [ -r $PKG/lib${LIBDIRSUFFIX}/libcap.a ]; then
-  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
-  mv $PKG/lib${LIBDIRSUFFIX}/libcap.a $PKG/usr/lib${LIBDIRSUFFIX}
-fi
-
 # Add included scripts
 ( cd contrib || exit 1
   for file in pcaps4convenience pcaps4server pcaps4suid0 ; do
diff --git a/source/l/libcap/libcap.capability.h.fix.broken.includes.diff b/source/l/libcap/libcap.capability.h.fix.broken.includes.diff
index 5a4fcbcf5..dcf01e7a5 100644
--- a/source/l/libcap/libcap.capability.h.fix.broken.includes.diff
+++ b/source/l/libcap/libcap.capability.h.fix.broken.includes.diff
@@ -1,11 +1,14 @@
---- ./libcap/include/sys/capability.h.orig	2008-07-10 01:18:40.000000000 -0500
-+++ ./libcap/include/sys/capability.h	2009-04-11 13:19:33.000000000 -0500
-@@ -19,7 +19,7 @@
+--- ./libcap/include/sys/capability.h.orig	2009-08-27 00:01:01.000000000 -0500
++++ ./libcap/include/sys/capability.h	2011-02-08 14:24:36.000000000 -0600
+@@ -19,9 +19,9 @@
   * information for the user library.
   */
  
 -#include <sys/types.h>
-+#include <linux/types.h>
- #include <stdint.h>
+-#include <stdint.h>
+ #include <linux/types.h>
++#include <stdint.h>
++#include <sys/types.h>
  
  /*
+  * Required to limit what gets defined in the kernel header file.
-- 
cgit v1.2.3