APC Smart-UPS 2200 - 0ferta

2011-08-24 Thread Carlos
APC Smart-UPS 2200VA USB  Serial RM 2U 230V  $ 2500 Consulte
respondiendo el presente mensaje  Salida Capacidad de Potencia de Salida
1980 Vatios / 2200 VA / Max Potencia Configurable1980 Vatios / 2200
VA Voltaje de salida nominal 230V / Nota de voltaje de salida Configurable  
 a una tensioacute;n nominal de salida de 220 : 230 o 240 /
Distorsioacute;nde Voltaje de Salida Menos del 3% / Frecuencia de
salida (sincronizado paraprincipales) 47-53 Hz para 50 Hz nominal,57
- 63 Hz para 60 Hz nominal /Tipo de forma de onda Onda senoidal / 
Conexiones de salida (8) IEC 320 C13 / (1) IEC 320 C19 / (2) IEC Jumpers 
Entrada Voltaje Nominal de Entrada 230V / Frecuencia de entrada 50/60 Hz +/-
3 Hz(deteccioacute;n automaacute;tica) / Tipo de Conexioacute;n
de Entrada/ IEC-320 C20 / Schuko CEE 7 / EU1-16P / British BS1363A 
Rango de voltaje de entrada  En operaciones principales 160 - 286V / Rango
de voltaje ajustable paraoperaciones principales 151 - 302V
Bateriacute;as y tiempo de autonomiacute;a Tipo de bateriacute;a
Bateriacute;a libre de mantenimiento sellada alplomo con
electrolito suspendido : a prueba de fugas / Tiempo tiacute;picode
recarga 3 hour(s) / Cartucho de bateriacute;a de repuesto RBC43 / Cantidad 
  de RBCtrade; 1  Comunicaciones Gestioacute;n Puerto
Interfaz DB-9 RS-232,SmartSlot,USB / Interfaces SmartSlottrade; disponibles
   1 / Panel de Control Diodos luminosos de Estado, con barras graficas
decarga y bateriacute;a e Indicadores de En Red : Bateriacute;a
activada: Cambiar Bateriacute;a : y Sobrecarga / Alarma
Acuacute;stica Alarmaen caso de funcionar con bateriacute;as :
alarma especial de bateriacute;abaja : Retardos configurables /
Desconexioacute;n de Emergencia (EPO) Siacute;/ Proteccioacute;n
y Filtro contra Picos de Voltaje / Medicioacute;n deEnergiacute;a
de Picos de Voltaje (Julios ) 480 Julios / Filtro Filtracioacute;n   
multipolar permanente de ruido : Paso de tensioacute;n ante pico de voltage
   0.3% IEEE : tiempo de reaccioacute;n de bloqueo cero : acorde con UL
1449 Descripcioacute;n fiacute;sica Altura maacute;xima 89.00 mm
/ Anchura maacute;xima 483.00 mm / Profundidadmaacute;xima 660.00
mm / Altura del bastidor 2U / Peso neto 43.64 KG /Peso de
enviacute;o 51.50 KG / Altura de Enviacute;o 260.00 mm / Anchurade
Enviacute;o 600.00 mm / Profundidad de enviacute;o 980.00 mm / Color  
 Negro / Unidades en Palet 8.00  Descripcioacute;n medioambiental
Temperatura de trabajo 0 - 40 deg;C / Humedad Relativa de Trabajo 0 - 95%  
 / Elevacioacute;n de Trabajo 0-3000 metros / Temperatura de
Almacenamiento-15 - 45 deg;C / Humedad Relativa de Almacenamiento 0
- 95% / Elevacioacute;nde Almacenamiento 0-15000 metros / Ruido
perceptible a 1 metro desde lasuperficie de la unidad 47.00 dBA /
Disipacioacute;n teacute;rmica online300.00 BTU/h  Conformidad
Aceptaciones Ciclo C,CE,EN 50091-1,EN 50091-2,GOST,VDE / Cumplimiento
medioambientalRoHS 7b Exemption,China RoHS



