Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8fe08c7aa813678892fa5f33663c16159afd87e4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <treeve AT scarlet.be>
  • To: <sm-commit AT lists.ibiblio.org>
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8fe08c7aa813678892fa5f33663c16159afd87e4)
  • Date: Thu, 21 Apr 2016 17:55:19 +0200

On Thu, 21 Apr 2016 14:43:28 +0000, Vlad Glagolev wrote:
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

libs/libcap/BUILD | 2 +-
libs/libcap/CONFIGURE | 1 +
libs/libcap/CONFLICTS | 5 +++++
libs/libcap/DEPENDS | 17 +++++++++--------
libs/libcap/DETAILS | 6 +++---
libs/libcap/HISTORY | 8 ++++++++
libs/libcap/INSTALL | 1 +
7 files changed, 28 insertions(+), 12 deletions(-)

New commits:
commit 8fe08c7aa813678892fa5f33663c16159afd87e4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libcap: => 2.25



cast fails:


Preparing to install libcap
/var/lib/sorcery/modules/build_api/common: line 384: /tmp/sorcery/cast/21733/failed_list: No such file or directory
Creating compile log /var/log/sorcery/compile/libcap-2.25.bz2
/var/lib/sorcery/modules/libcast: line 693: /tmp/sorcery/cast/21733/libcap.compile.log.2: No such file or directory
mv: cannot stat '/tmp/sorcery/cast/21733/libcap.compile.log.2': No such file or directory
pbzip2: *ERROR: File [/tmp/sorcery/cast/21733/libcap.compile.log] NOT found! Skipping...
-------------------------------------------
touch: cannot touch '/tmp/sorcery/cast/21733/pass_four.done': No such file or directory
Download pass has not completed yet, pausing momentarily


in my situations, this breaks coreutils


$ gzd libcap
chrony:on:optional
coreutils:on:optional
pinentry:on:optional
syslog-ng:on:optional





commit ebc43d6c80fee87fd96cc6fbc319a159a2c00865
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libcap: corrected dependencies

diff --git a/libs/libcap/BUILD b/libs/libcap/BUILD
index 8f58e6d..8eb5214 100755
--- a/libs/libcap/BUILD
+++ b/libs/libcap/BUILD
@@ -1 +1 @@
-make
+make $OPTS
diff --git a/libs/libcap/CONFIGURE b/libs/libcap/CONFIGURE
new file mode 100755
index 0000000..22fe25c
--- /dev/null
+++ b/libs/libcap/CONFIGURE
@@ -0,0 +1 @@
+persistent_remove LIBCAP_PAM
diff --git a/libs/libcap/CONFLICTS b/libs/libcap/CONFLICTS
new file mode 100755
index 0000000..163cbcb
--- /dev/null
+++ b/libs/libcap/CONFLICTS
@@ -0,0 +1,5 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
+if spell_ok libcap && is_version_less $(installed_version $SPELL) 2.25; then
+ conflicts libcap
+fi
diff --git a/libs/libcap/DEPENDS b/libs/libcap/DEPENDS
index 3a5d7eb..5332b0f 100755
--- a/libs/libcap/DEPENDS
+++ b/libs/libcap/DEPENDS
@@ -1,8 +1,9 @@
-depends attr &&
-optional_depends linux-pam "" "" "for capabilities PAM module" &&
-persistent_add LIBCAP_PAM &&
-if is_depends_enabled $SPELL linux-pam; then
- LIBCAP_PAM=yes
-else
- LIBCAP_PAM=no
-fi
+optional_depends attr \
+ "LIBATTR=yes" \
+ "LIBATTR=no" \
+ "for extended attributes support" &&
+
+optional_depends linux-pam \
+ "LIBCAP_PAM=yes" \
+ "LIBCAP_PAM=no" \
+ "for capabilities PAM module"
diff --git a/libs/libcap/DETAILS b/libs/libcap/DETAILS
index f3ef180..15a5e7a 100755
--- a/libs/libcap/DETAILS
+++ b/libs/libcap/DETAILS
@@ -1,13 +1,13 @@
SPELL=libcap
- VERSION=2.24
-

SOURCE_HASH=sha512:c062bab936d651a50efa66dcfa51ab3ce4b0881195d23bb32142b5c8044d30e0e2152f3497844ce90c04f909aeffe2d41203efff41972e38758dcca7b653884b
- PATCHLEVEL=0
+ VERSION=2.25
SOURCE=$SPELL-$VERSION.tar.xz
+

SOURCE_HASH=sha512:c3ab491885292adc171cde542b96f1295e84132febb50112a46575c3bde3a3eb6fcf733f7a756b4b656e013c0abb5ed6571db24799f8c0b23d8f759f992864f9
# SOURCE2=$SOURCE.sign


SOURCE_URL[0]=http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$SOURCE
# SOURCE2_URL[0]=$SOURCE_URL.sign
# SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
# SOURCE2_IGNORE=signature
+ DOC_DIRS=""
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=GPL
WEB_SITE=http://sites.google.com/site/fullycapable/
diff --git a/libs/libcap/HISTORY b/libs/libcap/HISTORY
index d423225..ef0b295 100644
--- a/libs/libcap/HISTORY
+++ b/libs/libcap/HISTORY
@@ -1,3 +1,11 @@
+2016-04-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.25
+ * BUILD: use $OPTS
+ * DEPENDS: made attr actually optional; rewritten
+ * CONFIGURE: dropped deprecated persistent var
+ * INSTALL: added, to use OPTS
+ * CONFLICTS: added, for proper upgrading procedure for =2.25
+
2014-04-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.24
* PRE_BUILD, INSTALL, *.patch: deleted
diff --git a/libs/libcap/INSTALL b/libs/libcap/INSTALL
new file mode 100755
index 0000000..8b8f583
--- /dev/null
+++ b/libs/libcap/INSTALL
@@ -0,0 +1 @@
+make $OPTS install
_______________________________________________
SM-Commit mailing list
SM-Commit AT lists.ibiblio.org
http://lists.ibiblio.org/mailman/listinfo/sm-commit





Archive powered by MHonArc 2.6.24.

Top of Page