Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (d18723bbd5e227f78f4715da1d88a653f4054f75)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (d18723bbd5e227f78f4715da1d88a653f4054f75)
  • Date: Sun, 22 Feb 2009 07:52:51 -0600

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

utils/coreutils/HISTORY | 3 +++
utils/coreutils/coreutils-smack.patch | 24 ++++++++++++------------
2 files changed, 15 insertions(+), 12 deletions(-)

New commits:
commit d18723bbd5e227f78f4715da1d88a653f4054f75
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

coreutils: Fixed SMACK patch to work with coreutils-7.1.
<rant>
WHEN UPDATING A SPELL AS CRUCIAL AS THIS,
or any other spells for that matter,
DO NOT NEGLECT TO CHECK THE PATCHES !!!!!!!
</rant>

diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index 28ea35f..ef86d31 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,3 +1,6 @@
+2009-02-22 Juuso Alasuutari <iuso AT sourcemage.org>
+ * coreutils-smack.patch: Fixed patch for 7.1.
+
2009-02-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 7.1
* PRE_BUILD, coreutils-utimens.patch: removed patch
diff --git a/utils/coreutils/coreutils-smack.patch
b/utils/coreutils/coreutils-smack.patch
index 1735d9f..5042563 100644
--- a/utils/coreutils/coreutils-smack.patch
+++ b/utils/coreutils/coreutils-smack.patch
@@ -1,24 +1,24 @@
---- coreutils-6.12/src/ls.c~ 2008-05-26 09:40:32.000000000 +0300
-+++ coreutils-6.12/src/ls.c 2008-10-26 15:26:27.000000000 +0200
+--- coreutils-7.1/src/ls.c~ 2009-02-20 20:34:02.000000000 +0200
++++ coreutils-7.1/src/ls.c 2009-02-22 15:39:37.000000000 +0200
@@ -37,6 +37,7 @@

#include <config.h>
#include <sys/types.h>
+#include <attr/attributes.h>

- #if HAVE_TERMIOS_H
- # include <termios.h>
-@@ -182,6 +183,9 @@
+ #ifdef HAVE_CAP
+ # include <sys/capability.h>
+@@ -188,6 +189,9 @@
/* For long listings, true if the file has an access control list,
or an SELinux security context. */
- bool have_acl;
+ enum acl_type acl_type;
+
+ /* Smack label */
+ char smack[8];
};

#define LEN_STR_PAIR(s) sizeof (s) - 1, s
-@@ -649,6 +653,10 @@
+@@ -660,6 +664,10 @@

static bool print_dir_name;

@@ -29,7 +29,7 @@
/* The line length to use for breaking lines in many-per-line format.
Can be set with -w. */

-@@ -773,6 +781,7 @@
+@@ -787,6 +795,7 @@
{"ignore", required_argument, NULL, 'I'},
{"indicator-style", required_argument, NULL, INDICATOR_STYLE_OPTION},
{"dereference", no_argument, NULL, 'L'},
@@ -37,7 +37,7 @@
{"literal", no_argument, NULL, 'N'},
{"quote-name", no_argument, NULL, 'Q'},
{"quoting-style", required_argument, NULL, QUOTING_STYLE_OPTION},
-@@ -1520,7 +1529,7 @@
+@@ -1534,7 +1543,7 @@
{
int oi = -1;
int c = getopt_long (argc, argv,
@@ -46,7 +46,7 @@
long_options, &oi);
if (c == -1)
break;
-@@ -1683,6 +1692,10 @@
+@@ -1697,6 +1706,10 @@
dereference = DEREF_ALWAYS;
break;

@@ -57,7 +57,7 @@
case 'N':
set_quoting_style (NULL, literal_quoting_style);
break;
-@@ -2840,6 +2853,18 @@
+@@ -2873,6 +2886,18 @@
file_size_width = len;
}
}
@@ -76,7 +76,7 @@
}

if (print_inode)
-@@ -3452,6 +3477,12 @@
+@@ -3488,6 +3513,12 @@

p = buf;





Archive powered by MHonArc 2.6.24.

Top of Page