more old stuff

2011-08-24 Thread Marc Espie
Apparently, nobody cares about fat packages.

Not surprisingly, killing that code simplifies a few things.
Especially since the necessity of passing arch around was only due to
the possibility of fat packages...

Index: package.5
===
RCS file: /cvs/src/usr.sbin/pkg_add/package.5,v
retrieving revision 1.9
diff -u -p -r1.9 package.5
--- package.5   11 Jan 2010 10:16:20 -  1.9
+++ package.5   24 Aug 2011 10:35:28 -
@@ -29,7 +29,6 @@ and
 .Xr pkg_merge 1 ,
 and are usually manipulated using
 .Xr pkg_add 1 ,
-.Xr pkg_merge 1 ,
 .Xr pkg_mklocatedb 1 ,
 or
 .Xr pkg_info 1 .
@@ -57,9 +56,6 @@ All types of archive contents can be pre
 including files, directories, hardlinks, symlinks, fifos, block and character
 devices.
 .Pp
-A special extension to the format, dubbed fat packages, is described in
-the next section.
-.Pp
 In order to allow just-in-time extraction,
 packages always begin with a table of contents, named
 .Pa +CONTENTS .
@@ -74,8 +70,8 @@ See
 for annotation details.
 .Pp
 This table of contents is always followed by a few special files, some of
-which are optional: the package description (+DESC), an installation script
-(+INSTALL), a display message (+DISPLAY), etc.
+which are optional: the package description (+DESC),
+a display message (+DISPLAY), etc.
 .Pp
 The ustar format has some limitations with respect to file names.
 Accordingly, the package tools will replace very long names with
@@ -103,38 +99,17 @@ Once the packing-list signature is check
 will be checksummed, resulting in a
 .Sq just-in-time
 signature checking.
-.Sh FAT PACKAGES DESCRIPTION
-The
-.Xr pkg_merge 1
-command can create fat packages, which coalesce several normal packages in
-a single ustar archive, by interleaving their contents.
-.Pp
-Other tools, such as
-.Xr pkg_add 1 ,
-are aware of fat packages and can handle them transparently.
 .Pp
-In a fat package, every item has a small prefix that identifies the
-original package.
-For instance, after merging two packages, the package will usually
-begin with
-.Pa a/+CONTENTS
-and
-.Pa b/+CONTENTS .
-Individual items will then begin with
-.Pa ab/file ,
-for a file common to both packages;
-.Pa a/file
-for a file belonging to the first package;
-and
-.Pa b/file
-for a file belonging to the second package.
+Fat packages were removed in
+.Ox 5.1 ,
+since no practical application was found.
 .Sh SEE ALSO
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,
 .Xr pkg_info 1 ,
-.Xr pkg_merge 1 ,
 .Xr packages 7 ,
 .Xr packages-specs 7
+.Sh HISTORY
 .Sh STANDARDS
 Packages are valid gzip'ed ustar archives that can be extracted using
 .Xr tar 1 .
