Re: UPDATE: Fluxbox 1.0.0
* Edd Barrett <[EMAIL PROTECTED]> [080709 06:06]: > Landry Breuil wrote: > >Iirc david@ (maintainer) had a pending update for it, but it had issues > >with malloc.conf flags set. Maybe you can work with him to coordinate the > >bugfix/update ? > > > Just been digging: > http://archives.neohapsis.com/archives/openbsd/2007-11/0953.html > > Looks like this is the third attempt to make fluxbox-1.0.0. Sorry, I was > unaware. > > "I already have a port of 1.0.0 also, but there is one fatal flaw still. > If you run with malloc.conf->F, fluxbox segfaults on exit. I reported > this bug to the fluxbox project page but haven't heard anything yet." > > > If i F_>malloc.conf, I get this on fluxbox exit: > pure virtual method called > zsh: abort (core dumped) fluxbox > > How annoying. If someone wants to help, get the latest version from the fluxbox git repository and see if it still crashes. I haven't had time to mess with it. David
Re: UPDATE: x11/fluxbox 0.9.15.1 -> 1.0.0
* Mike Erdely <[EMAIL PROTECTED]> [071108 13:33]:
> On Thu, Nov 08, 2007 at 06:26:46PM +0200, Genadijus Paleckis wrote:
> > working for me on i386. please test and comment.
>
> Here's a modified diff that fixes WANTLIB and IMO handles the
> SEPARATE_BUILD a little better (no FILESDIR stuff):
>
> Works for me on i386.
>
> Also, CC'd $MAINTAINER.
I already have a port of 1.0.0 also, but there is one fatal flaw still.
If you run with malloc.conf->F, fluxbox segfaults on exit. I reported
this bug to the fluxbox project page but haven't heard anything yet.
See fluxbox bug 1814636:
https://sourceforge.net/tracker/index.php?func=detail&aid=1814636&group_id=35398&atid=413960
Here is my latest diff incorporating feedback from landry@, merdely@,
and others. It also has a patch to disable the SIGSEGV signal handler.
Without this patch and with malloc.conf on, fluxbox never exits and has
to be killed on the command line. With the patch, fluxbox will dump
core but at least I can sign out.
David
Index: x11/fluxbox/Makefile
===
RCS file: /cvs/ports/x11/fluxbox/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- x11/fluxbox/Makefile15 Sep 2007 20:04:19 - 1.42
+++ x11/fluxbox/Makefile10 Nov 2007 09:12:52 -
@@ -2,9 +2,8 @@
COMMENT= window manager based on the original Blackbox code
-VERSION= 0.9.15.1
+VERSION= 1.0.0
DISTNAME= fluxbox-${VERSION}
-PKGNAME= ${DISTNAME}p0
CATEGORIES=x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
@@ -18,22 +17,22 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= ICE SM X11 Xext Xft Xinerama Xpm Xrandr Xrender \
- fontconfig freetype stdc++ m c
-CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.59
-CONFIGURE_ARGS=--enable-xinerama --enable-imlib2
+WANTLIB= ICE SM X11 Xau Xdmcp Xext Xft Xinerama Xpm Xrandr \
+ Xrender c expat fontconfig freetype m stdc++ z
+
+USE_GMAKE= yes
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS=--enable-xinerama \
+ --enable-imlib2 \
+ --program-prefix="" \
+ --program-suffix=""
USE_X11= Yes
USE_LIBTOOL= Yes
-NO_REGRESS=Yes
-
SEPARATE_BUILD=simple
LIB_DEPENDS= Imlib2.>=2::graphics/imlib2
-
-CONFIGURE_ENV= PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
.include
Index: x11/fluxbox/distinfo
===
RCS file: /cvs/ports/x11/fluxbox/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- x11/fluxbox/distinfo5 Apr 2007 17:36:19 - 1.23
+++ x11/fluxbox/distinfo10 Nov 2007 09:12:52 -
@@ -1,5 +1,5 @@
-MD5 (fluxbox-0.9.15.1.tar.gz) = hq+mVwqH1oRQKoIKPxdeNw==
-RMD160 (fluxbox-0.9.15.1.tar.gz) = usCPchNn38HX2kkfKGvRnfzYES4=
-SHA1 (fluxbox-0.9.15.1.tar.gz) = oiuKZ5f69O2wO2Y4L+FNgiEqGhE=
-SHA256 (fluxbox-0.9.15.1.tar.gz) = qQiYo5W7MEs+9vhlo1qhFKnIgyvST2nNsGNKImQd384=
-SIZE (fluxbox-0.9.15.1.tar.gz) = 944863
+MD5 (fluxbox-1.0.0.tar.gz) = HziRd+F80ejb7QfICBKWHw==
+RMD160 (fluxbox-1.0.0.tar.gz) = uLofWPfDl1bDKCkdIeZVcmjgWAs=
+SHA1 (fluxbox-1.0.0.tar.gz) = uTSSOQ4hw9pfV12ZPnpS5PmVOjI=
+SHA256 (fluxbox-1.0.0.tar.gz) = mK/KrknNPLHKX6MrN51jDsiKdeZMuEcqECPbHRw1wSo=
+SIZE (fluxbox-1.0.0.tar.gz) = 975940
Index: x11/fluxbox/patches/patch-data_README_style
===
RCS file: x11/fluxbox/patches/patch-data_README_style
diff -N x11/fluxbox/patches/patch-data_README_style
--- x11/fluxbox/patches/patch-data_README_style 25 Jan 2006 03:57:44 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-data_README_style,v 1.1 2006/01/25 03:57:44 david Exp $
data/README.style.orig Mon Nov 15 14:40:53 2004
-+++ data/README.style Mon Jan 23 03:19:26 2006
-@@ -315,7 +315,7 @@ handleWidth:4
- menuFont: lucidasans-10
- titleFont: lucidasans-bold-10
-
--rootCommand:bsetroot -mod 4 4 -fg rgb:6/6/5c -bg grey20
-+rootCommand:fbsetroot -mod 4 4 -fg rgb:6/6/5c -bg grey20
- ...
-
- Alright! Our style is finished. Let's see how the sucker looks. First we
Index: x11/fluxbox/patches/patch-src_fluxbox_cc
===
RCS file: x11/fluxbox/patches/patch-src_fluxbox_cc
diff -N x11/fluxbox/patches/patch-src_fluxbox_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ x11/fluxbox/patches/patch-src_fluxbox_cc10 Nov 2007 09:12:52 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- src/fluxbox.cc.origF
Re: Updated Fluxbox Port
During the fake install for some reason it re-compiles stuff that it already compiled. The previous release (0.9.15.1) didn't do this. I'll try to look into it. Also, you need the attached patch if you don't already have .fluxbox directory or it was moved away. There should be any need to copy files to .fluxbox. It does that automatically on startup if they aren't there. David * Aaron Whiteside <[EMAIL PROTECTED]> [070407 05:47]: > Latest diff following -current > > Tested on i386 > > Just noticed that fluxbox 1.0rc3 is noted as being stable (source > http://www.fluxbox.org/), even though it spots the release candidate > suffix. > > Can someone please OK and commit? > > Cheers, > Aaron > > On 4/1/07, Aaron Whiteside <[EMAIL PROTECTED]> wrote: > >Latest diff following changes on head... > > > >Tested on i386, please test and send feedback, comments or abuse ;) > > > >Cheers, > >Aaron > > > >On 4/1/07, Aaron Whiteside <[EMAIL PROTECTED]> wrote: > >> Please find the diff attached... > >> > >> Cheers, > >> Aaron > >> > >> On 4/1/07, steven mestdagh <[EMAIL PROTECTED]> wrote: > >> > Aaron Whiteside [2007-04-01, 17:58:59]: > >> > > Please find attached an updated version of David Krause's (david at > >> > > openbsd org) Fluxbox port. > >> > > > >> > > This port is based on Fluxbox 1.0rc3, when the stable release of v1.0 > >> > > is released this port will be updated accordingly; but this is for > >> > > those who can't wait... > >> > > > >> > > Please test and reply with feedback. > >> > > >> > please make a diff against current cvs. thanks, > >> > > >> > steven > >> > > >> > > >> > Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm > >> > > >> > > >> > >> > > > > $OpenBSD$ --- util/startfluxbox.in.orig Mon Mar 19 14:57:15 2007 +++ util/startfluxbox.inThu Apr 5 11:29:25 2007 @@ -86,5 +86,5 @@ EOF ) > "$startup" fi chmod 644 "$startup" -exec "$startup" +exec sh "$startup" fi
multi-packages and portslogger
While looking at some output from portslogger I noticed that some ports are splitting the logging beteween $DISTNAME.log and $PKGNAME.log (with and without the p version suffix. The problem seems to only occur on ports with multi-packages. Example from a build with an empty log dir: [EMAIL PROTECTED]:~$ ls -1 /usr/ports/logs/*dnet* /usr/ports/logs/libdnet-1.10.log /usr/ports/logs/libdnet-1.10p2.log /usr/ports/logs/py-libdnet-1.10p1.log On a normal port it looks like this: ===> Checking files for x2vnc-1.6.1p0 ===> Extracting for x2vnc-1.6.1p0 ===> Patching for x2vnc-1.6.1p0 ===> Configuring for x2vnc-1.6.1p0 ===> Building for x2vnc-1.6.1p0 ===> Faking installation for x2vnc-1.6.1p0 ===> Building package for x2vnc-1.6.1p0 ===> Cleaning for x2vnc-1.6.1p0 On a multipackages port the p suffix is left off on some of the output steps: ===> Checking files for libdnet-1.10 ===> Extracting for libdnet-1.10 ===> Patching for libdnet-1.10 ===> Configuring for libdnet-1.10 ===> Building for libdnet-1.10 ===> Faking installation for libdnet-1.10 ===> Building package for libdnet-1.10p2 ===> Cleaning for libdnet-1.10p2 David
Re: p5-Mail-SpamAssassin: proposed change
* Antoine Jacoutot <[EMAIL PROTECTED]> [061024 09:57]: > Selon Andreas V?gele <[EMAIL PROTECTED]>: > > We might also use /var/spamassassin instead of /var/db/spamassassin > > for the updated rules that sa-update downloads. > > Indeed. > New diff attached. > > What do you all think? Should the _spamdaemon user be able to the write to the updated rules directory? David
Re: gtk+2 fix untrusted X11 clients (was Re: FIX: graphics/cairo)
works fine here on i386, tested gaim, gqview, gvim, and xnmap both
locally and remote through ssh -X
mozilla-firefox didn't work however, but there's probably more to it
than just fixing gtk+
ok david@
* steven mestdagh <[EMAIL PROTECTED]> [060610 08:38]:
> Brad [2006-06-10, 06:06:07]:
> > I noticed this from the Gtk+ 2.9.2 release notes..
> >
> > * Make GTK+ work as an untrused X client
>
> applies reasonably well to the in tree version. i did some very minimal
> testing on i386, it seems to work. obviously, more testing with this is
> appreciated...
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/gtk+2/Makefile,v
> retrieving revision 1.38
> diff -u -r1.38 Makefile
> --- Makefile 2006/06/03 19:56:56 1.38
> +++ Makefile 2006/06/10 12:57:43
> @@ -7,7 +7,7 @@
>
> VERSION= 2.8.18
> DISTNAME=gtk+-${VERSION}
> -PKGNAME= gtk+2-${VERSION}p1
> +PKGNAME= gtk+2-${VERSION}p2
> PKGNAME-docs=gtk+2-docs-${VERSION}
> CATEGORIES= x11 devel
>
> Index: patches/patch-gdk_x11_gdkdisplay-x11_c
> ===
> RCS file: patch-gdk_x11_gdkdisplay-x11_c
> diff -N patch-gdk_x11_gdkdisplay-x11_c
> --- /dev/null Sat Aug 30 18:16:59 1997
> +++ patches/patch-gdk_x11_gdkdisplay-x11_cSat Jun 10 12:57:43 2006
> @@ -0,0 +1,38 @@
> +$OpenBSD$
> +--- gdk/x11/gdkdisplay-x11.c.origThu Jun 30 05:35:30 2005
> gdk/x11/gdkdisplay-x11.c Sat Jun 10 14:32:57 2006
> +@@ -224,6 +224,24 @@ gdk_display_open (const gchar *display_n
> + #endif
> + display_x11->have_xfixes = FALSE;
> +
> ++ display_x11->trusted_client = TRUE;
> ++ {
> ++Window root, child;
> ++int rootx, rooty, winx, winy;
> ++unsigned int xmask;
> ++
> ++gdk_error_trap_push ();
> ++XQueryPointer (display_x11->xdisplay,
> ++ GDK_SCREEN_X11 (display_x11->default_screen)->xroot_window,
> ++ &root, &child, &rootx, &rooty, &winx, &winy, &xmask);
> ++gdk_flush ();
> ++if (G_UNLIKELY (gdk_error_trap_pop () == BadWindow))
> ++ {
> ++g_warning ("Connection to display %s appears to be untrusted. Pointer
> and keyboard grabs and inter-client communication may not work as expected.",
> gdk_display_get_name (display));
> ++display_x11->trusted_client = FALSE;
> ++ }
> ++ }
> ++
> + if (_gdk_synchronize)
> + XSynchronize (display_x11->xdisplay, True);
> +
> +@@ -1043,6 +1061,9 @@ gdk_notify_startup_complete (void)
> + display_x11 = GDK_DISPLAY_X11 (display);
> +
> + if (display_x11->startup_notification_id == NULL)
> ++return;
> ++
> ++ if (!G_LIKELY (display_x11->trusted_client))
> + return;
> +
> + escaped_id = escape_for_xmessage (display_x11->startup_notification_id);
> Index: patches/patch-gdk_x11_gdkdisplay-x11_h
> ===
> RCS file: patch-gdk_x11_gdkdisplay-x11_h
> diff -N patch-gdk_x11_gdkdisplay-x11_h
> --- /dev/null Sat Aug 30 18:16:59 1997
> +++ patches/patch-gdk_x11_gdkdisplay-x11_hSat Jun 10 12:57:43 2006
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +--- gdk/x11/gdkdisplay-x11.h.origThu Jun 30 05:35:30 2005
> gdk/x11/gdkdisplay-x11.h Sat Jun 10 14:32:57 2006
> +@@ -81,6 +81,11 @@ struct _GdkDisplayX11
> + gboolean have_xfixes;
> + gint xfixes_event_base;
> +
> ++ /* If the SECURITY extension is in place, whether this client holds
> ++ * a trusted authorization and so is allowed to make various requests
> ++ * (grabs, properties etc.) Otherwise always TRUE. */
> ++ gboolean trusted_client;
> ++
> + /* Information about current pointer and keyboard grabs held by this
> +* client. If gdk_pointer_xgrab_window or gdk_keyboard_xgrab_window
> +* window is NULL, then the other associated fields are ignored
> Index: patches/patch-gdk_x11_gdkdnd-x11_c
> ===
> RCS file: patch-gdk_x11_gdkdnd-x11_c
> diff -N patch-gdk_x11_gdkdnd-x11_c
> --- /dev/null Sat Aug 30 18:16:59 1997
> +++ patches/patch-gdk_x11_gdkdnd-x11_cSat Jun 10 12:57:43 2006
> @@ -0,0 +1,39 @@
> +$OpenBSD$
> +--- gdk/x11/gdkdnd-x11.c.origThu May 18 20:15:40 2006
> gdk/x11/gdkdnd-x11.c Sat Jun 10 14:32:57 2006
> +@@ -489,6 +489,25 @@ gdk_window_cache_new (GdkScreen *screen)
> +
> + XGetWindowAttributes (xdisplay, GDK_WINDOW_XWINDOW (root_window), &xwa);
> + result->old_event_mask = xwa.your_event_mask;
> ++
> ++ if (G_UNLIKELY (!GDK_DISPLAY_X11 (GDK_SCREEN_X11
> (screen)->display)->trusted_client))
> ++{
> ++ GList *toplevel_windows, *list;
> ++ GdkWindow *window;
> ++ gint x, y, width, height;
> ++
> ++ toplevel_windows = gdk_screen_get_toplevel_windows (screen);
> ++ for (list = toplevel_windows; list; list = list->next) {
> ++window = GD
UPDATE: snort-2.4.5
http://www.snort.org/pub-bin/snortnews.cgi#445
Index: net/snort/Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- net/snort/Makefile 30 May 2006 18:45:18 - 1.44
+++ net/snort/Makefile 6 Jun 2006 18:23:31 -
@@ -2,7 +2,7 @@
COMMENT= "highly flexible sniffer/NIDS"
-DISTNAME= snort-2.4.4
+DISTNAME= snort-2.4.5
PKGNAME= ${DISTNAME}p0
CATEGORIES=net security
MASTER_SITES= ${HOMEPAGE}/dl/current/
Index: net/snort/distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- net/snort/distinfo 30 May 2006 18:45:18 - 1.12
+++ net/snort/distinfo 6 Jun 2006 18:23:31 -
@@ -1,4 +1,4 @@
-MD5 (snort-2.4.4.tar.gz) = 37415bc9db02063ce421e3cd3f59c6c8
-RMD160 (snort-2.4.4.tar.gz) = 3b1c2bcd79ffcbce6510df52d7a7591cc1ed508d
-SHA1 (snort-2.4.4.tar.gz) = 9b1444e8c014826e934d70a3041fdb880be366ae
-SIZE (snort-2.4.4.tar.gz) = 2800651
+MD5 (snort-2.4.5.tar.gz) = 108b3c20dcbaf3cdb17ea9203342eaaa
+RMD160 (snort-2.4.5.tar.gz) = 1b697ccd84e1c10406ac20ccc0c46f79ea661e11
+SHA1 (snort-2.4.5.tar.gz) = 3ba7dae8058aecf4e4eb1c7a816a7c8a4fb7c550
+SIZE (snort-2.4.5.tar.gz) = 2817837
UPDATE: fluxbox-0.9.15.1
Index: x11/fluxbox/Makefile
===
RCS file: /cvs/ports/x11/fluxbox/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- x11/fluxbox/Makefile25 Jan 2006 03:57:43 - 1.36
+++ x11/fluxbox/Makefile12 Apr 2006 20:47:10 -
@@ -2,7 +2,7 @@
COMMENT= "window manager based on the original Blackbox code"
-VERSION= 0.9.14
+VERSION= 0.9.15.1
DISTNAME= fluxbox-${VERSION}
CATEGORIES=x11
Index: x11/fluxbox/distinfo
===
RCS file: /cvs/ports/x11/fluxbox/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- x11/fluxbox/distinfo25 Jan 2006 03:57:43 - 1.21
+++ x11/fluxbox/distinfo12 Apr 2006 20:47:10 -
@@ -1,4 +1,4 @@
-MD5 (fluxbox-0.9.14.tar.gz) = fc013c3d233ce11bcb8b6d989b1a4326
-RMD160 (fluxbox-0.9.14.tar.gz) = 8185498a076a87ec7b0cce088c52ae493020c6a2
-SHA1 (fluxbox-0.9.14.tar.gz) = ca81da9cab1df67d41b539527fc077f99ea366f8
-SIZE (fluxbox-0.9.14.tar.gz) = 928623
+MD5 (fluxbox-0.9.15.1.tar.gz) = 86afa6570a87d684502a820a3f175e37
+RMD160 (fluxbox-0.9.15.1.tar.gz) = bac08f721367dfc1d7da491f286bd19dfcd8112e
+SHA1 (fluxbox-0.9.15.1.tar.gz) = a22b8a6797faf4edb03b66382fe14d82212a1a11
+SIZE (fluxbox-0.9.15.1.tar.gz) = 944863
Index: x11/fluxbox/patches/patch-data_Makefile_in
===
RCS file: x11/fluxbox/patches/patch-data_Makefile_in
diff -N x11/fluxbox/patches/patch-data_Makefile_in
--- x11/fluxbox/patches/patch-data_Makefile_in 25 Jan 2006 03:57:44 -
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-data_Makefile_in,v 1.3 2006/01/25 03:57:44 david Exp $
data/Makefile.in.orig Wed Sep 14 15:27:20 2005
-+++ data/Makefile.in Wed Oct 5 16:54:18 2005
-@@ -535,7 +535,7 @@ install-pkgdataDATA:
- $(INSTALL_DATA) menu $(DESTDIR)$(DEFAULT_MENU)
- @echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)"
- $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS))
-- $(INSTALL_DATA) keys $(DESTDIR)$(DEFAULT_KEYS)
-+ $(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS)
- @echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)"
- $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT))
- $(INSTALL_DATA) init $(DESTDIR)$(DEFAULT_INIT)
Index: x11/fluxbox/patches/patch-data_styles_Artwiz
===
RCS file: x11/fluxbox/patches/patch-data_styles_Artwiz
diff -N x11/fluxbox/patches/patch-data_styles_Artwiz
--- x11/fluxbox/patches/patch-data_styles_Artwiz25 Jan 2006 03:57:44
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-data_styles_Artwiz,v 1.1 2006/01/25 03:57:44 david Exp $
data/styles/Artwiz.origMon Nov 15 14:40:52 2004
-+++ data/styles/Artwiz Mon Jan 23 02:56:44 2006
-@@ -104,7 +104,7 @@ bevelWidth:2
- borderWidth: 1
- handleWidth: 5
-
--rootCommand: bsetroot -mod 4 4 -bg rgb:10/18/20 -fg
rgb:30/38/40
-+rootCommand: fbsetroot -mod 4 4 -bg rgb:10/18/20 -fg
rgb:30/38/40
-
- *Font:
-*-lucidatypewriter-medium-r-*-*-*-100-*-*-*-*-*-*
- !*Font: vera-7
Index: x11/fluxbox/patches/patch-data_styles_BlueNight
===
RCS file: x11/fluxbox/patches/patch-data_styles_BlueNight
diff -N x11/fluxbox/patches/patch-data_styles_BlueNight
--- x11/fluxbox/patches/patch-data_styles_BlueNight 25 Jan 2006 03:57:44
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-data_styles_BlueNight,v 1.1 2006/01/25 03:57:44 david Exp $
data/styles/BlueNight.orig Mon Nov 15 14:40:52 2004
-+++ data/styles/BlueNight Mon Jan 23 02:56:47 2006
-@@ -5,7 +5,7 @@ style.credits:
- style.comments: Modified/tweaked by skypher
-
-
--rootCommand: bsetroot -solid rgb:6A/9A/AF
-+rootCommand: fbsetroot -solid rgb:6A/9A/AF
-
- ! Toolbar settings...
- toolbar.button: Gradient Diagonal
Index: x11/fluxbox/patches/patch-data_styles_Carbondioxide
===
RCS file: x11/fluxbox/patches/patch-data_styles_Carbondioxide
diff -N x11/fluxbox/patches/patch-data_styles_Carbondioxide
--- x11/fluxbox/patches/patch-data_styles_Carbondioxide 25 Jan 2006 03:57:44
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-$OpenBSD: patch-data_styles_Carbondioxide,v 1.1 2006/01/25 03:57:44 david Exp $
data/styles/Carbondioxide.orig Mon Nov 15 14:40:53 2004
-+++ data/styles/Carbondioxide Mon Jan 23 02:56:50 2006
-@@ -132,4 +132,4 @@ bevelWidt
UPDATE: oinkmaster-2.0
Index: net/oinkmaster/Makefile
===
RCS file: /cvs/ports/net/oinkmaster/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- net/oinkmaster/Makefile 5 Feb 2006 12:48:43 - 1.12
+++ net/oinkmaster/Makefile 10 Mar 2006 19:53:57 -
@@ -2,8 +2,7 @@
COMMENT= "update your Snort rules"
-DISTNAME= oinkmaster-1.2
-PKGNAME= ${DISTNAME}p0
+DISTNAME= oinkmaster-2.0
CATEGORIES=net security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=oinkmaster/}
@@ -22,6 +21,8 @@ NO_BUILD=Yes
NO_REGRESS=Yes
PKG_ARCH=*
+DOCS= FAQ INSTALL LICENSE README README.templates UPGRADING
+
do-install:
sed -e
's;"/usr/local/etc/oinkmaster.conf";"${SYSCONFDIR}/oinkmaster.conf";g' \
${WRKSRC}/oinkmaster.pl > ${WRKSRC}/oinkmaster-
@@ -32,6 +33,8 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/oinkmaster.conf \
${WRKSRC}/template-examples.conf \
${PREFIX}/share/examples/oinkmaster
- ${INSTALL_DATA} ${WRKSRC}/README.templates
${PREFIX}/share/doc/oinkmaster
+.for i in ${DOCS}
+ ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/oinkmaster
+.endfor
.include
Index: net/oinkmaster/distinfo
===
RCS file: /cvs/ports/net/oinkmaster/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- net/oinkmaster/distinfo 25 Jan 2006 04:30:58 - 1.7
+++ net/oinkmaster/distinfo 10 Mar 2006 19:53:57 -
@@ -1,4 +1,4 @@
-MD5 (oinkmaster-1.2.tar.gz) = 23dc212f3a5a93ab32253edb379cb724
-RMD160 (oinkmaster-1.2.tar.gz) = 74dcd25477b24af4e64100cc51b70416e8f5a1ec
-SHA1 (oinkmaster-1.2.tar.gz) = d4628e9c42e635aaaf90f8c9b2dfdcd5db618ed4
-SIZE (oinkmaster-1.2.tar.gz) = 75512
+MD5 (oinkmaster-2.0.tar.gz) = d2a1b56f51cf40e919c63206ca4ec8f8
+RMD160 (oinkmaster-2.0.tar.gz) = a3292cfc2e6b175008a7172be5809ca6e2fc85b7
+SHA1 (oinkmaster-2.0.tar.gz) = 01a0d774195670a11af5ff3e302773d962b34224
+SIZE (oinkmaster-2.0.tar.gz) = 80111
Index: net/oinkmaster/patches/patch-oinkmaster_1
===
RCS file: /cvs/ports/net/oinkmaster/patches/patch-oinkmaster_1,v
retrieving revision 1.2
diff -u -p -r1.2 patch-oinkmaster_1
--- net/oinkmaster/patches/patch-oinkmaster_1 25 Jan 2006 04:30:58 -
1.2
+++ net/oinkmaster/patches/patch-oinkmaster_1 10 Mar 2006 19:53:57 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-oinkmaster_1,v 1.2 2006/01/25 04:30:58 david Exp $
oinkmaster.1.orig Sat Apr 16 02:29:41 2005
-+++ oinkmaster.1 Tue Jan 3 23:05:36 2006
+--- oinkmaster.1.orig Sat Feb 18 06:35:21 2006
oinkmaster.1 Thu Mar 9 09:12:04 2006
@@ -8,7 +8,7 @@
.B oinkmaster
\- update Snort signatures
@@ -10,7 +10,7 @@ $OpenBSD: patch-oinkmaster_1,v 1.2 2006/
.I outdir
[options]
.SH DESCRIPTION
-@@ -182,14 +182,14 @@ Download rules archive from default loca
+@@ -205,14 +205,14 @@ Download rules archive from default loca
and put the new rules in /etc/rules/:
.PP
.nf
@@ -27,8 +27,8 @@ $OpenBSD: patch-oinkmaster_1,v 1.2 2006/
.fi
.PP
Download rules archive from default location, make backup of old rules if
-@@ -200,7 +200,7 @@ passwords, you should of course not send
- first encrypting the content.)
+@@ -223,7 +223,7 @@ passwords, you should of course not send
+ first encrypting the content.):
.PP
.nf
-\fBoinkmaster.pl -o /etc/snort/rules -b /etc/snort/backup 2>&1 | \fP\\
@@ -36,7 +36,16 @@ $OpenBSD: patch-oinkmaster_1,v 1.2 2006/
\fBmail -s "subject" [EMAIL PROTECTED]
.fi
.PP
-@@ -212,7 +212,7 @@ command is available on the system:
+@@ -232,7 +232,7 @@ downloaded snort.conf and foo.conf but n
+ /etc/snort/snort.conf:
+ .PP
+ .nf
+-\fBoinkmaster.pl -u file:///tmp/foo.rules.tar.gz \fP\\
++\fBoinkmaster -u file:///tmp/foo.rules.tar.gz \fP\\
+ \fB-u http://somewhere/rules.tar.gz -u https://blah/rules.tar.gz \fP\\
+ \fB-o /etc/rules -S snort.conf -S foo.conf -U /etc/snort/snort.conf
+ .fi
+@@ -245,7 +245,7 @@ command is available on the system:
.PP
.nf
\fBTMP=`mktemp /tmp/oinkmaster.XX` && \fP\\
Index: net/oinkmaster/patches/patch-oinkmaster_conf
===
RCS file: net/oinkmaster/patches/patch-oinkmaster_conf
diff -N net/oinkmaster/patches/patch-oinkmaster_conf
--- net/oinkmaster/patches/patch-oinkmaster_conf5 Feb 2006 05:00:43
- 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,33 +0,0 @@
-$OpenBSD: patch-oinkmaster_conf,v 1.4 2006/02/05 05:00:43 david Exp $
oinkmaster.conf.orig Sat Apr 16 02:29:41 2005
-+++ oinkmaster.confSat Feb 4 12:20:56 2006
-@@ -47,9 +47,9 @@
- # You then specify the URL as
- # http://www.snort.org/pub-bin/oinkmaster.cgi//
- # For example, if your code is 5a081649c06a277e1022e1284b and
--# you use Snort 2.3, the url to use would be (without the wrap
UPDATE: snort-2.4.4
The Snort Team is pleased to announce the availability of Snort v2.4.4.
This release fixes an issue where under certain conditions the frag3
preprocessor will not properly defragment fragmented IP packets.
Improvements have also been made to stream4 and also a fix for Snort in
inline mode. Numerous other improvements are detailed in the changlog
for this release.
Index: net/snort/Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- net/snort/Makefile 4 Feb 2006 13:15:42 - 1.42
+++ net/snort/Makefile 10 Mar 2006 19:53:50 -
@@ -2,7 +2,7 @@
COMMENT= "highly flexible sniffer/NIDS"
-DISTNAME= snort-2.4.3
+DISTNAME= snort-2.4.4
CATEGORIES=net security
MASTER_SITES= ${HOMEPAGE}/dl/current/
Index: net/snort/distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- net/snort/distinfo 4 Feb 2006 13:15:42 - 1.10
+++ net/snort/distinfo 10 Mar 2006 19:53:50 -
@@ -1,4 +1,4 @@
-MD5 (snort-2.4.3.tar.gz) = 5c3c8c69f2459bbe0c1f2057966c88a7
-RMD160 (snort-2.4.3.tar.gz) = 1cba0a9d843da1cfa8c8dbaae5b18a16574cb7d2
-SHA1 (snort-2.4.3.tar.gz) = 5b38b558b73252c048f23dba2499bcd902ebdd9e
-SIZE (snort-2.4.3.tar.gz) = 2733590
+MD5 (snort-2.4.4.tar.gz) = 9dc9060d1f2e248663eceffadfc45e7e
+RMD160 (snort-2.4.4.tar.gz) = 5c0ff9aafdb083438cb10e82bdcdba43f806f86e
+SHA1 (snort-2.4.4.tar.gz) = 80783bfae2854c8cb9d604747251ba584522a053
+SIZE (snort-2.4.4.tar.gz) = 2825187
Index: net/snort/patches/patch-configure
===
RCS file: /cvs/ports/net/snort/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- net/snort/patches/patch-configure 4 Feb 2006 13:15:42 - 1.2
+++ net/snort/patches/patch-configure 10 Mar 2006 19:53:50 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2006/02/04 13:15:42 david Exp $
configure.orig Mon Oct 17 08:50:23 2005
-+++ configure Tue Jan 3 23:41:30 2006
-@@ -7884,20 +7884,20 @@ fi
+--- configure.orig Wed Mar 8 15:38:24 2006
configure Thu Mar 9 09:03:15 2006
+@@ -8397,20 +8397,20 @@ fi
# Check whether --enable-flexresp or --disable-flexresp was given.
if test "${enable_flexresp+set}" = set; then
enableval="$enable_flexresp"
@@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.2 2006/02/
{ echo "$as_me:$LINENO: WARNING: are using a precompiled package please
notify the" >&5
echo "$as_me: WARNING: are using a precompiled package please notify the"
>&2;}
{ echo "$as_me:$LINENO: WARNING: maintainer." >&5
-@@ -8069,7 +8069,7 @@ echo $ECHO_N "checking for libnet versio
+@@ -8590,7 +8590,7 @@ echo $ECHO_N "checking for libnet versio
libnet_dir="/usr/include /usr/local/include /sw/include"
fi
else
UPDATE: ipfm-0.11.5
Index: net/ipfm/Makefile === RCS file: /cvs/ports/net/ipfm/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- net/ipfm/Makefile 16 Dec 2004 00:31:22 - 1.9 +++ net/ipfm/Makefile 10 Mar 2006 19:53:44 - @@ -2,7 +2,7 @@ COMMENT= "IP bandwidth analysis tool" -DISTNAME= ipfm-0.11.4 +DISTNAME= ipfm-0.11.5 CATEGORIES= net HOMEPAGE= http://robert.cheramy.net/ipfm/ Index: net/ipfm/distinfo === RCS file: /cvs/ports/net/ipfm/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- net/ipfm/distinfo 5 Jan 2005 17:14:45 - 1.2 +++ net/ipfm/distinfo 10 Mar 2006 19:53:44 - @@ -1,4 +1,4 @@ -MD5 (ipfm-0.11.4.tgz) = 51fd94d3bb4aa1225de08262d50114b6 -RMD160 (ipfm-0.11.4.tgz) = 09359ade7417648fec00453fa4fcbbe777e9dc9d -SHA1 (ipfm-0.11.4.tgz) = 97ad2e12c90025d94d61d07fa573b165a7d145a1 -SIZE (ipfm-0.11.4.tgz) = 45189 +MD5 (ipfm-0.11.5.tgz) = 7331aeeabf47cbd37603abe75355fe20 +RMD160 (ipfm-0.11.5.tgz) = 70b18eafa9c889c1d80b5d3a6dc739a46014a0e9 +SHA1 (ipfm-0.11.5.tgz) = a42837383793e5abb0c5d299001831247b7d26c9 +SIZE (ipfm-0.11.5.tgz) = 51742 Index: net/ipfm/pkg/DESCR === RCS file: /cvs/ports/net/ipfm/pkg/DESCR,v retrieving revision 1.2 diff -u -p -r1.2 DESCR --- net/ipfm/pkg/DESCR 15 Dec 2003 21:55:04 - 1.2 +++ net/ipfm/pkg/DESCR 10 Mar 2006 19:53:44 - @@ -1,2 +1,2 @@ -IP Flow Meter is a bandwidth analysis tool, that measures how much bandwidth -specified hosts use on their Internet link. +IP Flow Meter (IPFM) is a bandwidth analysis tool, that measures how much +bandwidth specified hosts use on their Internet link.
Re: Chrooting snort
* Dave Harrison <[EMAIL PROTECTED]> [060224 00:18]: > There doesn't seem to be much info around on how to chroot snort, and the > limited references to it that I have found, somehow don't seem to feel right. > > What I have come to is the following : > > /usr/local/bin/snort -D -c /var/snort/etc/snort/snort.conf -l \ > /var/snort/var/log/snort -t /var/snort -u _snort -g _snort > > Somehow I just don't trust this since it seems to want to read everything as a > fully relative path, and not simply relative to the chroot. > > Can anyone that runs snort (I'm using the snort package from the 3.8 ports) > confirm if this is actually correctly chrooting or if (as I fear) it's not - > nothing in the launch output specifies that a chroot has occurred. The way it works is snort first opens the config file and promisc on the interface, then it chroots. So the config file option and the log directory do need to be the full path. Note that the config file (and rules) don't need to live in the chroot, or anything else for that matter except for the log directory. I think that breaks -HUP however, but it's safer. If possible please try or have a look at the 3.9 port as I tried to set up the user/group and chroot automatically. >From the 3.9 port: It is recommended that snort be run as an unprivileged chrooted user. An _snort user/group and log directory has been created for this purpose. You should start snort with the following options to take advantage of this: -u _snort -g _snort -t /var/snort and if you want to log: -l /var/snort/log and the PLIST: @sample /var/snort/ @owner _snort @group _snort @sample /var/snort/log/ David
correct location for perl SYSCONFDIR substitution
As pointed out by bernd@, 'make update-patches' breaks if a perl
substitution for SYSCONFDIR is done in post-patch instead of
pre-configure. I found these ports had similar problems including a
couple that lost their SYSCONFDIR patch due to this.
David
Index: databases/sqsh/Makefile
===
RCS file: /cvs/ports/databases/sqsh/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- databases/sqsh/Makefile 22 Nov 2004 16:59:30 - 1.13
+++ databases/sqsh/Makefile 4 Feb 2006 13:46:57 -
@@ -30,7 +30,7 @@ CONFIGURE_ARGS= --with-readline --syscon
ALL_TARGET=
NO_REGRESS=Yes
-post-patch:
+pre-configure:
@perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," ${WRKSRC}/Makefile.in \
${WRKSRC}/src/Makefile.in
Index: russian/cyrproxy/Makefile
===
RCS file: /cvs/ports/russian/cyrproxy/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- russian/cyrproxy/Makefile 2 Dec 2004 21:14:45 - 1.16
+++ russian/cyrproxy/Makefile 4 Feb 2006 13:46:57 -
@@ -18,7 +18,7 @@ WANTLIB= c
NO_REGRESS=Yes
-post-patch:
+pre-configure:
@perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," ${WRKSRC}/Makefile
do-install:
Index: russian/cyrproxy/patches/patch-Makefile
===
RCS file: /cvs/ports/russian/cyrproxy/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile
--- russian/cyrproxy/patches/patch-Makefile 4 Jan 2004 23:37:27 -
1.3
+++ russian/cyrproxy/patches/patch-Makefile 4 Feb 2006 13:46:57 -
@@ -14,6 +14,15 @@ $OpenBSD: patch-Makefile,v 1.3 2004/01/0
# Some systems contains resolver routines in libresolv
# EXTRALIBS=lresolv
EXTRALIBS=
+@@ -34,7 +34,7 @@ SPY=tcpspy
+ TBLDIR=/usr/local/share/proxy
+
+ # config file location
+-CONF_FILE=/etc/cyrproxy.conf
++CONF_FILE=%%SYSCONFDIR%%/cyrproxy.conf
+
+ # Subdirs for make
+ # cyrcoder - filter-like cyrillic recoder
@@ -65,7 +65,7 @@ all: ${CYRPROXY} ${SPY} subdirmake confi
Index: sysutils/apc-upsd/Makefile
===
RCS file: /cvs/ports/sysutils/apc-upsd/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- sysutils/apc-upsd/Makefile 20 Dec 2004 10:35:34 - 1.16
+++ sysutils/apc-upsd/Makefile 4 Feb 2006 13:46:57 -
@@ -21,7 +21,7 @@ MAKE_FLAGS= CFLAGS="${CFLAGS}"
NO_REGRESS=Yes
-post-patch:
+pre-configure:
@perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," ${WRKSRC}/apc_upsd.h
do-install:
Index: sysutils/gkrellm/gkrellm/patches/patch-server_gkrellmd_h
===
RCS file: /cvs/ports/sysutils/gkrellm/gkrellm/patches/patch-server_gkrellmd_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-server_gkrellmd_h
--- sysutils/gkrellm/gkrellm/patches/patch-server_gkrellmd_h18 May 2004
14:49:56 - 1.2
+++ sysutils/gkrellm/gkrellm/patches/patch-server_gkrellmd_h4 Feb 2006
13:46:57 -
@@ -1,16 +1,17 @@
$OpenBSD: patch-server_gkrellmd_h,v 1.2 2004/05/18 14:49:56 naddy Exp $
server/gkrellmd.h.orig 2004-05-05 10:30:52.0 -0500
-+++ server/gkrellmd.h 2004-05-14 19:27:05.0 -0500
+--- server/gkrellmd.h.orig Mon Sep 6 17:33:14 2004
server/gkrellmd.h Sat Feb 4 07:37:54 2006
@@ -105,9 +105,11 @@
#endif
#if !defined(WIN32)
-+#if !defined(GKRELLMD_SYS_ETC)
- #define GKRELLMD_SYS_ETC"/etc"
+-#define GKRELLMD_SYS_ETC"/etc"
-#define GKRELLMD_LOCAL_ETC"/usr/local/etc"
-#endif
++#if !defined(GKRELLMD_SYS_ETC)
++#define GKRELLMD_SYS_ETC"%%SYSCONFDIR%%"
+#endif /* GKRELLMD_SYS_ETC */
-+#define GKRELLMD_LOCAL_ETC"/etc"
++#define GKRELLMD_LOCAL_ETC"%%SYSCONFDIR%%"
+#endif /* WIN32 */
NEW: nrpe-2.3 (Nagios Remote Plugin Executor)
NRPE is an addon for Nagios that allows you to execute "local" plugins (like check_disk, check_procs, etc.) on remote hosts. The check_nrpe plugin is called from Nagios and makes plugin execution requests to the NRPE daemon running on the remote host (either as a standalone daemon or as a service under inetd). Supports passing command arguments to server, as well as native SSL/TLS encryption (anonymous DH mode). David nrpe.tgz Description: application/tar-gz
UPDATE: micq-0.5.1
Index: net/micq/Makefile === RCS file: /cvs/ports/net/micq/Makefile,v retrieving revision 1.38 diff -u -p -r1.38 Makefile --- net/micq/Makefile 7 Jun 2005 06:48:13 - 1.38 +++ net/micq/Makefile 23 Jan 2006 08:40:12 - @@ -3,7 +3,7 @@ COMMENT= "text-based ICQ implementation" -DISTNAME= micq-0.5.0.4 +DISTNAME= micq-0.5.1 CATEGORIES=net MAINTAINER=David Krause <[EMAIL PROTECTED]> Index: net/micq/distinfo === RCS file: /cvs/ports/net/micq/distinfo,v retrieving revision 1.15 diff -u -p -r1.15 distinfo --- net/micq/distinfo 7 Jun 2005 06:48:13 - 1.15 +++ net/micq/distinfo 23 Jan 2006 08:40:12 - @@ -1,4 +1,4 @@ -MD5 (micq-0.5.0.4.tgz) = 142f80100955018046745ada09859b2d -RMD160 (micq-0.5.0.4.tgz) = fa164c847624b389f20eb426a592582a6b38913b -SHA1 (micq-0.5.0.4.tgz) = bd30f9a79febcae5a0e995328edef0c8bd9f6132 -SIZE (micq-0.5.0.4.tgz) = 1042082 +MD5 (micq-0.5.1.tgz) = 8a8d33e130add017e76293e788d3d590 +RMD160 (micq-0.5.1.tgz) = 4518e5fe4c14ea23764470a0d0991658b473baeb +SHA1 (micq-0.5.1.tgz) = 1a5aece25e82861de319851bc5ff6701570a6fb8 +SIZE (micq-0.5.1.tgz) = 1082826 Index: net/micq/pkg/PLIST === RCS file: /cvs/ports/net/micq/pkg/PLIST,v retrieving revision 1.17 diff -u -p -r1.17 PLIST --- net/micq/pkg/PLIST 20 Feb 2005 06:57:14 - 1.17 +++ net/micq/pkg/PLIST 23 Jan 2006 08:40:12 - @@ -63,6 +63,7 @@ man/uk/man7/ share/micq/ share/micq/C.i18n share/micq/bg.i18n +share/micq/cs.i18n share/micq/de.i18n share/micq/de_CH.i18n share/micq/en.i18n
UPDATE: snort-2.4.3
Here is an update to 2.4.3 similar to what others have posted but
without any rules. The licensing on the rules has changed and and we
can't bundle the GPLed community rules because of the distfile
constantly changing. I think it's kinda pointless to bundle rules
anyway since you will almost always want to get the latest ones after
install. I don't know if I like the exact wording in MESSAGE, but you
get the idea.
Also apparently snort-2.3.3 is broken on sparc64 so I'm guessing this
one is too. Brad was looking at it.
David
Index: net/snort/Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- net/snort/Makefile 4 Jan 2006 04:15:18 - 1.38
+++ net/snort/Makefile 4 Jan 2006 06:10:56 -
@@ -2,8 +2,7 @@
COMMENT= "highly flexible sniffer/NIDS"
-DISTNAME= snort-2.3.3
-PKGNAME= ${DISTNAME}p1
+DISTNAME= snort-2.4.3
CATEGORIES=net security
MASTER_SITES= ${HOMEPAGE}/dl/current/
@@ -59,6 +58,5 @@ post-install:
${PREFIX}/share/examples/snort
${INSTALL_DATA} ${WRKSRC}/etc/reference.config \
${PREFIX}/share/examples/snort
- ${INSTALL_DATA} ${WRKSRC}/rules/*.rules ${PREFIX}/share/examples/snort
.include
Index: net/snort/distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- net/snort/distinfo 29 Jun 2005 06:01:38 - 1.9
+++ net/snort/distinfo 4 Jan 2006 06:10:56 -
@@ -1,4 +1,4 @@
-MD5 (snort-2.3.3.tar.gz) = 06bf140893e7cb120aaa9372d10a0100
-RMD160 (snort-2.3.3.tar.gz) = 6bb635df1c62d293d8dd4b2fec55cfa486916908
-SHA1 (snort-2.3.3.tar.gz) = 6d05c995f0eef5adde9d63157436c0088747d435
-SIZE (snort-2.3.3.tar.gz) = 2631270
+MD5 (snort-2.4.3.tar.gz) = 5c3c8c69f2459bbe0c1f2057966c88a7
+RMD160 (snort-2.4.3.tar.gz) = 1cba0a9d843da1cfa8c8dbaae5b18a16574cb7d2
+SHA1 (snort-2.4.3.tar.gz) = 5b38b558b73252c048f23dba2499bcd902ebdd9e
+SIZE (snort-2.4.3.tar.gz) = 2733590
Index: net/snort/patches/patch-configure
===
RCS file: /cvs/ports/net/snort/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure
--- net/snort/patches/patch-configure 24 May 2005 04:39:05 - 1.1
+++ net/snort/patches/patch-configure 4 Jan 2006 06:10:56 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2005/05/24 04:39:05 mjc Exp $
configure.orig Wed Mar 31 13:31:57 2004
-+++ configure Mon May 23 18:11:16 2005
-@@ -6575,20 +6575,20 @@ fi;
+--- configure.orig Mon Oct 17 08:50:23 2005
configure Tue Jan 3 23:41:30 2006
+@@ -7884,20 +7884,20 @@ fi
# Check whether --enable-flexresp or --disable-flexresp was given.
if test "${enable_flexresp+set}" = set; then
enableval="$enable_flexresp"
@@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.1 2005/05/
{ echo "$as_me:$LINENO: WARNING: are using a precompiled package please
notify the" >&5
echo "$as_me: WARNING: are using a precompiled package please notify the"
>&2;}
{ echo "$as_me:$LINENO: WARNING: maintainer." >&5
-@@ -6732,7 +6732,7 @@ echo $ECHO_N "checking for libnet versio
+@@ -8069,7 +8069,7 @@ echo $ECHO_N "checking for libnet versio
libnet_dir="/usr/include /usr/local/include /sw/include"
fi
else
Index: net/snort/patches/patch-src_output-plugins_spo_database_c
===
RCS file: net/snort/patches/patch-src_output-plugins_spo_database_c
diff -N net/snort/patches/patch-src_output-plugins_spo_database_c
--- net/snort/patches/patch-src_output-plugins_spo_database_c 4 Jan 2006
04:15:19 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_output-plugins_spo_database_c,v 1.1 2006/01/04 04:15:19
david Exp $
src/output-plugins/spo_database.c.orig Mon Sep 13 12:44:49 2004
-+++ src/output-plugins/spo_database.c Tue Jan 3 16:26:09 2006
-@@ -1910,9 +1910,23 @@ int CheckDBVersion(DatabaseData * data)
-else
- #endif
-{
-- snprintf(select0, MAX_QUERY_LENGTH,
-+#if defined(ENABLE_MYSQL)
-+ if (data->shared->dbtype_id == DB_MYSQL)
-+ {
-+ /* "schema" is a keyword in MYSQL, so use `schema`
-+ * to indicate that we are referring to the table
-+ */
-+ snprintf(select0, MAX_QUERY_LENGTH,
-"SELECT vseq "
-+ "FROM `schema`");
-+ }
-+ else
-+#endif
-+ {
-+ snprintf(select0, MAX_QUERY_LENGTH,
-+ "SELECT vseq "
-"FROM schema");
-+ }
-}
-
-schema_version = Select(select0,data);
Index: net/snort/pkg/MESSAGE
===
RCS file: /cvs/ports/net/snort/pkg/MESSAGE,v
retrieving revision 1.2
diff -u -p -r1.2 MESSAG
UPDATE: oinkmaster-1.2
Index: net/oinkmaster/Makefile
===
RCS file: /cvs/ports/net/oinkmaster/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- net/oinkmaster/Makefile 29 Mar 2005 01:31:39 - 1.10
+++ net/oinkmaster/Makefile 4 Jan 2006 05:29:15 -
@@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2005/03/29 01:31:39 msf Exp $
-COMMENT= "update your Snort 1.8+ rules"
+COMMENT= "update your Snort rules"
-DISTNAME= oinkmaster-1.1
-PKGNAME= ${DISTNAME}p0
+DISTNAME= oinkmaster-1.2
CATEGORIES=net security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=oinkmaster/}
Index: net/oinkmaster/distinfo
===
RCS file: /cvs/ports/net/oinkmaster/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- net/oinkmaster/distinfo 5 Jan 2005 17:14:51 - 1.6
+++ net/oinkmaster/distinfo 4 Jan 2006 05:29:15 -
@@ -1,4 +1,4 @@
-MD5 (oinkmaster-1.1.tar.gz) = 28cfaf6220f5fc3fa3f3838ea33cecf1
-RMD160 (oinkmaster-1.1.tar.gz) = bb4e58007a5f67ad2ca9a886013b6c9764e05abd
-SHA1 (oinkmaster-1.1.tar.gz) = be216566653352782615a752993968246c4ee102
-SIZE (oinkmaster-1.1.tar.gz) = 69947
+MD5 (oinkmaster-1.2.tar.gz) = 23dc212f3a5a93ab32253edb379cb724
+RMD160 (oinkmaster-1.2.tar.gz) = 74dcd25477b24af4e64100cc51b70416e8f5a1ec
+SHA1 (oinkmaster-1.2.tar.gz) = d4628e9c42e635aaaf90f8c9b2dfdcd5db618ed4
+SIZE (oinkmaster-1.2.tar.gz) = 75512
Index: net/oinkmaster/patches/patch-oinkmaster_1
===
RCS file: /cvs/ports/net/oinkmaster/patches/patch-oinkmaster_1,v
retrieving revision 1.1
diff -u -p -r1.1 patch-oinkmaster_1
--- net/oinkmaster/patches/patch-oinkmaster_1 5 Dec 2004 18:22:57 -
1.1
+++ net/oinkmaster/patches/patch-oinkmaster_1 4 Jan 2006 05:29:15 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-oinkmaster_1,v 1.1 2004/12/05 18:22:57 robert Exp $
oinkmaster.1.orig Sun Dec 5 19:05:14 2004
-+++ oinkmaster.1 Sun Dec 5 19:05:51 2004
+--- oinkmaster.1.orig Sat Apr 16 02:29:41 2005
oinkmaster.1 Tue Jan 3 23:05:36 2006
@@ -8,7 +8,7 @@
.B oinkmaster
\- update Snort signatures
@@ -10,7 +10,7 @@ $OpenBSD: patch-oinkmaster_1,v 1.1 2004/
.I outdir
[options]
.SH DESCRIPTION
-@@ -154,14 +154,14 @@
+@@ -182,14 +182,14 @@ Download rules archive from default loca
and put the new rules in /etc/rules/:
.PP
.nf
@@ -27,7 +27,7 @@ $OpenBSD: patch-oinkmaster_1,v 1.1 2004/
.fi
.PP
Download rules archive from default location, make backup of old rules if
-@@ -172,7 +172,7 @@
+@@ -200,7 +200,7 @@ passwords, you should of course not send
first encrypting the content.)
.PP
.nf
@@ -36,7 +36,7 @@ $OpenBSD: patch-oinkmaster_1,v 1.1 2004/
\fBmail -s "subject" [EMAIL PROTECTED]
.fi
.PP
-@@ -184,7 +184,7 @@
+@@ -212,7 +212,7 @@ command is available on the system:
.PP
.nf
\fBTMP=`mktemp /tmp/oinkmaster.XX` && \fP\\
Index: net/oinkmaster/patches/patch-oinkmaster_conf
===
RCS file: /cvs/ports/net/oinkmaster/patches/patch-oinkmaster_conf,v
retrieving revision 1.2
diff -u -p -r1.2 patch-oinkmaster_conf
--- net/oinkmaster/patches/patch-oinkmaster_conf5 Dec 2004 18:22:57
- 1.2
+++ net/oinkmaster/patches/patch-oinkmaster_conf4 Jan 2006 05:29:15
-
@@ -1,16 +1,12 @@
-$OpenBSD: patch-oinkmaster_conf,v 1.2 2004/12/05 18:22:57 robert Exp $
oinkmaster.conf.orig Sat Oct 9 15:28:24 2004
-+++ oinkmaster.confSun Dec 5 19:11:01 2004
-@@ -36,10 +36,10 @@
- # is the most recent version of Snort at the time of this writing.
- # This may have changed by the time you read this, so make
- # sure to follow the instructions above.
--url = http://www.snort.org/dl/rules/snortrules-snapshot-2_2.tar.gz
-+# url = http://www.snort.org/dl/rules/snortrules-snapshot-2_2.tar.gz
+$OpenBSD$
+--- oinkmaster.conf.orig Sat Apr 16 02:29:41 2005
oinkmaster.confTue Jan 3 23:24:21 2006
+@@ -64,7 +64,7 @@
+ # url =
http://www.snort.org/pub-bin/oinkmaster.cgi//snortrules-snapshot-CURRENT.tar.gz
- # This is for Snort 2.1.x.
--# url = http://www.snort.org/dl/rules/snortrules-snapshot-2_1.tar.gz
-+url = http://www.snort.org/dl/rules/snortrules-snapshot-2_1.tar.gz
+ # Example for Community rules
+-# url =
http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rules.tar.gz
++# url =
http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rules-2.3.tar.gz
- # If you use Snort 2.0.x (which is deprecated):
- # url = http://www.snort.org/dl/rules/snortrules-snapshot-2_0.tar.gz
+ # Example for rules from the Bleeding Snort project
+ # url = http://www.bleedingsnort.com/bleeding.rules.tar.gz
Index: net/oinkmaster/pkg/DESCR
===
RCS file: /cvs/ports/net/oinkmaster/pkg/DESC
ugly fonts in mozilla-firefox-1.5
Did the default fonts in firefox change from 1.0 to 1.5? After installing 1.5 the fonts are very ugly on www.openbsd.org and other sites that don't specify a font. I had moved my profile out of the way and created a brand new one. I started up 1.0 on another system and compared. It seems that 3 of the 4 default fonts changed: Proportional: Serif -> Serif Serif: serif -> Times Sans-serif: sans-serif -> Helvetica Monospace: monospace -> Courier Is anyone else seeing this? David
Re: SourceForge screwed up games/scummvm
* Moritz Grimm <[EMAIL PROTECTED]> [051103 07:48]:
> seeing the updated BASS, I felt like playing it again. During the
> install, I ran into this:
>
> --- snip ---
> ===> Verifying install for scummvm->=0.5.1 in games/scummvm
> ===> Checking files for scummvm-0.8.0
> >> scummvm-0.8.0.tar.gz doesn't seem to exist on this system.
> >> Fetch
> http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.8.0.tar.gz.
> >> Size does not match for /usr/ports/distfiles/scummvm-0.8.0.tar.gz
> /bin/sh: test: 3: unexpected operator/operand
> *** Error code 2
> --- snap ---
I send a patch to fix this a while back but received no comments. The
wrong exit code is being tested.
Index: infrastructure/mk/bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.719
diff -u -p -r1.719 bsd.port.mk
--- infrastructure/mk/bsd.port.mk 10 Oct 2005 19:20:00 - 1.719
+++ infrastructure/mk/bsd.port.mk 3 Nov 2005 16:34:57 -
@@ -2067,7 +2067,7 @@ ${_F}:
else \
if grep -q "SIZE ($$file)"
${CHECKSUM_FILE}; then \
${ECHO_MSG} ">> Size does not
match for ${_F}"; \
- test `wc -c "$$file"
2>/dev/null|awk '{print $$1}' || echo 0` -lt 3 && rm -f $$file; \
+ test `wc -c "$$file"
2>/dev/null || echo 0 | awk '{print $$1}'` -lt 3 && rm -f $$file; \
else \
${ECHO_MSG} ">> No size
recorded for ${_F}"; \
exit 0; \
UPDATE: fluxbox-0.9.14
please test
Index: x11/fluxbox/Makefile
===
RCS file: /cvs/ports/x11/fluxbox/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- x11/fluxbox/Makefile12 Jun 2005 16:52:20 - 1.35
+++ x11/fluxbox/Makefile5 Oct 2005 22:27:33 -
@@ -2,7 +2,7 @@
COMMENT= "window manager based on the original Blackbox code"
-VERSION= 0.9.13
+VERSION= 0.9.14
DISTNAME= fluxbox-${VERSION}
CATEGORIES=x11
Index: x11/fluxbox/distinfo
===
RCS file: /cvs/ports/x11/fluxbox/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- x11/fluxbox/distinfo25 May 2005 06:59:56 - 1.20
+++ x11/fluxbox/distinfo5 Oct 2005 22:27:33 -
@@ -1,4 +1,4 @@
-MD5 (fluxbox-0.9.13.tar.gz) = aa0ad2392524242fdc25eca58c028553
-RMD160 (fluxbox-0.9.13.tar.gz) = 8191b985d8fb7f43e97b8d5040afd9ebbd14a08b
-SHA1 (fluxbox-0.9.13.tar.gz) = dddfb557c7f539e8c941b2a9be224da0dc18dc29
-SIZE (fluxbox-0.9.13.tar.gz) = 899873
+MD5 (fluxbox-0.9.14.tar.gz) = fc013c3d233ce11bcb8b6d989b1a4326
+RMD160 (fluxbox-0.9.14.tar.gz) = 8185498a076a87ec7b0cce088c52ae493020c6a2
+SHA1 (fluxbox-0.9.14.tar.gz) = ca81da9cab1df67d41b539527fc077f99ea366f8
+SIZE (fluxbox-0.9.14.tar.gz) = 928623
Index: x11/fluxbox/patches/patch-data_Makefile_in
===
RCS file: x11/fluxbox/patches/patch-data_Makefile_in
diff -N x11/fluxbox/patches/patch-data_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ x11/fluxbox/patches/patch-data_Makefile_in 5 Oct 2005 22:27:33 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- data/Makefile.in.orig Wed Sep 14 15:27:20 2005
data/Makefile.in Wed Oct 5 16:54:18 2005
+@@ -535,7 +535,7 @@ install-pkgdataDATA:
+ $(INSTALL_DATA) menu $(DESTDIR)$(DEFAULT_MENU)
+ @echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)"
+ $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS))
+- $(INSTALL_DATA) keys $(DESTDIR)$(DEFAULT_KEYS)
++ $(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS)
+ @echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)"
+ $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT))
+ $(INSTALL_DATA) init $(DESTDIR)$(DEFAULT_INIT)
Index: x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in
===
RCS file: x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in
diff -N x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in
--- x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in 19 Jun 2005
03:55:50 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,54 +0,0 @@
-$OpenBSD: patch-util_fluxbox-generate_menu_in,v 1.5 2005/06/19 03:55:50 david
Exp $
util/fluxbox-generate_menu.in.orig Thu Apr 28 05:21:09 2005
-+++ util/fluxbox-generate_menu.in Sat Jun 18 22:32:37 2005
-@@ -38,6 +38,7 @@
- # - don't use id -u or $UID, use whoami
- # - getopts won't work on all platforms, but the config-file can
- # compensate for that.
-+# - OpenBSD and Solaris grep do not have the -m option
- # - various software like grep/sed/perl may be not present or not
- # the version you have. for example grep '\W' only works on gnu-grep.
- # Keep this in mind, use bare basic defaults.
-@@ -271,7 +272,7 @@ doSearch(){
- # $dnlamVERBOSE "# Searching for icon $temp_icon for $execname" >>
$ICONMAPPING
-
- # check in $ICONMAPPING before searching directories
--entry_icon=`grep -m 1 "^\"${execname}\"" $ICONMAPPING | grep -o '<.*>'`
-+entry_icon=`grep "^\"${execname}\"" $ICONMAPPING | head -n 1 | grep -o
'<.*>'`
- if [ -n "$entry_icon" ]; then
- entry_icon=`replaceWithinString "$entry_icon" "<"`
- entry_icon=`replaceWithinString "$entry_icon" ">"`
-@@ -365,16 +366,16 @@ createIconMapping(){
- # >> $ICONMAPPING
- find "$DIR" -type f -name "*.desktop" | while read DESKTOP_FILE;
do
- # echo $DESKTOP_FILE;
--#entry_name=`grep -m 1 '^[ ]*Name=' $DESKTOP_FILE`
-+#entry_name=`grep '^[ ]*Name=' $DESKTOP_FILE | head -n 1`
- #entry_name=${entry_name##*=}
--entry_exec=`grep -m 1 '^[ ]*Exec=' "$DESKTOP_FILE"`
-+entry_exec=`grep '^[ ]*Exec=' "$DESKTOP_FILE" | head -n 1`
- entry_exec=${entry_exec##*=}
- entry_exec=`replaceWithinString "$entry_exec" "\""`
- if [ -z "$entry_exec" ]; then
- entry_exec=${DESKTOP_FILE%%.desktop*}
- fi
-
--entry_icon=`grep -m 1 '^[ ]*Icon=' "$DESKTOP_FILE"`
-+entry_icon=`grep '^[ ]*Icon=' "$DESKTOP_FILE" | head -n 1`
- entry_icon=${entry_icon##*=}
-
- # $dnlamVERBOSE echo "--- $entry_exec $entry_icon" >&2
-
patch: firefox IDN buffer overflow
Here is a fix for the IDN buffer overflow announced here:
http://security-protocols.com/advisory/sp-x17-advisory.txt
The file bug307259.js is taken from:
http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0.6/patches/307259.xpi
Index: www/mozilla-firefox/Makefile
===
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- www/mozilla-firefox/Makefile12 Aug 2005 19:01:44 - 1.32
+++ www/mozilla-firefox/Makefile12 Sep 2005 05:20:54 -
@@ -6,7 +6,7 @@ COMMENT="redesign of Mozilla's browser
VER= 1.0.6
DISTNAME= mozilla
-PKGNAME= mozilla-firefox-${VER}p1
+PKGNAME= mozilla-firefox-${VER}p2
SO_VERSION=5.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
@@ -120,6 +120,7 @@ do-install:
ln -f ${MOZ}/firefox-bin ${MOZ}/mozilla-firefox-bin
${INSTALL_DATA_DIR} ${MOZ}/extensions
+ ${INSTALL_DATA} ${FILESDIR}/bug307259.js ${MOZ}/defaults/pref/
${INSTALL_DATA} ${FILESDIR}/Extensions.rdf ${MOZ}/extensions/
${INSTALL_DATA_DIR} ${MOZ}/extensions/${MAGIC}
${INSTALL_DATA}
${MOZ}/defaults/profile/extensions/installed-extensions.txt
${MOZ}/extensions/installed-extensions-processed.txt
Index: www/mozilla-firefox/files/bug307259.js
===
RCS file: www/mozilla-firefox/files/bug307259.js
diff -N www/mozilla-firefox/files/bug307259.js
--- /dev/null 1 Jan 1970 00:00:00 -
+++ www/mozilla-firefox/files/bug307259.js 12 Sep 2005 05:20:54 -
@@ -0,0 +1,3 @@
+// rev version number so the patch is not offered again (bug307259)
+pref("general.useragent.productComment", "No IDN");
+pref("network.enableIDN", false);
\ No newline at end of file
Index: www/mozilla-firefox/pkg/PLIST
===
RCS file: /cvs/ports/www/mozilla-firefox/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- www/mozilla-firefox/pkg/PLIST 12 Aug 2005 19:01:44 - 1.10
+++ www/mozilla-firefox/pkg/PLIST 12 Sep 2005 05:20:54 -
@@ -332,6 +332,7 @@ mozilla-firefox/defaults/autoconfig/
mozilla-firefox/defaults/autoconfig/platform.js
mozilla-firefox/defaults/autoconfig/prefcalls.js
mozilla-firefox/defaults/pref/
+mozilla-firefox/defaults/pref/bug307259.js
mozilla-firefox/defaults/pref/firefox-l10n.js
mozilla-firefox/defaults/pref/firefox.js
mozilla-firefox/defaults/pref/inspector.js
Re: fix fetch 404s
* David Krause <[EMAIL PROTECTED]> [050703 19:29]:
> ===> Checking files for py-ldap-2.0.8
> >> python-ldap-2.0.8.tar.gz doesn't seem to exist on this system.
> >> Attempting to fetch /usr/ports/distfiles/python-ldap-2.0.8.tar.gz
> >> from http://mesh.dl.sourceforge.net/sourceforge/python-ldap/.
> >> Size does not match for /usr/ports/distfiles/python-ldap-2.0.8.tar.gz
> /bin/sh: test: 3: unexpected operator/operand
> *** Error code 2
It's not that the distfiles have spaces, although it doesn't hurt to
check, it still breaks with espie's latest commit. My fix was wrong
also. The real fix is that we want to check the return code of wc not
awk and echo 0 in that case.
David
Index: infrastructure/mk/bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.704
diff -u -p -r1.704 bsd.port.mk
--- infrastructure/mk/bsd.port.mk 4 Jul 2005 12:32:51 - 1.704
+++ infrastructure/mk/bsd.port.mk 4 Jul 2005 15:49:58 -
@@ -2005,7 +2005,7 @@ ${_F}:
else \
if grep -q "SIZE ($$file)"
${CHECKSUM_FILE}; then \
${ECHO_MSG} ">> Size does not
match for ${_F}"; \
- test `wc -c "$$file"
2>/dev/null|awk '{print $$1}' || echo 0` -lt 3 && rm -f $$file; \
+ test `wc -c "$$file"
2>/dev/null || echo 0 | awk '{print $$1}'` -lt 3 && rm -f $$file; \
else \
${ECHO_MSG} ">> No size
recorded for ${_F}"; \
exit 0; \
fix fetch 404s
===> Checking files for py-ldap-2.0.8
>> python-ldap-2.0.8.tar.gz doesn't seem to exist on this system.
>> Attempting to fetch /usr/ports/distfiles/python-ldap-2.0.8.tar.gz
>> from http://mesh.dl.sourceforge.net/sourceforge/python-ldap/.
>> Size does not match for /usr/ports/distfiles/python-ldap-2.0.8.tar.gz
/bin/sh: test: 3: unexpected operator/operand
*** Error code 2
Index: infrastructure/mk/bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.703
diff -u -p -r1.703 bsd.port.mk
--- infrastructure/mk/bsd.port.mk 27 Jun 2005 12:48:56 - 1.703
+++ infrastructure/mk/bsd.port.mk 4 Jul 2005 00:20:18 -
@@ -2005,7 +2005,7 @@ ${_F}:
else \
if grep -q "SIZE ($$file)"
${CHECKSUM_FILE}; then \
${ECHO_MSG} ">> Size does not
match for ${_F}"; \
- test `wc -c $$file
2>/dev/null|awk '{print $$1}' || echo 0` -lt 3 && rm -f $$file; \
+ test "`wc -c $$file
2>/dev/null|awk '{print $$1}' || echo 0`" -lt 3 && rm -f $$file; \
else \
${ECHO_MSG} ">> No size
recorded for ${_F}"; \
exit 0; \
