Re: CVS: cvs.openbsd.org: ports
On Sat, May 13, 2006 at 08:18:47PM -0600, Brad Smith wrote: CVSROOT: /cvs Module name: ports Changes by: [EMAIL PROTECTED] 2006/05/13 20:18:47 Modified files: x11/kde/base3/pkg: DESCR-samba Log message: kde - KDE Let me use the occasion to remind porters that file changes imply PKGNAME bumps. Yes, even for the DESCR. Especially for the DESCR, since it's a text file that's not supposed to change, and hence register-plist does store md5 for it. All people reasonably involved with ports run with a PLIST_DB, except when they prepare new ports.
Re: A way to verify installed packages?
Hello, On Sun, 14.05.2006 at 07:11:56 +0200, viq [EMAIL PROTECTED] wrote: binary files in /usr/lost+found. Is there a way to verify whether all packages have their files where they should? Or maybe even a way to figure out where did those files belong? there's +PLIST which you could be able to peruse, but of course, that doesn't catch your individual modifications (configs etc). Best, --Toni++
pfstat 2.0
Here's a major update to pfstat. The most important changes:
* Add a small daemon 'pfstatd' which listens on a TCP port and, when
connected to, sends the statistical pf data in plain text to the
peer. This program has no dependancies (gd, X11, etc.), so it can
be easily installed on a small firewall, and the main 'pfstat'
program can be installed on a different machine. Many users
complained that they had to install xbase39.tgz on a firewall,
this is now no longer required. Querying the local packet filter
through /dev/pf (without running pfstatd) is still supported and
the default.
* Switch the data storage from the simple text file to a DBT_BTREE
database (dbopen(3), no additional dependancies). Do MRTG-style
compression on insertion, so plotting graphs over large time periods
does not take longer anymore. Graph plotting is very fast now.
Expiry/purging of older data will be supported soon.
* Support for arbitrary interface and queue statistics. Label support
coming soon. This requires that values that should be stored must
be declared in advance (i.e. storing all values is possible, but
storing only user-specified values keeps the database smaller).
* The pfstat.conf syntax has therefore changed slightly, and example
is
collect 1 = interface sis0 pass bytes in ipv4 diff
collect 2 = interface sis0 pass bytes out ipv4 diff
image /var/www/htdocs/benzedrine.cx/pfstat.jpg {
from 72 hours to now
width 1000 height 400
left
graph 1 in bits/s color 0 192 0 filled
right
graph 2 out bits/s color 0 0 255
}
The 'collect' lines declare units to be collected, and the 'graph'
line reference units through the declaration numbers (1 and 2, in
the example).
* Fix several bugs. In particular one that affected scaling of values.
Before, the axis were sometimes wrongly labeled (like the maximum
value was labeled as '40 mbits/s' when it was really much higher.
The patch below is against the 3.9 ports tree. Apply it (to
ports/net/pfstat), delete the existing patches subdirectory.
NOTE: this won't work as-is on a pre-3.9 system. While it's not
complicated to get building there, I'd rather get feedback from 3.9
users at this time.
If someone with ports-foo has any suggestions about how to split pfstatd
into a separate package (so a package containing only pfstatd could be
installed on firewalls without any dependancies), please speak up ;)
Daniel
Index: Makefile
===
RCS file: /cvs/ports/net/pfstat/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile24 Oct 2005 05:09:59 - 1.11
+++ Makefile14 May 2006 10:11:09 -
@@ -2,8 +2,8 @@
COMMENT= packet filter statistics visualization
-DISTNAME= pfstat-1.7
-PKGNAME= ${DISTNAME}p1
+DISTNAME= pfstat-2.0
+PKGNAME= ${DISTNAME}
CATEGORIES=net
MASTER_SITES= http://www.benzedrine.cx/
@@ -24,5 +24,7 @@
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/pfstat ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/pfstat.8 ${PREFIX}/man/man8
+ ${INSTALL_PROGRAM} ${WRKSRC}/pfstatd/pfstatd ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/pfstatd/pfstatd.8 ${PREFIX}/man/man8
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/net/pfstat/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo5 Jan 2005 17:14:57 - 1.9
+++ distinfo14 May 2006 10:11:09 -
@@ -1,4 +1,4 @@
-MD5 (pfstat-1.7.tar.gz) = bd58864b56774aa10aa763258de8b625
-RMD160 (pfstat-1.7.tar.gz) = d15ebd14a42ddbdacf326b4ad59c2fcf4f7d8b07
-SHA1 (pfstat-1.7.tar.gz) = 7bd125039c130a56a4dda3040d309d0f445d88b5
-SIZE (pfstat-1.7.tar.gz) = 9610
+MD5 (pfstat-2.0.tar.gz) = c15416c16062da39500bb7822c71fcf1
+RMD160 (pfstat-2.0.tar.gz) = ae6d7f2db52df21282e05e45d0c8458ac0865433
+SHA1 (pfstat-2.0.tar.gz) = 798449440e1c8ac9a9eb33792a7fd49afee3def3
+SIZE (pfstat-2.0.tar.gz) = 16625
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/pfstat/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 15 Sep 2004 18:17:44 - 1.2
+++ pkg/PLIST 14 May 2006 10:11:09 -
@@ -1,3 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:17:44 espie Exp $
bin/pfstat
+bin/pfstatd
@man man/man8/pfstat.8
[EMAIL PROTECTED] man/man8/pfstatd.8
new: net/wispy-tools
This is a port of the wispy-tools package to display data acquired by the MetaGeek LLC Wi-Spy 2.4GHz spectrum analyser (http://www.metageek.net/). You'll need the device and a -current kernel to test it. -- Matthieu Herrb wispy-tools.tar.gz Description: application/gzip
Re: A way to verify installed packages?
On Sun, May 14, 2006 at 07:11:56AM +0200, viq wrote: My box didn't shut down cleanly due to power outage, and now there are some binary files in /usr/lost+found. Is there a way to verify whether all packages have their files where they should? Or maybe even a way to figure out where did those files belong? pkg_delete -n /var/db/pkg/* will pretend to delete everything. Along the way, it will check md5s of the files, and it should tell you which files are missing/corrupted.
Re: pfstat 2.0
On Sun, May 14, 2006 at 12:37:15PM +0200, Daniel Hartmeier wrote:
If someone with ports-foo has any suggestions about how to split pfstatd
into a separate package (so a package containing only pfstatd could be
installed on firewalls without any dependancies), please speak up ;)
Patch against your patch:
diff -rNu ../pfstat.daniel/Makefile ./Makefile
--- ../pfstat.daniel/Makefile Sun May 14 16:06:44 2006
+++ ./Makefile Sun May 14 16:21:34 2006
@@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.11 2005/10/24 05:09:59 fgsch Exp $
COMMENT= packet filter statistics visualization
+COMMENT-daemon=pfstat daemon
-DISTNAME= pfstat-2.0
-PKGNAME= ${DISTNAME}
+V= 2.0
+DISTNAME= pfstat-${V}
+PKGNAME= pfstat-${V}
+PKGNAME-daemon=pfstat-daemon-${V}
CATEGORIES=net
MASTER_SITES= http://www.benzedrine.cx/
@@ -15,11 +18,21 @@
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c jpeg m png z
+MULTI_PACKAGES=-daemon
+SUBPACKAGE?=
+
+WANTLIB= c
+
+.if defined(PACKAGING)
+. if ${SUBPACKAGE} != -daemon
+WANTLIB+= jpeg m png z
+
MODULES= converters/libiconv
LIB_DEPENDS= gd.18::graphics/gd
+. endif
+.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/pfstat ${PREFIX}/bin
diff -rNu ../pfstat.daniel/pkg/DESCR-daemon ./pkg/DESCR-daemon
--- ../pfstat.daniel/pkg/DESCR-daemon Thu Jan 1 01:00:00 1970
+++ ./pkg/DESCR-daemon Sun May 14 16:16:57 2006
@@ -0,0 +1 @@
+pfstatd is a daemon for remote access to pf statistics using pfstat.
diff -rNu ../pfstat.daniel/pkg/PLIST ./pkg/PLIST
--- ../pfstat.daniel/pkg/PLIST Sun May 14 16:06:44 2006
+++ ./pkg/PLIST Sun May 14 16:15:57 2006
@@ -1,5 +1,3 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:17:44 espie Exp $
bin/pfstat
-bin/pfstatd
@man man/man8/pfstat.8
[EMAIL PROTECTED] man/man8/pfstatd.8
diff -rNu ../pfstat.daniel/pkg/PLIST-daemon ./pkg/PLIST-daemon
--- ../pfstat.daniel/pkg/PLIST-daemon Thu Jan 1 01:00:00 1970
+++ ./pkg/PLIST-daemon Sun May 14 16:16:14 2006
@@ -0,0 +1,3 @@
[EMAIL PROTECTED] $OpenBSD$
+bin/pfstatd
[EMAIL PROTECTED] man/man8/pfstatd.8
Re: pfstat 2.0
On Sun, May 14, 2006 at 04:27:31PM +0200, Matthias Kilian wrote:
On Sun, May 14, 2006 at 12:37:15PM +0200, Daniel Hartmeier wrote:
If someone with ports-foo has any suggestions about how to split pfstatd
into a separate package (so a package containing only pfstatd could be
installed on firewalls without any dependancies), please speak up ;)
Patch against your patch:
diff -rNu ../pfstat.daniel/Makefile ./Makefile
--- ../pfstat.daniel/Makefile Sun May 14 16:06:44 2006
+++ ./MakefileSun May 14 16:21:34 2006
@@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.11 2005/10/24 05:09:59 fgsch Exp $
COMMENT= packet filter statistics visualization
+COMMENT-daemon= pfstat daemon
-DISTNAME=pfstat-2.0
-PKGNAME= ${DISTNAME}
+V= 2.0
+DISTNAME=pfstat-${V}
+PKGNAME= pfstat-${V}
+PKGNAME-daemon= pfstat-daemon-${V}
How about making the PKGNAME for the daemon be pfstatd-${V}
Otherwise the rest looks fine to me.
CATEGORIES= net
MASTER_SITES=http://www.benzedrine.cx/
@@ -15,11 +18,21 @@
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP=Yes
-WANTLIB= c jpeg m png z
+MULTI_PACKAGES= -daemon
+SUBPACKAGE?=
+
+WANTLIB= c
+
+.if defined(PACKAGING)
+. if ${SUBPACKAGE} != -daemon
+WANTLIB+=jpeg m png z
+
MODULES= converters/libiconv
LIB_DEPENDS= gd.18::graphics/gd
+. endif
+.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/pfstat ${PREFIX}/bin
diff -rNu ../pfstat.daniel/pkg/DESCR-daemon ./pkg/DESCR-daemon
--- ../pfstat.daniel/pkg/DESCR-daemon Thu Jan 1 01:00:00 1970
+++ ./pkg/DESCR-daemonSun May 14 16:16:57 2006
@@ -0,0 +1 @@
+pfstatd is a daemon for remote access to pf statistics using pfstat.
diff -rNu ../pfstat.daniel/pkg/PLIST ./pkg/PLIST
--- ../pfstat.daniel/pkg/PLISTSun May 14 16:06:44 2006
+++ ./pkg/PLIST Sun May 14 16:15:57 2006
@@ -1,5 +1,3 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:17:44 espie Exp $
bin/pfstat
-bin/pfstatd
@man man/man8/pfstat.8
[EMAIL PROTECTED] man/man8/pfstatd.8
diff -rNu ../pfstat.daniel/pkg/PLIST-daemon ./pkg/PLIST-daemon
--- ../pfstat.daniel/pkg/PLIST-daemon Thu Jan 1 01:00:00 1970
+++ ./pkg/PLIST-daemonSun May 14 16:16:14 2006
@@ -0,0 +1,3 @@
[EMAIL PROTECTED] $OpenBSD$
+bin/pfstatd
[EMAIL PROTECTED] man/man8/pfstatd.8
Re: pfstat 2.0
On Sun, May 14, 2006 at 02:06:16PM -0400, Brad wrote:
-DISTNAME= pfstat-2.0
-PKGNAME= ${DISTNAME}
+V= 2.0
+DISTNAME= pfstat-${V}
+PKGNAME= pfstat-${V}
+PKGNAME-daemon=pfstat-daemon-${V}
How about making the PKGNAME for the daemon be pfstatd-${V}
And Marc Balmer asked me not to introduce unnecessary variables
(${V}), so to merge both suggestions, we get
DISTNAME= pfstat-2.0
PKGNAME-daemon= ${PKGNAME:S/-/d-/}
However, I also found a small bug and changed the remote mode to
make use getaddrinfo(3). Patch is out to Daniel, he should decide
what to do with it ;-)
Ciao,
Kili
new: x11/915resolution
This is a port of 915resolution. It's used to modify the video BIOS
of Intel graphics chipsets in the 800 and 900 series. This includes
the 8{4,5,6}G chipsets, as well as the 9{1,4}5G{,M}.
I've tested it on my system with a 945GM.
Comments? Could people with video chipsets such as these please give
it a shot too?
Thanks!
915resolution-port.tar.gz
Description: application/tar-gz
mail/dspam update to 3.6.6
Hello,
Here's an update for dspam to release 3.6.6-STABLE.
This is a maintenance release that fixes two critical bugs:
BUGFIX: When using logfile, write errors result in segfault
BUGFIX: MySQLUIDInSignature causes segfault on retrain
BerkeleyDB backends were phased out, but they were already unmaintained
and there was intentionnaly no FLAVOR for it. patches/patch-src_libdb* can
be deleted.
Tested on i386 and amd64.
Best regards,
--
Frank Denis - frank [at] nailbox.fr - Young Nails / Akzentz nail tech
http://forum.manucure.info
Index: Makefile
===
RCS file: /cvs/openbsd/ports/mail/dspam/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile28 Apr 2006 01:13:36 - 1.13
+++ Makefile14 May 2006 19:40:26 -
@@ -2,7 +2,7 @@
COMMENT= anti-spam filter
-VERSION= 3.6.5
+VERSION= 3.6.6
DISTNAME= dspam-${VERSION}
SHARED_LIBS= dspam 7.0
CATEGORIES=mail
Index: distinfo
===
RCS file: /cvs/openbsd/ports/mail/dspam/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo28 Apr 2006 01:13:36 - 1.9
+++ distinfo14 May 2006 19:40:26 -
@@ -1,4 +1,4 @@
-MD5 (dspam-3.6.5.tar.gz) = da4f0e00633bff49d71fde418caaf14b
-RMD160 (dspam-3.6.5.tar.gz) = 363217410de515f15baaa0a864ee23617ae8f6c2
-SHA1 (dspam-3.6.5.tar.gz) = 031d3fbeb1fb0d8008dcc1cf7589d4d955e7f933
-SIZE (dspam-3.6.5.tar.gz) = 747196
+MD5 (dspam-3.6.6.tar.gz) = 72dbf9d802ac3645c93b715c81cc9f50
+RMD160 (dspam-3.6.6.tar.gz) = 2416908398e7e8e6a180e97dbebd4f9aee6088d7
+SHA1 (dspam-3.6.6.tar.gz) = 6113966122597c277d51b7f27539b899c3dcf847
+SIZE (dspam-3.6.6.tar.gz) = 725502
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/openbsd/ports/mail/dspam/patches/patch-src_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 26 Dec 2005 13:17:35 - 1.1
+++ patches/patch-src_Makefile_in 14 May 2006 19:40:26 -
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2005/12/26 13:17:35 steven Exp $
src/Makefile.in.orig Sun Dec 25 19:58:07 2005
-+++ src/Makefile.inSun Dec 25 19:59:15 2005
-@@ -442,7 +442,7 @@ libdspam_la_LIBADD = $(adapter_objects)
- libdspam_la_DEPENDENCIES = $(adapter_objects) $(am__append_12)
+$OpenBSD$
+--- src/Makefile.in.orig Sun May 14 21:32:29 2006
src/Makefile.inSun May 14 21:33:38 2006
+@@ -412,7 +412,7 @@ libdspam_la_LIBADD = $(adapter_objects)
+ libdspam_la_DEPENDENCIES = $(adapter_objects) $(am__append_10)
# current:revision:age
-libdspam_la_LDFLAGS = -rpath '$(libdir)' -version-info $(libversion)
+libdspam_la_LDFLAGS = -rpath '$(libdir)' $(librealdspam_la_LDFLAGS)
- @[EMAIL PROTECTED] = \
- @DYNAMIC_DRIVER_TRUE@ libdb4_drv.c libdb4_drv.h
+ @[EMAIL PROTECTED] = \
+ @DYNAMIC_DRIVER_TRUE@ mysql_drv.c mysql_drv.h
Index: patches/patch-src_dspam_c
===
RCS file: /cvs/openbsd/ports/mail/dspam/patches/patch-src_dspam_c,v
retrieving revision 1.5
diff -u -r1.5 patch-src_dspam_c
--- patches/patch-src_dspam_c 28 Apr 2006 01:13:37 - 1.5
+++ patches/patch-src_dspam_c 14 May 2006 19:40:26 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dspam_c,v 1.5 2006/04/28 01:13:37 brad Exp $
src/dspam.c.orig Fri Apr 21 22:51:52 2006
-+++ src/dspam.cThu Apr 27 10:03:28 2006
-@@ -382,7 +382,7 @@ process_message (
+--- src/dspam.c.orig Sat May 13 14:17:30 2006
src/dspam.cSun May 14 21:32:13 2006
+@@ -383,7 +383,7 @@ process_message (
CTX-confidence = 1.0;
STATUS(A virus was detected in the message contents);
result = DSR_ISSPAM;
@@ -10,7 +10,7 @@
internally_canned = 1;
}
}
-@@ -395,7 +395,7 @@ process_message (
+@@ -396,7 +396,7 @@ process_message (
result = DSR_ISSPAM;
CTX-probability = 1.0;
CTX-confidence = 1.0;
@@ -19,7 +19,7 @@
internally_canned = 1;
}
-@@ -415,7 +415,7 @@ process_message (
+@@ -416,7 +416,7 @@ process_message (
result = DSR_ISSPAM;
CTX-probability = 1.0;
CTX-confidence = 1.0;
@@ -28,7 +28,7 @@
internally_canned = 1;
}
}
-@@ -744,10 +744,10 @@ process_message (
+@@ -747,10 +747,10 @@ process_message (
switch (CTX-result) {
case DSR_ISSPAM:
@@ -41,7 +41,7 @@
break;
}
-@@ -1012,7 +1012,7 @@ int tag_message(AGENT_CTX *ATX, ds_messa
+@@ -1015,7 +1015,7 @@ int tag_message(AGENT_CTX *ATX, ds_messa
int tagged = 0;
char spam_subject[16];
@@ -50,7 +50,7 @@
if (_ds_pref_val(ATX-PTX, spamSubject)[0] != '\n'
_ds_pref_val(ATX-PTX, spamSubject)[0] != 0)
{
-@@ -1586,7 +1586,7 @@ int process_users(AGENT_CTX *ATX, buffer
+@@ -1589,7 +1589,7 @@ int
Re: A way to verify installed packages?
On Sunday 14 May 2006 16:09, Marc Espie wrote: On Sun, May 14, 2006 at 07:11:56AM +0200, viq wrote: My box didn't shut down cleanly due to power outage, and now there are some binary files in /usr/lost+found. Is there a way to verify whether all packages have their files where they should? Or maybe even a way to figure out where did those files belong? pkg_delete -n /var/db/pkg/* will pretend to delete everything. Along the way, it will check md5s of the files, and it should tell you which files are missing/corrupted. I knew there was going to be a 'native' way to do it, thanks :) The package tools rock :) -- viq
Re: new: x11/915resolution
Apparently I didn't add the 'z' flag to tar, but I tacked .gz onto the filename anyway. Here is the file (again): http://tilderoot.com/~ben/openbsd/ports/915resolution-0.5.2.tar.gz --ben
Re: gvim crashes over ssh -X tunnel
Several people pointed out to use -Y instead and that works. Sorry for the noise. Chris Kuethe wrote: On 5/14/06, Marco Peereboom [EMAIL PROTECTED] wrote: gvim 7 crashes after clicking any menu option whenever launched over an ssh tunnel. Any clues? My X-Fu is nonexistent, but I am unable to reproduce this on my i386 machine. CK
Re: gvim crashes over ssh -X tunnel
Except that is not a fix. It indicates the application (or some library it is using) is violating the X security extension. Meaning that if someone can misuse/fool such an application, it cannot just render into it's window, but totally take over your X server from remote. Lovely. The gtk libraries are one of the worst offenders. And one day someone will use this flaw, to significant effect. Several people pointed out to use -Y instead and that works. Sorry for the noise. Chris Kuethe wrote: On 5/14/06, Marco Peereboom [EMAIL PROTECTED] wrote: gvim 7 crashes after clicking any menu option whenever launched over an ssh tunnel. Any clues? My X-Fu is nonexistent, but I am unable to reproduce this on my i386 machine. CK