Index: pkg_merge
===
RCS file: pkg_merge
diff -N pkg_merge
--- pkg_merge   28 Jul 2010 12:19:54 -  1.21
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,257 +0,0 @@
-#! /usr/bin/perl
-# Copyright (c) 2005-2007 Marc Espie es...@openbsd.org
-# $OpenBSD: pkg_merge,v 1.21 2010/07/28 12:19:54 espie Exp $
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-use strict;
-use warnings;
-
-use OpenBSD::PackageLocator;
-use OpenBSD::PackageInfo;
-use OpenBSD::PackingList;
-use OpenBSD::Getopt;
-use OpenBSD::Error;
-use OpenBSD::Ustar;
-use OpenBSD::ArcCheck;
-use OpenBSD::Paths;
-use OpenBSD::State;
-use File::Copy;
-use File::Path;
-
-package OpenBSD::PackingElement;
-sub copy_over {}
-
-sub mark_tocopy {}
-
-sub make_alias {}
-package OpenBSD::PackingElement::FileBase;
-sub mark_tocopy
-{
-   my ($self, $list) = @_;
-   push(@$list, $self);
-}
-
-sub copy_over
-{
-   my ($self, $wrarc, $prefix, $pkg, $state) = @_;
-   my $e = $pkg-{pkg}-next;
-   if (!$e-check_name($self)) {
-   $state-fatal(Names don't match: #1 vs #2, 
-   $e-{name}, $self-{name});
-   }
-   $e-{name} = $prefix./.$e-{name};
-   $e-copy_long($wrarc);
-}
-
-sub make_alias
-{
-   my ($self, $wrarc, $prefix, $pkg, $alias, $state) = @_;
-   my $e = $pkg-{pkg}-next;
-   if (!$e-check_name($self)) {
-   $state-fatal(Names don't match: #1 vs #2, 
-   $e-{name}, $self-{name});
-   }
-   $e-{name} = $prefix./.$e-{name};
-   $e-alias($wrarc, $prefix/$alias);
-}
-
-package 

Re: more old stuff

2011-08-24 Thread Landry Breuil
On Wed, Aug 24, 2011 at 12:39:07PM +0200, Marc Espie wrote:
 Apparently, nobody cares about fat packages.
 
 Not surprisingly, killing that code simplifies a few things.
 Especially since the necessity of passing arch around was only due to
 the possibility of fat packages...

I don't see the relation between fat package and arch.. was one of the
planned usecase 'build a single package containing a pkg for each archs' ?

Or rather a way to install/bundle several packages together (like a
gnome metapackage ? :)

Landry



altq oddities

2011-08-24 Thread Martin Pelikan
Hi,
this is just another bunch of typos, but it breaks any attempts to write
altq discipline independent macros, for functions using statistics.
giovanni pointed out net/pfstat uses this too, so if you know of other
ports, either let me know or fix them.

Anyone willing to commit?
Thanks.
--
Martin Pelikan

Index: sbin/pfctl/pfctl_qstats.c
===
RCS file: /cvs/src/sbin/pfctl/pfctl_qstats.c,v
retrieving revision 1.32
diff -u -p -r1.32 pfctl_qstats.c
--- sbin/pfctl/pfctl_qstats.c   4 Jul 2011 22:49:03 -   1.32
+++ sbin/pfctl/pfctl_qstats.c   25 Aug 2011 00:29:20 -
@@ -297,7 +297,7 @@ print_cbqstats(struct queue_stats cur)
(unsigned long long)cur.data.cbq_stats.drop_cnt.packets,
(unsigned long long)cur.data.cbq_stats.drop_cnt.bytes);
printf(  [ qlength: %3d/%3d  borrows: %6u  suspends: %6u ]\n,
-   cur.data.cbq_stats.qcnt, cur.data.cbq_stats.qmax,
+   cur.data.cbq_stats.qlength, cur.data.cbq_stats.qmax,
cur.data.cbq_stats.borrows, cur.data.cbq_stats.delays);
 
if (cur.avgn  2)
@@ -313,10 +313,10 @@ print_priqstats(struct queue_stats cur)
 {
printf(  [ pkts: %10llu  bytes: %10llu  
dropped pkts: %6llu bytes: %6llu ]\n,
-   (unsigned long long)cur.data.priq_stats.xmitcnt.packets,
-   (unsigned long long)cur.data.priq_stats.xmitcnt.bytes,
-   (unsigned long long)cur.data.priq_stats.dropcnt.packets,
-   (unsigned long long)cur.data.priq_stats.dropcnt.bytes);
+   (unsigned long long)cur.data.priq_stats.xmit_cnt.packets,
+   (unsigned long long)cur.data.priq_stats.xmit_cnt.bytes,
+   (unsigned long long)cur.data.priq_stats.drop_cnt.packets,
+   (unsigned long long)cur.data.priq_stats.drop_cnt.bytes);
printf(  [ qlength: %3d/%3d ]\n,
cur.data.priq_stats.qlength, cur.data.priq_stats.qlimit);
 
