summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/btrfs-progs/PKGBUILD21
-rw-r--r--core/iptables/PKGBUILD21
-rwxr-xr-xcore/iptables/ip6tables69
-rw-r--r--core/iptables/ip6tables.service4
-rwxr-xr-xcore/iptables/iptables68
-rw-r--r--core/iptables/iptables.conf.d12
-rw-r--r--core/iptables/iptables.service4
-rw-r--r--core/procps-ng/PKGBUILD10
-rw-r--r--core/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch57
-rw-r--r--core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch163
-rw-r--r--core/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch26
-rw-r--r--core/util-linux/PKGBUILD28
12 files changed, 33 insertions, 450 deletions
diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD
index 6cef400a0..042014e1f 100644
--- a/core/btrfs-progs/PKGBUILD
+++ b/core/btrfs-progs/PKGBUILD
@@ -1,43 +1,46 @@
-# $Id: PKGBUILD 177869 2013-02-10 13:06:27Z tomegun $
+# $Id: PKGBUILD 186631 2013-05-30 10:13:30Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=btrfs-progs
-pkgver=0.20rc1.1
+pkgver=0.20rc1.2
pkgrel=1
pkgdesc="btrfs filesystem utilities"
arch=(i686 x86_64)
-depends=('glibc' 'e2fsprogs')
+depends=('glibc' 'e2fsprogs' 'lzo2')
+makedepends=('git')
url="http://btrfs.wiki.kernel.org/"
replaces=('btrfs-progs-unstable')
conflicts=('btrfs-progs-unstable')
provides=('btrfs-progs-unstable')
license=('GPL2')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-0.20-rc1.1.tar.xz
+source=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#commit=7854c8b667"
initcpio-install-btrfs
initcpio-hook-btrfs)
install=btrfs-progs.install
+options=(!staticlibs)
build() {
- cd $srcdir/$pkgname-0.20-rc1.1
+ cd $pkgname
make CFLAGS="$CFLAGS"
}
package() {
- cd $srcdir/$pkgname-0.20-rc1.1
+ cd $pkgname
+
make prefix=$pkgdir/usr install
+
# fix manpage
mkdir -p $pkgdir/usr/share/
mv $pkgdir/usr/man $pkgdir/usr/share/man
- mkdir -p ${pkgdir}/sbin
- ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
+
# install mkinitcpio hooks
install -Dm644 "$srcdir/initcpio-install-btrfs" \
"$pkgdir/usr/lib/initcpio/install/btrfs"
install -Dm644 "$srcdir/initcpio-hook-btrfs" \
"$pkgdir/usr/lib/initcpio/hooks/btrfs"
}
-md5sums=('4046bebaae014db1fd50cec2da0e94c0'
+md5sums=('SKIP'
'7241ba3a4286d08da0d50b7176941112'
'b09688a915a0ec8f40e2f5aacbabc9ad')
diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD
index f7fc86bbf..17c057d0a 100644
--- a/core/iptables/PKGBUILD
+++ b/core/iptables/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180028 2013-03-14 20:45:48Z foutrelis $
+# $Id: PKGBUILD 186735 2013-05-30 21:29:53Z andrea $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
pkgname=iptables
pkgver=1.4.18
-pkgrel=1
+pkgrel=2
pkgdesc='Linux kernel packet control tool'
arch=('i686' 'x86_64')
license=('GPL2')
@@ -13,11 +13,8 @@ depends=('glibc' 'bash')
makedepends=('linux-api-headers' 'chrpath')
options=('!libtool')
source=("http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2"
- iptables
- ip6tables
empty.rules
simple_firewall.rules
- iptables.conf.d
empty-filter.rules
empty-mangle.rules
empty-nat.rules
@@ -27,21 +24,17 @@ source=("http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.t
iptables.service
ip6tables.service
iptables-flush)
-backup=(etc/conf.d/iptables)
sha1sums=('34bf627c8755a61caf3635a998d2a5279f664f9e'
- '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
- '2db68906b603e5268736f48c8e251f3a49da1d75'
'83b3363878e3660ce23b2ad325b53cbd6c796ecf'
'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec'
- 'cdb830137192bbe002c6d01058656bd053ed0ddd'
'd9f9f06b46b4187648e860afa0552335aafe3ce4'
'c45b738b5ec4cfb11611b984c21a83b91a2d58f3'
'1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6'
'7db53bb882f62f6c677cc8559cff83d8bae2ef73'
'ebbd1424a1564fd45f455a81c61ce348f0a14c2e'
'44626980a52e49f345a0b1e1ca03060f3a35763c'
- '5f2e76985a751f635a45612565a6e1bc9547398a'
- 'fe6bbe214b3a13bd084f62a8ee9631fd8326c464'
+ '9306cba67dbeaa004af084a816f66920a6a10faf'
+ '38fa2ffe7965e63b494d333f69193029c1258c28'
'e7abda09c61142121b6695928d3b71ccd8fdf73a')
build() {
@@ -55,7 +48,8 @@ build() {
./configure --prefix=/usr \
--libexecdir=/usr/lib/iptables --sysconfdir=/etc \
--with-xtlibdir=/usr/lib/iptables \
- --enable-devel --enable-shared
+ --enable-devel --enable-shared \
+ --sbindir=/usr/bin
make
}
@@ -69,11 +63,8 @@ package() {
chrpath --delete "${pkgdir}"/usr/lib/iptables/*.so
cd "${srcdir}"
- install -D -m755 iptables "${pkgdir}"/etc/rc.d/iptables
- install -D -m755 ip6tables "${pkgdir}"/etc/rc.d/ip6tables
install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules
install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules
- install -D -m644 iptables.conf.d "${pkgdir}"/etc/conf.d/iptables
mkdir -p "${pkgdir}"/var/lib/{iptables,ip6tables}
install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables
diff --git a/core/iptables/ip6tables b/core/iptables/ip6tables
deleted file mode 100755
index 2d119e3ed..000000000
--- a/core/iptables/ip6tables
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
-
-# Set defaults if settings are missing
-[ -z "$IP6TABLES_CONF" ] && IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- if [ ! -f "$IP6TABLES_CONF" ]; then
- echo "Cannot load ip6tables rules: $IP6TABLES_CONF is missing!" >&2
- exit 1
- fi
- stat_busy "Starting IP6 Tables"
- if [ "$IPTABLES_FORWARD" = "1" ]; then
- echo 1 >/proc/sys/net/ipv6/conf/default/forwarding
- echo 1 >/proc/sys/net/ipv6/conf/all/forwarding
- fi
- if ck_daemon ip6tables; then
- /usr/sbin/ip6tables-restore < $IP6TABLES_CONF
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon ip6tables
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping IP6 Tables"
- if ! ck_daemon ip6tables; then
- fail=0
- for table in $(cat /proc/net/ip6_tables_names); do
- ip6tables-restore < /var/lib/iptables/empty-$table.rules
- [ $? -gt 0 ] && fail=1
- done
- if [ $fail -gt 0 ]; then
- stat_fail
- else
- rm_daemon ip6tables
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- save)
- stat_busy "Saving IP6 Tables"
- /usr/sbin/ip6tables-save >$IP6TABLES_CONF
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|save}"
-esac
-exit 0
diff --git a/core/iptables/ip6tables.service b/core/iptables/ip6tables.service
index 60d76becf..7a8d39ca0 100644
--- a/core/iptables/ip6tables.service
+++ b/core/iptables/ip6tables.service
@@ -3,8 +3,8 @@ Description=IPv6 Packet Filtering Framework
[Service]
Type=oneshot
-ExecStart=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
-ExecReload=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
+ExecStart=/usr/bin/ip6tables-restore /etc/iptables/ip6tables.rules
+ExecReload=/usr/bin/ip6tables-restore /etc/iptables/ip6tables.rules
ExecStop=/usr/lib/systemd/scripts/iptables-flush 6
RemainAfterExit=yes
diff --git a/core/iptables/iptables b/core/iptables/iptables
deleted file mode 100755
index fbb02face..000000000
--- a/core/iptables/iptables
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
-
-# Set defaults if settings are missing
-[ -z "$IPTABLES_CONF" ] && IPTABLES_CONF=/etc/iptables/iptables.rules
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- if [ ! -f "$IPTABLES_CONF" ]; then
- echo "Cannot load iptables rules: $IPTABLES_CONF is missing!" >&2
- exit 1
- fi
- stat_busy "Starting IP Tables"
- if [ "$IPTABLES_FORWARD" = "1" ]; then
- echo 1 >/proc/sys/net/ipv4/ip_forward
- fi
- if ck_daemon iptables; then
- /usr/sbin/iptables-restore < $IPTABLES_CONF
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon iptables
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping IP Tables"
- if ! ck_daemon iptables; then
- fail=0
- for table in $(cat /proc/net/ip_tables_names); do
- iptables-restore < /var/lib/iptables/empty-$table.rules
- [ $? -gt 0 ] && fail=1
- done
- if [ $fail -gt 0 ]; then
- stat_fail
- else
- rm_daemon iptables
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- save)
- stat_busy "Saving IP Tables"
- /usr/sbin/iptables-save >$IPTABLES_CONF
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|save}"
-esac
-exit 0
diff --git a/core/iptables/iptables.conf.d b/core/iptables/iptables.conf.d
deleted file mode 100644
index 1c6cc7b5d..000000000
--- a/core/iptables/iptables.conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-# Configuration for iptables rules
-IPTABLES_CONF=/etc/iptables/iptables.rules
-IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-
-# Enable IP forwarding (both IPv4 and IPv6)
-# NOTE: this is not the recommended way to do this, and is supported only for
-# backward compatibility. Instead, use /etc/sysctl.conf and set the following
-# options:
-# * net.ipv4.ip_forward=1
-# * net.ipv6.conf.default.forwarding=1
-# * net.ipv6.conf.all.forwarding=1
-#IPTABLES_FORWARD=0
diff --git a/core/iptables/iptables.service b/core/iptables/iptables.service
index eb1a967f3..5441e4577 100644
--- a/core/iptables/iptables.service
+++ b/core/iptables/iptables.service
@@ -3,8 +3,8 @@ Description=Packet Filtering Framework
[Service]
Type=oneshot
-ExecStart=/usr/sbin/iptables-restore /etc/iptables/iptables.rules
-ExecReload=/usr/sbin/iptables-restore /etc/iptables/iptables.rules
+ExecStart=/usr/bin/iptables-restore /etc/iptables/iptables.rules
+ExecReload=/usr/bin/iptables-restore /etc/iptables/iptables.rules
ExecStop=/usr/lib/systemd/scripts/iptables-flush
RemainAfterExit=yes
diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD
index 16e781fab..e2f1a9751 100644
--- a/core/procps-ng/PKGBUILD
+++ b/core/procps-ng/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186026 2013-05-20 14:49:45Z bisson $
+# $Id: PKGBUILD 186686 2013-05-30 13:43:55Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Eric Bélanger <eric@archlinux.org>
pkgname=procps-ng
-pkgver=3.3.7
-pkgrel=2
+pkgver=3.3.8
+pkgrel=1
pkgdesc='Utilities for monitoring your system and its processes'
url='http://gitorious.org/procps'
license=('GPL' 'LGPL')
@@ -12,9 +12,9 @@ arch=('i686' 'x86_64')
groups=('base')
depends=('ncurses')
backup=('etc/sysctl.conf')
-source=("procps-ng-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver}"
+source=("${pkgname}-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver}"
'sysctl.conf')
-sha1sums=('436ce9e585210340ff1673157e402e07879a6239'
+sha1sums=('63aed46ba4b5b05698beb25d2aa3eee6779d7f45'
'97ff07bab9aa5daa8d54a1346f73ba74f8e12a53')
conflicts=('procps')
diff --git a/core/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch b/core/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch
deleted file mode 100644
index 26da877ef..000000000
--- a/core/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From e3b6cb87e0ba1304fa07ec316784de1c6243b28e Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Mon, 13 May 2013 10:54:41 +0200
-Subject: [PATCH] lib/loopdev: fix loopcxt_check_size() to work with blkdevs
-
-The loopcxt_check_size() is workaround for kernels < v3.9, kernel has
-been fixed by commit 541c742a7559eb65f0e36d3e2338c2ca532a3e61.
-
-The function sets loopdev size according to backing file size. The
-problem is that the backing file could be a block device where
-stat.st_size is zero, so we have to use blkdev_get_size() for block
-devices.
-
-Addresses: https://bugs.archlinux.org/task/35193
-Reported-by: Dave Reisner <d@falconindy.com>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- lib/loopdev.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/lib/loopdev.c b/lib/loopdev.c
-index c35e306..3b65b5d 100644
---- a/lib/loopdev.c
-+++ b/lib/loopdev.c
-@@ -1097,7 +1097,17 @@ static int loopcxt_check_size(struct loopdev_cxt *lc, int file_fd)
- if (fstat(file_fd, &st))
- return -errno;
-
-- expected_size = st.st_size;
-+ if (S_ISBLK(st.st_mode)) {
-+ if (blkdev_get_size(file_fd,
-+ (unsigned long long *) &expected_size))
-+ return -errno;
-+ } else
-+ expected_size = st.st_size;
-+
-+ if (expected_size == 0 || expected_size <= lc->info.lo_offset) {
-+ DBG(lc, loopdev_debug("failed to determine expected size"));
-+ return 0; /* ignore this error */
-+ }
-
- if (lc->info.lo_offset > 0)
- expected_size -= lc->info.lo_offset;
-@@ -1113,6 +1123,10 @@ static int loopcxt_check_size(struct loopdev_cxt *lc, int file_fd)
- return -errno;
-
- if (expected_size != size) {
-+ DBG(lc, loopdev_debug("warning: loopdev and expected "
-+ "size dismatch (%ju/%ju)",
-+ size, expected_size));
-+
- if (loopcxt_set_capacity(lc)) {
- /* ioctl not available */
- if (errno == ENOTTY || errno == EINVAL)
---
-1.8.2.3
-
diff --git a/core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch b/core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch
deleted file mode 100644
index 86bb6e572..000000000
--- a/core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 4fb18cde32a6cb672090762c785d89a6ed02ef57 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 9 May 2013 13:06:02 +0200
-Subject: [PATCH] libfdisk: do not use va_list in the Ask API
-
- # fdisk /dev/sda
- Welcome to fdisk (util-linux 2.23).
-
- [...]
-
- Command (m for help): a
- Segmentation fault (core dumped)
-
-It's too fragile, the va_list implementation is architecture specific
-and it seems we need such thing in libfdisk at all.
-
-Reported-by: "Gabor Z. Papp" <gzp@papp.hu>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- fdisks/fdisk-ask.c | 13 +++----------
- libfdisk/src/ask.c | 35 +++++++++--------------------------
- libfdisk/src/fdiskP.h | 2 --
- libfdisk/src/libfdisk.h | 2 --
- 4 files changed, 12 insertions(+), 40 deletions(-)
-
-diff --git a/fdisks/fdisk-ask.c b/fdisks/fdisk-ask.c
-index 7495d85..61dc0c2 100644
---- a/fdisks/fdisk-ask.c
-+++ b/fdisks/fdisk-ask.c
-@@ -167,7 +167,6 @@ static int ask_offset(struct fdisk_context *cxt,
- int ask_callback(struct fdisk_context *cxt, struct fdisk_ask *ask,
- void *data __attribute__((__unused__)))
- {
-- va_list ap;
- int rc = 0;
- char buf[BUFSIZ];
-
-@@ -180,23 +179,17 @@ int ask_callback(struct fdisk_context *cxt, struct fdisk_ask *ask,
- case FDISK_ASKTYPE_OFFSET:
- return ask_offset(cxt, ask, buf, sizeof(buf));
- case FDISK_ASKTYPE_INFO:
-- fdisk_ask_print_get_va(ask, ap);
-- vfprintf(stdout, fdisk_ask_print_get_mesg(ask), ap);
-+ fputs(fdisk_ask_print_get_mesg(ask), stdout);
- fputc('\n', stdout);
-- va_end(ap);
- break;
- case FDISK_ASKTYPE_WARNX:
-- fdisk_ask_print_get_va(ask, ap);
-- vfprintf(stderr, fdisk_ask_print_get_mesg(ask), ap);
-+ fputs(fdisk_ask_print_get_mesg(ask), stderr);
- fputc('\n', stderr);
-- va_end(ap);
- break;
- case FDISK_ASKTYPE_WARN:
-- fdisk_ask_print_get_va(ask, ap);
-- vfprintf(stderr, fdisk_ask_print_get_mesg(ask), ap);
-+ fputs(fdisk_ask_print_get_mesg(ask), stderr);
- errno = fdisk_ask_print_get_errno(ask);
- fprintf(stderr, ": %m\n");
-- va_end(ap);
- break;
- case FDISK_ASKTYPE_YESNO:
- fputc('\n', stdout);
-diff --git a/libfdisk/src/ask.c b/libfdisk/src/ask.c
-index d2325d5..cdb4d01 100644
---- a/libfdisk/src/ask.c
-+++ b/libfdisk/src/ask.c
-@@ -18,11 +18,6 @@ void fdisk_reset_ask(struct fdisk_ask *ask)
- case FDISK_ASKTYPE_NUMBER:
- free(ask->data.num.range);
- break;
-- case FDISK_ASKTYPE_WARNX:
-- case FDISK_ASKTYPE_WARN:
-- if (ask->data.print.has_va)
-- va_end(ask->data.print.va);
-- break;
- default:
- break;
- }
-@@ -452,44 +447,32 @@ int fdisk_ask_print_set_mesg(struct fdisk_ask *ask, const char *mesg)
- return 0;
- }
-
--/* caller has to call va_end(ap) */
--int fdisk_ask_print_get_va(struct fdisk_ask *ask, va_list ap)
--{
-- assert(ask);
-- assert(is_print_ask(ask));
-- va_copy(ap, ask->data.print.va);
-- return 0;
--}
--
--/* note that fdisk_free_ask() calls va_end() to free the private va list. */
--int fdisk_ask_print_set_va(struct fdisk_ask *ask, va_list ap)
--{
-- assert(ask);
-- va_copy(ask->data.print.va, ap);
-- ask->data.print.has_va = 1;
-- return 0;
--}
--
- static int do_vprint(struct fdisk_context *cxt, int errnum, int type,
- const char *fmt, va_list va)
- {
- struct fdisk_ask *ask;
- int rc;
-+ char *mesg;
-
- assert(cxt);
-
-+ if (vasprintf(&mesg, fmt, va) < 0)
-+ return -ENOMEM;
-+
- ask = fdisk_new_ask();
-- if (!ask)
-+ if (!ask) {
-+ free(mesg);
- return -ENOMEM;
-+ }
-
- fdisk_ask_set_type(ask, type);
-- fdisk_ask_print_set_mesg(ask, fmt);
-- fdisk_ask_print_set_va(ask, va);
-+ fdisk_ask_print_set_mesg(ask, mesg);
- if (errnum >= 0)
- fdisk_ask_print_set_errno(ask, errnum);
- rc = fdisk_do_ask(cxt, ask);
-
- fdisk_free_ask(ask);
-+ free(mesg);
- return rc;
- }
-
-diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h
-index 570108c..ce42860 100644
---- a/libfdisk/src/fdiskP.h
-+++ b/libfdisk/src/fdiskP.h
-@@ -231,8 +231,6 @@ struct fdisk_ask {
- /* FDISK_ASKTYPE_{WARN,WARNX,..} */
- struct ask_print {
- const char *mesg;
-- va_list va;
-- unsigned int has_va:1;
- int errnum; /* errno */
- } print;
- /* FDISK_ASKTYPE_YESNO */
-diff --git a/libfdisk/src/libfdisk.h b/libfdisk/src/libfdisk.h
-index 0a23236..8a44067 100644
---- a/libfdisk/src/libfdisk.h
-+++ b/libfdisk/src/libfdisk.h
-@@ -182,8 +182,6 @@ extern int fdisk_ask_print_get_errno(struct fdisk_ask *ask);
- extern int fdisk_ask_print_set_errno(struct fdisk_ask *ask, int errnum);
- extern const char *fdisk_ask_print_get_mesg(struct fdisk_ask *ask);
- extern int fdisk_ask_print_set_mesg(struct fdisk_ask *ask, const char *mesg);
--extern int fdisk_ask_print_get_va(struct fdisk_ask *ask, va_list ap);
--extern int fdisk_ask_print_set_va(struct fdisk_ask *ask, va_list ap);
-
- #ifdef __cplusplus
- }
---
-1.8.2.3
-
diff --git a/core/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch b/core/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch
deleted file mode 100644
index afc875719..000000000
--- a/core/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b048b8af3a5568c90f6e0c2d56f6cb399dedb0d1 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Mon, 13 May 2013 11:00:47 +0200
-Subject: [PATCH] losetup: use warn_size() for regular files only
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- sys-utils/losetup.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
-index ccf120e..b44c9e5 100644
---- a/sys-utils/losetup.c
-+++ b/sys-utils/losetup.c
-@@ -380,7 +380,7 @@ static void warn_size(const char *filename, uint64_t size)
- struct stat st;
-
- if (!size) {
-- if (stat(filename, &st))
-+ if (stat(filename, &st) || S_ISBLK(st.st_mode))
- return;
- size = st.st_size;
- }
---
-1.8.2.3
-
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index c5bacea39..78e90224d 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186531 2013-05-28 12:25:50Z dreisner $
+# $Id: PKGBUILD 186677 2013-05-30 12:45:22Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=util-linux
-pkgver=2.23
-pkgrel=3
+pkgver=2.23.1
+pkgrel=1
pkgdesc="Miscellaneous system utilities for Linux"
url="http://www.kernel.org/pub/linux/utils/util-linux/"
arch=('i686' 'x86_64')
@@ -17,9 +17,6 @@ provides=("util-linux-ng=$pkgver" 'eject')
license=('GPL2')
options=('!libtool')
source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.23/$pkgname-$pkgver.tar.xz"
- 0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch
- 0001-losetup-use-warn_size-for-regular-files-only.patch
- 0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch
uuidd.tmpfiles
pam-login
pam-common
@@ -30,25 +27,14 @@ backup=(etc/pam.d/chfn
etc/pam.d/su
etc/pam.d/su-l)
install=util-linux.install
-md5sums=('cf5e9bb402371beaaffc3a5f276d5783'
- 'fdb627fbb3d6a42e0b36978649b4c064'
- 'de0ba450945a60f27c5df86e64523d57'
- 'df949d15dbff01fe9fcda5d999a35b15'
+md5sums=('33ba55ce82f8e3b8d7a38fac0f62779a'
'a39554bfd65cccfd8254bb46922f4a67'
'4368b3f98abd8a32662e094c54e7f9b1'
'a31374fef2cba0ca34dfc7078e2969e4'
'fa85e5cce5d723275b14365ba71a8aad')
-prepare() {
- cd "$pkgname-$pkgver"
-
- patch -Np1 <"$srcdir"/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch
- patch -Np1 <"$srcdir"/0001-losetup-use-warn_size-for-regular-files-only.patch
- patch -Np1 <"$srcdir"/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch
-}
-
build() {
- cd "${pkgname}-${pkgver}"
+ cd "$pkgname-$pkgver"
./configure --prefix=/usr \
--libdir=/usr/lib \
@@ -75,12 +61,10 @@ build() {
#}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "$pkgname-$pkgver"
make DESTDIR="${pkgdir}" install
- cd "${pkgdir}"
-
# setuid chfn and chsh
chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-07 02:22:36 +0000