tizen 2.4 release accepted/tizen_2.4_base tizen_2.4_base accepted/tizen/2.4/base/20151026.114051 submit/tizen_2.4_base/20151026.090057 submit/tizen_2.4_base/20151026.091204 tizen_2.4_mobile_release
authorjk7744.park <jk7744.park@samsung.com>
Fri, 23 Oct 2015 06:04:22 +0000 (15:04 +0900)
committerjk7744.park <jk7744.park@samsung.com>
Fri, 23 Oct 2015 06:04:22 +0000 (15:04 +0900)
25 files changed:
debian/README.Debian [new file with mode: 0644]
debian/README.source [new file with mode: 0644]
debian/capsh.8 [new file with mode: 0644]
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/libcap-dev.install [new file with mode: 0644]
debian/libcap-dev.manpages [new file with mode: 0644]
debian/libcap2-bin.dirs [new file with mode: 0644]
debian/libcap2-bin.examples [new file with mode: 0644]
debian/libcap2-bin.install [new file with mode: 0644]
debian/libcap2-bin.manpages [new file with mode: 0644]
debian/libcap2-bin.postinst.disabled [new file with mode: 0644]
debian/libcap2-bin.prerm.disabled [new file with mode: 0644]
debian/libcap2.install [new file with mode: 0644]
debian/orig-tar.sh [new file with mode: 0755]
debian/pam-configs/capability [new file with mode: 0644]
debian/patches/0001-fix-Makefiles.patch [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source/format [new file with mode: 0644]
debian/watch [new file with mode: 0644]
packaging/libcap.spec
packaging/libcap_aslr_20150407.patch [deleted file]

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644 (file)
index 0000000..9e1987c
--- /dev/null
@@ -0,0 +1,46 @@
+Please check http://www.friedhoff.org/posixfilecaps.html to get more
+information on POSIX File Capabilities.
+
+
+Example: how to remove the SUID root bit from /bin/ping?
+--------------------------------------------------------
+
+Make sure you have kernel 2.6.24 or newer you have
+CONFIG_SECURITY_CAPABILITIES and CONFIG_SECURITY_FILE_CAPABILITIES
+enabled. The Debian kernels are fine.
+
+  $ ls -l /bin/ping
+  -rwsr-xr-x 1 root root 30736 2007-01-31 00:10 /bin/ping
+     ^
+That is not good.
+
+  $ sudo chmod 755 /bin/ping
+
+Or use dpkg-statoverride.
+
+  $ ls -l /bin/ping
+  -rwxr-xr-x 1 root root 30736 2007-01-31 00:10 /bin/ping
+
+That is better but ping fails.
+
+  $ ping -c1 localhost
+  ping: icmp open socket: Operation not permitted
+
+Now set the missing capability:
+
+  $ sudo setcap cap_net_raw+ep /bin/ping
+
+... and ping will work again.
+
+  $ ping -c1 localhost
+  PING localhost (127.0.0.1) 56(84) bytes of data.
+  64 bytes from localhost (127.0.0.1): icmp_seq=1 ttl=64 time=0.026 ms
+
+  --- localhost ping statistics ---
+  1 packets transmitted, 1 received, 0% packet loss, time 0ms
+  rtt min/avg/max/mdev = 0.026/0.026/0.026/0.000 ms
+
+
+
+Torsten Werner
+
diff --git a/debian/README.source b/debian/README.source
new file mode 100644 (file)
index 0000000..9c145d9
--- /dev/null
@@ -0,0 +1,4 @@
+This package uses quilt to modify upstream source code. Please check
+/usr/share/doc/quilt/README.source for more information.
+
+ -- Torsten Werner <twerner@debian.org>  Wed, 30 Sep 2009 21:58:13 +0200
diff --git a/debian/capsh.8 b/debian/capsh.8
new file mode 100644 (file)
index 0000000..20272c6
--- /dev/null
@@ -0,0 +1,49 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH CAPSH "8" "September 2009" "capsh 2.17" "System Administration Utilities"
+.SH NAME
+capsh \- 'bash' wrapper to raise and lower the bset and pI capabilities
+.SH DESCRIPTION
+\fB/sbin/capsh\fR [args ...]
+.TP
+\fB\-\-help\fR
+this message
+.TP
+\fB\-\-print\fR
+display capability relevant state
+.TP
+\fB\-\-decode\fR=\fIxxx\fR
+decode a hex string to a list of caps
+.TP
+\fB\-\-drop\fR=\fIxxx\fR
+remove xxx,.. capabilities from bset
+.TP
+\fB\-\-caps\fR=\fIxxx\fR
+set caps as per cap_from_text()
+.TP
+\fB\-\-inh\fR=\fIxxx\fR
+set xxx,.. inheritiable set
+.TP
+\fB\-\-secbits=\fR<n>
+write a new value for securebits
+.TP
+\fB\-\-keep=\fR<n>
+set keep\-capabability bit to <n>
+.TP
+\fB\-\-uid=\fR<n>
+set uid to <n> (hint: id <username>)
+.TP
+\fB\-\-chroot\fR=\fIpath\fR
+chroot(2) to this path to invoke bash
+.TP
+\fB\-\-killit=\fR<n>
+send signal(n) to child
+.TP
+\fB\-\-forkfor=\fR<n>
+fork and make child sleep for <n> sec
+.TP
+\fB==\fR
+re\-exec(capsh) with args as for \fB\-\-\fR
+.TP
+\fB\-\-\fR
+remaing arguments are for /bin/bash
+(without \fB\-\-\fR [/sbin/capsh] will simply exit(0))
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..ac79acd
--- /dev/null
@@ -0,0 +1,202 @@
+libcap2 (1:2.21-1slp2+s3) unstable; urgency=low
+
+  * Revert to version with dependency on indent
+
+ -- Mike McCormack <mj.mccormack@samsung.com>  Thu, 16 Jun 2011 10:34:19 +0900
+
+libcap2 (1:2.21-1slp2+s1) unstable; urgency=low
+
+  * Disable dependencies on pam.
+  * Set SLP package maintainers.
+
+ -- Rafal Krypa <r.krypa@samsung.com>  Tue, 24 May 2011 12:48:39 +0200
+
+libcap2 (1:2.21-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/0001-fix-Makefiles.patch: link pam_cap against -lpam.
+    (Closes: #591410) (LP: #582769)
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com>  Fri, 20 May 2011 08:28:55 -0500
+
+libcap2 (1:2.20-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove all patches because they have been included upstream.
+
+ -- Torsten Werner <twerner@debian.org>  Fri, 11 Feb 2011 20:31:45 +0100
+
+libcap2 (1:2.19-3) unstable; urgency=high
+
+  * Add a versioned dependency on libpam-runtime to libcap2-bin because
+    pam-auth-update is needed in postinst. (Closes: #593250)
+  * Set urgency to high because we are fixing a RC bug.
+
+ -- Torsten Werner <twerner@debian.org>  Mon, 16 Aug 2010 23:13:50 +0200
+
+libcap2 (1:2.19-2) unstable; urgency=medium
+
+  * Add -lpam to LDLIBS. Thanks to Sebastian Ramacher for suggesting the patch!
+    (Closes: 591410)
+  * Set urgency to medium.
+  * Improve patch description.
+
+ -- Torsten Werner <twerner@debian.org>  Wed, 04 Aug 2010 05:22:23 +0200
+
+libcap2 (1:2.19-1) unstable; urgency=low
+
+  [ Kees Cook ]
+  * Add pam_cap.so to the default PAM auth stack. (Closes: #573089)
+
+  [ Torsten Werner ]
+  * New upstream release.
+  * Convert package to source format 3.0.
+  * Remove quilt from Build-Depends.
+  * Add static library to -dev package. Thanks to Stephan Sürken. (Closes:
+    #589840)
+  * Fix typo in Description. Thanks to Pascal De Vuyst. (Closes: #557496)
+  * Add a patch to fix the man page cap_from_text(3). Thanks to Roland
+    Koebler. (Closes: #567350)
+  * Update Standards-Version: 3.9.0 (no changes).
+
+ -- Torsten Werner <twerner@debian.org>  Thu, 22 Jul 2010 23:50:25 +0200
+
+libcap2 (1:2.17-2) unstable; urgency=low
+
+  * Explain in the long description of the -bin package that the manpage
+    cap_from_text(3) is part of -dev package. (Closes: #548080)
+
+ -- Torsten Werner <twerner@debian.org>  Sun, 18 Oct 2009 19:55:39 +0200
+
+libcap2 (1:2.17-1) unstable; urgency=low
+
+  * new upstream release
+  * Switch from cdbs to dh.
+  * Update Standards-Version: 3.8.3 (no changes).
+  * Use gbp-pq to edit quilt patch.
+  * Change Build-Depends: debhelper (>= 7.0.50~).
+  * Add README.source.
+  * Add man page capsh.8.
+
+ -- Torsten Werner <twerner@debian.org>  Wed, 30 Sep 2009 22:26:51 +0200
+
+libcap2 (1:2.16-5) unstable; urgency=low
+
+  * Remove reference to kernel version 2.2 in debian/control. (Closes:
+    #260005)
+  * Add Suggests: libcap-dev to binary package libcap2-bin. (Closes: #433782)
+
+ -- Torsten Werner <twerner@debian.org>  Wed, 01 Apr 2009 23:32:37 +0200
+
+libcap2 (1:2.16-4) unstable; urgency=low
+
+  * Add Conflicts: and Replaces: libcap2-dev to binary package libcap-dev.
+  * Add epoch to version number because the old package had an epoch.
+  * Add missing files to package libcap-dev which got lost in the previous
+    version.
+
+ -- Torsten Werner <twerner@debian.org>  Sun, 22 Mar 2009 21:23:50 +0100
+
+libcap2 (2.16-3) unstable; urgency=low
+
+  * Rename binary package libcap2-dev to libcap-dev as requested by the
+    release team to continue the transition from libcap1. (Closes: #520553)
+  * Add Provides: libcap2-dev to binary package libcap-dev to ease transition
+    from older versions of libcap2.
+  * Remove Conflicts: libcap-dev.
+
+ -- Torsten Werner <twerner@debian.org>  Sat, 21 Mar 2009 21:22:24 +0100
+
+libcap2 (2.16-2) unstable; urgency=low
+
+  * upload to unstable
+
+ -- Torsten Werner <twerner@debian.org>  Sun, 15 Feb 2009 22:09:04 +0100
+
+libcap2 (2.16-1) experimental; urgency=low
+
+  * new upstream release
+  * Always install libraries into /lib (never /lib64).
+    (Closes: #508315)
+
+ -- Torsten Werner <twerner@debian.org>  Sun, 14 Dec 2008 12:24:50 +0100
+
+libcap2 (2.15-3) experimental; urgency=low
+
+  * Set Priority: standard for binary package libcap2. (Closes: #507781)
+
+ -- Torsten Werner <twerner@debian.org>  Thu, 04 Dec 2008 14:15:48 +0100
+
+libcap2 (2.15-2) experimental; urgency=low
+
+  * Update shlibs file libcap2 (>= 2.10). (Closes: #464712)
+
+ -- Torsten Werner <twerner@debian.org>  Wed, 03 Dec 2008 23:42:19 +0100
+
+libcap2 (2.15-1) experimental; urgency=low
+
+  * new upstream release
+  * Add Homepage header.
+  * Bump Up Standards-Version: 3.8.0.
+  * Update patch build.diff.
+
+ -- Torsten Werner <twerner@debian.org>  Mon, 01 Dec 2008 00:26:09 +0100
+
+libcap2 (2.11-2) unstable; urgency=low
+
+  * Call dh_makeshlibs with -V. (Closes: #492467)
+  * Reformat debian/copyright.
+  * Add Build-Depends: libpam0g-dev to build the pam module.
+  * Ship the pam module in the package libcap2-bin.
+
+ -- Torsten Werner <twerner@debian.org>  Sat, 26 Jul 2008 15:40:42 +0200
+
+libcap2 (2.11-1) unstable; urgency=low
+
+  * new upstream release
+  * Remove patch bug487223.diff because it is not needed anymore.
+  * Refresh patch build.diff.
+
+ -- Torsten Werner <twerner@debian.org>  Thu, 24 Jul 2008 20:42:41 +0200
+
+libcap2 (2.10-3) unstable; urgency=low
+
+  * Add patch from upstream author to fix 'cap_copy_int() always returns NULL
+    (EINVAL)'. (Closes: #487223)
+
+ -- Torsten Werner <twerner@debian.org>  Mon, 07 Jul 2008 23:03:52 +0200
+
+libcap2 (2.10-2) unstable; urgency=medium
+
+  * Add Build-Depends: indent because it is needed on alpha. (Closes: #489477)
+  * Set urgency to medium because we are fixing a FTBFS bug.
+
+ -- Torsten Werner <twerner@debian.org>  Sun, 06 Jul 2008 11:34:15 +0200
+
+libcap2 (2.10-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Torsten Werner <twerner@debian.org>  Wed, 11 Jun 2008 23:37:06 +0200
+
+libcap2 (2.09-1) unstable; urgency=low
+
+  * new upstream release
+  * Change Priority: optional of package libcap2.
+
+ -- Torsten Werner <twerner@debian.org>  Sat, 10 May 2008 11:48:53 +0200
+
+libcap2 (2.08-2) unstable; urgency=low
+
+  * Do not install the old manpages capget(2) and capset(2) because the
+    package manpages-dev ships more recent ones.
+  * Replace Conflicts: manpages-dev by Suggests: manpages-dev.
+    (Closes: #473072)
+
+ -- Torsten Werner <twerner@debian.org>  Sat, 29 Mar 2008 10:19:58 +0100
+
+libcap2 (2.08-1) unstable; urgency=low
+
+  * Initial Release. (Closes: #464727)
+
+ -- Torsten Werner <twerner@debian.org>  Fri, 21 Mar 2008 16:26:04 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7f8f011
--- /dev/null
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..0d5d34f
--- /dev/null
@@ -0,0 +1,44 @@
+Source: libcap2
+Section: libs
+Priority: optional
+Maintainer: Rafal Krypa <r.krypa@samsung.com>, Karol Lewandowski <k.lewandowsk@samsung.com>
+X-Original-Maintainer: Torsten Werner <twerner@debian.org>
+Standards-Version: 3.9.0
+Build-Depends: debhelper (>= 7.0.50~), indent, libattr1-dev
+Homepage: http://sites.google.com/site/fullycapable/
+Vcs-Svn: https://bollin.googlecode.com/svn/libcap2/
+Vcs-Browser: http://bollin.googlecode.com/svn/libcap2/
+
+Package: libcap2-bin
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libcap-dev
+Conflicts: libcap-bin
+Description: basic utility programs for using capabilities
+ This package contains the programs sucap, execap, getpcaps, setpcaps for
+ manipulation of capabilities. The manpages of this package reference the
+ manpage cap_from_text(3) from the libcap-dev package. Please install the
+ libcap-dev package if you need its documentation.
+
+Package: libcap2
+Priority: standard
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: support for getting/setting POSIX.1e capabilities
+ This library implements the user-space interfaces to the POSIX
+ 1003.1e capabilities available in Linux kernels. These capabilities are 
+ a partitioning of the all powerful root privilege into a set of distinct 
+ privileges.
+
+Package: libcap-dev
+Section: libdevel
+Architecture: any
+Depends: libcap2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: libcap2-dev
+Conflicts: libcap2-dev
+Replaces: libcap2-dev
+Suggests: manpages-dev
+Description: development libraries and header files for libcap2
+ Contains the necessary support for building applications that use
+ capabilities.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..d1618bb
--- /dev/null
@@ -0,0 +1,53 @@
+This package was debianized by Torsten Werner <twerner@debian.org> on
+Fri Mar 21 16:35:46 CET 2008 based on the package 'libcap' that is
+maintained by Michael Vogt.
+
+It was downloaded from
+http://www.eu.kernel.org/pub/linux/libs/security/linux-privs/libcap2/
+
+Upstream Author: Andrew G. Morgan <morgan@linux.kernel.org>
+
+Copyright: (c) 1999-2008 Andrew G. Morgan <morgan@linux.kernel.org>
+
+Unless otherwise *explicitly* stated, the following text describes the
+licensed conditions under which the contents of this libcap release
+may be used and distributed:
+
+-------------------------------------------------------------------------
+Redistribution and use in source and binary forms of libcap, with
+or without modification, are permitted provided that the following
+conditions are met:
+
+1. Redistributions of source code must retain any existing copyright
+   notice, and this entire permission notice in its entirety,
+   including the disclaimer of warranties.
+
+2. Redistributions in binary form must reproduce all prior and current
+   copyright notices, this list of conditions, and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+3. The name of any author may not be used to endorse or promote
+   products derived from this software without their specific prior
+   written permission.
+
+ALTERNATIVELY, this product may be distributed under the terms of the
+GNU General Public License, in which case the provisions of the GNU
+GPL are required INSTEAD OF the above restrictions.  (This clause is
+necessary due to a potential conflict between the GNU GPL and the
+restrictions contained in a BSD-style copyright.)
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+-------------------------------------------------------------------------
+
+You can find the GPL in /usr/share/common-licenses/GPL
diff --git a/debian/libcap-dev.install b/debian/libcap-dev.install
new file mode 100644 (file)
index 0000000..3ea4447
--- /dev/null
@@ -0,0 +1,3 @@
+debian/tmp/usr/include/*
+debian/tmp/lib/lib*.so
+debian/tmp/lib/lib*.a
diff --git a/debian/libcap-dev.manpages b/debian/libcap-dev.manpages
new file mode 100644 (file)
index 0000000..7c72677
--- /dev/null
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man3/*
diff --git a/debian/libcap2-bin.dirs b/debian/libcap2-bin.dirs
new file mode 100644 (file)
index 0000000..c862666
--- /dev/null
@@ -0,0 +1,2 @@
+#usr/share/pam-configs
+#etc/security
diff --git a/debian/libcap2-bin.examples b/debian/libcap2-bin.examples
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/debian/libcap2-bin.install b/debian/libcap2-bin.install
new file mode 100644 (file)
index 0000000..94e4adc
--- /dev/null
@@ -0,0 +1,4 @@
+#debian/tmp/lib/security/*
+debian/tmp/sbin/*
+#debian/pam-configs/* usr/share/pam-configs/
+#pam_cap/capability.conf etc/security/
diff --git a/debian/libcap2-bin.manpages b/debian/libcap2-bin.manpages
new file mode 100644 (file)
index 0000000..e62fdb9
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man8/*
+debian/capsh.8
diff --git a/debian/libcap2-bin.postinst.disabled b/debian/libcap2-bin.postinst.disabled
new file mode 100644 (file)
index 0000000..5f72e25
--- /dev/null
@@ -0,0 +1,37 @@
+#!/bin/sh
+# postinst script for libcap2-bin
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure|abort-upgrade|abort-remove|abort-deconfigure)
+        pam-auth-update --package
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libcap2-bin.prerm.disabled b/debian/libcap2-bin.prerm.disabled
new file mode 100644 (file)
index 0000000..3c3f50e
--- /dev/null
@@ -0,0 +1,39 @@
+#!/bin/sh
+# prerm script for libcap2-bin
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove)
+        pam-auth-update --package --remove capability
+    ;;
+
+    upgrade|deconfigure|failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libcap2.install b/debian/libcap2.install
new file mode 100644 (file)
index 0000000..56556a7
--- /dev/null
@@ -0,0 +1 @@
+debian/tmp/lib/lib*.so.*
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755 (executable)
index 0000000..f7d89cf
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $3 $origDir
+  echo "moved $3 to $origDir"
+fi
diff --git a/debian/pam-configs/capability b/debian/pam-configs/capability
new file mode 100644 (file)
index 0000000..68ea62e
--- /dev/null
@@ -0,0 +1,6 @@
+Name: Inheritable Capabilities Management
+Default: yes
+Priority: 0
+Auth-Type: Additional
+Auth-Final:
+       optional                        pam_cap.so
diff --git a/debian/patches/0001-fix-Makefiles.patch b/debian/patches/0001-fix-Makefiles.patch
new file mode 100644 (file)
index 0000000..6386ecd
--- /dev/null
@@ -0,0 +1,22 @@
+Description: compile pam_cap with -lpam
+ A similar fix was in Debian but appears to have been accidentally
+ dropped.  Drop this one if or when debian gets it back so we can
+ directly sync.
+Author: Andrew Straw <strawman@astraw.com>
+Forwarded: no
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libcap2/+bug/582769
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=591410
+
+Index: libcap2-2.20/pam_cap/Makefile
+===================================================================
+--- libcap2-2.20.orig/pam_cap/Makefile 2011-05-10 10:15:02.540359338 -0500
++++ libcap2-2.20/pam_cap/Makefile      2011-05-10 10:15:07.600359338 -0500
+@@ -7,7 +7,7 @@
+ # that this next line does *not* require -lpam on it.) If you think it
+ # does, *verify that it does*, and if you observe that it fails as
+ # written (and you know why it fails), email me and explain why. Thanks!
+-LDLIBS += -L../libcap -lcap
++LDLIBS += -L../libcap -lcap -lpam
+ all: pam_cap.so
+       $(MAKE) testcompile
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..769a17a
--- /dev/null
@@ -0,0 +1 @@
+#0001-fix-Makefiles.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..e3d814c
--- /dev/null
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+%:
+       dh $@
+
+override_dh_auto_install:
+       dh_auto_install -- lib=lib RAISE_SETFCAP=no
+
+override_dh_makeshlibs:
+       dh_makeshlibs -V 'libcap2 (>= 2.10)'
+
+get-orig-source:
+       -uscan --upstream-version 0
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..74e3ca3
--- /dev/null
@@ -0,0 +1,3 @@
+version=3
+http://www.eu.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-(.*)\.tar\.gz \
+  debian debian/orig-tar.sh
index 103cea3..de4ecd4 100644 (file)
@@ -4,8 +4,7 @@
 
 Name:           libcap
 Version:        2.21
-Release:        2
-VCS:            external/libcap#submit/trunk/20121022.071522-2-g987e044673c6ec4df12d1862a80b9a4650499a9b
+Release:        1
 Summary:        Library for getting and setting POSIX
 Source:         http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.gz
 
@@ -13,7 +12,6 @@ License:        BSD-2.0 and GPL-2.0
 Url:            http://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
 Group:          System/Libraries
 BuildRequires:  libattr-devel
-Patch0:         libcap_aslr_20150407.patch 
 
 %description
 libcap is a library for getting and setting POSIX.1e (formerly POSIX 6)
@@ -35,7 +33,6 @@ libcap.
 
 %prep
 %setup -q
-%patch0 -p1 -b .aslr
 
 %build
 # libcap can not be build with _smp_mflags:
diff --git a/packaging/libcap_aslr_20150407.patch b/packaging/libcap_aslr_20150407.patch
deleted file mode 100644 (file)
index 8b8a389..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur libcap/progs/Makefile libcap_patch/progs/Makefile
---- libcap/progs/Makefile      2015-03-12 09:30:15.313213680 +0900
-+++ libcap_patch/progs/Makefile        2015-04-07 16:28:24.510784418 +0900
-@@ -19,7 +19,7 @@
- all: $(BUILD)
- $(BUILD): %: %.o
--      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
-+      $(CC) $(CFLAGS) $(LDFLAGS) -pie -o $@ $< $(LDLIBS)
- %.o: %.c $(INCS)
-       $(CC) $(IPATH) $(CFLAGS) -c $< -o $@