Fri May 17 01:52:35 PDT 2013

14 files changed, 144 insertions, 88 deletions

diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD
index 38c9cfc82..a25f1a53b 100644
--- a/core/inetutils/PKGBUILD
+++ b/core/inetutils/PKGBUILD
@@ -1,38 +1,40 @@
-# $Id: PKGBUILD 165908 2012-09-03 17:29:57Z eric $
+# $Id: PKGBUILD 185637 2013-05-16 17:56:59Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=inetutils
 pkgver=1.9.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A collection of common network programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/inetutils/"
 license=('GPL3')
 groups=('base')
-depends=('readline' 'ncurses' 'pam')
-backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
+depends=('pam')
+backup=('etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
         'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
 options=('!emptydirs')
 install=inetutils.install
 source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \
-        ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \
+        telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \
         ftpd.service dnsdomainname)
 sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90'
-          'ff0aad9946a38915580b094dadf67e790e8a2f87'
-          '84dc802b5e57b5e04c847572225a3b9612017155'
-          '68a590083b45997dfdb80e666b2de762f494ba74'
-          'bfad98a4a62f1fff8779f076c6019ed07f9111af'
-          '27d99b910eec0fc26bd79ccc2c1de26608330298'
-          '81f10b3b688e3952f793b35bcef63b5bf257a92b'
-          '81f4a8da823cf0bb14284fc71ee6108849691eda'
-          'fb607dafe177f074e14891dd887ef9e9ab67a875'
+          'SKIP'
+          '2b2dd71eb3233e5090f4c2df8abe9b4924d323f3'
+          'b15ab4faa9d97652e182c98c1e3a3b3cbbf6383c'
+          'd9b8f8aab094ecb779d0f16f21b4683ab327516f'
+          '26763ae31b8a5be256666a0ba55746941d75d6ee'
+          'e4a764828b57f1e907ec96f4ae0e0cf0d3e2e802'
           'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h
-  ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \
-    --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --libexec=/usr/bin \
+    --localstatedir=/var --sysconfdir=/etc \
     --without-wrap --with-pam \
     --enable-ftp --enable-ftpd \
     --enable-telnet --enable-telnetd \
@@ -50,20 +52,19 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -d "${pkgdir}/bin"
-  ln -s /usr/bin/hostname "${pkgdir}/bin/hostname"
-  install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname"
+  ln -s ../usr/bin/hostname "${pkgdir}/bin/hostname"
+  ln -s ../usr/bin/dnsdomainname "${pkgdir}/bin/dnsdomainname"
+  install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/usr/bin/dnsdomainname"
   echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1"
-  install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd"
-  install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd"
   install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet"
   install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk"
   install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"
diff --git a/core/inetutils/ftpd.conf b/core/inetutils/ftpd.conf
deleted file mode 100644
index f660f0035..000000000
--- a/core/inetutils/ftpd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to ftpd
-#
-FTPD_ARGS=""
diff --git a/core/inetutils/ftpd.rc b/core/inetutils/ftpd.rc
deleted file mode 100644
index 3d0d34421..000000000
--- a/core/inetutils/ftpd.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ftpd
-
-PID=$(pidof -o %PPID /usr/sbin/ftpd)
-case "$1" in
-  start)
-    stat_busy "Starting ftpd"
-    [ -z "$PID" ] && /usr/sbin/ftpd -D $FTPD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ftpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ftpd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ftpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/core/inetutils/ftpd.service b/core/inetutils/ftpd.service
index 5708bdfd1..57549c088 100644
--- a/core/inetutils/ftpd.service
+++ b/core/inetutils/ftpd.service
@@ -3,7 +3,7 @@ Description=FTPD Daemon
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/ftpd -D
+ExecStart=/usr/bin/ftpd -D
 Type=forking
 
 [Install]
diff --git a/core/inetutils/inetutils.install b/core/inetutils/inetutils.install
index b338fa498..bd2a283b8 100644
--- a/core/inetutils/inetutils.install
+++ b/core/inetutils/inetutils.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(inetutils.info.gz)
 
 post_install() {
diff --git a/core/inetutils/rlogin.xinetd b/core/inetutils/rlogin.xinetd
index 5c72f86df..bffdb9011 100644
--- a/core/inetutils/rlogin.xinetd
+++ b/core/inetutils/rlogin.xinetd
@@ -4,7 +4,7 @@ service login
         socket_type             = stream
         wait                    = no
         user                    = root
-        server                  = /usr/sbin/rlogind
+        server                  = /usr/bin/rlogind
         log_on_failure          += USERID
         disable                 = yes
 }
diff --git a/core/inetutils/rsh.xinetd b/core/inetutils/rsh.xinetd
index a13738c31..c8848ce7f 100644
--- a/core/inetutils/rsh.xinetd
+++ b/core/inetutils/rsh.xinetd
@@ -4,7 +4,7 @@ service shell
         socket_type             = stream
         wait                    = no
         user                    = root
-        server                  = /usr/sbin/rshd
+        server                  = /usr/bin/rshd
         log_on_failure          += USERID
         disable                 = yes
 }
