From: John Crispin Date: Fri, 21 Jun 2013 16:52:52 +0000 (+0000) Subject: util-linux: move package to package/system/utils X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e3dcf2448fa1a8267831b1bd4e236e5f392f7ff9;p=openwrt%2Fstaging%2Fmans0n.git util-linux: move package to package/system/utils Signed-off-by: John Crispin SVN-Revision: 36986 --- diff --git a/package/system/utils/util-linux/Makefile b/package/system/utils/util-linux/Makefile new file mode 100644 index 0000000000..ed2c10f172 --- /dev/null +++ b/package/system/utils/util-linux/Makefile @@ -0,0 +1,594 @@ +# +# Copyright (C) 2007-2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=util-linux +PKG_VERSION:=2.21.2 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.21 +PKG_MD5SUM:=54ba880f1d66782c2287ee2c898520e9 + +PKG_LICENSE:=GPLv2 LGPLv2.1 BSD-3c +PKG_LICENSE_FILES:=COPYING getopt/COPYING libblkid/COPYING libmount/COPYING Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.LGPLv2.1 libuuid/COPYING Documentation/licenses/COPYING.BSD-3 + +PKG_BUILD_PARALLEL:=1 +PKG_BUILD_DEPENDS:=libncurses +PKG_FIXUP:=autoreconf + +include $(INCLUDE_DIR)/package.mk + +define Package/util-linux/Default + SECTION:=utils + CATEGORY:=Utilities + URL:=http://www.kernel.org/pub/linux/utils/util-linux/ +endef + +CONFIGURE_ARGS += \ + --enable-new-mount \ + --with-ncurses \ + --disable-nls \ + --disable-tls \ + --without-udev + +TARGET_CFLAGS += $(FPIC) + +define Build/InstallDev + $(MAKE) -C $(PKG_BUILD_DIR) \ + BUILDCC="$(HOSTCC)" \ + DESTDIR="$(1)" \ + installdirs install-data + + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_BUILD_DIR)/libblkid/blkid.pc $(1)/usr/lib/pkgconfig + $(CP) $(PKG_BUILD_DIR)/libmount/mount.pc $(1)/usr/lib/pkgconfig + $(CP) $(PKG_BUILD_DIR)/libuuid/uuid.pc $(1)/usr/lib/pkgconfig + + $(INSTALL_DIR) $(1)/usr/include/blkid + $(CP) $(PKG_BUILD_DIR)/libblkid/src/blkid.h $(1)/usr/include/blkid + $(INSTALL_DIR) $(1)/usr/include/libmount + $(CP) $(PKG_BUILD_DIR)/libmount/src/libmount.h $(1)/usr/include/libmount + $(INSTALL_DIR) $(1)/usr/include/uuid + $(CP) $(PKG_BUILD_DIR)/libuuid/src/uuid.h $(1)/usr/include/uuid + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libblkid/src/.libs/libblkid.{a,so*} $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libmount/src/.libs/libmount.{a,so*} $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libuuid/src/.libs/libuuid.{a,so*} $(1)/usr/lib +endef + +define Package/libblkid +$(call Package/util-linux/Default) + DEPENDS:=+libuuid + TITLE:=block device id library + SECTION:=libs + CATEGORY:=Libraries +endef + +define Package/libblkid/description + The libblkid library is used to identify block devices (disks) as to their + content (e.g. filesystem type, partitions) as well as extracting additional + information such as filesystem labels/volume names, partitions, unique + identifiers/serial numbers... +endef + +define Package/libmount +$(call Package/util-linux/Default) + DEPENDS:=+libblkid + TITLE:=mount library + SECTION:=libs + CATEGORY:=Libraries +endef + +define Package/libmount/description + The libmount library is used to parse /etc/fstab, /etc/mtab and + /proc/self/mountinfo files, manage the mtab file, evaluate mount options... +endef + +define Package/libuuid +$(call Package/util-linux/Default) + TITLE:=DCE compatible Universally Unique Identifier library + SECTION:=libs + CATEGORY:=Libraries +endef + +define Package/libuuid/description + The UUID library is used to generate unique identifiers for objects + that may be accessible beyond the local system. This library + generates UUIDs compatible with those created by the Open Software + Foundation (OSF) Distributed Computing Environment (DCE) utility. +endef + +define Package/agetty +$(call Package/util-linux/Default) + TITLE:=alternative Linux getty + SUBMENU=Terminal +endef + +define Package/agetty/description + agetty opens a tty port, prompts for a login name and invokes the + /bin/login command +endef + +define Package/blkid +$(call Package/util-linux/Default) + TITLE:=locate/print block device attributes + DEPENDS:= +libblkid + SUBMENU=disc +endef + +define Package/blkid/description + The blkid program is the command-line interface to working with the libblkid + library. +endef + +define Package/cal +$(call Package/util-linux/Default) + TITLE:=display a calendar + DEPENDS:= +libncurses +endef + +define Package/cal/description + cal displays a simple calendar +endef + +define Package/cfdisk +$(call Package/util-linux/Default) + TITLE:=display or manipulate disk partition table + DEPENDS:= +libblkid +libncurses + SUBMENU:=disc +endef + +define Package/cfdisk/description + cfdisk is a curses-based program for partitioning any hard disk drive +endef + +define Package/dmesg +$(call Package/util-linux/Default) + TITLE:=print or control the kernel ring buffer +endef + +define Package/dmesg/description + dmesg is used to examine or control the kernel ring buffer +endef + +define Package/fdisk +$(call Package/util-linux/Default) + TITLE:=manipulate disk partition table + DEPENDS:= +libblkid + SUBMENU=disc +endef + +define Package/fdisk/description + a menu-driven program for creation and manipulation of partition tables +endef + +define Package/findfs +$(call Package/util-linux/Default) + TITLE:=find a filesystem by label or UUID + DEPENDS:= +libblkid + SUBMENU=disc +endef + +define Package/findfs/description + findfs will search the disks in the system looking for a filesystem which has + a label matching label or a UUID equal to uuid +endef + +define Package/flock +$(call Package/util-linux/Default) + TITLE:=manage locks from shell scripts +endef + +define Package/flock/description + manages flock locks from within shell scripts or the command line +endef + +define Package/getopt +$(call Package/util-linux/Default) + TITLE:=parse command options (enhanced) +endef + +define Package/getopt/description + getopt is used to break up (parse) options in command lines for easy parsing + by shell procedures, and to check for legal options +endef + +define Package/hwclock +$(call Package/util-linux/Default) + TITLE:=query or set the hardware clock +endef + +define Package/hwclock/description + hwclock is a tool for accessing the Hardware Clock +endef + +define Package/logger +$(call Package/util-linux/Default) + TITLE:=a shell command interface to the syslog system log module +endef + +define Package/logger/description + logger makes entries in the system log, it provides a shell command interface + to the syslog system log module +endef + +define Package/look +$(call Package/util-linux/Default) + TITLE:=display lines beginning with a given string +endef + +define Package/look/description + look utility displays any lines in file which contain string +endef + +define Package/losetup +$(call Package/util-linux/Default) + TITLE:=set up and control loop devices +endef + +define Package/losetup/description + losetup is used to associate loop devices with regular files or block devices, + to detach loop devices and to query the status of a loop device +endef + +define Package/lsblk +$(call Package/util-linux/Default) + TITLE:=list block devices + DEPENDS:= +libblkid + SUBMENU=disc +endef + +define Package/lsblk/description + lsblk lists information about all or the specified block devices +endef + +define Package/mcookie +$(call Package/util-linux/Default) + TITLE:=generate magic cookies for xauth +endef + +define Package/mcookie/description + mcookie generates a 128-bit random hexadecimal number for use with the X + authority system +endef + +define Package/mount-utils +$(call Package/util-linux/Default) + TITLE:=related (u)mount utilities + DEPENDS+= +libmount +endef + +define Package/mount-utils/description + contains: mount, umount, findmnt +endef + +define Package/namei +$(call Package/util-linux/Default) + TITLE:=follow a pathname until a terminal point is found +endef + +define Package/namei/description + namei uses its arguments as pathnames to any type of Unix file (symlinks, + files, directories, and so forth) +endef + +define Package/rename +$(call Package/util-linux/Default) + TITLE:=rename files +endef + +define Package/rename/description + rename will rename the specified files by replacing the first occurrence of + expression in their name by replacement +endef + +define Package/partx-utils +$(call Package/util-linux/Default) + TITLE:=inform kernel about the presence and numbering of on-disk partitions + DEPENDS:= +libblkid + SUBMENU=disc +endef + +define Package/partx-utils/description + contains partx, addpart, delpart +endef + +define Package/script-utils +$(call Package/util-linux/Default) + TITLE:=make and replay typescript of terminal session + SUBMENU=Terminal +endef + +define Package/script-utils/description + contains: script, scriptreplay +endef + +define Package/setterm +$(call Package/util-linux/Default) + TITLE:=set terminal attributes + DEPENDS:= +libncurses + SUBMENU:=Terminal +endef + +define Package/setterm/description + setterm writes to standard output a character string that will invoke the + specified terminal capabilities +endef + +define Package/sfdisk +$(call Package/util-linux/Default) + TITLE:=partition table manipulator for Linux + SUBMENU=disc +endef + +define Package/sfdisk/description + list the size of a partition, list the partitions on a device, check the + partitions on a device and repartition a device +endef + +define Package/swap-utils +$(call Package/util-linux/Default) + TITLE:=swap space management utilities + DEPENDS+= +libblkid + SUBMENU:=disc +endef + +define Package/swap-utils/description + contains: mkswap, swaplabel, swapon, swapoff +endef + +define Package/uuidd +$(call Package/util-linux/Default) + TITLE:=UUID generation daemon + DEPENDS:= +libuuid +endef + +define Package/uuidd/description + The uuidd daemon is used by the UUID library to generate universally unique + identifiers (UUIDs), especially time-based UUIDs, in a secure and + guaranteed-unique fashion, even in the face of large numbers of threads + running on different CPUs trying to grab UUIDs. +endef + +define Package/uuidgen +$(call Package/util-linux/Default) + TITLE:=create a new UUID value + DEPENDS:= +libuuid +endef + +define Package/uuidgen/description + The uuidgen program creates (and prints) a new universally unique identifier + (UUID) using the libuuid library. The new UUID can reasonably be considered + unique among all UUIDs created on the local system, and among UUIDs created on + other systems in the past and in the future. +endef + +define Package/wall +$(call Package/util-linux/Default) + TITLE:=send a message to everybody's terminal + SUBMENU=Terminal +endef + +define Package/wall/description + wall sends a message to everybody logged in with their mesg permission + set to yes +endef + +define Package/whereis +$(call Package/util-linux/Default) + TITLE:=locate the binary, source, and manual page files for a command +endef + +define Package/whereis/description + whereis locates source/binary and manuals sections for specified files +endef + +define Package/wipefs +$(call Package/util-linux/Default) + TITLE:=wipe a signature from a device + DEPENDS:= +libblkid + SUBMENU:=disc +endef + +define Package/wipefs/description + wipefs can erase filesystem, raid or partition table signatures (magic + strings) from the specified device to make the signature invisible for + libblkid. +endef + +define Package/libblkid/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libblkid/src/.libs/libblkid.so.* $(1)/usr/lib/ +endef + +define Package/libmount/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libmount/src/.libs/libmount.so.* $(1)/usr/lib/ +endef + +define Package/libuuid/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libuuid/src/.libs/libuuid.so.* $(1)/usr/lib/ +endef + +define Package/agetty/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/agetty $(1)/usr/sbin/ +endef + +define Package/blkid/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/blkid $(1)/usr/sbin/ +endef + +define Package/cal/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/cal $(1)/usr/bin/ +endef + +define Package/cfdisk/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/.libs/cfdisk $(1)/usr/sbin/ +endef + +define Package/fdisk/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/.libs/fdisk $(1)/usr/sbin/ +endef + +define Package/findfs/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/findfs $(1)/usr/sbin/ +endef + +define Package/flock/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/flock $(1)/usr/bin/ +endef + +define Package/getopt/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/getopt/getopt $(1)/usr/bin/ +endef + +define Package/hwclock/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/usr/sbin/ +endef + +define Package/logger/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/logger $(1)/usr/bin/ +endef + +define Package/look/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/look $(1)/usr/bin/ +endef + +define Package/losetup/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/losetup $(1)/usr/sbin/ +endef + +define Package/lsblk/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/lsblk $(1)/usr/bin/ +endef + +define Package/mcookie/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/mcookie $(1)/usr/bin/ +endef + +define Package/mount-utils/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/{u,}mount $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/mountpoint $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/findmnt $(1)/usr/bin/ +endef + +define Package/namei/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/namei $(1)/usr/bin/ +endef + +define Package/rename/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/rename $(1)/usr/bin/ +endef + +define Package/partx-utils/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/partx/.libs/partx $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/partx/addpart $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/partx/delpart $(1)/usr/sbin/ +endef + +define Package/script-utils/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/script $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/scriptreplay $(1)/usr/bin/ +endef + +define Package/setterm/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/setterm $(1)/usr/bin/ +endef + +define Package/sfdisk/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/sfdisk $(1)/usr/sbin/ +endef + +define Package/swap-utils/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/.libs/mkswap $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/.libs/swaplabel $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/swapon $(1)/usr/sbin/ + ln -sf swapon $(1)/usr/sbin/swapoff +endef + +define Package/uuidd/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/uuidd $(1)/usr/sbin/ +endef + +define Package/uuidgen/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/uuidgen $(1)/usr/bin/ +endef + +define Package/wall/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/wall $(1)/usr/bin/ +endef + +define Package/whereis/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/whereis $(1)/usr/bin/ +endef + +define Package/wipefs/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/wipefs $(1)/usr/sbin/ +endef + +$(eval $(call BuildPackage,libblkid)) +$(eval $(call BuildPackage,libmount)) +$(eval $(call BuildPackage,libuuid)) +$(eval $(call BuildPackage,agetty)) +$(eval $(call BuildPackage,blkid)) +$(eval $(call BuildPackage,cal)) +$(eval $(call BuildPackage,cfdisk)) +$(eval $(call BuildPackage,dmesg)) +$(eval $(call BuildPackage,fdisk)) +$(eval $(call BuildPackage,findfs)) +$(eval $(call BuildPackage,flock)) +$(eval $(call BuildPackage,getopt)) +$(eval $(call BuildPackage,hwclock)) +$(eval $(call BuildPackage,logger)) +$(eval $(call BuildPackage,look)) +$(eval $(call BuildPackage,losetup)) +$(eval $(call BuildPackage,lsblk)) +$(eval $(call BuildPackage,mcookie)) +$(eval $(call BuildPackage,mount-utils)) +$(eval $(call BuildPackage,namei)) +$(eval $(call BuildPackage,rename)) +$(eval $(call BuildPackage,partx-utils)) +$(eval $(call BuildPackage,script-utils)) +$(eval $(call BuildPackage,setterm)) +$(eval $(call BuildPackage,sfdisk)) +$(eval $(call BuildPackage,swap-utils)) +$(eval $(call BuildPackage,uuidd)) +$(eval $(call BuildPackage,uuidgen)) +$(eval $(call BuildPackage,wall)) +$(eval $(call BuildPackage,whereis)) +$(eval $(call BuildPackage,wipefs)) diff --git a/package/system/utils/util-linux/patches/000-compile.patch b/package/system/utils/util-linux/patches/000-compile.patch new file mode 100644 index 0000000000..b7cc18b40c --- /dev/null +++ b/package/system/utils/util-linux/patches/000-compile.patch @@ -0,0 +1,44 @@ +--- a/misc-utils/cal.c ++++ b/misc-utils/cal.c +@@ -291,41 +291,6 @@ main(int argc, char **argv) { + } + #endif + +-/* +- * The traditional Unix cal utility starts the week at Sunday, +- * while ISO 8601 starts at Monday. We read the start day from +- * the locale database, which can be overridden with the +- * -s (Sunday) or -m (Monday) options. +- */ +-#if HAVE_DECL__NL_TIME_WEEK_1STDAY +- /* +- * You need to use 2 locale variables to get the first day of the week. +- * This is needed to support first_weekday=2 and first_workday=1 for +- * the rare case where working days span across 2 weeks. +- * This shell script shows the combinations and calculations involved: +- * +- * for LANG in en_US ru_RU fr_FR csb_PL POSIX; do +- * printf "%s:\t%s + %s -1 = " $LANG $(locale week-1stday first_weekday) +- * date -d"$(locale week-1stday) +$(($(locale first_weekday)-1))day" +%w +- * done +- * +- * en_US: 19971130 + 1 -1 = 0 #0 = sunday +- * ru_RU: 19971130 + 2 -1 = 1 +- * fr_FR: 19971201 + 1 -1 = 1 +- * csb_PL: 19971201 + 2 -1 = 2 +- * POSIX: 19971201 + 7 -1 = 0 +- */ +- { +- int wfd; +- union { unsigned int word; char *string; } val; +- val.string = nl_langinfo(_NL_TIME_WEEK_1STDAY); +- +- wfd = val.word; +- wfd = day_in_week(wfd % 100, (wfd / 100) % 100, wfd / (100 * 100)); +- weekstart = (wfd + *nl_langinfo(_NL_TIME_FIRST_WEEKDAY) - 1) % 7; +- } +-#endif +- + yflag = 0; + while ((ch = getopt_long(argc, argv, "13mjsyVh", longopts, NULL)) != -1) + switch(ch) { diff --git a/package/system/utils/util-linux/patches/001-no-printf-alloc.patch b/package/system/utils/util-linux/patches/001-no-printf-alloc.patch new file mode 100644 index 0000000000..e3f048ab3c --- /dev/null +++ b/package/system/utils/util-linux/patches/001-no-printf-alloc.patch @@ -0,0 +1,108 @@ +for systems that don't support latest POSIX standard: %as + +https://bugs.gentoo.org/406303 + +--- a/configure.ac ++++ b/configure.ac +@@ -688,7 +688,6 @@ AC_ARG_ENABLE([libmount], + UL_BUILD_INIT([libmount]) + UL_REQUIRES_LINUX([libmount]) + UL_REQUIRES_BUILD([libmount], [libblkid]) +-UL_REQUIRES_HAVE([libmount], [scanf_alloc_modifier], [scanf string alloc modifier]) + AM_CONDITIONAL(BUILD_LIBMOUNT, test "x$build_libmount" = xyes) + + AC_SUBST([LIBMOUNT_VERSION]) +--- a/libmount/src/tab_parse.c ++++ b/libmount/src/tab_parse.c +@@ -22,6 +22,10 @@ + #include "pathnames.h" + #include "strutils.h" + ++#ifndef HAVE_SCANF_MS_MODIFIER ++# define UL_SCNsA "%s" ++#endif ++ + static inline char *skip_spaces(char *s) + { + assert(s); +@@ -61,16 +65,31 @@ static int mnt_parse_table_line(struct l + int rc, n = 0, xrc; + char *src = NULL, *fstype = NULL, *optstr = NULL; + ++#ifndef HAVE_SCANF_MS_MODIFIER ++ size_t len = strlen(s) + 1; ++ src = malloc(len); ++ fstype = malloc(len); ++ fs->target = malloc(len); ++ optstr = malloc(len); ++#endif ++ + rc = sscanf(s, UL_SCNsA" " /* (1) source */ + UL_SCNsA" " /* (2) target */ + UL_SCNsA" " /* (3) FS type */ + UL_SCNsA" " /* (4) options */ + "%n", /* byte count */ + ++#ifdef HAVE_SCANF_MS_MODIFIER + &src, + &fs->target, + &fstype, + &optstr, ++#else ++ src, ++ fs->target, ++ fstype, ++ optstr, ++#endif + &n); + xrc = rc; + +@@ -136,6 +155,16 @@ static int mnt_parse_mountinfo_line(stru + unsigned int maj, min; + char *fstype = NULL, *src = NULL, *p; + ++#ifndef HAVE_SCANF_MS_MODIFIER ++ size_t len = strlen(s) + 1; ++ fs->root = malloc(len); ++ fs->target = malloc(len); ++ fs->vfs_optstr = malloc(len); ++ fs->fs_optstr = malloc(len); ++ fstype = malloc(len); ++ src = malloc(len); ++#endif ++ + rc = sscanf(s, "%u " /* (1) id */ + "%u " /* (2) parent */ + "%u:%u " /* (3) maj:min */ +@@ -147,9 +176,15 @@ static int mnt_parse_mountinfo_line(stru + &fs->id, + &fs->parent, + &maj, &min, ++#ifdef HAVE_SCANF_MS_MODIFIER + &fs->root, + &fs->target, + &fs->vfs_optstr, ++#else ++ fs->root, ++ fs->target, ++ fs->vfs_optstr, ++#endif + &end); + + if (rc >= 7 && end > 0) +@@ -167,9 +202,15 @@ static int mnt_parse_mountinfo_line(stru + UL_SCNsA" " /* (9) source */ + UL_SCNsA, /* (10) fs options (fs specific) */ + ++#ifdef HAVE_SCANF_MS_MODIFIER + &fstype, + &src, + &fs->fs_optstr); ++#else ++ fstype, ++ src, ++ fs->fs_optstr); ++#endif + + if (rc >= 10) { + fs->flags |= MNT_FS_KERNEL; diff --git a/package/system/utils/util-linux/patches/002-fix-endianess.patch b/package/system/utils/util-linux/patches/002-fix-endianess.patch new file mode 100644 index 0000000000..4c59932cda --- /dev/null +++ b/package/system/utils/util-linux/patches/002-fix-endianess.patch @@ -0,0 +1,13 @@ +Index: util-linux-2.21.2/libblkid/src/superblocks/swap.c +=================================================================== +--- util-linux-2.21.2.orig/libblkid/src/superblocks/swap.c 2012-05-15 13:51:45.814410455 +0200 ++++ util-linux-2.21.2/libblkid/src/superblocks/swap.c 2013-06-12 23:23:03.270742199 +0200 +@@ -48,7 +48,7 @@ + + /* SWAPSPACE2 - check for wrong version or zeroed pagecount */ + if (strcmp(version, "2") == 0 && +- (hdr->version != 1 || hdr->lastpage == 0)) ++ ((hdr->version != 1 && swab32(hdr->version) != 1) || hdr->lastpage == 0)) + return -1; + + /* arbitrary sanity check.. is there any garbage down there? */ diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile deleted file mode 100644 index ed2c10f172..0000000000 --- a/package/util-linux/Makefile +++ /dev/null @@ -1,594 +0,0 @@ -# -# Copyright (C) 2007-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=util-linux -PKG_VERSION:=2.21.2 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.21 -PKG_MD5SUM:=54ba880f1d66782c2287ee2c898520e9 - -PKG_LICENSE:=GPLv2 LGPLv2.1 BSD-3c -PKG_LICENSE_FILES:=COPYING getopt/COPYING libblkid/COPYING libmount/COPYING Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.LGPLv2.1 libuuid/COPYING Documentation/licenses/COPYING.BSD-3 - -PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=libncurses -PKG_FIXUP:=autoreconf - -include $(INCLUDE_DIR)/package.mk - -define Package/util-linux/Default - SECTION:=utils - CATEGORY:=Utilities - URL:=http://www.kernel.org/pub/linux/utils/util-linux/ -endef - -CONFIGURE_ARGS += \ - --enable-new-mount \ - --with-ncurses \ - --disable-nls \ - --disable-tls \ - --without-udev - -TARGET_CFLAGS += $(FPIC) - -define Build/InstallDev - $(MAKE) -C $(PKG_BUILD_DIR) \ - BUILDCC="$(HOSTCC)" \ - DESTDIR="$(1)" \ - installdirs install-data - - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_BUILD_DIR)/libblkid/blkid.pc $(1)/usr/lib/pkgconfig - $(CP) $(PKG_BUILD_DIR)/libmount/mount.pc $(1)/usr/lib/pkgconfig - $(CP) $(PKG_BUILD_DIR)/libuuid/uuid.pc $(1)/usr/lib/pkgconfig - - $(INSTALL_DIR) $(1)/usr/include/blkid - $(CP) $(PKG_BUILD_DIR)/libblkid/src/blkid.h $(1)/usr/include/blkid - $(INSTALL_DIR) $(1)/usr/include/libmount - $(CP) $(PKG_BUILD_DIR)/libmount/src/libmount.h $(1)/usr/include/libmount - $(INSTALL_DIR) $(1)/usr/include/uuid - $(CP) $(PKG_BUILD_DIR)/libuuid/src/uuid.h $(1)/usr/include/uuid - - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libblkid/src/.libs/libblkid.{a,so*} $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libmount/src/.libs/libmount.{a,so*} $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libuuid/src/.libs/libuuid.{a,so*} $(1)/usr/lib -endef - -define Package/libblkid -$(call Package/util-linux/Default) - DEPENDS:=+libuuid - TITLE:=block device id library - SECTION:=libs - CATEGORY:=Libraries -endef - -define Package/libblkid/description - The libblkid library is used to identify block devices (disks) as to their - content (e.g. filesystem type, partitions) as well as extracting additional - information such as filesystem labels/volume names, partitions, unique - identifiers/serial numbers... -endef - -define Package/libmount -$(call Package/util-linux/Default) - DEPENDS:=+libblkid - TITLE:=mount library - SECTION:=libs - CATEGORY:=Libraries -endef - -define Package/libmount/description - The libmount library is used to parse /etc/fstab, /etc/mtab and - /proc/self/mountinfo files, manage the mtab file, evaluate mount options... -endef - -define Package/libuuid -$(call Package/util-linux/Default) - TITLE:=DCE compatible Universally Unique Identifier library - SECTION:=libs - CATEGORY:=Libraries -endef - -define Package/libuuid/description - The UUID library is used to generate unique identifiers for objects - that may be accessible beyond the local system. This library - generates UUIDs compatible with those created by the Open Software - Foundation (OSF) Distributed Computing Environment (DCE) utility. -endef - -define Package/agetty -$(call Package/util-linux/Default) - TITLE:=alternative Linux getty - SUBMENU=Terminal -endef - -define Package/agetty/description - agetty opens a tty port, prompts for a login name and invokes the - /bin/login command -endef - -define Package/blkid -$(call Package/util-linux/Default) - TITLE:=locate/print block device attributes - DEPENDS:= +libblkid - SUBMENU=disc -endef - -define Package/blkid/description - The blkid program is the command-line interface to working with the libblkid - library. -endef - -define Package/cal -$(call Package/util-linux/Default) - TITLE:=display a calendar - DEPENDS:= +libncurses -endef - -define Package/cal/description - cal displays a simple calendar -endef - -define Package/cfdisk -$(call Package/util-linux/Default) - TITLE:=display or manipulate disk partition table - DEPENDS:= +libblkid +libncurses - SUBMENU:=disc -endef - -define Package/cfdisk/description - cfdisk is a curses-based program for partitioning any hard disk drive -endef - -define Package/dmesg -$(call Package/util-linux/Default) - TITLE:=print or control the kernel ring buffer -endef - -define Package/dmesg/description - dmesg is used to examine or control the kernel ring buffer -endef - -define Package/fdisk -$(call Package/util-linux/Default) - TITLE:=manipulate disk partition table - DEPENDS:= +libblkid - SUBMENU=disc -endef - -define Package/fdisk/description - a menu-driven program for creation and manipulation of partition tables -endef - -define Package/findfs -$(call Package/util-linux/Default) - TITLE:=find a filesystem by label or UUID - DEPENDS:= +libblkid - SUBMENU=disc -endef - -define Package/findfs/description - findfs will search the disks in the system looking for a filesystem which has - a label matching label or a UUID equal to uuid -endef - -define Package/flock -$(call Package/util-linux/Default) - TITLE:=manage locks from shell scripts -endef - -define Package/flock/description - manages flock locks from within shell scripts or the command line -endef - -define Package/getopt -$(call Package/util-linux/Default) - TITLE:=parse command options (enhanced) -endef - -define Package/getopt/description - getopt is used to break up (parse) options in command lines for easy parsing - by shell procedures, and to check for legal options -endef - -define Package/hwclock -$(call Package/util-linux/Default) - TITLE:=query or set the hardware clock -endef - -define Package/hwclock/description - hwclock is a tool for accessing the Hardware Clock -endef - -define Package/logger -$(call Package/util-linux/Default) - TITLE:=a shell command interface to the syslog system log module -endef - -define Package/logger/description - logger makes entries in the system log, it provides a shell command interface - to the syslog system log module -endef - -define Package/look -$(call Package/util-linux/Default) - TITLE:=display lines beginning with a given string -endef - -define Package/look/description - look utility displays any lines in file which contain string -endef - -define Package/losetup -$(call Package/util-linux/Default) - TITLE:=set up and control loop devices -endef - -define Package/losetup/description - losetup is used to associate loop devices with regular files or block devices, - to detach loop devices and to query the status of a loop device -endef - -define Package/lsblk -$(call Package/util-linux/Default) - TITLE:=list block devices - DEPENDS:= +libblkid - SUBMENU=disc -endef - -define Package/lsblk/description - lsblk lists information about all or the specified block devices -endef - -define Package/mcookie -$(call Package/util-linux/Default) - TITLE:=generate magic cookies for xauth -endef - -define Package/mcookie/description - mcookie generates a 128-bit random hexadecimal number for use with the X - authority system -endef - -define Package/mount-utils -$(call Package/util-linux/Default) - TITLE:=related (u)mount utilities - DEPENDS+= +libmount -endef - -define Package/mount-utils/description - contains: mount, umount, findmnt -endef - -define Package/namei -$(call Package/util-linux/Default) - TITLE:=follow a pathname until a terminal point is found -endef - -define Package/namei/description - namei uses its arguments as pathnames to any type of Unix file (symlinks, - files, directories, and so forth) -endef - -define Package/rename -$(call Package/util-linux/Default) - TITLE:=rename files -endef - -define Package/rename/description - rename will rename the specified files by replacing the first occurrence of - expression in their name by replacement -endef - -define Package/partx-utils -$(call Package/util-linux/Default) - TITLE:=inform kernel about the presence and numbering of on-disk partitions - DEPENDS:= +libblkid - SUBMENU=disc -endef - -define Package/partx-utils/description - contains partx, addpart, delpart -endef - -define Package/script-utils -$(call Package/util-linux/Default) - TITLE:=make and replay typescript of terminal session - SUBMENU=Terminal -endef - -define Package/script-utils/description - contains: script, scriptreplay -endef - -define Package/setterm -$(call Package/util-linux/Default) - TITLE:=set terminal attributes - DEPENDS:= +libncurses - SUBMENU:=Terminal -endef - -define Package/setterm/description - setterm writes to standard output a character string that will invoke the - specified terminal capabilities -endef - -define Package/sfdisk -$(call Package/util-linux/Default) - TITLE:=partition table manipulator for Linux - SUBMENU=disc -endef - -define Package/sfdisk/description - list the size of a partition, list the partitions on a device, check the - partitions on a device and repartition a device -endef - -define Package/swap-utils -$(call Package/util-linux/Default) - TITLE:=swap space management utilities - DEPENDS+= +libblkid - SUBMENU:=disc -endef - -define Package/swap-utils/description - contains: mkswap, swaplabel, swapon, swapoff -endef - -define Package/uuidd -$(call Package/util-linux/Default) - TITLE:=UUID generation daemon - DEPENDS:= +libuuid -endef - -define Package/uuidd/description - The uuidd daemon is used by the UUID library to generate universally unique - identifiers (UUIDs), especially time-based UUIDs, in a secure and - guaranteed-unique fashion, even in the face of large numbers of threads - running on different CPUs trying to grab UUIDs. -endef - -define Package/uuidgen -$(call Package/util-linux/Default) - TITLE:=create a new UUID value - DEPENDS:= +libuuid -endef - -define Package/uuidgen/description - The uuidgen program creates (and prints) a new universally unique identifier - (UUID) using the libuuid library. The new UUID can reasonably be considered - unique among all UUIDs created on the local system, and among UUIDs created on - other systems in the past and in the future. -endef - -define Package/wall -$(call Package/util-linux/Default) - TITLE:=send a message to everybody's terminal - SUBMENU=Terminal -endef - -define Package/wall/description - wall sends a message to everybody logged in with their mesg permission - set to yes -endef - -define Package/whereis -$(call Package/util-linux/Default) - TITLE:=locate the binary, source, and manual page files for a command -endef - -define Package/whereis/description - whereis locates source/binary and manuals sections for specified files -endef - -define Package/wipefs -$(call Package/util-linux/Default) - TITLE:=wipe a signature from a device - DEPENDS:= +libblkid - SUBMENU:=disc -endef - -define Package/wipefs/description - wipefs can erase filesystem, raid or partition table signatures (magic - strings) from the specified device to make the signature invisible for - libblkid. -endef - -define Package/libblkid/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libblkid/src/.libs/libblkid.so.* $(1)/usr/lib/ -endef - -define Package/libmount/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libmount/src/.libs/libmount.so.* $(1)/usr/lib/ -endef - -define Package/libuuid/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libuuid/src/.libs/libuuid.so.* $(1)/usr/lib/ -endef - -define Package/agetty/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/agetty $(1)/usr/sbin/ -endef - -define Package/blkid/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/blkid $(1)/usr/sbin/ -endef - -define Package/cal/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/cal $(1)/usr/bin/ -endef - -define Package/cfdisk/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/.libs/cfdisk $(1)/usr/sbin/ -endef - -define Package/fdisk/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/.libs/fdisk $(1)/usr/sbin/ -endef - -define Package/findfs/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/findfs $(1)/usr/sbin/ -endef - -define Package/flock/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/flock $(1)/usr/bin/ -endef - -define Package/getopt/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/getopt/getopt $(1)/usr/bin/ -endef - -define Package/hwclock/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/usr/sbin/ -endef - -define Package/logger/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/logger $(1)/usr/bin/ -endef - -define Package/look/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/look $(1)/usr/bin/ -endef - -define Package/losetup/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/losetup $(1)/usr/sbin/ -endef - -define Package/lsblk/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/lsblk $(1)/usr/bin/ -endef - -define Package/mcookie/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/mcookie $(1)/usr/bin/ -endef - -define Package/mount-utils/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/{u,}mount $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/mountpoint $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/findmnt $(1)/usr/bin/ -endef - -define Package/namei/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/namei $(1)/usr/bin/ -endef - -define Package/rename/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/rename $(1)/usr/bin/ -endef - -define Package/partx-utils/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/partx/.libs/partx $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/partx/addpart $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/partx/delpart $(1)/usr/sbin/ -endef - -define Package/script-utils/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/script $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/scriptreplay $(1)/usr/bin/ -endef - -define Package/setterm/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/setterm $(1)/usr/bin/ -endef - -define Package/sfdisk/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/sfdisk $(1)/usr/sbin/ -endef - -define Package/swap-utils/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/.libs/mkswap $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/.libs/swaplabel $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/swapon $(1)/usr/sbin/ - ln -sf swapon $(1)/usr/sbin/swapoff -endef - -define Package/uuidd/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/uuidd $(1)/usr/sbin/ -endef - -define Package/uuidgen/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/uuidgen $(1)/usr/bin/ -endef - -define Package/wall/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/wall $(1)/usr/bin/ -endef - -define Package/whereis/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/whereis $(1)/usr/bin/ -endef - -define Package/wipefs/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/wipefs $(1)/usr/sbin/ -endef - -$(eval $(call BuildPackage,libblkid)) -$(eval $(call BuildPackage,libmount)) -$(eval $(call BuildPackage,libuuid)) -$(eval $(call BuildPackage,agetty)) -$(eval $(call BuildPackage,blkid)) -$(eval $(call BuildPackage,cal)) -$(eval $(call BuildPackage,cfdisk)) -$(eval $(call BuildPackage,dmesg)) -$(eval $(call BuildPackage,fdisk)) -$(eval $(call BuildPackage,findfs)) -$(eval $(call BuildPackage,flock)) -$(eval $(call BuildPackage,getopt)) -$(eval $(call BuildPackage,hwclock)) -$(eval $(call BuildPackage,logger)) -$(eval $(call BuildPackage,look)) -$(eval $(call BuildPackage,losetup)) -$(eval $(call BuildPackage,lsblk)) -$(eval $(call BuildPackage,mcookie)) -$(eval $(call BuildPackage,mount-utils)) -$(eval $(call BuildPackage,namei)) -$(eval $(call BuildPackage,rename)) -$(eval $(call BuildPackage,partx-utils)) -$(eval $(call BuildPackage,script-utils)) -$(eval $(call BuildPackage,setterm)) -$(eval $(call BuildPackage,sfdisk)) -$(eval $(call BuildPackage,swap-utils)) -$(eval $(call BuildPackage,uuidd)) -$(eval $(call BuildPackage,uuidgen)) -$(eval $(call BuildPackage,wall)) -$(eval $(call BuildPackage,whereis)) -$(eval $(call BuildPackage,wipefs)) diff --git a/package/util-linux/patches/000-compile.patch b/package/util-linux/patches/000-compile.patch deleted file mode 100644 index b7cc18b40c..0000000000 --- a/package/util-linux/patches/000-compile.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/misc-utils/cal.c -+++ b/misc-utils/cal.c -@@ -291,41 +291,6 @@ main(int argc, char **argv) { - } - #endif - --/* -- * The traditional Unix cal utility starts the week at Sunday, -- * while ISO 8601 starts at Monday. We read the start day from -- * the locale database, which can be overridden with the -- * -s (Sunday) or -m (Monday) options. -- */ --#if HAVE_DECL__NL_TIME_WEEK_1STDAY -- /* -- * You need to use 2 locale variables to get the first day of the week. -- * This is needed to support first_weekday=2 and first_workday=1 for -- * the rare case where working days span across 2 weeks. -- * This shell script shows the combinations and calculations involved: -- * -- * for LANG in en_US ru_RU fr_FR csb_PL POSIX; do -- * printf "%s:\t%s + %s -1 = " $LANG $(locale week-1stday first_weekday) -- * date -d"$(locale week-1stday) +$(($(locale first_weekday)-1))day" +%w -- * done -- * -- * en_US: 19971130 + 1 -1 = 0 #0 = sunday -- * ru_RU: 19971130 + 2 -1 = 1 -- * fr_FR: 19971201 + 1 -1 = 1 -- * csb_PL: 19971201 + 2 -1 = 2 -- * POSIX: 19971201 + 7 -1 = 0 -- */ -- { -- int wfd; -- union { unsigned int word; char *string; } val; -- val.string = nl_langinfo(_NL_TIME_WEEK_1STDAY); -- -- wfd = val.word; -- wfd = day_in_week(wfd % 100, (wfd / 100) % 100, wfd / (100 * 100)); -- weekstart = (wfd + *nl_langinfo(_NL_TIME_FIRST_WEEKDAY) - 1) % 7; -- } --#endif -- - yflag = 0; - while ((ch = getopt_long(argc, argv, "13mjsyVh", longopts, NULL)) != -1) - switch(ch) { diff --git a/package/util-linux/patches/001-no-printf-alloc.patch b/package/util-linux/patches/001-no-printf-alloc.patch deleted file mode 100644 index e3f048ab3c..0000000000 --- a/package/util-linux/patches/001-no-printf-alloc.patch +++ /dev/null @@ -1,108 +0,0 @@ -for systems that don't support latest POSIX standard: %as - -https://bugs.gentoo.org/406303 - ---- a/configure.ac -+++ b/configure.ac -@@ -688,7 +688,6 @@ AC_ARG_ENABLE([libmount], - UL_BUILD_INIT([libmount]) - UL_REQUIRES_LINUX([libmount]) - UL_REQUIRES_BUILD([libmount], [libblkid]) --UL_REQUIRES_HAVE([libmount], [scanf_alloc_modifier], [scanf string alloc modifier]) - AM_CONDITIONAL(BUILD_LIBMOUNT, test "x$build_libmount" = xyes) - - AC_SUBST([LIBMOUNT_VERSION]) ---- a/libmount/src/tab_parse.c -+++ b/libmount/src/tab_parse.c -@@ -22,6 +22,10 @@ - #include "pathnames.h" - #include "strutils.h" - -+#ifndef HAVE_SCANF_MS_MODIFIER -+# define UL_SCNsA "%s" -+#endif -+ - static inline char *skip_spaces(char *s) - { - assert(s); -@@ -61,16 +65,31 @@ static int mnt_parse_table_line(struct l - int rc, n = 0, xrc; - char *src = NULL, *fstype = NULL, *optstr = NULL; - -+#ifndef HAVE_SCANF_MS_MODIFIER -+ size_t len = strlen(s) + 1; -+ src = malloc(len); -+ fstype = malloc(len); -+ fs->target = malloc(len); -+ optstr = malloc(len); -+#endif -+ - rc = sscanf(s, UL_SCNsA" " /* (1) source */ - UL_SCNsA" " /* (2) target */ - UL_SCNsA" " /* (3) FS type */ - UL_SCNsA" " /* (4) options */ - "%n", /* byte count */ - -+#ifdef HAVE_SCANF_MS_MODIFIER - &src, - &fs->target, - &fstype, - &optstr, -+#else -+ src, -+ fs->target, -+ fstype, -+ optstr, -+#endif - &n); - xrc = rc; - -@@ -136,6 +155,16 @@ static int mnt_parse_mountinfo_line(stru - unsigned int maj, min; - char *fstype = NULL, *src = NULL, *p; - -+#ifndef HAVE_SCANF_MS_MODIFIER -+ size_t len = strlen(s) + 1; -+ fs->root = malloc(len); -+ fs->target = malloc(len); -+ fs->vfs_optstr = malloc(len); -+ fs->fs_optstr = malloc(len); -+ fstype = malloc(len); -+ src = malloc(len); -+#endif -+ - rc = sscanf(s, "%u " /* (1) id */ - "%u " /* (2) parent */ - "%u:%u " /* (3) maj:min */ -@@ -147,9 +176,15 @@ static int mnt_parse_mountinfo_line(stru - &fs->id, - &fs->parent, - &maj, &min, -+#ifdef HAVE_SCANF_MS_MODIFIER - &fs->root, - &fs->target, - &fs->vfs_optstr, -+#else -+ fs->root, -+ fs->target, -+ fs->vfs_optstr, -+#endif - &end); - - if (rc >= 7 && end > 0) -@@ -167,9 +202,15 @@ static int mnt_parse_mountinfo_line(stru - UL_SCNsA" " /* (9) source */ - UL_SCNsA, /* (10) fs options (fs specific) */ - -+#ifdef HAVE_SCANF_MS_MODIFIER - &fstype, - &src, - &fs->fs_optstr); -+#else -+ fstype, -+ src, -+ fs->fs_optstr); -+#endif - - if (rc >= 10) { - fs->flags |= MNT_FS_KERNEL; diff --git a/package/util-linux/patches/002-fix-endianess.patch b/package/util-linux/patches/002-fix-endianess.patch deleted file mode 100644 index 4c59932cda..0000000000 --- a/package/util-linux/patches/002-fix-endianess.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: util-linux-2.21.2/libblkid/src/superblocks/swap.c -=================================================================== ---- util-linux-2.21.2.orig/libblkid/src/superblocks/swap.c 2012-05-15 13:51:45.814410455 +0200 -+++ util-linux-2.21.2/libblkid/src/superblocks/swap.c 2013-06-12 23:23:03.270742199 +0200 -@@ -48,7 +48,7 @@ - - /* SWAPSPACE2 - check for wrong version or zeroed pagecount */ - if (strcmp(version, "2") == 0 && -- (hdr->version != 1 || hdr->lastpage == 0)) -+ ((hdr->version != 1 && swab32(hdr->version) != 1) || hdr->lastpage == 0)) - return -1; - - /* arbitrary sanity check.. is there any garbage down there? */