Revision: 5741
http://ipcop.svn.sourceforge.net/ipcop/?rev=5741&view=rev
Author: owes
Date: 2011-07-19 11:41:14 +0000 (Tue, 19 Jul 2011)
Log Message:
-----------
Update parted to 3.0
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/parted
ipcop/trunk/lfs/parted
ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20
ipcop/trunk/updates/1.9.20/information.xml
ipcop/trunk/updates/1.9.20/setup
Removed Paths:
-------------
ipcop/trunk/src/patches/parted-2.3_sun-raid-type-test-fix.patch
ipcop/trunk/src/patches/parted-2.3_sun-revert-disk-flag.patch
Modified: ipcop/trunk/config/rootfiles/common/parted
===================================================================
--- ipcop/trunk/config/rootfiles/common/parted 2011-07-18 15:41:05 UTC (rev
5740)
+++ ipcop/trunk/config/rootfiles/common/parted 2011-07-19 11:41:14 UTC (rev
5741)
@@ -12,8 +12,8 @@
#usr/include/parted/unit.h
#usr/lib/libparted.la
usr/lib/libparted.so
-usr/lib/libparted.so.0
-usr/lib/libparted.so.0.0.1
+usr/lib/libparted.so.1
+usr/lib/libparted.so.1.0.0
#usr/lib/libparted_pic.a
#usr/lib/pkgconfig/libparted.pc
usr/sbin/parted
Modified: ipcop/trunk/lfs/parted
===================================================================
--- ipcop/trunk/lfs/parted 2011-07-18 15:41:05 UTC (rev 5740)
+++ ipcop/trunk/lfs/parted 2011-07-19 11:41:14 UTC (rev 5741)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = parted
-VER = 2.3
+VER = 3.0
HOST_ARCH = all
OTHER_SRC = yes
@@ -53,7 +53,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 01d93eaaa3f290a17dd9d5dbfc7bb927
+$(DL_FILE)_MD5 = c415e5c97f86b5ff65a2d925e5a3feb7
install : $(TARGET)
@@ -83,8 +83,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)_sun-revert-disk-flag.patch
- cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/$(THISAPP)_sun-raid-type-test-fix.patch
# mkpartfs ext2 is not used because it is not similary advanced as
e2fsprogs
# it may even been deprecated in futur versions
Deleted: ipcop/trunk/src/patches/parted-2.3_sun-raid-type-test-fix.patch
===================================================================
--- ipcop/trunk/src/patches/parted-2.3_sun-raid-type-test-fix.patch
2011-07-18 15:41:05 UTC (rev 5740)
+++ ipcop/trunk/src/patches/parted-2.3_sun-raid-type-test-fix.patch
2011-07-19 11:41:14 UTC (rev 5741)
@@ -1,33 +0,0 @@
-From a582ca642f4817dd02e65a3ecc55e951008969b2 Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyer...@redhat.com>
-Date: Sat, 26 Jun 2010 09:22:59 +0200
-Subject: [PATCH] tests: adjust sun-partition-creating test to conform
-
-* tests/t4000-sun-raid-type.sh: Adjust partition size so the
-end falls on a cylinder boundary.
----
- tests/t4000-sun-raid-type.sh | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: b/tests/t4000-sun-raid-type.sh
-===================================================================
---- a/tests/t4000-sun-raid-type.sh
-+++ b/tests/t4000-sun-raid-type.sh
-@@ -26,7 +26,7 @@
-
- N=2000 # number of sectors
- dev=sun-disk-file
--exp="BYT;\n---:${N}s:file:$ss:$ss:sun:;\n1:0s:50s:51s"
-+exp="BYT;\n---:${N}s:file:$ss:$ss:sun:;\n1:0s:127s:128s"
- test_expect_success \
- 'create an empty file as a test disk' \
- 'dd if=/dev/zero of=$dev bs=${ss}c count=$N 2> /dev/null'
-@@ -38,7 +38,7 @@
-
- test_expect_success \
- 'create a single partition' \
-- 'parted -s $dev unit s mkpart ext2 0s 50s > out 2>&1'
-+ 'parted -s $dev unit s mkpart ext2 0s 127s > out 2>&1'
- test_expect_success 'check for empty output' 'compare out /dev/null'
-
- test_expect_success \
Deleted: ipcop/trunk/src/patches/parted-2.3_sun-revert-disk-flag.patch
===================================================================
--- ipcop/trunk/src/patches/parted-2.3_sun-revert-disk-flag.patch
2011-07-18 15:41:05 UTC (rev 5740)
+++ ipcop/trunk/src/patches/parted-2.3_sun-revert-disk-flag.patch
2011-07-19 11:41:14 UTC (rev 5741)
@@ -1,100 +0,0 @@
-From f51344a1a5f8e703b503d0f20d5bf2ef5f1ce98b Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwat...@ubuntu.com>
-Date: Tue, 15 Jun 2010 19:49:40 +0100
-Subject: [PATCH 2/2] sun: revert "implement disk flag operations"
-
-This reverts the libparted/labels/sun.c part of
-723ea23c5df68cbe67d1f518ef484f4c77f516fa. Sun disk labels do
-not appear to be able to handle non-cylinder alignment
-(http://bugs.debian.org/579948).
-* libparted/labels/sun.c: Revert.
----
- libparted/labels/sun.c | 47 +----------------------------------------------
- 1 files changed, 1 insertions(+), 46 deletions(-)
-
-Index: b/libparted/labels/sun.c
-===================================================================
---- a/libparted/labels/sun.c
-+++ b/libparted/labels/sun.c
-@@ -110,7 +110,6 @@
- struct _SunDiskData {
- PedSector length; /* This is based on cyl - alt-cyl */
- SunRawLabel raw_label;
-- int cylinder_alignment;
- };
-
- static PedDiskType sun_disk_type;
-@@ -192,7 +191,6 @@
- PED_ASSERT (bios_geom->cylinders == (PedSector) (dev->length /
cyl_size),
- return NULL);
- sun_specific->length = ped_round_down_to (dev->length, cyl_size);
-- sun_specific->cylinder_alignment = 1;
-
- label = &sun_specific->raw_label;
- memset(label, 0, sizeof(SunRawLabel));
-@@ -259,42 +257,6 @@
- }
-
- static int
--sun_disk_set_flag (PedDisk *disk, PedDiskFlag flag, int state)
--{
-- SunDiskData *disk_specific = disk->disk_specific;
-- switch (flag) {
-- case PED_DISK_CYLINDER_ALIGNMENT:
-- disk_specific->cylinder_alignment = !!state;
-- return 1;
-- default:
-- return 0;
-- }
--}
--
--static int
--sun_disk_get_flag (const PedDisk *disk, PedDiskFlag flag)
--{
-- SunDiskData *disk_specific = disk->disk_specific;
-- switch (flag) {
-- case PED_DISK_CYLINDER_ALIGNMENT:
-- return disk_specific->cylinder_alignment;
-- default:
-- return 0;
-- }
--}
--
--static int
--sun_disk_is_flag_available (const PedDisk *disk, PedDiskFlag flag)
--{
-- switch (flag) {
-- case PED_DISK_CYLINDER_ALIGNMENT:
-- return 1;
-- default:
-- return 0;
-- }
--}
--
--static int
- _check_geometry_sanity (PedDisk* disk, SunRawLabel* label)
- {
- PedDevice* dev = disk->dev;
-@@ -805,10 +767,7 @@
- {
- PED_ASSERT (part != NULL, return 0);
-
-- SunDiskData *disk_specific = part->disk->disk_specific;
--
-- if (disk_specific->cylinder_alignment &&
-- _ped_partition_attempt_align (part, constraint,
-+ if (_ped_partition_attempt_align (part, constraint,
- _get_strict_constraint
(part->disk)))
- return 1;
- if (_ped_partition_attempt_align (part, constraint,
-@@ -922,10 +881,6 @@
- clobber: NULL,
- write: NULL_IF_DISCOVER_ONLY (sun_write),
-
-- disk_set_flag: sun_disk_set_flag,
-- disk_get_flag: sun_disk_get_flag,
-- disk_is_flag_available: sun_disk_is_flag_available,
--
- get_partition_alignment: sun_get_partition_alignment,
-
- partition_set_name: NULL,
Modified: ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20
===================================================================
--- ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20 2011-07-18 15:41:05 UTC
(rev 5740)
+++ ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20 2011-07-19 11:41:14 UTC
(rev 5741)
@@ -307,6 +307,11 @@
/usr/lib/libpangocairo-1.0.so.0.2800.4
/usr/lib/libpangoft2-1.0.so.0.2800.4
##
+## parted-3.0
+/usr/sbin/parted
+/usr/sbin/partprobe
+/usr/lib/libparted.so.1.0.0
+##
## pcmciautils-018
/lib/udev/pcmcia-check-broken-cis
/lib/udev/pcmcia-socket-startup
Modified: ipcop/trunk/updates/1.9.20/information.xml
===================================================================
--- ipcop/trunk/updates/1.9.20/information.xml 2011-07-18 15:41:05 UTC (rev
5740)
+++ ipcop/trunk/updates/1.9.20/information.xml 2011-07-19 11:41:14 UTC (rev
5741)
@@ -9,7 +9,7 @@
hdparm to 9.37, iproute2 to 2.6.39, iptables to 1.4.11.1, iptstate to
2.2.3, iw to 0.9.22, kernel to 2.6.32.43,
less to 444, libnet to 1.1.5, libcap to 2.21, linux-atm-2.5.2 patched,
mdadm to 3.1.5, openssh to 5.8p2, openswan to 2.6.34, openvpn to 2.2.0,
- pango to 1.28.4, pcmciautils to 018, procps-3.2.8 patched,
+ pango to 1.28.4, parted to 3.0, pcmciautils to 018, procps-3.2.8
patched,
squid to 3.1.14, squid-langpack to 20110707, tzdata to 2011h,
traceroute to 2.0.17, vnstat to 1.11.
Compile gnupg with stackprotector.<br />
<b>Mandatory reboot after upgrade.</b></description>
Modified: ipcop/trunk/updates/1.9.20/setup
===================================================================
--- ipcop/trunk/updates/1.9.20/setup 2011-07-18 15:41:05 UTC (rev 5740)
+++ ipcop/trunk/updates/1.9.20/setup 2011-07-19 11:41:14 UTC (rev 5741)
@@ -73,6 +73,7 @@
/bin/rm -f /lib/libxtables.so.5.0.0
/bin/rm -f /usr/lib/libdns.so.69.1.2
/bin/rm -f /lib/libcap.so.2.20
+/bin/rm -f /usr/lib/libparted.so.0.0.1
# Replaced by xtables-multi
/bin/rm -f /sbin/ip6tables-multi
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Magic Quadrant for Content-Aware Data Loss Prevention
Research study explores the data loss prevention market. Includes in-depth
analysis on the changes within the DLP market, and the criteria used to
evaluate the strengths and weaknesses of these DLP solutions.
http://www.accelacomm.com/jaw/sfnl/114/51385063/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
