Revision: 7659
http://sourceforge.net/p/ipcop/svn/7659
Author: owes
Date: 2014-09-28 14:02:24 +0000 (Sun, 28 Sep 2014)
Log Message:
-----------
Update util-linux to 2.25.1
Modified Paths:
--------------
ipcop/trunk/lfs/util-linux
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
Removed Paths:
-------------
ipcop/trunk/src/patches/util-linux-2.25_lscpu-pic.patch
Modified: ipcop/trunk/lfs/util-linux
===================================================================
--- ipcop/trunk/lfs/util-linux 2014-09-28 14:00:45 UTC (rev 7658)
+++ ipcop/trunk/lfs/util-linux 2014-09-28 14:02:24 UTC (rev 7659)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = util-linux
-VER = 2.25
+VER = 2.25.1
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4c78fdef4cb882caafad61e33cafbc14
+$(DL_FILE)_MD5 = 2ff36a8f8ede70f66c5ad0fb09e40e79
install : $(TARGET)
@@ -81,7 +81,6 @@
$(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
Deleted: ipcop/trunk/src/patches/util-linux-2.25_lscpu-pic.patch
===================================================================
--- ipcop/trunk/src/patches/util-linux-2.25_lscpu-pic.patch 2014-09-28
14:00:45 UTC (rev 7658)
+++ ipcop/trunk/src/patches/util-linux-2.25_lscpu-pic.patch 2014-09-28
14:02:24 UTC (rev 7659)
@@ -1,81 +0,0 @@
-From f86d649d5f2522c61b791366a96e9f00cd255668 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vap...@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 <vap...@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-09-28 14:00:45 UTC
(rev 7658)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-09-28 14:02:24 UTC
(rev 7659)
@@ -469,7 +469,7 @@
/usr/share/zoneinfo/posix/US/Samoa
/usr/share/zoneinfo/posix/W-SU
##
-## util-linux-2.25
+## util-linux-2.25.1
/bin/dmesg
/bin/kill
/bin/more
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-09-28 14:00:45 UTC (rev
7658)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-09-28 14:02:24 UTC (rev
7659)
@@ -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.25.
+ tzdata to 2014f, util-linux to 2.25.1.
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.
------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
