Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

util-linux: Update to 2.25.1

Browse Source
This commit is contained in:
Alexpux
2014-11-05 15:01:05 +03:00
parent bbdfe202af
commit af97a96172
8 changed files with 149 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
util-linux/2.24.2-msysize.patch
View File

@@ -32,41 +32,50 @@ diff -Naur util-linux-2.24.2-orig/config/config.guess util-linux-2.24.2/config/c
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit ;;
--- util-linux-2.24.2/config/config.rpath.orig 2014-10-13 12:14:54.893800000 +0400
+++ util-linux-2.24.2/config/config.rpath 2014-10-13 12:15:44.283000000 +0400
@@ -109,7 +109,7 @@
--- util-linux-2.25.1/config/config.rpath.orig 2014-11-04 20:24:30.957200000 +0300
+++ util-linux-2.25.1/config/config.rpath 2014-11-04 20:25:44.766400000 +0300
@@ -57,7 +57,7 @@
aix*)
wl='-Wl,'
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
;;
hpux9* | hpux10* | hpux11*)
wl='-Wl,'
@@ -149,7 +149,7 @@
hardcode_minus_L=no
case "$host_os" in
- cygwin* | mingw* | pw32*)
+ cygwin* | msys* | mingw* | pw32*)
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@@ -149,7 +149,7 @@
@@ -198,7 +198,7 @@
ld_shlibs=no
fi
;;
- cygwin* | mingw* | pw32*)
+ cygwin* | msys* | mingw* | pw32*)
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -268,7 +268,7 @@
@@ -348,7 +348,7 @@
;;
bsdi4*)
bsdi[45]*)
;;
- cygwin* | mingw* | pw32*)
+ cygwin* | msys* | mingw* | pw32*)
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -440,7 +440,7 @@
@@ -537,7 +537,7 @@
bsdi[45]*)
library_names_spec='$libname$shrext'
;;
bsdi4*)
;;
- cygwin* | mingw* | pw32*)
+ cygwin* | msys* | mingw* | pw32*)
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
shrext=.dll
library_names_spec='$libname.dll.a $libname.lib'
;;
darwin* | rhapsody*)

20
util-linux/2.24.2-sys-utils.patch
View File

@@ -1,20 +0,0 @@
ipcrm and ipcs are provided by ipc-utils
--- origsrc/util-linux-2.24.2/sys-utils/Makemodule.am 2014-04-24 02:37:04.454705800 -0500
+++ src/util-linux-2.24.2/sys-utils/Makemodule.am 2014-07-08 21:15:11.943157700 -0500
@@ -9,6 +9,7 @@ dist_man_MANS += sys-utils/ipcmk.1
ipcmk_SOURCES = sys-utils/ipcmk.c
ipcmk_LDADD = $(LDADD) libcommon.la
+if LINUX
usrbin_exec_PROGRAMS += ipcrm
dist_man_MANS += sys-utils/ipcrm.1
ipcrm_SOURCES = sys-utils/ipcrm.c
@@ -20,6 +21,7 @@ ipcs_SOURCES = sys-utils/ipcs.c \
sys-utils/ipcutils.c \
sys-utils/ipcutils.h
ipcs_LDADD = $(LDADD) libcommon.la
+endif
usrbin_exec_PROGRAMS += renice

20
util-linux/2.24.2-cygwin-include.patch → util-linux/2.25.1-cygwin-include.patch
View File

@@ -1,5 +1,5 @@
--- origsrc/util-linux-2.24.2/include/blkdev.h 2014-04-24 02:37:04.351704100 -0500
+++ src/util-linux-2.24.2/include/blkdev.h 2014-07-08 21:17:16.247442300 -0500
--- origsrc/util-linux-2.25.1/include/blkdev.h 2014-08-27 06:06:31.182865100 -0500
+++ src/util-linux-2.25.1/include/blkdev.h 2014-10-20 12:23:01.868981200 -0500
@@ -21,6 +21,10 @@
#define DEFAULT_SECTOR_SIZE 512
@@ -9,10 +9,10 @@
+#endif
+
#ifdef __linux__
/* very basic ioclts, should be available everywhere */
/* very basic ioctls, should be available everywhere */
# ifndef BLKROSET
--- origsrc/util-linux-2.24.2/include/ttyutils.h 2014-04-24 02:37:04.352704100 -0500
+++ src/util-linux-2.24.2/include/ttyutils.h 2014-07-08 21:51:22.062227800 -0500
--- origsrc/util-linux-2.25.1/include/ttyutils.h 2014-04-24 02:37:04.352704100 -0500
+++ src/util-linux-2.25.1/include/ttyutils.h 2014-10-20 12:23:01.878981200 -0500
@@ -80,7 +80,10 @@ static inline void reset_virtual_console
tp->c_oflag &= ~(OLCUC | OCRNL | ONOCR | ONLRET | OFILL | \
NLDLY|CRDLY|TABDLY|BSDLY|VTDLY|FFDLY);
@@ -25,18 +25,18 @@
if ((flags & UL_TTY_KEEPCFLAGS) == 0) {
tp->c_cflag |= (CREAD | CS8 | HUPCL);
--- origsrc/util-linux-2.24.2/lib/randutils.c 2014-04-23 08:28:29.138326200 -0500
+++ src/util-linux-2.24.2/lib/randutils.c 2014-07-08 21:47:19.052369400 -0500
--- origsrc/util-linux-2.25.1/lib/randutils.c 2014-08-26 09:48:45.079654000 -0500
+++ src/util-linux-2.25.1/lib/randutils.c 2014-10-20 12:23:01.878981200 -0500
@@ -13,8 +13,6 @@
#include <string.h>
#include <sys/time.h>
-#include <sys/syscall.h>
-
#include "c.h"
#include "randutils.h"
#ifdef HAVE_TLS
@@ -24,6 +22,7 @@
#include "nls.h"
@@ -26,6 +24,7 @@
#endif
#if defined(__linux__) && defined(__NR_gettid) && defined(HAVE_JRAND48)

23
util-linux/2.25.1-ipc-utils.patch Normal file
View File

@@ -0,0 +1,23 @@
--- origsrc/util-linux-2.25.1/configure.ac 2014-10-20 12:23:59.409060600 -0500
+++ src/util-linux-2.25.1/configure.ac 2014-10-20 12:33:08.525917600 -0500
@@ -1204,10 +1204,18 @@ AM_CONDITIONAL([BUILD_FLOCK], [test "x$b
UL_BUILD_INIT([ipcmk], [yes])
AM_CONDITIONAL([BUILD_IPCMK], [test "x$build_ipcmk" = xyes])
-UL_BUILD_INIT([ipcrm], [yes])
+AC_ARG_ENABLE([ipcrm],
+ AS_HELP_STRING([--disable-ipcrm], [do not build ipcrm]),
+ [], [UL_DEFAULT_ENABLE([ipcrm], [check])]
+)
+UL_BUILD_INIT([ipcrm])
AM_CONDITIONAL([BUILD_IPCRM], [test "x$build_ipcrm" = xyes])
-UL_BUILD_INIT([ipcs], [yes])
+AC_ARG_ENABLE([ipcs],
+ AS_HELP_STRING([--disable-ipcs], [do not build ipcs]),
+ [], [UL_DEFAULT_ENABLE([ipcs], [check])]
+)
+UL_BUILD_INIT([ipcs])
AM_CONDITIONAL([BUILD_IPCS], [test "x$build_ipcs" = xyes])
UL_BUILD_INIT([renice], [yes])

16
util-linux/2.25.1-lslogins.patch Normal file
View File

@@ -0,0 +1,16 @@
--- origsrc/util-linux-2.25.1/configure.ac 2014-10-20 12:35:57.424262800 -0500
+++ src/util-linux-2.25.1/configure.ac 2014-10-22 19:25:17.942302200 -0500
@@ -1101,8 +1101,11 @@ UL_REQUIRES_HAVE([lscpu], [cpu_set_t], [
AM_CONDITIONAL([BUILD_LSCPU], [test "x$build_lscpu" = xyes])
-UL_BUILD_INIT([lslogins], [check])
-UL_REQUIRES_BUILD([lslogins], [libsmartcols])
+AC_ARG_ENABLE([lslogins],
+ AS_HELP_STRING([--disable-lslogins], [do not build lslogins]),
+ [], [UL_DEFAULT_ENABLE([lslogins], [check])]
+)
+UL_BUILD_INIT([lslogins])
AM_CONDITIONAL([BUILD_LSLOGINS], [test "x$build_lslogins" = xyes])

16
util-linux/2.25.1-ncurses-reentrant.patch Normal file
View File

@@ -0,0 +1,16 @@
--- origsrc/util-linux-2.25.1/disk-utils/cfdisk.c 2014-09-03 02:50:42.185957900 -0500
+++ src/util-linux-2.25.1/disk-utils/cfdisk.c 2014-10-22 19:09:20.709249100 -0500
@@ -199,10 +199,11 @@ static void resize(void)
if (ioctl(fileno(stdout), TIOCGWINSZ, &ws) != -1
&& ws.ws_row && ws.ws_col) {
- LINES = ws.ws_row;
- COLS = ws.ws_col;
#if HAVE_RESIZETERM
resizeterm(ws.ws_row, ws.ws_col);
+#else
+ LINES = ws.ws_row;
+ COLS = ws.ws_col;
#endif
clearok(stdscr, TRUE);
}

27
util-linux/2.25.1-scanf-ms.patch Normal file
View File

@@ -0,0 +1,27 @@
newlib scanf(3) does not support 'm'
--- origsrc/util-linux-2.25.1/lib/colors.c 2014-09-03 02:50:42.187957900 -0500
+++ src/util-linux-2.25.1/lib/colors.c 2014-10-22 17:25:41.257979100 -0500
@@ -561,7 +561,8 @@ static int colors_read_schemes(struct ul
}
while (fgets(buf, sizeof(buf), f)) {
- char *cn = NULL, *seq = NULL;
+ char *cn = malloc (sizeof(buf) + 1);
+ char *seq = malloc (sizeof(buf) + 1);
char *p = strchr(buf, '\n');
if (!p) {
@@ -577,9 +578,9 @@ static int colors_read_schemes(struct ul
if (*p == '\0' || *p == '#')
continue;
- rc = sscanf(p, UL_SCNsA" " /* name */
- UL_SCNsA, /* color */
- &cn, &seq);
+ rc = sscanf(p, "%s " /* name */
+ "%s", /* color */
+ cn, seq);
if (rc == 2 && cn && seq)
rc = colors_add_scheme(cc, cn, seq); /* set rc=0 on success */
if (rc) {

51
util-linux/PKGBUILD
View File

@@ -1,39 +1,46 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=("util-linux" "libutil-linux" "libutil-linux-devel")
pkgver=2.24.2
pkgver=2.25.1
pkgrel=1
pkgdesc="Miscellaneous system utilities for Linux"
arch=('i686' 'x86_64')
license=('GPL3')
url="http://www.kernel.org/pub/linux/utils/util-linux/"
groups=('base')
depends=('coreutils' 'libintl' 'libiconv')
options=('staticlibs')
makedepends=('gettext-devel' 'libiconv-devel')
source=(ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.xz
2.24.2-libintl.patch
2.24.2-cygwin-include.patch
2.24.2-agetty.patch
2.24.2-sys-utils.patch
2.24.2-libblkid-topology.patch
2.24.2-msysize.patch)
md5sums=('3f191727a0d28f7204b755cf1b6ea0aa'
'db24717018176a3375860059b70478c8'
'50285a244eda304bf6caa55ac4f98622'
2.24.2-libintl.patch
2.24.2-msysize.patch
2.25.1-cygwin-include.patch
2.25.1-ipc-utils.patch
2.25.1-lslogins.patch
2.25.1-ncurses-reentrant.patch
2.25.1-scanf-ms.patch)
md5sums=('2ff36a8f8ede70f66c5ad0fb09e40e79'
'7bfa7a252cf44b70d489580dead33b4a'
'dc5bd0ab554bbd9e2b427b7ea44b132d'
'4a6a486f374d90985ca4d636c6305b51'
'cf620fa98a6e8ab34627b3de770b336e')
'db24717018176a3375860059b70478c8'
'1ac5cb60e1a613e1ca1d72ac958c8e9c'
'ed3c35e3f4a9f89e248d1d108a0b5b94'
'a8fd1f4a8821e9f2aebf4679d2d9d355'
'b3c5b5275ceb07c2b3637700e21c8322'
'feaa429e437a28d73c0a07d4c0359757'
'9a66b65aee60df39ff6e7c7e06bc6a8c')
prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p2 -i $srcdir/2.24.2-libintl.patch
patch -p2 -i $srcdir/2.24.2-cygwin-include.patch
patch -p2 -i $srcdir/2.24.2-agetty.patch
patch -p2 -i $srcdir/2.24.2-sys-utils.patch
patch -p2 -i $srcdir/2.24.2-libblkid-topology.patch
patch -p2 -i $srcdir/2.24.2-libintl.patch
patch -p2 -i $srcdir/2.25.1-cygwin-include.patch
patch -p2 -i $srcdir/2.25.1-ipc-utils.patch
patch -p2 -i $srcdir/2.25.1-lslogins.patch
patch -p2 -i $srcdir/2.25.1-ncurses-reentrant.patch
patch -p2 -i $srcdir/2.25.1-scanf-ms.patch
patch -p1 -i ${srcdir}/2.24.2-msysize.patch
autoreconf -fi
@@ -58,7 +65,6 @@ build() {
--disable-libmount \
--disable-mount \
--disable-losetup \
--disable-cytune \
--disable-fsck \
--disable-partx \
--enable-uuidd \
@@ -76,9 +82,12 @@ build() {
--disable-wdctl \
--disable-switch_root \
--disable-pivot_root \
--disable-ipcrm \
--disable-ipcs \
--disable-tunelp \
--disable-kill \
--disable-last \
--disable-lslogins \
--disable-utmpdump \
--disable-line \
--disable-mesg \
@@ -100,12 +109,11 @@ build() {
--disable-schedutils \
--disable-wall \
--disable-write \
--disable-socket-activation \
--disable-use-tty-group \
--disable-makeinstall-chown \
--disable-makeinstall-setuid \
--without-libintl-prefix \
--without-libiconv-prefix \
--without-libintl-prefix \
ac_cv_func___fpending=yes \
SOLIB_LDFLAGS=-no-undefined
@@ -128,7 +136,7 @@ package_util-linux() {
package_libutil-linux() {
pkgdesc="Block device ID and Universally Unique ID libraries"
provides=("libblkid" "libuuid")
provides=("libblkid" "libuuid" "libsmartcols")
depends=("gcc-libs" "libintl" "msys2-runtime")
mkdir -p ${pkgdir}/usr/bin
@@ -137,10 +145,11 @@ package_libutil-linux() {
package_libutil-linux-devel() {
pkgdesc="Block device ID and Universally Unique ID headers and libraries."
provides=("libblkid-devel" "libuuid-devel")
provides=("libblkid-devel" "libuuid-devel" "libsmartcols-devel")
depends=("libutil-linux")
options=('staticlibs')
mkdir -p ${pkgdir}/usr
cp -rf ${srcdir}/dest/usr/lib ${pkgdir}/usr/
cp -rf ${srcdir}/dest/usr/include ${pkgdir}/usr/
}
}