summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xdisk/xfsprogs/DETAILS2
-rw-r--r--disk/xfsprogs/HISTORY3
-rw-r--r--disk/xfsprogs/xfsprogs_2.9.5-1.tar.gz.sigbin287 -> 0 bytes
-rw-r--r--disk/xfsprogs/xfsprogs_2.9.6-1.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xutils/util-linux/DETAILS15
-rw-r--r--utils/util-linux/HISTORY4
-rwxr-xr-xutils/util-linux/PRE_BUILD37
-rw-r--r--utils/util-linux/glibc-fix.patch62
-rw-r--r--utils/util-linux/glibc-umount2.patch18
-rw-r--r--utils/util-linux/util-linux-2.12p-cramfs-1.patch83
-rw-r--r--utils/util-linux/util-linux-ng-nls.patch12
11 files changed, 220 insertions, 16 deletions
diff --git a/disk/xfsprogs/DETAILS b/disk/xfsprogs/DETAILS
index 094c61d41b..068bd804f0 100755
--- a/disk/xfsprogs/DETAILS
+++ b/disk/xfsprogs/DETAILS
@@ -1,5 +1,5 @@
SPELL=xfsprogs
- VERSION=2.9.5
+ VERSION=2.9.6
SOURCE=${SPELL}_$VERSION-1.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://oss.sgi.com/projects/xfs/cmd_tars/$SOURCE
diff --git a/disk/xfsprogs/HISTORY b/disk/xfsprogs/HISTORY
index cbaec0f220..1fc6e1c766 100644
--- a/disk/xfsprogs/HISTORY
+++ b/disk/xfsprogs/HISTORY
@@ -1,3 +1,6 @@
+2008-02-07 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 2.9.6
+
2008-01-22 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 2.9.5
diff --git a/disk/xfsprogs/xfsprogs_2.9.5-1.tar.gz.sig b/disk/xfsprogs/xfsprogs_2.9.5-1.tar.gz.sig
deleted file mode 100644
index ebd72f7089..0000000000
--- a/disk/xfsprogs/xfsprogs_2.9.5-1.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/disk/xfsprogs/xfsprogs_2.9.6-1.tar.gz.sig b/disk/xfsprogs/xfsprogs_2.9.6-1.tar.gz.sig
new file mode 100644
index 0000000000..308415967d
--- /dev/null
+++ b/disk/xfsprogs/xfsprogs_2.9.6-1.tar.gz.sig
Binary files differ
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index e0b2491d0f..440c3d6d1a 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -10,20 +10,17 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-ng-$VERSION
SOURCE_GPG="kernel.gpg:$SOURCE2"
SOURCE2_IGNORE=signature
else
- VERSION=2.13.1
- SOURCE=$SPELL-ng-$VERSION.tar.gz
- SOURCE2=$SOURCE.sign
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-ng-$VERSION
- SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/$SPELL-ng/v2.13/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sign
- SOURCE_GPG="kernel.gpg:$SOURCE2"
- SOURCE2_IGNORE=signature
+ VERSION=2.12r
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/$SPELL/$SOURCE
+ SOURCE_HASH=sha1:7c47454d66c41d89efa6fda68eb83255cff9e382
fi
WEB_SITE=http://userweb.kernel.org/~kzak/util-linux-ng/
ENTERED=20010922
LICENSE[0]=GPL
KEYWORDS="utils"
- PATCHLEVEL=0
+ PATCHLEVEL=3
SHORT="Essential utilities for any Linux box."
cat << EOF
Util-linux is a suite of essential utilities for any Linux system. Its
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index b44a6128f4..3e08077165 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,7 +1,3 @@
-2008-01-20 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS, PRE_BUILD: promoted 2.13.1 to stable
- * *.patch: removed
-
2008-01-19 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.13.1, new WEB_SITE
diff --git a/utils/util-linux/PRE_BUILD b/utils/util-linux/PRE_BUILD
index 5e3d708e28..4a47774651 100755
--- a/utils/util-linux/PRE_BUILD
+++ b/utils/util-linux/PRE_BUILD
@@ -1,6 +1,39 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-if [ "$SELINUX" == "y" ] ; then
- OPTS="--with-selinux"
+if [[ $UTIL_LINUX_NG == n ]]
+then
+patch -p1 < $SCRIPT_DIRECTORY/util-linux-2.12p-cramfs-1.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/glibc-fix.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/glibc-umount2.patch &&
+sedit "s/HAVE_SLN=no/HAVE_SLN=yes/" MCONFIG &&
+sedit "s/# ADD_RAW=yes/ADD_RAW=yes/" MCONFIG &&
+sedit "s/\$(OPT)//" MCONFIG &&
+# Stupid `make install` doesn't honor --prefix
+sedit "s:/dev:${TRACK_ROOT}/dev:" MCONFIG &&
+sedit "s:/etc:${TRACK_ROOT}/etc:" MCONFIG &&
+# Stupid people who use TABs in their files...
+sedit "s: /sbin: ${TRACK_ROOT}/sbin:" MCONFIG &&
+sedit "s:/usr:${TRACK_ROOT}/usr:g" MCONFIG &&
+sedit "s:BIN_DIR= /bin: BIN_DIR=${TRACK_ROOT}/bin:" MCONFIG &&
+sedit "s:= /var/:= ${TRACK_ROOT}/var:g" MCONFIG &&
+
+#ORIGINAL Below############################################
+#sedit "s: /sbin: ${INSTALL_ROOT}/sbin:" MCONFIG &&
+#sedit "s:/usr:${INSTALL_ROOT}/usr:g" MCONFIG &&
+#sedit "s: /bin: ${INSTALL_ROOT}/bin:" MCONFIG &&
+#sedit "s:/var:${INSTALL_ROOT}/var:g" MCONFIG &&
+############################################################
+
+if [ "$SELINUX" == "y" ]; then
+ sedit "s/HAVE_SELINUX=no/HAVE_SELINUX=yes/" MCONFIG &&
+ message "${MESSAGE_COLOR} SELINUX is enabled ${DEFAULT_COLOR}"
+fi
+
+else
+ patch -p1 < ${SCRIPT_DIRECTORY}/util-linux-ng-nls.patch
+
+ if [ "$SELINUX" == "y" ] ; then
+ OPTS="--with-selinux"
+ fi
fi
diff --git a/utils/util-linux/glibc-fix.patch b/utils/util-linux/glibc-fix.patch
new file mode 100644
index 0000000000..d72c1701ef
--- /dev/null
+++ b/utils/util-linux/glibc-fix.patch
@@ -0,0 +1,62 @@
+--- /tmp/llseek.c 2006-11-21 11:31:31.000000000 +0100
++++ util-linux-2.12r/fdisk/llseek.c 2006-11-21 11:33:21.218554000 +0100
+@@ -31,9 +31,18 @@
+
+ #ifdef __NR__llseek
+
++#ifdef _syscall5
++
+ static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high,
+ unsigned long, offset_low,long long *,result,
+ unsigned int, origin)
++#else
++static int _llseek (unsigned int fd, unsigned long oh,
++ unsigned long ol, long long *result,
++ unsigned int origin) {
++ return syscall (__NR__llseek, fd, oh, ol, result, origin);
++}
++#endif /* _syscall5 */
+
+ #else
+
+--- /tmp/sfdisk.c 2006-11-21 11:36:13.000000000 +0100
++++ util-linux-2.12r/fdisk/sfdisk.c 2006-11-21 11:37:17.678554000 +0100
+@@ -177,9 +177,16 @@
+ #endif
+
+ #ifndef use_lseek
++#ifdef _syscall5
+ static __attribute__used
+ _syscall5(int, _llseek, unsigned int, fd, ulong, hi, ulong, lo,
+ loff_t *, res, unsigned int, wh);
++#else
++int _llseek (unsigned int fd, ulong hi, ulong lo,
++ loff_t *res, unsigned int wh) {
++ return syscall (__NR__llseek, fd, hi, lo, res, wh);
++}
++#endif /* _syscall5 */
+ #endif
+
+ static int
+--- /tmp/cmos.c 2006-11-21 11:38:55.000000000 +0100
++++ util-linux-2.12r/hwclock/cmos.c 2006-11-21 11:41:45.458554000 +0100
+@@ -46,15 +46,16 @@
+
+ #include <unistd.h> /* for geteuid() */
+ #include <fcntl.h> /* for O_RDWR */
++#include <linux/version.h>
+ #include <errno.h>
+ #include "../defines.h" /* for HAVE_sys_io_h */
+ #include "nls.h"
+
+ #if defined(__i386__)
+-#ifdef HAVE_sys_io_h
+-#include <sys/io.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
++#include <asm/io.h>
+ #else
+-#include <asm/io.h> /* for inb, outb */
++#include <sys/io.h> /* for inb, outb */
+ #endif
+ #elif defined(__alpha__)
+ /* <asm/io.h> fails to compile, probably because of u8 etc */
diff --git a/utils/util-linux/glibc-umount2.patch b/utils/util-linux/glibc-umount2.patch
new file mode 100644
index 0000000000..3da3a85cfc
--- /dev/null
+++ b/utils/util-linux/glibc-umount2.patch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10sparcumount.dpatch by Jeff Bailey <jbailey@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Sparc and Arm have umount2 in glibc.
+
+@DPATCH@
+--- util-linux/mount/umount.c 2005-05-20 11:39:07.000000000 +0000
++++ util-linux/mount/umount.c 2005-05-20 11:39:15.000000000 +0000
+@@ -31,7 +31,7 @@
+ #include <arpa/inet.h>
+ #endif
+
+-#if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__)
++#if defined(MNT_FORCE)
+ /* Interesting ... it seems libc knows about MNT_FORCE and presumably
+ about umount2 as well -- need not do anything */
+ #else /* MNT_FORCE */
diff --git a/utils/util-linux/util-linux-2.12p-cramfs-1.patch b/utils/util-linux/util-linux-2.12p-cramfs-1.patch
new file mode 100644
index 0000000000..05615bb878
--- /dev/null
+++ b/utils/util-linux/util-linux-2.12p-cramfs-1.patch
@@ -0,0 +1,83 @@
+diff -Naur util-linux-2.12p/disk-utils/fsck.cramfs.c util-linux-2.12p-new/disk-utils/fsck.cramfs.c
+--- util-linux-2.12p/disk-utils/fsck.cramfs.c 2004-12-11 14:53:16.000000000 +0000
++++ util-linux-2.12p-new/disk-utils/fsck.cramfs.c 2004-12-26 00:53:10.665199086 +0000
+@@ -76,16 +76,7 @@
+
+ #define PAD_SIZE 512
+
+-#include <asm/page.h>
+-#ifdef PAGE_SIZE
+-#define PAGE_CACHE_SIZE ((int) PAGE_SIZE)
+-#elif defined __ia64__
+-#define PAGE_CACHE_SIZE (16384)
+-#elif defined __alpha__
+-#define PAGE_CACHE_SIZE (8192)
+-#else
+-#define PAGE_CACHE_SIZE (4096)
+-#endif
++#define PAGE_CACHE_SIZE page_size
+
+ /* Guarantee access to at least 8kB at a time */
+ #define ROMBUFFER_BITS 13
+@@ -95,11 +86,13 @@
+ static unsigned long read_buffer_block = ~0UL;
+
+ /* Uncompressing data structures... */
+-static char outbuffer[PAGE_CACHE_SIZE*2];
++static char *outbuffer;
+ z_stream stream;
+
+ #endif /* INCLUDE_FS_TESTS */
+
++static size_t page_size;
++
+ /* Input status of 0 to print help and exit without an error. */
+ static void usage(int status)
+ {
+@@ -464,9 +457,17 @@
+ int c; /* for getopt */
+ int start = 0;
+
++ page_size = sysconf(_SC_PAGESIZE);
++
+ if (argc)
+ progname = argv[0];
+
++ outbuffer = malloc(page_size * 2);
++ if (!outbuffer) {
++ fprintf(stderr, _("failed to allocate outbuffer\n"));
++ exit(8);
++ }
++
+ /* command line options */
+ while ((c = getopt(argc, argv, "hx:v")) != EOF) {
+ switch (c) {
+diff -Naur util-linux-2.12p/disk-utils/mkfs.cramfs.c util-linux-2.12p-new/disk-utils/mkfs.cramfs.c
+--- util-linux-2.12p/disk-utils/mkfs.cramfs.c 2004-12-11 14:56:01.000000000 +0000
++++ util-linux-2.12p-new/disk-utils/mkfs.cramfs.c 2004-12-26 00:53:10.666198928 +0000
+@@ -46,16 +46,8 @@
+ static const char *progname = "mkcramfs";
+ static int verbose = 0;
+
+-#ifdef __ia64__
+-#define PAGE_CACHE_SIZE (16384)
+-#elif defined __alpha__
+-#define PAGE_CACHE_SIZE (8192)
+-#else
+-#define PAGE_CACHE_SIZE (4096)
+-#endif
+-
+ /* The kernel assumes PAGE_CACHE_SIZE as block size. */
+-static unsigned int blksize = PAGE_CACHE_SIZE; /* settable via -b option */
++static unsigned int blksize; /* settable via -b option */
+ static long total_blocks = 0, total_nodes = 1; /* pre-count the root node */
+ static int image_length = 0;
+
+@@ -730,6 +722,7 @@
+ u32 crc = crc32(0L, Z_NULL, 0);
+ int c;
+
++ blksize = sysconf(_SC_PAGESIZE);
+ total_blocks = 0;
+
+ if (argc) {
diff --git a/utils/util-linux/util-linux-ng-nls.patch b/utils/util-linux/util-linux-ng-nls.patch
new file mode 100644
index 0000000000..79080609a8
--- /dev/null
+++ b/utils/util-linux/util-linux-ng-nls.patch
@@ -0,0 +1,12 @@
+--- a/include/nls.h 2007-09-14 04:13:55.000000000 +0000
++++ b/include/nls.h 2007-09-14 04:14:19.000000000 +0000
+@@ -9,6 +9,9 @@
+
+ #ifdef ENABLE_NLS
+ # include <libintl.h>
++# ifndef LC_ALL
++# include <locale.h>
++# endif
+ # define _(Text) gettext (Text)
+ # ifdef gettext_noop
+ # define N_(String) gettext_noop (String)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 23:46:38 +0000