@@ -381,8 +381,8 @@ update_avg(struct pf_altq_node *a)
p = qs-data.cbq_stats.xmit_cnt.packets;
break;
case ALTQT_PRIQ:
-   b = qs-data.priq_stats.xmitcnt.bytes;
-   p = qs-data.priq_stats.xmitcnt.packets;
+   b = qs-data.priq_stats.xmit_cnt.bytes;
+   p = qs-data.priq_stats.xmit_cnt.packets;
break;
case ALTQT_HFSC:
b = qs-data.hfsc_stats.xmit_cnt.bytes;
Index: sys/altq/altq_cbq.c
===
RCS file: /cvs/src/sys/altq/altq_cbq.c,v
retrieving revision 1.26
diff -u -p -r1.26 altq_cbq.c
--- sys/altq/altq_cbq.c 3 Jul 2011 23:59:43 -   1.26
+++ sys/altq/altq_cbq.c 25 Aug 2011 00:29:20 -
@@ -173,7 +173,7 @@ get_class_stats(class_stats_t *statsp, s
statsp-qmax= qlimit(cl-q_);
statsp-ns_per_byte = cl-ns_per_byte_;
statsp-wrr_allot   = cl-w_allotment_;
-   statsp-qcnt= qlen(cl-q_);
+   statsp-qlength = qlen(cl-q_);
statsp-avgidle = cl-avgidle_;
 
statsp-qtype   = qtype(cl-q_);
Index: sys/altq/altq_cbq.h
===
RCS file: /cvs/src/sys/altq/altq_cbq.h,v
retrieving revision 1.13
diff -u -p -r1.13 altq_cbq.h
--- sys/altq/altq_cbq.h 4 Jul 2011 01:07:43 -   1.13
+++ sys/altq/altq_cbq.h 25 Aug 2011 00:29:20 -
@@ -81,7 +81,7 @@ typedef struct _cbq_class_stats_ {
int ns_per_byte;
int wrr_allot;
 
-   int qcnt;   /* # packets in queue */
+   int qlength;/* # packets in queue */
int avgidle;
 
/* red and rio related info */
Index: sys/altq/altq_priq.c
===
RCS file: /cvs/src/sys/altq/altq_priq.c,v
retrieving revision 1.24
diff -u -p -r1.24 altq_priq.c
--- sys/altq/altq_priq.c3 Jul 2011 23:59:43 -   1.24
+++ sys/altq/altq_priq.c25 Aug 2011 00:29:21 -
@@ -477,8 +477,8 @@ get_class_stats(struct priq_classstats *
sp-qlength = qlen(cl-cl_q);
sp-qlimit = qlimit(cl-cl_q);
sp-period = cl-cl_period;
-   sp-xmitcnt = cl-cl_xmitcnt;
-   sp-dropcnt = cl-cl_dropcnt;
+   sp-xmit_cnt = cl-cl_xmitcnt;
+   sp-drop_cnt = cl-cl_dropcnt;
 
sp-qtype = qtype(cl-cl_q);
 #ifdef ALTQ_RED
Index: sys/altq/altq_priq.h
===
RCS file: /cvs/src/sys/altq/altq_priq.h,v
retrieving revision 1.8
diff -u -p -r1.8 altq_priq.h
--- sys/altq/altq_priq.h3 Jul 2011 23:48:41 -   1.8
+++ sys/altq/altq_priq.h25 Aug 2011 00:29:21 -
@@ -54,8 +54,8 @@ struct priq_classstats {
u_int   qlength;
u_int   qlimit;
u_int   period;
-   struct pktcntr  xmitcnt;  /*