[prev in list] [next in list] [prev in thread] [next in thread]
List: ipcop-svn
Subject: [Ipcop-svn] SF.net SVN: ipcop:[7650] ipcop/trunk
From: owes () users ! sourceforge ! net
Date: 2014-08-28 10:43:31
Message-ID: E1XMxB6-0002F6-4A () sfs-ml-4 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 7650
http://sourceforge.net/p/ipcop/svn/7650
Author: owes
Date: 2014-08-28 10:43:30 +0000 (Thu, 28 Aug 2014)
Log Message:
-----------
Update util-linux to 2.25
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/util-linux
ipcop/trunk/lfs/util-linux
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
Added Paths:
-----------
ipcop/trunk/src/patches/util-linux-2.25_lscpu-pic.patch
Modified: ipcop/trunk/config/rootfiles/common/util-linux
===================================================================
--- ipcop/trunk/config/rootfiles/common/util-linux 2014-08-28 10:28:51 UTC (rev 7649)
+++ ipcop/trunk/config/rootfiles/common/util-linux 2014-08-28 10:43:30 UTC (rev 7650)
@@ -11,6 +11,8 @@
lib/libblkid.so.1.1.0
lib/libmount.so.1
lib/libmount.so.1.1.0
+lib/libsmartcols.so.1
+lib/libsmartcols.so.1.1.0
lib/libuuid.so.1
lib/libuuid.so.1.3.0
sbin/agetty
@@ -46,7 +48,6 @@
#usr/bin/colcrt
#usr/bin/colrm
#usr/bin/column
-#usr/bin/cytune
#usr/bin/eject
#usr/bin/fallocate
#usr/bin/flock
@@ -65,6 +66,7 @@
#usr/bin/look
#usr/bin/lscpu
#usr/bin/lslocks
+#usr/bin/lslogins
#usr/bin/mcookie
usr/bin/mesg
#usr/bin/namei
@@ -81,6 +83,7 @@
#usr/bin/setterm
#usr/bin/tailf
#usr/bin/ul
+#usr/bin/uname26
usr/bin/utmpdump
#usr/bin/uuidgen
#usr/bin/wall
@@ -89,13 +92,18 @@
#usr/include/blkid/blkid.h
#usr/include/libmount
#usr/include/libmount/libmount.h
+#usr/include/libsmartcols
+#usr/include/libsmartcols/libsmartcols.h
#usr/include/uuid
#usr/include/uuid/uuid.h
usr/lib/libblkid.so
usr/lib/libmount.so
+#usr/lib/libsmartcols.la
+usr/lib/libsmartcols.so
usr/lib/libuuid.so
#usr/lib/pkgconfig/blkid.pc
#usr/lib/pkgconfig/mount.pc
+#usr/lib/pkgconfig/smartcols.pc
#usr/lib/pkgconfig/uuid.pc
#usr/sbin/addpart
#usr/sbin/delpart
@@ -106,6 +114,8 @@
#usr/sbin/resizepart
#usr/sbin/rtcwake
#usr/sbin/uuidd
+#usr/share/bash-completion
+#usr/share/bash-completion/completions
#usr/share/doc/util-linux
#usr/share/doc/util-linux/getopt
#usr/share/doc/util-linux/getopt/getopt-parse.bash
@@ -130,6 +140,7 @@
#usr/share/man/man1/logger.1
#usr/share/man/man1/look.1
#usr/share/man/man1/lscpu.1
+#usr/share/man/man1/lslogins.1
#usr/share/man/man1/mcookie.1
#usr/share/man/man1/mesg.1
#usr/share/man/man1/more.1
@@ -165,6 +176,7 @@
#usr/share/man/man3/uuid_time.3
#usr/share/man/man3/uuid_unparse.3
#usr/share/man/man5/fstab.5
+#usr/share/man/man5/terminal-colors.d.5
#usr/share/man/man8/addpart.8
#usr/share/man/man8/agetty.8
#usr/share/man/man8/blkdiscard.8
@@ -173,7 +185,6 @@
#usr/share/man/man8/cfdisk.8
#usr/share/man/man8/chcpu.8
#usr/share/man/man8/ctrlaltdel.8
-#usr/share/man/man8/cytune.8
#usr/share/man/man8/delpart.8
#usr/share/man/man8/fdformat.8
#usr/share/man/man8/fdisk.8
@@ -211,6 +222,7 @@
#usr/share/man/man8/swapon.8
#usr/share/man/man8/switch_root.8
#usr/share/man/man8/umount.8
+#usr/share/man/man8/uname26.8
#usr/share/man/man8/uuidd.8
#usr/share/man/man8/wdctl.8
#usr/share/man/man8/wipefs.8
Modified: ipcop/trunk/lfs/util-linux
===================================================================
--- ipcop/trunk/lfs/util-linux 2014-08-28 10:28:51 UTC (rev 7649)
+++ ipcop/trunk/lfs/util-linux 2014-08-28 10:43:30 UTC (rev 7650)
@@ -33,13 +33,13 @@
include Config
PKG_NAME = util-linux
-VER = 2.24.2
+VER = 2.25
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
DL_FILE = $(THISAPP).tar.xz
-DL_FROM = $(URL_KERNEL)/linux/utils/util-linux/v2.24
+DL_FROM = $(URL_KERNEL)/linux/utils/util-linux/v2.25
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3f191727a0d28f7204b755cf1b6ea0aa
+$(DL_FILE)_MD5 = 4c78fdef4cb882caafad61e33cafbc14
install : $(TARGET)
@@ -81,6 +81,7 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_lscpu-pic.patch
ifeq "$(STAGE)" "toolchain"
# Just try to build only what is required here : mount, setarch (for linux32), \
libblkid, libuuid @@ -127,11 +128,12 @@
ifeq "$(STAGE)" "base"
# 2.25 should have this to be able to change adjtime: ./configure \
ADJTIME_PATH=/var/lib/hwclock/adjtime
- cd $(DIR_APP) && sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' `grep -rl \
'etc/adjtime' .` + #cd $(DIR_APP) && sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
`grep -rl 'etc/adjtime' .` cd $(DIR_APP) && mkdir -p /var/lib/hwclock
cd $(DIR_APP) && ./configure --localstatedir=/var/run --disable-static \
--disable-nls \
--disable-bash-completion --disable-cramfs --disable-login --disable-nologin \
- --disable-schedutils --disable-su --disable-unshare
+ --disable-schedutils --disable-su --disable-unshare \
+ ADJTIME_PATH=/var/lib/hwclock/adjtime
# CCACHE_CPP2=1 replace the CFLAGS -fPIE hack and workaround a not well identified \
gcc-4.4 issue that trigger # lscpu.c: In function 'read_hypervisor':
# lscpu.c:446: error can't find a register in class 'BREG' while reloading 'asm'
Added: ipcop/trunk/src/patches/util-linux-2.25_lscpu-pic.patch
===================================================================
--- ipcop/trunk/src/patches/util-linux-2.25_lscpu-pic.patch \
(rev 0)
+++ ipcop/trunk/src/patches/util-linux-2.25_lscpu-pic.patch 2014-08-28 10:43:30 UTC \
(rev 7650) @@ -0,0 +1,81 @@
+From f86d649d5f2522c61b791366a96e9f00cd255668 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 5 Aug 2014 18:58:52 -0400
+Subject: [PATCH] lscpu: clean up vmware inline asm
+
+This code is not PIC clean which means it fails to build on hardened
+32bit x86 systems (i.e. building as PIE).
+
+While here, optimize the existing cpuid logic slightly.
+
+URL: https://bugs.gentoo.org/518936
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ sys-utils/lscpu.c | 36 ++++++++++++++++++++++++++----------
+ 1 file changed, 26 insertions(+), 10 deletions(-)
+
+diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
+index 062dff5..9965eeb 100644
+--- a/sys-utils/lscpu.c
++++ b/sys-utils/lscpu.c
+@@ -546,10 +546,9 @@ cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx,
+ __asm__(
+ #if defined(__PIC__) && defined(__i386__)
+ /* x86 PIC cannot clobber ebx -- gcc bitches */
+- "pushl %%ebx;"
++ "xchg %%ebx, %%esi;"
+ "cpuid;"
+- "movl %%ebx, %%esi;"
+- "popl %%ebx;"
++ "xchg %%esi, %%ebx;"
+ : "=S" (*ebx),
+ #else
+ "cpuid;"
+@@ -656,12 +655,29 @@ read_hypervisor_powerpc(struct lscpu_desc *desc)
+ #define VMWARE_BDOOR_PORT 0x5658
+ #define VMWARE_BDOOR_CMD_GETVERSION 10
+
+-#define VMWARE_BDOOR(eax, ebx, ecx, edx) \
+- __asm__("inl (%%dx), %%eax" : \
+- "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : \
+- "0"(VMWARE_BDOOR_MAGIC), "1"(VMWARE_BDOOR_CMD_GETVERSION), \
+- "2"(VMWARE_BDOOR_PORT), "3"(0) : \
+- "memory");
++static inline
++void vmware_bdoor(uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
++{
++ __asm__(
++#if defined(__PIC__) && defined(__i386__)
++ /* x86 PIC cannot clobber ebx -- gcc bitches */
++ "xchg %%ebx, %%esi;"
++ "inl (%%dx), %%eax;"
++ "xchg %%esi, %%ebx;"
++ : "=S" (*ebx),
++#else
++ "inl (%%dx), %%eax;"
++ : "=b" (*ebx),
++#endif
++ "=a" (*eax),
++ "=c" (*ecx),
++ "=d" (*edx)
++ : "0" (VMWARE_BDOOR_MAGIC),
++ "1" (VMWARE_BDOOR_CMD_GETVERSION),
++ "2" (VMWARE_BDOOR_PORT),
++ "3" (0)
++ : "memory");
++}
+
+ static jmp_buf segv_handler_env;
+
+@@ -697,7 +713,7 @@ is_vmware_platform(void)
+ if (sigaction(SIGSEGV, &act, &oact))
+ err(EXIT_FAILURE, _("error: can not set signal handler"));
+
+- VMWARE_BDOOR(eax, ebx, ecx, edx);
++ vmware_bdoor(&eax, &ebx, &ecx, &edx);
+
+ if (sigaction(SIGSEGV, &oact, NULL))
+ err(EXIT_FAILURE, _("error: can not restore signal handler"));
+--
+2.0.0
+
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-28 10:28:51 UTC (rev 7649)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-28 10:43:30 UTC (rev 7650)
@@ -466,7 +466,7 @@
/usr/share/zoneinfo/posix/US/Samoa
/usr/share/zoneinfo/posix/W-SU
##
-## util-linux-2.24.2
+## util-linux-2.25
/bin/dmesg
/bin/kill
/bin/more
@@ -475,6 +475,8 @@
/bin/umount
/lib/libblkid.so.1.1.0
/lib/libmount.so.1.1.0
+/lib/libsmartcols.so.1
+/lib/libsmartcols.so.1.1.0
/lib/libuuid.so.1.3.0
/sbin/agetty
/sbin/blkid
@@ -496,5 +498,6 @@
/usr/bin/rename
/usr/bin/renice
/usr/bin/utmpdump
+/usr/lib/libsmartcols.so
/usr/sbin/fdformat
/usr/sbin/mklost+found
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-08-28 10:28:51 UTC (rev 7649)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-08-28 10:43:30 UTC (rev 7650)
@@ -11,7 +11,7 @@
gnupg to 1.4.18, grep to 2.20, iproute2 to 3.16.0, libgcrypt to 1.6.2, libnl \
to 3.2.25, mdadm to 3.3.2,
openssl to 1.0.1i, openvpn to 2.3.4, ppp to 2.4.7, rsyslog to 7.6.3,
squid to 3.4.7, squid-langpack to 20140506, syslinux to 6.02,
- tzdata to 2014f, util-linux to 2.24.2.
+ tzdata to 2014f, util-linux to 2.25.
Upgrade Perl modules IO-Socket-SSL to 1.997, NetAddr-IP to 4.075, Net-DNS to \
0.75, Net-SSLeay to 1.63. <br />
Upgrade e1000e network driver to 3.1.0.2, igb network driver to \
5.2.9.4.<br />
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic