Re: OpenVPN update
On Fri, Mar 28, 2008 at 6:59 AM, Peter Hessler [EMAIL PROTECTED] wrote: On 2008 Mar 27 (Thu) at 19:33:20 +0100 (+0100), Felix Kronlage wrote: :On Sun, Feb 17, 2008 at 09:51:53PM +0100, Felix Kronlage wrote: : : here comes an update to OpenVPN to 2.1RC7. Please test : this in the scenarios where you use OpenVPN and report : any breakage. : :Since nobody complained so far, I assume noone has run into :problems. We've been running 2.1rc7 in various scenarions :(with 2.0 servers with 2.1 clients and vice versa) and had no :problems at all. If noone speaks up, I will go ahead and update :our version in ports to 2.1rc7. : :felix : this works very well for me on amd64 as a client. This works for me too, as a client on i386, with various versions of 2.0.X. -- A power so great, it can only be used for Good or Evil! -- Firesign Theatre, The Giant Rat of Sumatra -- Mattieu Baptiste /earth is 102% full ... please delete anyone you can.
Re: NEW: graphics/jpegpixi
Matthias Kilian wrote: The way you're setting CFLAGS via CONFIGURE_ENV is wrong and causes the port to ignore the default CFLAGS. Is CONFIGURE_ENV needed at all? The port seems to build fine without it (only tried on i386 yet). You are right, CONFIGURE_ENV is not needed, I updated the port at http://bigio.snb.it/openbsd/jpegpixi-1.1.1.tgz Cheers Giovanni
Re: UPDATE: x11/isomaster
On Fri, 28 Mar 2008, Giovanni Bechis wrote:
Little update to latest version (bug fix release).
I came up with this patch instead.
Is this OK to you?
Cheers!
--
AntoineIndex: Makefile
===
RCS file: /cvs/ports/x11/isomaster/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile15 Mar 2008 11:54:24 - 1.4
+++ Makefile28 Mar 2008 11:10:16 -
@@ -2,13 +2,13 @@
COMMENT= gui cd image editor
-DISTNAME= isomaster-1.3
+DISTNAME= isomaster-1.3.1
CATEGORIES=x11
HOMEPAGE= http://littlesvr.ca/isomaster/
MAINTAINER=Giovanni Bechis [EMAIL PROTECTED]
-# GPL
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
@@ -30,5 +30,8 @@
USE_X11= Yes
USE_GMAKE= Yes
NO_REGRESS=Yes
+
+FAKE_FLAGS=MYMANPATH=${WRKINST}/${TRUEPREFIX}/man/man1 \
+ DESTDIR=
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/x11/isomaster/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo15 Mar 2008 11:54:24 - 1.4
+++ distinfo28 Mar 2008 11:10:16 -
@@ -1,5 +1,5 @@
-MD5 (isomaster-1.3.tar.bz2) = CRaJMC3EFwVwbaAyPE/r8w==
-RMD160 (isomaster-1.3.tar.bz2) = UV0WUxmnFANc6zXmlzwe6n8eo4E=
-SHA1 (isomaster-1.3.tar.bz2) = 2aHpf0d0EzCmH/zf0S77O7+GECM=
-SHA256 (isomaster-1.3.tar.bz2) = W1v6p/R6ie/e9ao5hUQsKW/lFibiuc/whoXs5QYSKDE=
-SIZE (isomaster-1.3.tar.bz2) = 191258
+MD5 (isomaster-1.3.1.tar.bz2) = 6GECkZEFZiBjrClL7+GEcg==
+RMD160 (isomaster-1.3.1.tar.bz2) = 6giHk3+2Ag+JbrmbbxYymEw/Vl8=
+SHA1 (isomaster-1.3.1.tar.bz2) = RKF1+hcqMRrFt/lXYu22gfLuV44=
+SHA256 (isomaster-1.3.1.tar.bz2) = WSYowL0AbJq0TIyevKcfvTXv9KuB7Ksso0g2SkCGtcE=
+SIZE (isomaster-1.3.1.tar.bz2) = 194619
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/isomaster/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile
--- patches/patch-Makefile 15 Mar 2008 11:54:24 - 1.4
+++ patches/patch-Makefile 28 Mar 2008 11:10:16 -
@@ -1,22 +1,6 @@
$OpenBSD: patch-Makefile,v 1.4 2008/03/15 11:54:24 steven Exp $
--- Makefile.orig Wed Dec 12 22:48:16 2007
+++ Makefile Sat Mar 15 12:50:37 2008
-@@ -1,5 +1,5 @@
- # Other paths are relative to this.
--PREFIX ?= /usr/local
-+PREFIX ?= ${PREFIX}
-
- # Where to install the executable.
- BINPATH ?= $(PREFIX)/bin
-@@ -14,7 +14,7 @@ export ICONPATH ?= $(PREFIX)/share/isomaster/icons
- export LOCALEDIR ?= $(PREFIX)/share/locale
-
- # Where to install the man page.
--MYMANPATH ?= $(PREFIX)/share/man/man1
-+MYMANPATH ?= $(PREFIX)/man/man1
-
- # Where to install the .desktop file
- DESKTOPPATH ?= $(PREFIX)/share/applications
@@ -64,7 +64,7 @@ all: translations isomaster.desktop isomaster
isomaster: $(OBJECTS) lib iniparser
@@ -26,35 +10,3 @@
# static pattern rule
$(OBJECTS): %.o: %.c %.h bk/bk.h Makefile
-@@ -97,22 +97,22 @@ endif
- # for info about DESTDIR see
http://www.gnu.org/prep/standards/html_node/DESTDIR.html
-
- install: all
-- $(INSTALL) -d $(DESTDIR)$(BINPATH)
-- $(INSTALL) isomaster $(DESTDIR)$(BINPATH)
-+ $(INSTALL) -d $(BINPATH)
-+ $(INSTALL) isomaster $(BINPATH)
- cd icons $(MAKE) install
- ifndef WITHOUT_NLS
- cd po $(MAKE) install
- endif
-- $(INSTALL) -d $(DESTDIR)$(MYMANPATH)
-- $(INSTALL) -m 644 isomaster.1 $(DESTDIR)$(MYMANPATH)
-- $(INSTALL) -d $(DESTDIR)$(DESKTOPPATH)
-- $(INSTALL) -m 644 isomaster.desktop $(DESTDIR)$(DESKTOPPATH)
-+ $(INSTALL) -d $(MYMANPATH)
-+ $(INSTALL) -m 644 isomaster.1 $(MYMANPATH)
-+ $(INSTALL) -d $(DESKTOPPATH)
-+ $(INSTALL) -m 644 isomaster.desktop $(DESKTOPPATH)
-
- uninstall:
-- $(RM) $(DESTDIR)$(BINPATH)/isomaster
-+ $(RM) $(BINPATH)/isomaster
- cd icons $(MAKE) uninstall
- ifndef WITHOUT_NLS
- cd po $(MAKE) uninstall
- endif
-- $(RM) $(DESTDIR)$(MYMANPATH)/isomaster.1
-- $(RM) $(DESTDIR)$(DESKTOPPATH)/isomaster.desktop
-+ $(RM) $(MYMANPATH)/isomaster.1
-+ $(RM) $(DESKTOPPATH)/isomaster.desktop
Index: patches/patch-icons_Makefile
===
RCS file: /cvs/ports/x11/isomaster/patches/patch-icons_Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-icons_Makefile
--- patches/patch-icons_Makefile30 Jun 2007 21:52:02 - 1.1.1.1
+++ patches/patch-icons_Makefile28 Mar 2008 11:10:16 -
@@ -1,19 +1,16 @@
$OpenBSD: patch-icons_Makefile,v 1.1.1.1 2007/06/30 21:52:02 kili Exp $
--- icons/Makefile.origThu Jan 18 20:45:09 2007
+++ icons/Makefile Fri Jun 22 22:04:31 2007
-@@ -3,12 +3,12 @@
- ICONS = isomaster.png go-back-kearone.png folder-new-kearone.png
Issue porting a program to OpenBSD
Hi there all,... I used to maintain a small semi-embedded GNU/Linux system at my previous employer and I really enjoyed that. But now I'd like to try my had at building a dedicated OSPF/BGP route/firewall appliance based on OpenBSD. I have a particular liking for the pkgutils package manager written by Per Linden and would like to build my own OpenBSD release using this package manager (yeah I'm bored, and have a few reasons of my own for liking it). 'Cept I'm having an issue compiling it,... I've installed OpenBSD 4.2-release with no updates as yet (I'm behind an ISA proxy :( and they block just about the whole planet lol) On top of that I've installed: gmake-3.80p1.tgz libiconv-1.9.2p3.tgz gettext-0.14.6p0.tgz and libarchive-2.4.14 from source (couldn't find a binary package) When I try compile the package (pkgutils-5.32.0) I get the following error, any thoughts??? # gmake g++ -DNDEBUG -O2 -Wall -pedantic -D_GNU_SOURCE -DVERSION=\5.32.0\ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -MM main.cc pkgutil.cc pkgadd.cc pkgrm.cc pkginfo.cc .depend g++ -DNDEBUG -O2 -Wall -pedantic -D_GNU_SOURCE -DVERSION=\5.32.0\ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -c -o main.o main.cc g++ -DNDEBUG -O2 -Wall -pedantic -D_GNU_SOURCE -DVERSION=\5.32.0\ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -c -o pkgutil.o pkgutil.cc pkgutil.cc: In member function `void pkgutil::db_open(const std::string)': pkgutil.cc:75: error: no matching function for call to ` __gnu_cxx::stdio_filebufchar, std::char_traitschar ::stdio_filebuf(int, const std::_Ios_Openmode, int)' /usr/include/g++/ext/stdio_filebuf.h:53: error: candidates are: __gnu_cxx::stdio_filebufchar, std::char_traitschar ::stdio_filebuf(const __gnu_cxx::stdio_filebufchar, std::char_traitschar ) /usr/include/g++/ext/stdio_filebuf.h:147: error: __gnu_cxx::stdio_filebuf_CharT, _Traits::stdio_filebuf(std::__c_file*, std::_Ios_Openmode, long unsigned int) [with _CharT = char, _Traits = std::char_traitschar] near match /usr/include/g++/ext/stdio_filebuf.h:122: error: __gnu_cxx::stdio_filebuf_CharT, _Traits::stdio_filebuf(int, std::_Ios_Openmode, bool, long unsigned int) [with _CharT = char, _Traits = std::char_traitschar] pkgutil.cc: In member function `void pkgutil::db_commit()': pkgutil.cc:119: error: no matching function for call to ` __gnu_cxx::stdio_filebufchar, std::char_traitschar ::stdio_filebuf(int, const std::_Ios_Openmode, int)' /usr/include/g++/ext/stdio_filebuf.h:53: error: candidates are: __gnu_cxx::stdio_filebufchar, std::char_traitschar ::stdio_filebuf(const __gnu_cxx::stdio_filebufchar, std::char_traitschar ) /usr/include/g++/ext/stdio_filebuf.h:147: error: __gnu_cxx::stdio_filebuf_CharT, _Traits::stdio_filebuf(std::__c_file*, std::_Ios_Openmode, long unsigned int) [with _CharT = char, _Traits = std::char_traitschar] near match /usr/include/g++/ext/stdio_filebuf.h:122: error: __gnu_cxx::stdio_filebuf_CharT, _Traits::stdio_filebuf(int, std::_Ios_Openmode, bool, long unsigned int) [with _CharT = char, _Traits = std::char_traitschar] gmake: *** [pkgutil.o] Error 1 #
gtk+2 CUPS support
Hi.
This diff adds a -cups subpackage to our gtk+2.
This allows easy printing to CUPS printers from applications using
gtkprint (lots of apps, like leafpad, eog..!).
Since more and more applications seem to migrate from gnomeprint to
gtkprint, this could be a really nice addition.
I'd really like this to go in.
Comments/OK?
--
AntoineIndex: Makefile
===
RCS file: /cvs/ports/x11/gtk+2/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- Makefile9 Feb 2008 17:55:39 - 1.60
+++ Makefile28 Mar 2008 13:37:00 -
@@ -3,12 +3,14 @@
SHARED_ONLY= Yes
COMMENT-main= multi-platform graphical toolkit
-COMMENT-docs= gtk+-2 documentation
+COMMENT-docs= gtk+2 documentation
+COMMENT-cups= gtk+2 CUPS print backend
VERSION= 2.12.7
DISTNAME= gtk+-${VERSION}
-PKGNAME-main= gtk+2-${VERSION}
+PKGNAME-main= gtk+2-${VERSION}p0
PKGNAME-docs= gtk+2-docs-${VERSION}
+PKGNAME-cups= gtk+2-cups-${VERSION}
SHARED_LIBS += gdk_pixbuf-2.0 1200.7 # .1200.7
SHARED_LIBS += gdk-x11-2.0 1200.7 # .1200.7
SHARED_LIBS += gtk-x11-2.0 1200.7 # .1200.7
@@ -26,26 +28,37 @@
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/2.12/}
EXTRACT_SUFX= .tar.bz2
-MULTI_PACKAGES=-main -docs
+MULTI_PACKAGES=-main -docs -cups
-WANTLIB-main= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
- Xfixes Xi Xinerama Xrender Xrandr c cairo expat \
- fontconfig freetype glib-2.0 glitz m gmodule-2.0 \
- gobject-2.0 gthread-2.0 pcre pthread z
-
-MODULES= devel/gettext
-
-LIB_DEPENDS=
glib-2.0.=1000.0,gmodule-2.0.=1000.0,gobject-2.0.=1000.0::devel/glib2 \
-
pango-1.0.=1300.0,pangocairo-1.0.=1300.0,pangoft2-1.0.=1300.0::devel/pango \
- atk-1.0.=1809.0::devel/atk \
- tiff.=35::graphics/tiff \
- png.=3::graphics/png \
- jpeg.=62::graphics/jpeg
-RUN_DEPENDS= ::x11/hicolor-icon-theme
+WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+ Xfixes Xi Xinerama Xrandr Xrender cairo expat \
+ fontconfig freetype glitz m pcre z
+
+MODULES= devel/gettext
+
+BUILD_DEPENDS= ::print/cups
+RUN_DEPENDS= ::x11/hicolor-icon-theme
+
+LIB_DEPENDS-main= ${LIB_DEPENDS} \
+
glib-2.0.=1000.0,gmodule-2.0.=1000.0,gobject-2.0.=1000.0,gthread-2.0::devel/glib2
\
+
pango-1.0.=1300.0,pangocairo-1.0.=1300.0,pangoft2-1.0.=1300.0::devel/pango \
+ atk-1.0.=1809.0::devel/atk \
+ tiff.=35::graphics/tiff \
+ png.=3::graphics/png \
+ jpeg.=62::graphics/jpeg
+WANTLIB-main= ${WANTLIB} c pthread
LIB_DEPENDS-docs=
RUN_DEPENDS-docs=
-PKG_ARCH-docs= *
+WANTLIB-docs=
+PKG_ARCH-docs= *
+
+LIB_DEPENDS-cups= ${LIB_DEPENDS} \
+ cups.=3::print/cups \
+
gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::${BASE_PKGPATH},-main
+WANTLIB-cups= ${WANTLIB} atk-1.0 crypto glib-2.0 gmodule-2.0 \
+ gobject-2.0 pango-1.0 pangocairo-1.0 \
+ pangoft2-1.0 png ssl
USE_X11= Yes
USE_GMAKE= Yes
@@ -54,8 +67,7 @@
CONFIGURE_ARGS+= --disable-gtk-doc \
--with-xinput=yes
CONFIGURE_ENV= CPPFLAGS=-I${X11BASE}/include/freetype2/
-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng \
- LDFLAGS=-L${LOCALBASE}/lib \
- ENABLE_CUPS=no
+ LDFLAGS=-L${LOCALBASE}/lib
# The regression tests require a running instance of X.
# You will also need to set the XAUTHORITY environment variable to point
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 9 Feb 2008 17:55:39 - 1.19
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure,v 1.19 2008/02/09 17:55:39 jasper Exp $
configure.orig Wed Jan 30 04:13:49 2008
-+++ configure Fri Feb 1 14:23:41 2008
-@@ -32939,7 +32939,9 @@ fi
-
- fi
-
--
-+if test x$ENABLE_CUPS != xyes; then
-+ CUPS_CONFIG=no
-+fi
- if test x$CUPS_CONFIG != xno; then
- HAVE_CUPS_TRUE=
- HAVE_CUPS_FALSE='#'
Index:
UPDATE: mail/amavisd-new
Amavisd-new updated to latest version 2.5.4,
some bugs has been fixed; I have enabled some addictional utilities.
Cheers
Giovanni
Index: Makefile
===
RCS file: /cvs/ports/mail/amavisd-new/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile4 Jan 2008 02:53:52 - 1.6
+++ Makefile28 Mar 2008 14:05:07 -
@@ -2,7 +2,7 @@
COMMENT= interface between mailer MTA and content checkers
-DISTNAME= amavisd-new-2.5.3
+DISTNAME= amavisd-new-2.5.4
CATEGORIES=mail security
HOMEPAGE= http://www.ijs.si/software/amavisd/
@@ -14,7 +14,11 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${HOMEPAGE}
+MASTER_SITES= ${HOMEPAGE} \
+ http://mirrors.catpipe.net/amavisd-new/ \
+ http://mirror.mainloop.se/amavisd/ \
+ http://mirror.cedratnet.com/amavisd-new/ \
+ http://mirror.omroep.nl/amavisd-new/
RUN_DEPENDS= ::archivers/arc \
::archivers/bzip2 \
@@ -33,6 +37,7 @@ RUN_DEPENDS= ::archivers/arc \
::converters/p5-Convert-TNEF \
::converters/rpm2cpio \
:p5-Convert-UUlib-=1.05:converters/p5-Convert-UUlib \
+ ::databases/p5-BerkeleyDB \
::devel/p5-Net-Server \
::mail/p5-Mail-SpamAssassin \
::mail/p5-MIME-tools \
@@ -45,6 +50,12 @@ PKG_ARCH=*
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/amavisd ${PREFIX}/sbin/amavisd
+ ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-agent \
+ ${PREFIX}/bin/amavisd-agent
+ ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-nanny \
+ ${PREFIX}/bin/amavisd-nanny
+ ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-release \
+ ${PREFIX}/bin/amavisd-release
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amavisd-new
${INSTALL_DATA} ${WRKSRC}/AAAREADME.first \
${PREFIX}/share/doc/amavisd-new
Index: distinfo
===
RCS file: /cvs/ports/mail/amavisd-new/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo4 Jan 2008 02:53:52 - 1.6
+++ distinfo28 Mar 2008 14:05:07 -
@@ -1,5 +1,5 @@
-MD5 (amavisd-new-2.5.3.tar.gz) = XPGnpIGFXGcSN4wEdQWCVQ==
-RMD160 (amavisd-new-2.5.3.tar.gz) = Sbl/83grQviqunvrc0QDmNg2ONk=
-SHA1 (amavisd-new-2.5.3.tar.gz) = LhRgrVBa1CUah27FBtAho5LHwMA=
-SHA256 (amavisd-new-2.5.3.tar.gz) =
9yRlThXqs/q84ihzpfKg/PLbk3TKhJec8Gaik2DuUz0=
-SIZE (amavisd-new-2.5.3.tar.gz) = 789275
+MD5 (amavisd-new-2.5.4.tar.gz) = nUgstVXh6MCDTba5CEO0pA==
+RMD160 (amavisd-new-2.5.4.tar.gz) = w3jnDSVMADy52Tm6nckUDlXqoC8=
+SHA1 (amavisd-new-2.5.4.tar.gz) = xjc1WU7LwFhQrfgbzTDhk+uHPjg=
+SHA256 (amavisd-new-2.5.4.tar.gz) =
G4QQ8CPJTczmGwUQ/HNxBvTDWoz/7oHBk2TNuGxIrys=
+SIZE (amavisd-new-2.5.4.tar.gz) = 791835
Index: patches/patch-amavisd
===
RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd,v
retrieving revision 1.4
diff -u -p -r1.4 patch-amavisd
--- patches/patch-amavisd 27 Nov 2007 13:53:19 - 1.4
+++ patches/patch-amavisd 28 Mar 2008 14:05:07 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-amavisd,v 1.4 2007/11/27 13:53:19 okan Exp $
amavisd.orig Wed Jun 27 12:43:00 2007
-+++ amavisdSat Nov 24 10:18:12 2007
+--- amavisd.orig Wed Mar 12 20:06:37 2008
amavisdThu Mar 20 12:16:13 2008
@@ -153,7 +153,7 @@ sub fetch_modules($$@) {
BEGIN {
@@ -10,7 +10,7 @@ $OpenBSD: patch-amavisd,v 1.4 2007/11/27
IO::Handle IO::File IO::Socket IO::Socket::UNIX IO::Socket::INET
IO::Wrap IO::Stringy Digest::MD5 Unix::Syslog File::Basename
Compress::Zlib MIME::Base64 MIME::QuotedPrint MIME::Words
-@@ -17909,7 +17909,7 @@ sub initializeSpamAssassin {
+@@ -18019,7 +18019,7 @@ sub initializeSpamAssassin {
local_tests_only = $sa_local_tests_only,
home_dir_for_helpers = $helpers_home,
stop_at_threshold = 0,
Index: patches/patch-amavisd-agent
===
RCS file: patches/patch-amavisd-agent
diff -N patches/patch-amavisd-agent
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-amavisd-agent 28 Mar 2008 14:05:07 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- amavisd-agent.orig Thu Mar 20 12:21:58 2008
amavisd-agent Thu Mar 20 12:22:16 2008
+@@ -146,7 +146,7 @@ sub fmt_ticks($) {
+ { die Usage: $0 [ -w wait-interval ]\n }
+ }
+ my($env) = BerkeleyDB::Env-new(
+-'-Home'='/var/amavis/db', '-Flags'= DB_INIT_CDB | DB_INIT_MPOOL);
++'-Home'='/var/amavisd/db', '-Flags'= DB_INIT_CDB |
Re: [new] shmux
On Wed, Mar 19, 2008 at 01:16:14PM +0100, [EMAIL PROTECTED] wrote: And it seems that it has fping as a hidden RUN_DEPENDS (use -P switch), but wh ship it as only executable by root.. Yes, shmux can use fping; i was aware of it. (Frankly, I use shmux without fping for more than 2 years without any trouble.) To make it fully functional, you are right, fping has to be a dependancy. Also, i'd prefer ALL_TARGET=shmux for the sake of clarification, and also REGRESS_TARGET=test to have make regress happy. Simon@ pointed out that PERMIT_DISTFILE_CDROM could be set to no, as clause (1) speaks about 'reasonable fee'.. but anyway we don't ship distfiles on CDROM. I'm not a licence expert, but this licence scares me. Landry OK, it is done. Could you please have a look? Thanks, Later. -- Olivier Cherrier mailto:[EMAIL PROTECTED] shmux.taz Description: Binary data
SECURITY FIX: sdl-image
hi,
this fixes two buffer overflows in IMG_gif.c and IMG_lbm.c.
ok?
cheers,
jasper
--
The good life is one inspired by love and guided by knowledge.
-- Bertrand Russel
SECURITY FIX for http://secunia.com/advisories/28640/
Patches were taken from libsdl's svn.
Index: Makefile
===
RCS file: /cvs/ports/devel/sdl-image/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- Makefile14 Oct 2007 08:22:17 - 1.26
+++ Makefile28 Mar 2008 17:41:39 -
@@ -2,7 +2,7 @@
COMMENT= SDL image library
DISTNAME= SDL_image-1.2.4
-PKGNAME= ${DISTNAME:L:S/_/-/}p3
+PKGNAME= ${DISTNAME:L:S/_/-/}p4
SHARED_LIBS= SDL_image 2.0
CATEGORIES=devel graphics
MASTER_SITES= ftp://ftp.fr.freebsd.org/pub/FreeBSD/distfiles/ \
Index: patches/patch-IMG_gif_c
===
RCS file: patches/patch-IMG_gif_c
diff -N patches/patch-IMG_gif_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-IMG_gif_c 28 Mar 2008 17:41:39 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- IMG_gif.c.orig Fri Mar 28 18:36:08 2008
IMG_gif.c Fri Mar 28 18:36:54 2008
+@@ -406,6 +406,10 @@ LWZReadByte(SDL_RWops *src, int flag, int input_code_s
+ static int stack[(1 (MAX_LWZ_BITS)) * 2], *sp;
+ register int i;
+
++/* Fixed buffer overflow found by Michael Skladnikiewicz */
++if (input_code_size MAX_LWZ_BITS)
++return -1;
++
+ if (flag) {
+ set_code_size = input_code_size;
+ code_size = set_code_size + 1;
Index: patches/patch-IMG_lbm_c
===
RCS file: patches/patch-IMG_lbm_c
diff -N patches/patch-IMG_lbm_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-IMG_lbm_c 28 Mar 2008 17:41:39 -
@@ -0,0 +1,29 @@
+$OpenBSD$
+--- IMG_lbm.c.orig Fri Mar 28 18:37:11 2008
IMG_lbm.c Fri Mar 28 18:39:09 2008
+@@ -30,6 +30,7 @@
+EHB and HAM (specific Amiga graphic chip modes) support added by Marc Le
Douarain
+(http://www.multimania.com/mavati) in December 2003.
+Stencil and colorkey fixes by David Raulo (david.raulo AT free DOT fr) in
February 2004.
++ Buffer overflow fix in RLE decompression by David Raulo in January 2008.
+ */
+
+ #include stdio.h
+@@ -321,7 +322,7 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *src )
+ count ^= 0xFF;
+ count += 2; /* now it */
+
+- if ( !SDL_RWread( src, color,
1, 1 ) )
++ if ( ( count remainingbytes )
|| !SDL_RWread( src, color, 1, 1 ) )
+ {
+ error=error reading BODY
chunk;
+ goto done;
+@@ -332,7 +333,7 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *src )
+ {
+ ++count;
+
+- if ( !SDL_RWread( src, ptr,
count, 1 ) )
++ if ( ( count remainingbytes )
|| !SDL_RWread( src, ptr, count, 1 ) )
+ {
+ error=error reading BODY
chunk;
+ goto done;
UPDATE: lang/lua
- bug-fix release 5.1.3
- regen patches with libversion from Makefile
http://www.lua.org/bugs.html#5.1.3
tested on i386
--
Christian Rueger
Index: Makefile
===
RCS file: /cvs/openbsd/ports/lang/lua/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile29 Oct 2007 22:38:42 - 1.33
+++ Makefile28 Mar 2008 18:36:25 -
@@ -2,8 +2,7 @@
COMMENT= powerful, light-weight programming language
-DISTNAME= lua-5.1.2
-PKGNAME= ${DISTNAME}p1
+DISTNAME= lua-5.1.3
CATEGORIES=lang
MASTER_SITES= http://www.lua.org/ftp/ \
@@ -23,6 +22,7 @@ PERMIT_DISTFILES_FTP= Yes
SHARED_ONLY= Yes
SHARED_LIBS= lua 5.1
+MAKE_FLAGS+= LIBlua_VERSION=${LIBlua_VERSION}
WANTLIB= c m edit curses
NO_REGRESS=Yes
Index: distinfo
===
RCS file: /cvs/openbsd/ports/lang/lua/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo5 Apr 2007 16:20:00 - 1.9
+++ distinfo24 Mar 2008 12:35:51 -
@@ -1,5 +1,5 @@
-MD5 (lua-5.1.2.tar.gz) = aHzkwqHd/xjxAISQ/cTl4A==
-RMD160 (lua-5.1.2.tar.gz) = ATUFSbOgWDiSXa4aZmcAu58bwBo=
-SHA1 (lua-5.1.2.tar.gz) = ikYNLX5w6Ty3K/PVhEBUZHY8tfA=
-SHA256 (lua-5.1.2.tar.gz) = XPCYxv5o09LZIhkE8QF/8ChuSpzBZqFFKkVt+biLPZ4=
-SIZE (lua-5.1.2.tar.gz) = 214134
+MD5 (lua-5.1.3.tar.gz) = pwqN+qFQ4EeGbcAaRiclmQ==
+RMD160 (lua-5.1.3.tar.gz) = HFl53UmGBX/vMlqirwyHK77KuS4=
+SHA1 (lua-5.1.3.tar.gz) = ibyfWjUUAlZbgHfoEjMn580V8AQ=
+SHA256 (lua-5.1.3.tar.gz) = a13y7apeAr8aLYXhRCsuMpSTswsMB4D3cZnSTwh9KW0=
+SIZE (lua-5.1.3.tar.gz) = 215817
Index: patches/patch-Makefile
===
RCS file: /cvs/openbsd/ports/lang/lua/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile 29 Oct 2007 20:30:32 - 1.5
+++ patches/patch-Makefile 24 Mar 2008 13:54:29 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.5 2007/10/29 20:30:32 espie Exp $
Makefile.orig Sun Mar 25 16:44:39 2007
-+++ Makefile Mon Oct 29 21:26:20 2007
+--- Makefile.orig Thu Jan 17 18:53:37 2008
Makefile Mon Mar 24 14:54:18 2008
@@ -5,14 +5,14 @@
# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT
===
@@ -18,12 +18,12 @@ $OpenBSD: patch-Makefile,v 1.5 2007/10/2
INSTALL_BIN= $(INSTALL_TOP)/bin
INSTALL_INC= $(INSTALL_TOP)/include
INSTALL_LIB= $(INSTALL_TOP)/lib
-@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw
+@@ -38,7 +38,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw
# What to install.
TO_BIN= lua luac
TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
-TO_LIB= liblua.a
-+TO_LIB= liblua.a liblua.so.5.1
++TO_LIB= liblua.a liblua.so.${LIBlua_VERSION}
TO_MAN= lua.1 luac.1
# Lua version and release.
Index: patches/patch-etc_lua_pc
===
RCS file: /cvs/openbsd/ports/lang/lua/patches/patch-etc_lua_pc,v
retrieving revision 1.3
diff -u -p -r1.3 patch-etc_lua_pc
--- patches/patch-etc_lua_pc29 Oct 2007 22:38:42 - 1.3
+++ patches/patch-etc_lua_pc28 Mar 2008 18:34:46 -
@@ -2,7 +2,6 @@ $OpenBSD: patch-etc_lua_pc,v 1.3 2007/10
--- etc/lua.pc.origFri Mar 23 20:58:49 2007
+++ etc/lua.pc Mon Oct 29 21:26:20 2007
@@ -8,7 +8,7 @@ V= 5.1
- R= 5.1.2
# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
-prefix= /usr/local
Index: patches/patch-src_Makefile
===
RCS file: /cvs/openbsd/ports/lang/lua/patches/patch-src_Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_Makefile
--- patches/patch-src_Makefile 29 Oct 2007 20:30:32 - 1.4
+++ patches/patch-src_Makefile 24 Mar 2008 13:17:55 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_Makefile,v 1.4 2007/10/29 20:30:32 espie Exp $
src/Makefile.orig Sun Mar 25 16:49:23 2007
-+++ src/Makefile Mon Oct 29 21:28:39 2007
+--- src/Makefile.orig Sat Jan 19 20:37:58 2008
src/Makefile Mon Mar 24 14:17:33 2008
@@ -7,8 +7,7 @@
# Your platform. See PLATS for possible values.
PLAT= none
@@ -15,7 +15,7 @@ $OpenBSD: patch-src_Makefile,v 1.4 2007/
LUAC_T= luac
LUAC_O= luac.o print.o
-+LUA_SO= liblua.so.5.1
++LUA_SO= liblua.so.${LIBlua_VERSION}
ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
Index: patches/patch-src_lparser_c
===
RCS file: /cvs/openbsd/ports/lang/lua/patches/patch-src_lparser_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_lparser_c
--- patches/patch-src_lparser_c 15 Sep 2007 09:42:57 - 1.1
+++ patches/patch-src_lparser_c 24 Mar 2008 13:07:04 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_lparser_c,v 1.1
UPDATE: x11/dmenu
3.4 - 3.5 Index: Makefile === RCS file: /cvs/ports/x11/dmenu/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile27 Oct 2007 12:33:53 - 1.5 +++ Makefile28 Mar 2008 19:04:02 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.5 2007/10/27 12:33:53 merdely Exp $ COMMENT= dynamic menu for X11 -DISTNAME= dmenu-3.4 +DISTNAME= dmenu-3.5 CATEGORIES=x11 HOMEPAGE= http://www.suckless.org/wiki/tools/xlib Index: distinfo === RCS file: /cvs/ports/x11/dmenu/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- distinfo27 Oct 2007 12:33:53 - 1.5 +++ distinfo28 Mar 2008 19:04:15 - @@ -1,5 +1,5 @@ -MD5 (dmenu-3.4.tar.gz) = m1ydQnxoluUNodx3okBQZQ== -RMD160 (dmenu-3.4.tar.gz) = tb6Ko7wLq8L4kJLaDonf7bDZbak= -SHA1 (dmenu-3.4.tar.gz) = +d77IQ2p/M41mCulov9a2P6NamM= -SHA256 (dmenu-3.4.tar.gz) = QhaoABm4kiSWbtS9ixEUnscajOcGxVGsDPLNSJ4SAJE= -SIZE (dmenu-3.4.tar.gz) = 8131 +MD5 (dmenu-3.5.tar.gz) = 3+y5ym6shTpq58RWP1H2VA== +RMD160 (dmenu-3.5.tar.gz) = Zwd5v8V1yZPRWTRr4eCUD+Bdhf0= +SHA1 (dmenu-3.5.tar.gz) = PzX66kPhHa4TkTveLbXSk6V4Tkc= +SHA256 (dmenu-3.5.tar.gz) = /giWCDonQgHd3CjWStn/5A18yD3/Kbfk7kJJxQOSNVg= +SIZE (dmenu-3.5.tar.gz) = 8203 Index: pkg/PLIST === RCS file: /cvs/ports/x11/dmenu/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- pkg/PLIST 26 May 2007 16:39:45 - 1.2 +++ pkg/PLIST 28 Mar 2008 19:05:21 - @@ -1,4 +1,5 @@ @comment $OpenBSD: PLIST,v 1.2 2007/05/26 16:39:45 ajacoutot Exp $ bin/dmenu bin/dmenu_path +bin/dmenu_run @man man/man1/dmenu.1
UPDATE: x11/dwm
4.7 - 4.8
Index: Makefile
===
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile25 Nov 2007 12:07:06 - 1.6
+++ Makefile28 Mar 2008 19:06:46 -
@@ -2,7 +2,7 @@
COMMENT= dynamic window manager
-V= 4.7
+V= 4.8
DISTNAME= dwm-$V
CATEGORIES=x11
Index: distinfo
===
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo25 Nov 2007 12:07:06 - 1.6
+++ distinfo28 Mar 2008 19:07:25 -
@@ -1,5 +1,5 @@
-MD5 (dwm-4.7.tar.gz) = gnsShRSj7bh+II6E/uDrPw==
-RMD160 (dwm-4.7.tar.gz) = KkZM67ykMcC7GZ/Arp/axIEFwiY=
-SHA1 (dwm-4.7.tar.gz) = 23CkLts4PmU5zOT5qO4fy+Watz0=
-SHA256 (dwm-4.7.tar.gz) = N0gZV/wkf2hgullCdI+PibUmv1uLIQQgAdOE6INgxao=
-SIZE (dwm-4.7.tar.gz) = 17693
+MD5 (dwm-4.8.tar.gz) = dfSZl8SvRXB2iPdk9gTBGQ==
+RMD160 (dwm-4.8.tar.gz) = XV/fEzR7PNJtbjsH/wPch8tbnoI=
+SHA1 (dwm-4.8.tar.gz) = 6o5LpkZM28YM6HlJkCSJJtWpm+g=
+SHA256 (dwm-4.8.tar.gz) = QxtnZ+CQ1LgLQuKt/2pqXH00TG4i6T4N0CLc7CueIRg=
+SIZE (dwm-4.8.tar.gz) = 17879
Index: patches/patch-config_h
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_h,v
retrieving revision 1.3
diff -u -r1.3 patch-config_h
--- patches/patch-config_h 25 Nov 2007 12:07:06 - 1.3
+++ patches/patch-config_h 28 Mar 2008 19:07:44 -
@@ -1,9 +1,10 @@
config.h.orig Sat Nov 24 23:23:08 2007
-+++ config.h Sat Nov 24 23:23:09 2007
-@@ -4,12 +4,12 @@
- #define BARPOSBarTop /* BarBot, BarOff */
+$OpenBSD$
+--- config.h.orig Fri Mar 28 15:50:27 2008
config.h Fri Mar 28 15:50:30 2008
+@@ -3,12 +3,12 @@
+ /* appearance */
#define BORDERPX 1
- #define FONT -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*
+ #define FONT -*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*
-#define NORMBORDERCOLOR #cc
-#define NORMBGCOLOR #cc
-#define NORMFGCOLOR #00
@@ -18,13 +19,13 @@
+#define SELFGCOLOR#f0f0f0
/* tagging */
- const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8,
www };
+ const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8, 9
};
@@ -39,7 +39,7 @@ Key keys[] = {
+ /* modifier key function
argument */
{ MODKEY, XK_p, spawn,
- exe=`dmenu_path | dmenu -fn 'FONT' -nb 'NORMBGCOLOR' -nf
'NORMFGCOLOR'
--sb 'SELBGCOLOR' -sf 'SELFGCOLOR'` exec $exe },
+ exec dmenu_run -fn 'FONT' -nb 'NORMBGCOLOR' -nf
'NORMFGCOLOR' -sb 'SELBGCOLOR' -sf 'SELFGCOLOR' },
- { MODKEY|ShiftMask, XK_Return, spawn, exec uxterm },
+ { MODKEY|ShiftMask, XK_Return, spawn, exec xterm },
- { MODKEY, XK_space, setlayout, NULL },
- { MODKEY, XK_b, togglebar, NULL },
{ MODKEY, XK_j, focusnext, NULL },
+ { MODKEY, XK_k, focusprev, NULL },
+ { MODKEY, XK_r, reapply,NULL },
Re: UPDATE: x11/dmenu
On Fri, Mar 28, 2008 at 05:14:01PM -0300, Gleydson Soares wrote: 3.4 - 3.5 Index: Makefile === RCS file: /cvs/ports/x11/dmenu/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile 27 Oct 2007 12:33:53 - 1.5 +++ Makefile 28 Mar 2008 19:04:02 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.5 2007/10/27 12:33:53 merdely Exp $ COMMENT= dynamic menu for X11 -DISTNAME=dmenu-3.4 +DISTNAME=dmenu-3.5 CATEGORIES= x11 HOMEPAGE=http://www.suckless.org/wiki/tools/xlib Index: distinfo === RCS file: /cvs/ports/x11/dmenu/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- distinfo 27 Oct 2007 12:33:53 - 1.5 +++ distinfo 28 Mar 2008 19:04:15 - @@ -1,5 +1,5 @@ -MD5 (dmenu-3.4.tar.gz) = m1ydQnxoluUNodx3okBQZQ== -RMD160 (dmenu-3.4.tar.gz) = tb6Ko7wLq8L4kJLaDonf7bDZbak= -SHA1 (dmenu-3.4.tar.gz) = +d77IQ2p/M41mCulov9a2P6NamM= -SHA256 (dmenu-3.4.tar.gz) = QhaoABm4kiSWbtS9ixEUnscajOcGxVGsDPLNSJ4SAJE= -SIZE (dmenu-3.4.tar.gz) = 8131 +MD5 (dmenu-3.5.tar.gz) = 3+y5ym6shTpq58RWP1H2VA== +RMD160 (dmenu-3.5.tar.gz) = Zwd5v8V1yZPRWTRr4eCUD+Bdhf0= +SHA1 (dmenu-3.5.tar.gz) = PzX66kPhHa4TkTveLbXSk6V4Tkc= +SHA256 (dmenu-3.5.tar.gz) = /giWCDonQgHd3CjWStn/5A18yD3/Kbfk7kJJxQOSNVg= +SIZE (dmenu-3.5.tar.gz) = 8203 Index: pkg/PLIST === RCS file: /cvs/ports/x11/dmenu/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- pkg/PLIST 26 May 2007 16:39:45 - 1.2 +++ pkg/PLIST 28 Mar 2008 19:05:21 - @@ -1,4 +1,5 @@ @comment $OpenBSD: PLIST,v 1.2 2007/05/26 16:39:45 ajacoutot Exp $ bin/dmenu bin/dmenu_path +bin/dmenu_run @man man/man1/dmenu.1 Hello, in the future please send a mail to the maintainer first :) I suspect that they'll release 3.6 soonish, but anyway. The diff looks fine to me, tested on i386. Users: dmenu is case sensitive now - if you want the old behaviour back, use -i
Re: UPDATE: x11/dmenu
On Fri, Mar 28, 2008 at 05:14:01PM -0300, Gleydson Soares wrote: 3.4 - 3.5 Gleydson, Did you run this by Jim? Both dwm and dmenu are maintained by a pretty responsive guy. Please forward updates like this to the MAINTAINER. Jim: I've tested both on i386 and amd64. Seems ok to me. How about you? Also builds fine on macppc, alpha and sparc64. -ME
Re: UPDATE: x11/dwm
* Gleydson Soares [EMAIL PROTECTED] [080328 16:58]:
4.7 - 4.8
Index: Makefile
===
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 25 Nov 2007 12:07:06 - 1.6
+++ Makefile 28 Mar 2008 19:06:46 -
@@ -2,7 +2,7 @@
COMMENT= dynamic window manager
-V= 4.7
+V= 4.8
DISTNAME=dwm-$V
CATEGORIES= x11
Index: distinfo
===
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 25 Nov 2007 12:07:06 - 1.6
+++ distinfo 28 Mar 2008 19:07:25 -
@@ -1,5 +1,5 @@
-MD5 (dwm-4.7.tar.gz) = gnsShRSj7bh+II6E/uDrPw==
-RMD160 (dwm-4.7.tar.gz) = KkZM67ykMcC7GZ/Arp/axIEFwiY=
-SHA1 (dwm-4.7.tar.gz) = 23CkLts4PmU5zOT5qO4fy+Watz0=
-SHA256 (dwm-4.7.tar.gz) = N0gZV/wkf2hgullCdI+PibUmv1uLIQQgAdOE6INgxao=
-SIZE (dwm-4.7.tar.gz) = 17693
+MD5 (dwm-4.8.tar.gz) = dfSZl8SvRXB2iPdk9gTBGQ==
+RMD160 (dwm-4.8.tar.gz) = XV/fEzR7PNJtbjsH/wPch8tbnoI=
+SHA1 (dwm-4.8.tar.gz) = 6o5LpkZM28YM6HlJkCSJJtWpm+g=
+SHA256 (dwm-4.8.tar.gz) = QxtnZ+CQ1LgLQuKt/2pqXH00TG4i6T4N0CLc7CueIRg=
+SIZE (dwm-4.8.tar.gz) = 17879
Index: patches/patch-config_h
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_h,v
retrieving revision 1.3
diff -u -r1.3 patch-config_h
--- patches/patch-config_h25 Nov 2007 12:07:06 - 1.3
+++ patches/patch-config_h28 Mar 2008 19:07:44 -
@@ -1,9 +1,10 @@
config.h.origSat Nov 24 23:23:08 2007
-+++ config.h Sat Nov 24 23:23:09 2007
-@@ -4,12 +4,12 @@
- #define BARPOS BarTop /* BarBot, BarOff */
+$OpenBSD$
+--- config.h.origFri Mar 28 15:50:27 2008
config.h Fri Mar 28 15:50:30 2008
+@@ -3,12 +3,12 @@
+ /* appearance */
#define BORDERPX1
- #define FONT
-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*
+ #define FONT
-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*
-#define NORMBORDERCOLOR #cc
-#define NORMBGCOLOR #cc
-#define NORMFGCOLOR #00
@@ -18,13 +19,13 @@
+#define SELFGCOLOR #f0f0f0
/* tagging */
- const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8,
www };
+ const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8,
9 };
@@ -39,7 +39,7 @@ Key keys[] = {
+ /* modifier key function
argument */
{ MODKEY, XK_p, spawn,
- exe=`dmenu_path | dmenu -fn 'FONT' -nb 'NORMBGCOLOR' -nf
'NORMFGCOLOR'
- -sb 'SELBGCOLOR' -sf 'SELFGCOLOR'` exec $exe },
+ exec dmenu_run -fn 'FONT' -nb 'NORMBGCOLOR' -nf
'NORMFGCOLOR' -sb 'SELBGCOLOR' -sf 'SELFGCOLOR' },
-{ MODKEY|ShiftMask, XK_Return, spawn, exec uxterm },
+{ MODKEY|ShiftMask, XK_Return, spawn, exec xterm },
- { MODKEY, XK_space, setlayout, NULL },
- { MODKEY, XK_b, togglebar, NULL },
{ MODKEY, XK_j, focusnext, NULL },
+ { MODKEY, XK_k, focusprev, NULL },
+ { MODKEY, XK_r, reapply,NULL },
Please hold off on this. I have a slightly different patch in my tree
that's dependent on Tobias and dmenu. Frankly, I learned a bit from
Tobias port and applied it to dwm. Also, it looks like 4.9 is imminent
and fixes some issues related to multi-head setups.
Thanks,
Jim
Jim
Re: UPDATE: x11/dmenu
On Fri, Mar 28, 2008 at 6:35 PM, Mike Erdely [EMAIL PROTECTED] wrote: On Fri, Mar 28, 2008 at 05:14:01PM -0300, Gleydson Soares wrote: 3.4 - 3.5 Gleydson, Did you run this by Jim? Both dwm and dmenu are maintained by a pretty responsive guy. Please forward updates like this to the MAINTAINER. Jim: I've tested both on i386 and amd64. Seems ok to me. How about you? Also builds fine on macppc, alpha and sparc64. -ME sorry for it. i sent to ports@ because others persons can reply. now, i'll send privately new updates for your respective maintainers. thanks a lot by comments and excellent work,
Re: gtk+2 CUPS support
Antoine Jacoutot [2008-03-28, 14:44:41]: Hi. This diff adds a -cups subpackage to our gtk+2. This allows easy printing to CUPS printers from applications using gtkprint (lots of apps, like leafpad, eog..!). Since more and more applications seem to migrate from gnomeprint to gtkprint, this could be a really nice addition. I'd really like this to go in. Comments/OK? Can this be done after the update? Did you verify whether or not it affects other stuff in the tree?
Re: UPDATE: x11/dmenu
On Fri, Mar 28, 2008 at 05:35:44PM -0400, Mike Erdely wrote: Did you run this by Jim? Both dwm and dmenu are maintained by a pretty responsive guy. Please forward updates like this to the MAINTAINER. Jim: I've tested both on i386 and amd64. Seems ok to me. How about you? As Tobias pointed out, Jim is not the maintainer for dmenu (dwm, though). I just assumed ... -ME
Re: x11/kde/utils3 fails to build
On Sun, Mar 23, 2008 at 01:55:50PM +0100, Marc Espie wrote: I will take care of that at some point in the near future, along with the update to kde 3.5.9. It works now, thank you. Right now, I can't easily commit to C++ ports, because I'm not sure they will build outside my machine, as I'm using a patch that would help with some C++ feature that's not supported in mainstream gcc 3.3... but it causes issues on ppc and arm which I'm trying to solve. -- viq
