Hello community, here is the log from the commit of package evms checked in at Wed Dec 13 01:13:35 CET 2006. -------- --- evms/evms.changes 2006-12-07 17:56:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/evms/evms.changes 2006-12-13 00:46:25.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 12 16:46:10 MST 2006 - cgao@novell.com + +- Fixed all instance of strncat, which broke the build + +------------------------------------------------------------------- New: ---- strncat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evms.spec ++++++ --- /var/tmp/diff_new_pack.u8p2KX/_old 2006-12-13 01:13:02.000000000 +0100 +++ /var/tmp/diff_new_pack.u8p2KX/_new 2006-12-13 01:13:02.000000000 +0100 @@ -21,7 +21,7 @@ %endif Autoreqprov: on Version: 2.5.5 -Release: 67 +Release: 70 Summary: EVMS--Enterprise Volume Management System BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: http://prdownloads.sourceforge.net/evms/evms-%{version}.tar.bz2 @@ -53,6 +53,7 @@ Patch20: allow_container_on_active_md.patch Patch21: cli_query_segfault.patch Patch22: daemon.patch +Patch23: strncat.patch %description This package contains the userspace tools needed to manage EVMS @@ -128,6 +129,7 @@ %patch20 %patch21 -p1 %patch22 +%patch23 -p1 %build autoconf @@ -206,6 +208,8 @@ /etc/ha.d/resource.d/evms_failover %changelog -n evms +* Tue Dec 12 2006 - cgao@novell.com +- Fixed all instance of strncat, which broke the build * Thu Dec 07 2006 - cgao@novell.com - Modify MAC partition minor # to match that of the OS #219788 * Sun Nov 19 2006 - olh@suse.de ++++++ strncat.patch ++++++ --- evms-2.5.5/engine/dm-targets.c 2005-11-07 08:46:41.000000000 -0700 +++ evms-2.5.5/engine/dm-targets.c 2006-12-08 15:00:56.000000000 -0700 @@ -1257,7 +1257,7 @@ } strncat(mp->group[i].path[j].path_args, - " ", DM_PATH_ARGS_SIZE); + " ", sizeof( mp->group[i].path[j].path_args ) - strlen( mp->group[i].path[j].path_args ) - 1 ); sz = strlen(mp->group[i].path[j].path_args); params = next_token(params); } @@ -1359,7 +1359,7 @@ } strncat(mp->group[i].path[j].path_args, - " ", DM_PATH_ARGS_SIZE); + " ", sizeof( mp->group[i].path[j].path_args ) - strlen( mp->group[i].path[j].path_args ) - 1 ); sz = strlen(mp->group[i].path[j].path_args); params = next_token(params); } --- evms-2.5.5/plugins/bbr/bbr.c 2006-02-22 13:31:41.000000000 -0700 +++ evms-2.5.5/plugins/bbr/bbr.c 2006-12-08 15:01:08.000000000 -0700 @@ -2123,11 +2123,11 @@ parent->name[0] = '\0'; if (child->disk_group) { - strncat(parent->name, child->disk_group->name, EVMS_NAME_SIZE); - strncat(parent->name, "/", EVMS_NAME_SIZE-strlen(parent->name)); + strncat(parent->name, child->disk_group->name, sizeof( parent->name ) - strlen( parent->name ) - 1 ); + strncat(parent->name, "/", sizeof( parent->name ) - strlen( parent->name ) - 1 ); } strncat(parent->name, child->feature_header->object_name, - EVMS_NAME_SIZE-strlen(parent->name)); + sizeof( parent->name ) - strlen( parent->name ) - 1 ); memcpy( &pdata->feature_header_object_name, child->feature_header->object_name, --- evms-2.5.5/plugins/dos/segoptions.c 2006-02-22 09:05:13.000000000 -0700 +++ evms-2.5.5/plugins/dos/segoptions.c 2006-12-08 15:01:13.000000000 -0700 @@ -1480,7 +1480,7 @@ char pname[PARTITION_NAME_SIZE+12]; strcpy(pname, "os2_seg_"); - strncat(pname, value->s, PARTITION_NAME_SIZE ); + strncat(pname, value->s, sizeof( pname ) - strlen( pname ) - 1 ); rc = EngFncs->validate_name( pname ); --- evms-2.5.5/plugins/dos/segs.c 2005-09-29 09:43:27.000000000 -0600 +++ evms-2.5.5/plugins/dos/segs.c 2006-12-08 15:01:14.000000000 -0700 @@ -1605,7 +1605,7 @@ if (seg_pdata->dla_entry->Partition_Name[0]!=0x00) { strcpy(pname, "os2_seg_"); - strncat( pname, (char *) &seg_pdata->dla_entry->Partition_Name[0], PARTITION_NAME_SIZE); + strncat( pname, (char *) &seg_pdata->dla_entry->Partition_Name[0], sizeof( pname ) - strlen( pname ) - 1 ); EngFncs->unregister_name( pname ); } @@ -1694,7 +1694,7 @@ char pname[PARTITION_NAME_SIZE+12]; strcpy(pname, "os2_seg_"); - strncat(pname, seg_pdata->dla_entry->Partition_Name, PARTITION_NAME_SIZE); + strncat(pname, seg_pdata->dla_entry->Partition_Name, sizeof( pname ) - strlen( pname ) - 1 ); rc = EngFncs->register_name( pname ); if (rc) { --- evms-2.5.5/plugins/lvm/lvm_move.c 2005-01-13 11:27:02.000000000 -0700 +++ evms-2.5.5/plugins/lvm/lvm_move.c 2006-12-08 15:01:19.000000000 -0700 @@ -1304,11 +1304,11 @@ if (rc) { count++; if (region->volume) { - strncat(volume_string, region->volume->name, EVMS_NAME_SIZE); + strncat(volume_string, region->volume->name, sizeof( volume_string ) - strlen( volume_string ) - 1 ); } else { - strncat(volume_string, region->name, EVMS_NAME_SIZE); + strncat(volume_string, region->name, sizeof( volume_string ) - strlen( volume_string ) - 1 ); } - strncat(volume_string, "\n", 1); + strncat(volume_string, "\n", sizeof( volume_string ) - strlen( volume_string ) - 1 ); } } } --- evms-2.5.5/plugins/lvm/lvm_names.c 2004-09-09 14:38:02.000000000 -0600 +++ evms-2.5.5/plugins/lvm/lvm_names.c 2006-12-08 15:01:20.000000000 -0700 @@ -54,11 +54,11 @@ container_name[0] = '\0'; if (disk_group) { - strncat(container_name, disk_group->name, EVMS_NAME_SIZE); - strncat(container_name, "/", EVMS_NAME_SIZE-strlen(container_name)); + strncat(container_name, disk_group->name, sizeof( container_name ) - strlen( container_name ) - 1 ); + strncat(container_name, "/", sizeof( container_name ) - strlen( container_name ) - 1 ); } - strncat(container_name, LVM_DEV_DIRECTORY, EVMS_NAME_SIZE-strlen(container_name)); - strncat(container_name, vg_name, EVMS_NAME_SIZE-strlen(container_name)); + strncat(container_name, LVM_DEV_DIRECTORY, sizeof( container_name ) - strlen( container_name ) - 1 ); + strncat(container_name, vg_name, sizeof( container_name ) - strlen( container_name ) - 1 ); LOG_EXIT_VOID(); } @@ -151,11 +151,11 @@ */ region_name[0] = '\0'; if (disk_group_name) { - strncat(region_name, disk_group_name, EVMS_NAME_SIZE-strlen(region_name)); - strncat(region_name, "/", EVMS_NAME_SIZE-strlen(region_name)); + strncat(region_name, disk_group_name, sizeof( region_name ) - strlen( region_name ) - 1 ); + strncat(region_name, "/", sizeof( region_name ) - strlen( region_name ) - 1 ); } - strncat(region_name, LVM_DEV_DIRECTORY, EVMS_NAME_SIZE-strlen(region_name)); - strncat(region_name, ptr, EVMS_NAME_SIZE-strlen(region_name)); + strncat(region_name, LVM_DEV_DIRECTORY, sizeof( region_name ) - strlen( region_name ) - 1 ); + strncat(region_name, ptr, sizeof( region_name ) - strlen( region_name ) - 1 ); out: LOG_EXIT_INT(rc); @@ -200,9 +200,9 @@ lvm_translate_container_name_to_vg_name(group, vg_name); strncpy(lv_name, DEV_DIRECTORY, EVMS_NAME_SIZE); - strncat(lv_name, vg_name, EVMS_NAME_SIZE-strlen(lv_name)); - strncat(lv_name, "/", EVMS_NAME_SIZE-strlen(lv_name)); - strncat(lv_name, simple_name, EVMS_NAME_SIZE-strlen(lv_name)); + strncat(lv_name, vg_name, sizeof( lv_name ) - strlen( lv_name ) - 1 ); + strncat(lv_name, "/", sizeof( lv_name ) - strlen( lv_name ) - 1 ); + strncat(lv_name, simple_name, sizeof( lv_name ) - strlen( lv_name ) - 1 ); LOG_EXIT_VOID(); } --- evms-2.5.5/plugins/iscsi/iscsi.c 2006-04-07 10:51:54.000000000 -0600 +++ evms-2.5.5/plugins/iscsi/iscsi.c 2006-12-08 15:01:29.000000000 -0700 @@ -464,7 +464,7 @@ iscsi_object->object_type = EVMS_OBJECT; iscsi_object->data_type = DATA_TYPE; iscsi_object->flags = SOFLAG_MUST_BE_TOP; - strncat(iscsi_object->name,iscsi_name,EVMS_NAME_SIZE-strlen(iscsi_object->name)); + strncat(iscsi_object->name,iscsi_name,sizeof( iscsi_object->name ) - strlen( iscsi_object->name ) - 1 ); iscsi_object->plugin = &iscsi_plugin; rc = EngFncs->register_name(iscsi_name); if (rc) --- evms-2.5.5/plugins/drivelink/dl_discovery.c 2004-11-23 12:44:11.000000000 -0700 +++ evms-2.5.5/plugins/drivelink/dl_discovery.c 2006-12-08 15:01:30.000000000 -0700 @@ -482,9 +482,9 @@ // build cluster ready object name if (object->disk_group) { strncpy(object->name, object->disk_group->name, EVMS_NAME_SIZE); - strncat(object->name, "/", EVMS_NAME_SIZE-strlen(object->name)); + strncat(object->name, "/", sizeof( object->name ) - strlen( object->name ) - 1 ); } - strncat(object->name, drivelink_name, EVMS_NAME_SIZE-strlen(object->name)); + strncat(object->name, drivelink_name, sizeof( object->name ) - strlen( object->name ) - 1 ); // save drivelink name in pdata strncpy(pdata->parent_object_name, drivelink_name, EVMS_NAME_SIZE); --- evms-2.5.5/plugins/drivelink/dl_object.c 2004-09-03 08:52:33.000000000 -0600 +++ evms-2.5.5/plugins/drivelink/dl_object.c 2006-12-08 15:01:30.000000000 -0700 @@ -629,9 +629,9 @@ // build cluster ready object name if (drivelink->disk_group) { strncpy(drivelink->name, drivelink->disk_group->name, EVMS_NAME_SIZE); - strncat(drivelink->name, "/", EVMS_NAME_SIZE-strlen(drivelink->name)); + strncat(drivelink->name, "/", sizeof( drivelink->name ) - strlen( drivelink->name ) - 1 ); } - strncat(drivelink->name, drive_link_name, EVMS_NAME_SIZE-strlen(drivelink->name)); + strncat(drivelink->name, drive_link_name, sizeof( drivelink->name ) - strlen( drivelink->name ) - 1 ); strncpy(pdata->parent_object_name, drive_link_name, EVMS_NAME_SIZE); --- evms-2.5.5/plugins/snapshot/snap_create.c 2006-02-22 13:21:25.000000000 -0700 +++ evms-2.5.5/plugins/snapshot/snap_create.c 2006-12-08 15:01:33.000000000 -0700 @@ -158,12 +158,12 @@ parent_name[0] = '\0'; if (child_object->disk_group) { - strncat(parent_name, child_object->disk_group->name, EVMS_NAME_SIZE); - strncat(parent_name, "/", EVMS_NAME_SIZE-strlen(parent_name)); + strncat(parent_name, child_object->disk_group->name, sizeof( parent_name ) - strlen( parent_name ) - 1 ); + strncat(parent_name, "/", sizeof( parent_name ) - strlen( parent_name ) - 1 ); } - strncat(parent_name, child_object->name, EVMS_NAME_SIZE-strlen(parent_name)); - strncat(parent_name, "#origin#", EVMS_NAME_SIZE-strlen(parent_name)); + strncat(parent_name, child_object->name, sizeof( parent_name ) - strlen( parent_name ) - 1 ); + strncat(parent_name, "#origin#", sizeof( parent_name ) - strlen( parent_name ) - 1 ); LOG_EXIT_VOID(); } @@ -190,11 +190,11 @@ * to the snapshot object name. */ if (snap_child->disk_group) { - strncat(name, snap_child->disk_group->name, EVMS_NAME_SIZE); - strncat(name, "/", EVMS_NAME_SIZE-strlen(name)); + strncat(name, snap_child->disk_group->name, sizeof( name ) - strlen( name ) - 1 ); + strncat(name, "/", sizeof( name ) - strlen( name ) - 1 ); } strncat(name, snap_child->feature_header->object_name, - EVMS_NAME_SIZE-strlen(name)); + sizeof( name ) - strlen( name ) - 1 ); LOG_DEBUG("Allocating snapshot %s.\n", name); @@ -253,7 +253,7 @@ snap_sibling->disk_group = snap_parent->disk_group; strncpy(snap_sibling->name, name, EVMS_NAME_SIZE); strncat(snap_sibling->name, "#sibling#", - EVMS_NAME_SIZE-strlen(snap_sibling->name)); + sizeof( snap_sibling->name ) - strlen( snap_sibling->name ) - 1 ); out: LOG_EXIT_PTR(volume); --- evms-2.5.5/plugins/snapshot/snap_options.c 2004-09-22 16:37:12.000000000 -0600 +++ evms-2.5.5/plugins/snapshot/snap_options.c 2006-12-08 15:01:33.000000000 -0700 @@ -43,10 +43,10 @@ test_name[0] = '\0'; if (disk_group) { - strncat(test_name, disk_group->name, EVMS_NAME_SIZE); - strncat(test_name, "/", EVMS_NAME_SIZE-strlen(test_name)); + strncat(test_name, disk_group->name, sizeof( test_name ) - strlen( test_name ) - 1 ); + strncat(test_name, "/", sizeof( test_name ) - strlen( test_name ) - 1 ); } - strncat(test_name, snap_name, EVMS_NAME_SIZE-strlen(test_name)); + strncat(test_name, snap_name, sizeof( test_name ) - strlen( test_name ) - 1 ); rc = EngFncs->validate_name(test_name); --- evms-2.5.5/plugins/snapshot/snap_discover.c 2004-11-24 15:09:22.000000000 -0700 +++ evms-2.5.5/plugins/snapshot/snap_discover.c 2006-12-08 15:01:33.000000000 -0700 @@ -419,7 +419,7 @@ if (!(snap_volume->sibling->flags & SOFLAG_ACTIVE)) { strncpy(old_name, snap_volume->child->name, EVMS_NAME_SIZE); - strncat(old_name, "#snap#", EVMS_NAME_SIZE-strlen(old_name)); + strncat(old_name, "#snap#", sizeof( old_name ) - strlen( old_name ) - 1 ); /* Lie about the active bit to fool dm_rename. The subsequent * call to dm_update_status will correct it if necessary. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org