diff --git a/core/inetutils/talk.xinetd b/core/inetutils/talk.xinetd
index 6abef359c..b62e56310 100644
--- a/core/inetutils/talk.xinetd
+++ b/core/inetutils/talk.xinetd
@@ -4,7 +4,7 @@ service ntalk
 	socket_type		= dgram
 	wait			= yes
 	user			= root
-	server			= /usr/sbin/talkd
+	server			= /usr/bin/talkd
 	log_on_failure		+= USERID
 	disable			= yes
 }
diff --git a/core/inetutils/telnet.xinetd b/core/inetutils/telnet.xinetd
index bd3a5e4b1..c56f33985 100644
--- a/core/inetutils/telnet.xinetd
+++ b/core/inetutils/telnet.xinetd
@@ -4,7 +4,7 @@ service telnet
 	socket_type		= stream
 	wait			= no
 	user			= root
-	server			= /usr/sbin/telnetd
+	server			= /usr/bin/telnetd
 	log_on_failure		+= USERID
 	disable			= yes
 }
diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD
index f010b1da0..f2760dfb8 100644
--- a/core/logrotate/PKGBUILD
+++ b/core/logrotate/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 184326 2013-05-06 09:32:38Z pierre $
+# $Id: PKGBUILD 185626 2013-05-16 13:54:50Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=logrotate
 pkgver=3.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Rotates system logs automatically"
 arch=('i686' 'x86_64')
 url="https://fedorahosted.org/logrotate/"
@@ -21,7 +21,7 @@ md5sums=('7be7f1eabea33a1d0483438a6e33d634'
          'cd76976b5ce37d328b452c806b55a015'
          'e76526bcd6fc33c9d921e1cb1eff1ffb'
          '86209d257c8b8bc0ae34d6f6ef057c0f'
-         'aa8ac8283908b6114483a293adcb650f')
+         '3909380f8a55fa160f62ed976a8bef4b')
 
 build() {
 	cd "$srcdir/${pkgname}-${pkgver}"
@@ -40,7 +40,9 @@ check() {
 package() {
 	cd "$srcdir/${pkgname}-${pkgver}"
 	make PREFIX="$pkgdir" MANDIR="/usr/share/man" install
+	mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin
 
+	install -dm755 "$pkgdir/etc/logrotate.d"
 	install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf"
 	install -Dm744 "$srcdir/logrotate.cron.daily" "$pkgdir/etc/cron.daily/logrotate"
 }
diff --git a/core/logrotate/logrotate.cron.daily b/core/logrotate/logrotate.cron.daily
index ee0eeeb48..37d9e534c 100755
--- a/core/logrotate/logrotate.cron.daily
+++ b/core/logrotate/logrotate.cron.daily
@@ -9,16 +9,16 @@ IONICE_CLASS=2
 # 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
 IONICE_PRIORITY=7
 
-CMD_LOGROTATE="/usr/sbin/logrotate /etc/logrotate.conf"
- 
+CMD_LOGROTATE="/usr/bin/logrotate /etc/logrotate.conf"
+
 if [ -x /usr/bin/nice ]; then
   CMD_LOGROTATE="/usr/bin/nice -n ${NICE:-19} ${CMD_LOGROTATE}"
 fi
- 
+
 if [ -x /usr/bin/ionice ]; then
   CMD_LOGROTATE="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${CMD_LOGROTATE}"
 fi
- 
+
 ${CMD_LOGROTATE}
- 
+
 exit 0
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
new file mode 100644
index 000000000..26da877ef
--- /dev/null
+++ b/core/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch
@@ -0,0 +1,57 @@
+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-losetup-use-warn_size-for-regular-files-only.patch b/core/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch
new file mode 100644
index 000000000..afc875719
--- /dev/null
+++ b/core/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch
@@ -0,0 +1,26 @@
+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 3894784c6..77b94f1a8 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 184217 2013-05-03 23:40:29Z dreisner $
+# $Id: PKGBUILD 185607 2013-05-15 22:53:31Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
 pkgver=2.23
-pkgrel=1
+pkgrel=2
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64')
@@ -13,10 +13,12 @@ depends=('pam' 'shadow' 'coreutils' 'glibc')
 makedepends=('systemd')
 # checkdepends=('bc')
 conflicts=('util-linux-ng' 'eject')
-provides=("util-linux-ng=${pkgver}" 'eject')
+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
+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
         uuidd.tmpfiles
         pam-login
         pam-common
@@ -27,9 +29,23 @@ backup=(etc/pam.d/chfn
         etc/pam.d/su
         etc/pam.d/su-l)
 install=util-linux.install
+md5sums=('cf5e9bb402371beaaffc3a5f276d5783'
+         'fdb627fbb3d6a42e0b36978649b4c064'
+         'de0ba450945a60f27c5df86e64523d57'
+         '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
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
               --libdir=/usr/lib \
@@ -76,8 +92,3 @@ package() {
   # TODO(dreisner): offer this upstream?
   install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf"
 }
-md5sums=('cf5e9bb402371beaaffc3a5f276d5783'
-         'a39554bfd65cccfd8254bb46922f4a67'
-         '4368b3f98abd8a32662e094c54e7f9b1'
-         'a31374fef2cba0ca34dfc7078e2969e4'
-         'fa85e5cce5d723275b14365ba71a8aad')