mtkbabel for GPS devices based on MTK chipset
Hi! could you please review new port and commit it in tree? /usr/ports/mystuff/geo/mtkbabel$ cat Makefile | grep -i comment COMMENT = MTKBabel is a Perl program to operate with GPS devices. -- sergeyb@ mtkbabel.tar.gz Description: application/tar-gz
[NEW] mtkbabel for GPS devices based on MTK chipset
Hi! could you please review new port and commit it in source tree? /usr/ports/mystuff/geo/mtkbabel$ cat Makefile | grep -i comment COMMENT = MTKBabel is a Perl program to operate with GPS devices. -- sergeyb@ mtkbabel.tar.gz Description: application/tar-gz
PATCH: net/ekg and external libgadu support
Hi,
This is heavly based on patch from pld-linux.org. I've tested ekg with
libgadu-1.10.1 from Brad. Works fine so far. Most important part for
using external libgadu is that compiled in (old) libgadu library in
ekg-1.7 doesn't support 8 digit numeric Gadu-Gadu IDs. External libgadu
in our ports system supports that for quite some time now, as libgadu is
actively developed, ekg not really.
I have one problem with ekg(1), not related to libgadu as issue exists
in current version as well. Not sure when this issue started as I don't
remember this if I look few years back, but I have it for many months
now, but didn't bothered to report it.
Can anyone confirm that resizing the window, in screen, in tmux, or for
example in putty doesn't quite work in ekg? You don't need to be
registered in Gadu-Gadu network to start the ekg client. You will see
problem straight away after resizing the window.
Sending to ports@ for review, looking for feedback.
Index: Makefile
===
RCS file: /cvs/ports/net/ekg/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile18 Oct 2010 18:36:47 - 1.4
+++ Makefile30 Mar 2011 00:15:10 -
@@ -3,6 +3,7 @@
COMMENT= Gadu-Gadu IM protocol client
DISTNAME= ekg-1.7
+REVISION= 0
CATEGORIES=net
HOMEPAGE= http://ekg.chmurka.net/
@@ -15,21 +16,23 @@
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
-WANTLIB= ncurses ssl crypto z c pthread
+WANTLIB= c crypto gadu ncurses pthread ssl z
MASTER_SITES= ${HOMEPAGE}
+LIB_DEPENDS= net/libgadu
+
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
-CONFIGURE_ARGS=--disable-shared \
+CONFIGURE_ARGS=--enable-dynamic \
--with-pthread \
--without-libjpeg \
--without-libgsm \
--without-libungif
-USE_GROFF =Yes
+USE_GROFF= Yes
NO_REGRESS=Yes
.include
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in 30 Mar 2011 00:15:10 -
@@ -0,0 +1,72 @@
+$OpenBSD$
+
+- external libgadu support, from cvs.pld-linux.org
+
+--- Makefile.in.orig Sat Aug 5 16:46:21 2006
Makefile.inTue Mar 29 22:40:31 2011
+@@ -15,11 +15,8 @@ INSTALL = @INSTALL@
+
+ #
+
+-all: configure libgadu @ekg@ @make_ekgwap@
++all: configure @ekg@ @make_ekgwap@
+
+-libgadu:
+- cd lib && $(MAKE) all
+-
+ ekg:
+ cd src && $(MAKE) all
+
+@@ -31,11 +28,8 @@ examples:
+
+ #
+
+-dep: dep-libgadu @dep_ekg@
++dep: @dep_ekg@
+
+-dep-libgadu:
+- cd lib && $(MAKE) dep
+-
+ dep-ekg:
+ cd src && $(MAKE) dep
+
+@@ -46,11 +40,8 @@ configure: configure.in m4/*
+
+ #
+
+-install: all install-libgadu @install_ekg@ @install_ekgwap@
++install: all @install_ekg@ @install_ekgwap@
+
+-install-libgadu:
+- cd lib && $(MAKE) install
+-
+ install-ekg: install-ekg-data install-ekg-man
+ cd src && $(MAKE) install
+
+@@ -93,11 +84,8 @@ uninstall-ekg:
+
+ #
+
+-clean:clean-libgadu @clean_ekg@ clean-examples clean-compat
++clean:@clean_ekg@ clean-examples clean-compat
+
+-clean-libgadu:
+- cd lib && $(MAKE) clean
+-
+ clean-ekg:
+ cd src && $(MAKE) clean
+
+@@ -109,12 +97,9 @@ clean-compat:
+
+ #
+
+-distclean:distclean-libgadu @distclean_ekg@ distclean-examples
distclean-compat
++distclean:@distclean_ekg@ distclean-examples distclean-compat
+ rm -f *~ config.log config.cache config.status config.h Makefile
+ rm -f config.h.in configure aclocal.m4
+-
+-distclean-libgadu:
+- cd lib && $(MAKE) distclean
+
+ distclean-ekg:
+ cd src && $(MAKE) distclean
Index: patches/patch-lib_Makefile_in
===
RCS file: /cvs/ports/net/ekg/patches/patch-lib_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-lib_Makefile_in
--- patches/patch-lib_Makefile_in 15 Oct 2008 14:59:37 - 1.3
+++ patches/patch-lib_Makefile_in 30 Mar 2011 00:15:10 -
@@ -1,4 +1,7 @@
$OpenBSD: patch-lib_Makefile_in,v 1.3 2008/10/15 14:59:37 ajacoutot Exp $
+
+- build without gnu make
+
--- lib/Makefile.in.orig Tue Apr 18 21:05:11 2006
+++ lib/Makefile.inMon Oct 13 13:59:13 2008
@@ -11,7 +11,7 @@ VERSION_MAJOR=3
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/ports/net/ekg/patches/patch-src_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 15 Oct 2008 14:59:37 - 1.2
+++ patches/patch-src_Makefile_in 30 Mar
Re: UPDATE: ffmpeg
On Tue, Mar 29, 2011 at 06:34:02PM -0400, Brad wrote: > On 29/03/11 6:14 PM, Pascal Stumpf wrote: > >On Tue, Mar 29, 2011 at 07:26:11PM +0100, Edd Barrett wrote: > >>On Tue, Mar 29, 2011 at 06:15:21PM +0200, Landry Breuil wrote: > >>>On Tue, Mar 29, 2011 at 05:10:27PM +0100, Edd Barrett wrote: > On Sat, Mar 26, 2011 at 03:01:24PM +, Jacob Meuser wrote: > >>Replacing --disable-altivec by --disable-asm lets ffmpeg build and run > >>in > >>basic testing. I'm not sure we want that fix, nor if its a good thing > >>for all archs. > > > >afaics, we have to, at least on ppc. and on ppc it only affects the > >file that doesn't build. unless there's a binutil update coming ... > > So.. If I see this correctly, this brings us to here: > >>> > >>>You also need jake's fix for libavutil defining _BSD_SOURCE, cf > >>>http://marc.info/?l=openbsd-ports&m=130099604711156&w=2 > >> > >>sure: > >> > >>Index: Makefile > >*snip* > > > >Since the dependency on faad was removed, some ports which depend on > >ffmpeg and have faad WANTLIB need to have an explicit dependency on > >audio/faad added: > > > >audio/xmms2 > >graphics/amide > >graphics/gegl > >multimedia/ffmpeg2theora > >telephony/iaxclient > >www/cherokee > >x11/xfce4/tumbler > > No, these were missed when doing WANTLIB updates. faad needs to be removed. ugh. yeah, I missed some. > > > -- > This message has been scanned for viruses and > dangerous content by MailScanner, and is > believed to be clean. -- jake...@sdf.lonestar.org SDF Public Access UNIX System - http://sdf.lonestar.org
Re: UPDATE: ffmpeg
On 29/03/11 6:14 PM, Pascal Stumpf wrote: On Tue, Mar 29, 2011 at 07:26:11PM +0100, Edd Barrett wrote: On Tue, Mar 29, 2011 at 06:15:21PM +0200, Landry Breuil wrote: On Tue, Mar 29, 2011 at 05:10:27PM +0100, Edd Barrett wrote: On Sat, Mar 26, 2011 at 03:01:24PM +, Jacob Meuser wrote: Replacing --disable-altivec by --disable-asm lets ffmpeg build and run in basic testing. I'm not sure we want that fix, nor if its a good thing for all archs. afaics, we have to, at least on ppc. and on ppc it only affects the file that doesn't build. unless there's a binutil update coming ... So.. If I see this correctly, this brings us to here: You also need jake's fix for libavutil defining _BSD_SOURCE, cf http://marc.info/?l=openbsd-ports&m=130099604711156&w=2 sure: Index: Makefile *snip* Since the dependency on faad was removed, some ports which depend on ffmpeg and have faad WANTLIB need to have an explicit dependency on audio/faad added: audio/xmms2 graphics/amide graphics/gegl multimedia/ffmpeg2theora telephony/iaxclient www/cherokee x11/xfce4/tumbler No, these were missed when doing WANTLIB updates. faad needs to be removed. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: _rsync user for rsync
Hi Antoine, Antoine Jacoutot wrote on Tue, Mar 29, 2011 at 09:45:50AM +0200: > This diff makes rsync use "_rsync" as default user instead of "nobody". Actually, this makes _rsync the default user for two completely unrelated purposes: The default user a client uses when connecting to a server, and the default user a server drops privilege to when running as root and accessing files to serve to a client. Using the same user for both is not required - actually, the username used for the first purpose need not actually exist on any computer. However, maybe you are right that using the same name for both does no harm either, and using anything else might clash with something else. [...] > Index: patches/patch-clientserver_c > === > RCS file: patches/patch-clientserver_c > diff -N patches/patch-clientserver_c > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-clientserver_c 29 Mar 2011 07:28:10 - > @@ -0,0 +1,14 @@ > +$OpenBSD$ > +--- clientserver.c.orig Mon Mar 28 14:28:49 2011 > clientserver.c Mon Mar 28 14:29:08 2011 > +@@ -413,8 +413,8 @@ static int rsync_module(int f_in, int f_out, int i, ch > + int argc; > + char **argv, **orig_argv, **orig_early_argv, *module_chdir; > + char line[BIGPATHBUFLEN]; > +-uid_t uid = (uid_t)-2; /* canonically "nobody" */ > +-gid_t gid = (gid_t)-2; > ++uid_t uid = (uid_t)669; /* canonically "_rsync" */ > ++gid_t gid = (gid_t)669; > + char *p, *err_msg = NULL; > + char *name = lp_name(i); > + int use_chroot = lp_use_chroot(i); On first sight, that looks wrong, because on a particular system, uid and gid 669 might be something else. However, from code inspection, i conclude that the initial values of these two variables are never used. When running as root, they are overwritten before use, otherwise, these two variables are never used at all. So, the patch seems correct by virtue of having no effect. > Index: patches/patch-rsyncd_conf_5 > === > RCS file: /cvs/ports/net/rsync/patches/patch-rsyncd_conf_5,v > retrieving revision 1.1 > diff -u -u -r1.1 patch-rsyncd_conf_5 > --- patches/patch-rsyncd_conf_5 7 Mar 2011 19:48:20 - 1.1 > +++ patches/patch-rsyncd_conf_5 29 Mar 2011 07:28:10 - > @@ -1,6 +1,6 @@ > $OpenBSD: patch-rsyncd_conf_5,v 1.1 2011/03/07 19:48:20 ajacoutot Exp $ > rsyncd.conf.5.orig Thu Dec 31 22:15:51 2009 > -+++ rsyncd.conf.5Tue Feb 22 11:22:44 2011 > +--- rsyncd.conf.5.orig Sat Mar 26 22:37:52 2011 > rsyncd.conf.5Mon Mar 28 14:31:04 2011 > @@ -67,12 +67,11 @@ When run via inetd you should add a line like this to > and a single line something like this to /etc/inetd.conf: > .PP > @@ -16,6 +16,25 @@ > reread its config file. > .PP > Note that you should \fBnot\fP send the rsync daemon a HUP signal to force > +@@ -341,14 +340,14 @@ for modules to be listable. > + This parameter specifies the user name or user ID that > + file transfers to and from that module should take place as when the daemon > + was run as root. In combination with the \(dq\&gid\(dq\& parameter this > determines what > +-file permissions are available. The default is uid \-2, which is normally > +-the user \(dq\&nobody\(dq\&. > ++file permissions are available. The default is uid 669, which is normally > ++the user \(dq\&_rsync\(dq\&. >From code inspection, i conclude that both the old text and the new text are incorrect. The correct statements would be: - The default is "nobody". (before your patches) + The default is "_rsync". (after your patches) That's it, because the numerical default is never used, as discussed above. What is used is the string contained in the gid/uid struct member of the respective service, which in the default case is defined by the NOBODY_GROUP/NOBODY_USER configure variables, see loadparm.c, which you happily patch. In case that string does not resolve to an actual user/group, clientserver.c, function rsync_module() errors out instead of using the numbers. That said, i'm now a bit scared of running rsync. The security relevant parts of it are full of XXX and TODO. :-( That software was hardly written with security in mind. Yours, Ingo
Re: UPDATE: ffmpeg
On Tue, Mar 29, 2011 at 07:26:11PM +0100, Edd Barrett wrote: > On Tue, Mar 29, 2011 at 06:15:21PM +0200, Landry Breuil wrote: > > On Tue, Mar 29, 2011 at 05:10:27PM +0100, Edd Barrett wrote: > > > On Sat, Mar 26, 2011 at 03:01:24PM +, Jacob Meuser wrote: > > > > > Replacing --disable-altivec by --disable-asm lets ffmpeg build and > > > > > run in > > > > > basic testing. I'm not sure we want that fix, nor if its a good thing > > > > > for all archs. > > > > > > > > afaics, we have to, at least on ppc. and on ppc it only affects the > > > > file that doesn't build. unless there's a binutil update coming ... > > > > > > So.. If I see this correctly, this brings us to here: > > > > You also need jake's fix for libavutil defining _BSD_SOURCE, cf > > http://marc.info/?l=openbsd-ports&m=130099604711156&w=2 > > sure: > > Index: Makefile *snip* Since the dependency on faad was removed, some ports which depend on ffmpeg and have faad WANTLIB need to have an explicit dependency on audio/faad added: audio/xmms2 graphics/amide graphics/gegl multimedia/ffmpeg2theora telephony/iaxclient www/cherokee x11/xfce4/tumbler
Re: [new] Iso9660 Analyzer Tool
On Sun, Mar 27, 2011 at 7:15 PM, Dmitrij D. Czarkoff wrote: > Iso9660 Analyzer Tool - cd image files converter > > Comments are welcome! Any reports? -- Dmitrij D. Czarkoff
Incrementa tus Ventas un 300 por ciento
Reciba un cordial saludo Desea incrementar las ventas de su producto y la penetracion de su empresa, sea cual sea su giro? Somos expertos en incrementar las ventas de nuestros clientes Hemos reunido todas las herramientas necesarias en un solo producto, le incluimos bases de datos, software y servidores http://mailingmex.mx
Re: UPDATE: ffmpeg
On Tue, Mar 29, 2011 at 06:15:21PM +0200, Landry Breuil wrote:
> On Tue, Mar 29, 2011 at 05:10:27PM +0100, Edd Barrett wrote:
> > On Sat, Mar 26, 2011 at 03:01:24PM +, Jacob Meuser wrote:
> > > > Replacing --disable-altivec by --disable-asm lets ffmpeg build and run
> > > > in
> > > > basic testing. I'm not sure we want that fix, nor if its a good thing
> > > > for all archs.
> > >
> > > afaics, we have to, at least on ppc. and on ppc it only affects the
> > > file that doesn't build. unless there's a binutil update coming ...
> >
> > So.. If I see this correctly, this brings us to here:
>
> You also need jake's fix for libavutil defining _BSD_SOURCE, cf
> http://marc.info/?l=openbsd-ports&m=130099604711156&w=2
sure:
Index: Makefile
===
RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- Makefile12 Feb 2011 10:48:56 - 1.68
+++ Makefile29 Mar 2011 18:23:32 -
@@ -2,21 +2,21 @@
COMMENT= audio/video converter and streamer with bktr(4) support
-V= 20100512
-DISTNAME= ffmpeg-svn-${V}
+V= 20110306
+DISTNAME= ffmpeg-git-${V}
PKGNAME= ffmpeg-${V}
-REVISION= 6
CATEGORIES=graphics multimedia
-MASTER_SITES= http://comstyle.com/source/ \
- http://gormsby.com/downloads/
-
-SHARED_LIBS= avcodec 14.0 \
- avdevice3.0 \
- avfilter1.0 \
- avformat13.0 \
- avutil 7.0 \
- postproc13.0 \
- swscale 2.0
+#MASTER_SITES= http://comstyle.com/source/ \
+# http://gormsby.com/downloads/
+MASTER_SITES= http://theunixzoo.co.uk/distfiles/
+
+SHARED_LIBS= avcodec 15.0 \
+ avdevice4.0 \
+ avfilter2.0 \
+ avformat14.0 \
+ avutil 8.0 \
+ postproc14.0 \
+ swscale 3.0
HOMEPAGE= http://ffmpeg.mplayerhq.hu/
@@ -31,7 +31,7 @@ PERMIT_DISTFILES_FTP= Yes
MODULES= gcc3
MODGCC3_ARCHES=sparc
-WANTLIB= SDL X11 Xext Xfixes bz2 c faac faad gsm m mp3lame ogg \
+WANTLIB= SDL X11 Xext Xfixes bz2 c faac gsm m mp3lame ogg \
orc-0.4 pthread schroedinger-1.0>=2 sndio speex theora \
theoradec theoraenc vorbis vorbisenc x264 z
@@ -41,7 +41,6 @@ BUILD_DEPENDS+= devel/yasm
.endif
LIB_DEPENDS= archivers/bzip2 \
audio/faac \
- audio/faad \
audio/lame \
audio/libvorbis \
audio/speex \
@@ -51,13 +50,18 @@ LIB_DEPENDS=archivers/bzip2 \
multimedia/schroedinger>=1.0.10 \
multimedia/x264
+# binutils fun
+.if ${MACHINE_ARCH:Mpowerpc}
+CONFIGURE_ARGS += --disable-asm
+.endif
+
.if ${MACHINE_ARCH:Marm}
# uses ARM EABI
-CONFIGURE_ARGS+= --arch=generic
+CONFIGURE_ARGS+= --arch=generic
.endif
# inter-library dependencies for the current configuration
-LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lfaac -lfaad -lgsm -lm -lmp3lame
-logg -lorc-0.4 -lschroedinger-1.0 -lspeex -ltheora -lvorbis -lvorbisenc -lx264
-lz -pthread -Wl,-rpath,${LOCALBASE}/lib
+LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lfaac -lgsm -lm -lmp3lame -logg
-lorc-0.4 -lschroedinger-1.0 -lspeex -ltheora -lvorbis -lvorbisenc -lx264 -lz
-pthread -Wl,-rpath,${LOCALBASE}/lib
LIBavdevice_EXTRALIBS=-L${X11BASE}/lib -lX11 -lXext -lXfixes -lm -lsndio
-Wl,-rpath,${LOCALBASE}/lib -Wl,-rpath,${X11BASE}/lib
LIBavfilter_EXTRALIBS=-lm
LIBavformat_EXTRALIBS=-L${LOCALBASE}/lib -lbz2 -lm -Wl,-rpath,${LOCALBASE}/lib
@@ -72,7 +76,6 @@ USE_GMAKE=Yes
CONFIGURE_STYLE= simple
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--cc=${CC} \
- --disable-altivec \
--disable-armv5te \
--disable-armv6 \
--disable-armv6t2 \
@@ -86,7 +89,6 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-outdev=oss \
--enable-gpl \
--enable-libfaac \
- --enable-libfaad \
--enable-libgsm \
--enable-libmp3lame \
--enable-libschroedinger \
@@ -144,8 +146,12 @@ ALL_TARGET=all tools/qt-faststart
#REGRESS_TARGET= codectest
NO_REGRESS=Yes
-HTML_DOCS= developer faq ffmpeg-doc ffplay-doc ffprobe-doc ffserver-doc \
+HTML_DOCS= developer faq ffmpeg ffplay ffprobe ffserver \
general libavfilter
+
+# When you are rolling your distfile, you need to get the version string
+# from 'git describe --always' *before* you remove the .git directory.
+MAKE_ENV +=OBSD_VSTR=git-f4f4e12
post-extract:
@cp -f ${FILESDIR}/sndio_* ${WRKSRC}/libavdevice
Index: distinfo
==
Re: boost warning fix
On Tue, Mar 29, 2011 at 8:15 AM, Federico G. Schwindt wrote: > Comments? Any OKs? I think this changes the ABI, so you should probably bump the soname if you're going to commit this. However, it seems like a deliberate decision on their part to omit the virtual tag here (not familiar with context to know why, but since it's protected, I can imagine it's safe), so I'm inclined to leave it alone.
[UPDATE] iodine-0.5.2p1 rcscript
Can someone please commit this? Thanks!
Index: Makefile
===
RCS file: /cvs/ports/net/iodine/Makefile,v
retrieving revision 1.11
diff -N -u Makefile
--- Makefile3 Dec 2010 07:47:44 - 1.11
+++ Makefile15 Mar 2011 16:43:19 -
@@ -3,7 +3,7 @@
COMMENT= tunnel IPv4 data through DNS
DISTNAME= iodine-0.5.2
-REVISION= 0
+REVISION= 1
CATEGORIES=net
HOMEPAGE= http://code.kryo.se/iodine/
? diff
Index: patches/patch-man_iodine_8
===
RCS file: patches/patch-man_iodine_8
diff -N -u patches/patch-man_iodine_8
--- /dev/null 15 Mar 2011 10:43:19 -
+++ patches/patch-man_iodine_8 15 Mar 2011 16:43:19 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- man/iodine.8.orig Tue Jan 4 21:00:27 2011
man/iodine.8 Tue Jan 4 21:01:53 2011
+@@ -103,10 +103,10 @@ Print usage info and exit.
+ Keep running in foreground.
+ .TP
+ .B -u user
+-Drop privileges and run as user 'user' after setting up tunnel.
++Drop privileges and run as user 'user' after setting up tunnel.
Default is _iodine.
+ .TP
+ .B -t chrootdir
+-Chroot to 'chrootdir' after setting up tunnel.
++Chroot to 'chrootdir' after setting up tunnel. Default is /var/empty.
+ .TP
+ .B -d device
+ Use the TUN device 'device' instead of the normal one, which is dnsX on
Linux
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/iodine/pkg/PLIST,v
retrieving revision 1.3
diff -N -u pkg/PLIST
--- pkg/PLIST 30 Mar 2009 09:17:45 - 1.3
+++ pkg/PLIST 15 Mar 2011 16:43:19 -
@@ -4,3 +4,4 @@
@man man/man8/iodine.8
@bin sbin/iodine
@bin sbin/iodined
+@rcscript ${RCDIR}/iodined
Index: pkg/iodined.rc
===
RCS file: pkg/iodined.rc
diff -N -u pkg/iodined.rc
--- /dev/null 15 Mar 2011 10:43:19 -
+++ pkg/iodined.rc 15 Mar 2011 16:43:19 -
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+daemon="${TRUEPREFIX}/bin/iodined"
+
+. /etc/rc.d/rc.subr
+
+pexp=${daemon}
+
+rc_cmd $1
--
-Will Orr
Re: UPDATE: ffmpeg
On Sat, Mar 26, 2011 at 03:01:24PM +, Jacob Meuser wrote:
> > Replacing --disable-altivec by --disable-asm lets ffmpeg build and run in
> > basic testing. I'm not sure we want that fix, nor if its a good thing
> > for all archs.
>
> afaics, we have to, at least on ppc. and on ppc it only affects the
> file that doesn't build. unless there's a binutil update coming ...
So.. If I see this correctly, this brings us to here:
Index: Makefile
===
RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.68
diff -u -p -u -r1.68 Makefile
--- Makefile12 Feb 2011 10:48:56 - 1.68
+++ Makefile29 Mar 2011 16:00:43 -
@@ -2,21 +2,21 @@
COMMENT= audio/video converter and streamer with bktr(4) support
-V= 20100512
-DISTNAME= ffmpeg-svn-${V}
+V= 20110306
+DISTNAME= ffmpeg-git-${V}
PKGNAME= ffmpeg-${V}
-REVISION= 6
CATEGORIES=graphics multimedia
-MASTER_SITES= http://comstyle.com/source/ \
- http://gormsby.com/downloads/
-
-SHARED_LIBS= avcodec 14.0 \
- avdevice3.0 \
- avfilter1.0 \
- avformat13.0 \
- avutil 7.0 \
- postproc13.0 \
- swscale 2.0
+#MASTER_SITES= http://comstyle.com/source/ \
+# http://gormsby.com/downloads/
+MASTER_SITES= http://theunixzoo.co.uk/distfiles/
+
+SHARED_LIBS= avcodec 15.0 \
+ avdevice4.0 \
+ avfilter2.0 \
+ avformat14.0 \
+ avutil 8.0 \
+ postproc14.0 \
+ swscale 3.0
HOMEPAGE= http://ffmpeg.mplayerhq.hu/
@@ -31,7 +31,7 @@ PERMIT_DISTFILES_FTP= Yes
MODULES= gcc3
MODGCC3_ARCHES=sparc
-WANTLIB= SDL X11 Xext Xfixes bz2 c faac faad gsm m mp3lame ogg \
+WANTLIB= SDL X11 Xext Xfixes bz2 c faac gsm m mp3lame ogg \
orc-0.4 pthread schroedinger-1.0>=2 sndio speex theora \
theoradec theoraenc vorbis vorbisenc x264 z
@@ -41,7 +41,6 @@ BUILD_DEPENDS+= devel/yasm
.endif
LIB_DEPENDS= archivers/bzip2 \
audio/faac \
- audio/faad \
audio/lame \
audio/libvorbis \
audio/speex \
@@ -51,13 +50,18 @@ LIB_DEPENDS=archivers/bzip2 \
multimedia/schroedinger>=1.0.10 \
multimedia/x264
+# binutils fun
+.if ${MACHINE_ARCH:Mpowerpc}
+CONFIGURE_ARGS += --disable-asm
+.endif
+
.if ${MACHINE_ARCH:Marm}
# uses ARM EABI
-CONFIGURE_ARGS+= --arch=generic
+CONFIGURE_ARGS+= --arch=generic
.endif
# inter-library dependencies for the current configuration
-LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lfaac -lfaad -lgsm -lm -lmp3lame
-logg -lorc-0.4 -lschroedinger-1.0 -lspeex -ltheora -lvorbis -lvorbisenc -lx264
-lz -pthread -Wl,-rpath,${LOCALBASE}/lib
+LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lfaac -lgsm -lm -lmp3lame -logg
-lorc-0.4 -lschroedinger-1.0 -lspeex -ltheora -lvorbis -lvorbisenc -lx264 -lz
-pthread -Wl,-rpath,${LOCALBASE}/lib
LIBavdevice_EXTRALIBS=-L${X11BASE}/lib -lX11 -lXext -lXfixes -lm -lsndio
-Wl,-rpath,${LOCALBASE}/lib -Wl,-rpath,${X11BASE}/lib
LIBavfilter_EXTRALIBS=-lm
LIBavformat_EXTRALIBS=-L${LOCALBASE}/lib -lbz2 -lm -Wl,-rpath,${LOCALBASE}/lib
@@ -72,7 +76,6 @@ USE_GMAKE=Yes
CONFIGURE_STYLE= simple
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--cc=${CC} \
- --disable-altivec \
--disable-armv5te \
--disable-armv6 \
--disable-armv6t2 \
@@ -86,7 +89,6 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-outdev=oss \
--enable-gpl \
--enable-libfaac \
- --enable-libfaad \
--enable-libgsm \
--enable-libmp3lame \
--enable-libschroedinger \
@@ -144,8 +146,12 @@ ALL_TARGET=all tools/qt-faststart
#REGRESS_TARGET= codectest
NO_REGRESS=Yes
-HTML_DOCS= developer faq ffmpeg-doc ffplay-doc ffprobe-doc ffserver-doc \
+HTML_DOCS= developer faq ffmpeg ffplay ffprobe ffserver \
general libavfilter
+
+# When you are rolling your distfile, you need to get the version string
+# from 'git describe --always' *before* you remove the .git directory.
+MAKE_ENV +=OBSD_VSTR=git-f4f4e12
post-extract:
@cp -f ${FILESDIR}/sndio_* ${WRKSRC}/libavdevice
Index: distinfo
===
RCS file: /cvs/ports/graphics/ffmpeg/distinfo,v
retrieving revision 1.17
diff -u -p -u -r1.17 distinfo
--- distinfo26 May 2010 21:38:52 - 1.17
+++ distinfo29 Mar 2011 16:00:43 -
@@ -1,5 +1,5 @@
-MD5 (ffmpeg-svn-20100512.tar.gz) = 0Ic9e4MjT5ojQBIDeon7mg==
-RMD160
Re: boost warning fix
On Tue, Mar 29, 2011 at 09:53:39AM -0700, Matthew Dempsky wrote: > On Tue, Mar 29, 2011 at 8:15 AM, Federico G. Schwindt > wrote: > > ?Comments? Any OKs? > > I think this changes the ABI, so you should probably bump the soname > if you're going to commit this. true. > However, it seems like a deliberate decision on their part to omit the > virtual tag here (not familiar with context to know why, but since > it's protected, I can imagine it's safe), so I'm inclined to leave it > alone. maybe. there is a bug open, let's see what they say. f.-
free tool for searching
Free tool for searching any goods or services at the best prices to download the program Genie: http://www.MyShoppingGenie.com/miliard Activation applets: 34275 http://miliarders.com Enjoy this program's like a butterfly enjoying the flight, easily. http://www.mymarketinggenie.com/miliard/ http://www.mymarketinggenie.com/miliard/home.php?action=welcome http://www.myshoppinggenie.com/distributor.asp A great tool for saving and for making money [IMAGE] Click here to play video. __ Unsubscribe at this page. The world's most successful companies have integrated and utilize video email and web conferencing as an essential component of their marketing strategies.
Re: UPDATE: ffmpeg
On Tue, Mar 29, 2011 at 05:10:27PM +0100, Edd Barrett wrote: > On Sat, Mar 26, 2011 at 03:01:24PM +, Jacob Meuser wrote: > > > Replacing --disable-altivec by --disable-asm lets ffmpeg build and run in > > > basic testing. I'm not sure we want that fix, nor if its a good thing > > > for all archs. > > > > afaics, we have to, at least on ppc. and on ppc it only affects the > > file that doesn't build. unless there's a binutil update coming ... > > So.. If I see this correctly, this brings us to here: You also need jake's fix for libavutil defining _BSD_SOURCE, cf http://marc.info/?l=openbsd-ports&m=130099604711156&w=2 Landry
boost warning fix
Hi,
This fixes the warning when -Wnon-virtual-dtor is used, which is quite
annoying and might hide other crap.
Shouldn't break anything TBH but worth checking in a bulk.
Comments? Any OKs?
f.-
Index: Makefile
===
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile19 Sep 2010 20:09:41 - 1.27
+++ Makefile29 Mar 2011 15:12:22 -
@@ -3,7 +3,7 @@
COMMENT= free peer-reviewed portable C++ source libraries
PKGNAME= boost-${VERSION}
-REVISION= 5
+REVISION= 6
VERSION= 1.42.0
DISTNAME= boost_${VERSION:S/./_/g}
Index: patches/patch-boost_exception_exception_hpp
===
RCS file: patches/patch-boost_exception_exception_hpp
diff -N patches/patch-boost_exception_exception_hpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-boost_exception_exception_hpp 29 Mar 2011 15:12:22 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- boost/exception/exception.hpp.orig Tue Mar 29 11:54:43 2011
boost/exception/exception.hpp Tue Mar 29 11:54:45 2011
+@@ -166,7 +166,7 @@ boost
+
+ protected:
+
+-~error_info_container() throw()
++virtual ~error_info_container() throw()
+ {
+ }
+ };
Re: emacs
Speaking of emacs23, when I start it on alpha, I get a *Warnings* window with Emergency (alloc): Warning: past 95% of memory limit Whatever that means. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: autoconf 2.67
On Tue, Mar 29, 2011 at 11:18:37AM +0100, Stuart Henderson wrote: > Mostly taken from 2.65 with an upstream patch added to make things > work with older pkgconfig. Tested with lighttpd and emacs23. > Ok? > Works fine with Dovecot 2. Regards, -- Pierre-Emmanuel André GPG key: 0x7AE329DC
Re: update: devel/p5-Try-Tiny (Was: Re: update: devel/p5-Class-MOP + devel/p5-Moose)
Hi guys, it's ok for me, tested on i386, amd64. C. On Thu, 2011-03-24 at 19:48 +0100, Simon Bertrang wrote: > On Thu, Mar 24, 2011 at 10:53:02AM +0100, Landry Breuil wrote: > > On Wed, Mar 23, 2011 at 10:53:39PM +0100, Simon Bertrang wrote: > > > Hi, > > > > > > The diff below updates p5-Class-MOP to version 1.12 and p5-Moose to 1.24. > > > Taken from an up to date /usr/ports/devel - update/patch accordingly. > > > All tests pass here on i386, but more testing is needed. > > > > > > Tests, comments, oks? > > > > Class-MOP fails regress: > > Try::Tiny version 0.07 required--this is only version 0.06 at > > /usr/local/libdata/perl5/site_perl/Test/Fatal.pm line 11. > > > > Oops - but already sent to maintainer, no feedback yet; now in the open: > > Index: Makefile > === > RCS file: /cvs/ports/devel/p5-Try-Tiny/Makefile,v > retrieving revision 1.6 > diff -p -u -r1.6 Makefile > --- Makefile 3 Dec 2010 11:44:38 - 1.6 > +++ Makefile 21 Mar 2011 22:24:10 - > @@ -3,8 +3,7 @@ > COMMENT =minimal try/catch with proper localization of $\@ > > MODULES =cpan > -DISTNAME = Try-Tiny-0.06 > -REVISION = 0 > +DISTNAME = Try-Tiny-0.09 > CATEGORIES = devel > USE_GROFF = Yes > > @@ -16,6 +15,6 @@ PERMIT_PACKAGE_FTP =Yes > PERMIT_DISTFILES_CDROM =Yes > PERMIT_DISTFILES_FTP = Yes > > -CPAN_AUTHOR =NUFFIN > +CPAN_AUTHOR =DOY > > .include > Index: distinfo > === > RCS file: /cvs/ports/devel/p5-Try-Tiny/distinfo,v > retrieving revision 1.2 > diff -p -u -r1.2 distinfo > --- distinfo 29 Jun 2010 14:31:42 - 1.2 > +++ distinfo 21 Mar 2011 22:24:10 - > @@ -1,5 +1,5 @@ > -MD5 (Try-Tiny-0.06.tar.gz) = 03z2zslaUA4jk5ZywiCC0A== > -RMD160 (Try-Tiny-0.06.tar.gz) = oBMdSycAMkYNK4WlHQncgCQpBWg= > -SHA1 (Try-Tiny-0.06.tar.gz) = C7/HTOuy2KOaaOUJUpM0AoggKeM= > -SHA256 (Try-Tiny-0.06.tar.gz) = UJvRHoYDuMPpqxdX/J55x9PISTWPuxgd2mEYpfiOTVE= > -SIZE (Try-Tiny-0.06.tar.gz) = 9328 > +MD5 (Try-Tiny-0.09.tar.gz) = 5SaqfYDLxpDEogklpZLBPA== > +RMD160 (Try-Tiny-0.09.tar.gz) = LSk5AH8H+mBJNlirMBtA5LAdez8= > +SHA1 (Try-Tiny-0.09.tar.gz) = 0pbCG8t3Ee/ZfxksZDj3q/fTj4M= > +SHA256 (Try-Tiny-0.09.tar.gz) = em9S9NPiWXbnBMxBnvrRRmiSQqekNEsSJEfxQwbmULo= > +SIZE (Try-Tiny-0.09.tar.gz) = 9095
Re: autoconf 2.67
On 2011/03/29 11:18, Stuart Henderson wrote: > Mostly taken from 2.65 with an upstream patch added to make things > work with older pkgconfig. Tested with lighttpd and emacs23. > Ok? note: requires up-to-date /usr/src/usr.bin/m4, otherwise m4 will hang during build.
autoconf 2.67
Mostly taken from 2.65 with an upstream patch added to make things
work with older pkgconfig. Tested with lighttpd and emacs23.
Ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/autoconf/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile22 Mar 2010 20:54:24 - 1.37
+++ Makefile29 Mar 2011 10:10:51 -
@@ -14,5 +14,6 @@ SUBDIR += 2.62
SUBDIR += 2.63
SUBDIR += 2.64
SUBDIR += 2.65
+SUBDIR += 2.67
.include
Index: 2.67/Makefile
===
RCS file: 2.67/Makefile
diff -N 2.67/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ 2.67/Makefile 29 Mar 2011 10:10:51 -
@@ -0,0 +1,16 @@
+# $OpenBSD: Makefile,v 1.7 2011/03/24 12:34:10 espie Exp $
+
+VERSION = 2.67
+
+BUILD_DEPENDS =devel/help2man
+
+CONFIGURE_ARGS += --without-lispdir \
+ --mandir=${PREFIX}/man \
+ --infodir=${PREFIX}/info
+MODGNU_CONFIG_GUESS_DIRS =${WRKSRC}/build-aux
+MAKE_FLAGS = EMACS=no
+FAKE_FLAGS = EMACS=no
+REGRESS_DEPENDS = devel/automake/1.9
+REGRESS_FLAGS += AUTOMAKE_VERSION=1.9
+
+.include
Index: 2.67/distinfo
===
RCS file: 2.67/distinfo
diff -N 2.67/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -
+++ 2.67/distinfo 29 Mar 2011 10:10:51 -
@@ -0,0 +1,5 @@
+MD5 (autoconf-2.67.tar.gz) = YHj1Pf2pEb37Uj459Nf7LQ==
+RMD160 (autoconf-2.67.tar.gz) = mMg21rdGoxyclibTMp9pihcP/Ag=
+SHA1 (autoconf-2.67.tar.gz) = EuhGQjNqjSP7gyDUAn/IYPJcm2A=
+SHA256 (autoconf-2.67.tar.gz) = JrdSxCdkctOyH6Kmz9+0lX451dYQik9AILEyNP+6ZtE=
+SIZE (autoconf-2.67.tar.gz) = 1837052
Index: 2.67/patches/patch-Makefile_in
===
RCS file: 2.67/patches/patch-Makefile_in
diff -N 2.67/patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ 2.67/patches/patch-Makefile_in 29 Mar 2011 10:10:51 -
@@ -0,0 +1,11 @@
+$OpenBSD: patch-Makefile_in,v 1.1.1.1 2010/03/22 20:54:07 espie Exp $
+--- Makefile.in.orig Sat Nov 21 14:59:19 2009
Makefile.inMon Mar 8 12:26:47 2010
+@@ -312,6 +312,7 @@ install-pkgdataDATA: $(pkgdata_DATA)
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
++p=`basename $$p`; \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
Index: 2.67/patches/patch-bin_autom4te_in
===
RCS file: 2.67/patches/patch-bin_autom4te_in
diff -N 2.67/patches/patch-bin_autom4te_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ 2.67/patches/patch-bin_autom4te_in 29 Mar 2011 10:10:51 -
@@ -0,0 +1,38 @@
+$OpenBSD: patch-bin_autom4te_in,v 1.1.1.1 2010/03/22 20:54:07 espie Exp $
+--- bin/autom4te.in.orig Wed Jul 22 14:45:09 2009
bin/autom4te.inMon Mar 8 12:06:34 2010
+@@ -89,16 +89,9 @@ my $freeze = 0;
+
+ # $M4.
+ my $m4 = $ENV{"M4"} || '@M4@';
+-# Some non-GNU m4's don't reject the --help option, so give them /dev/null.
+-fatal "need GNU m4 1.4 or later: $m4"
+- if system "$m4 --help &1 | grep reload-state >/dev/null";
+
+-# Set some high recursion limit as the default limit, 250, has already
+-# been hit with AC_OUTPUT. Don't override the user's choice.
+-$m4 .= ' --nesting-limit=1024'
+- if " $m4 " !~ / (--nesting-limit(=[0-9]+)?|-L[0-9]*) /;
++$m4 .= " -g -D__gnu__";
+
+-
+ # @M4_BUILTIN -- M4 builtins and a useful comment.
+ my @m4_builtin = `echo dumpdef | $m4 2>&1 >/dev/null`;
+ map { s/:.*//;s/\W// } @m4_builtin;
+@@ -464,11 +457,11 @@ sub handle_m4 ($@)
+ # We don't output directly to the cache files, to avoid problems
+ # when we are interrupted (that leaves corrupted files).
+ xsystem ("$m4 @M4_GNU@"
+- . join (' --include=', '', map { shell_quote ($_) } @include)
+- . ' --debug=aflq'
+- . (!exists $ENV{'AUTOM4TE_NO_FATAL'} ? ' --fatal-warning' : '')
+- . " @M4_DEBUGFILE@=" . shell_quote ("$tcache" . $req->id . "t")
+- . join (' --trace=', '', map { shell_quote ($_) } sort @macro)
++ . join (' -I', '', map { shell_quote ($_) } @include)
++ . ' -daflq'
++#. (!exists $ENV{'AUTOM4TE_NO_FATAL'} ? ' --fatal-warning' : '')
++ . " -o" . shell_quote ($tcache . $req->id . "t")
++ . join (' -t', '', map { shell_quote ($_) } sort @macro)
+ . " " . files_to_options (@ARGV)
+ . " > " . shell_quote ("$ocache" . $req->id . "t"));
+
Index: 2.67/patches/patch-bin_autoupdate_in
===
RCS file: 2.67/patches/patch-bin_autoupdate_in
diff -N 2.67/patches/patch-bin_autoupdate_in
--- /dev/null 1 Jan 197
Re: autoconf/m4 [was Re: New www/libmicrohttpd]
On 2011/03/29 00:56, Nigel Taylor wrote: > This one > http://thread.gmane.org/gmane.comp.sysutils.autoconf.general/13133/focus=13153 > > Says fixed in autoconf 2.68 to work with older pkg-config. Ah perfect, we can just take the patch then. > I looked at devel/metaauto, I can't get to pkg-config.freedesktop.org, url > changed to http://pkgconfig.freedesktop.org/releases/ MASTER_SITES is wrong in > Makefile, v0.21 16 Aug 2006 latest is v0.25 28 May 2010. The fix for > pkg-config > is in GIT only. I've fixed MASTER_SITES. We don't use their pkg-config any more, see /usr/src/usr.bin/pkg-config.
İngilizce Konuşma Kılavuzu
ANINDA iNGiLiZCE KONUSMA KILAVUZU Yeni kitabımız çıkmıştır. (Bilgilendirme) iNGiLiZCE KONUSMA KILAVUZU, EN SIK KULLANILAN KELiMELERiN CDSi, KELiME PDFSi ve 2011 TAKViMi HEPSi BiRARADA STOKLARLA SINIRLI HERKES OGRENSiN KONUSSUN DiYE... http://www.anindaingilizcekonusma.com/ İyi günler dileriz.
Re: emacs
On Tue, Mar 29, 2011 at 11:42:19AM +0200, Manuel Giraud wrote: > > Hi, > > I just saw that you've commited editors/emacs23 why didn't you make it > editors/emacs and get rid of old emacs21 and emacs22 version? It seems > extra work to maintain these old versions, no? > > -- > Manuel Giraud I committed it as emacs23 on purpose, as there are quite a few users of emacs21 who can't, don't want or have other reasons not to migrate and forcing them seems harsh. And it was agreed with various porters that having a separate directory for emacs23 would be best since there were other changes between 22 and 23 that'd require rewriting parts of .emacs. And honestly, it's not extra work to maintain since the older versions don't require updates ;-) -- Cheers, Jasper "Capable, generous men do not create victims, they nurture them."
emacs
Hi, I just saw that you've commited editors/emacs23 why didn't you make it editors/emacs and get rid of old emacs21 and emacs22 version? It seems extra work to maintain these old versions, no? -- Manuel Giraud
_rsync user for rsync
Hi.
This diff makes rsync use "_rsync" as default user instead of "nobody".
It's been slightly tested by naddy and myself but could use more
eyes/tests/comments ...
Thanks.
Index: Makefile
===
RCS file: /cvs/ports/net/rsync/Makefile,v
retrieving revision 1.61
diff -u -u -r1.61 Makefile
--- Makefile27 Mar 2011 17:16:47 - 1.61
+++ Makefile29 Mar 2011 07:28:10 -
@@ -6,13 +6,16 @@
CATEGORIES = net
HOMEPAGE = http://rsync.samba.org/
+REVISION = 0
+
MAINTAINER = Marc Espie
-# GPL
+# GPLv3
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
+
WANTLIB = c
MASTER_SITES = ftp://ftp.samba.org/pub/rsync/ \
@@ -24,7 +27,8 @@
CONFIGURE_STYLE =gnu
CONFIGURE_ARGS =--with-included-popt \
--with-rsyncd-conf="${SYSCONFDIR}/rsyncd.conf" \
- --with-rsh="ssh -T"
+ --with-rsh="ssh -T" \
+ --with-nobody-group=_rsync
DOCDIR = ${PREFIX}/share/doc/rsync
USE_GROFF =Yes
Index: patches/patch-authenticate_c
===
RCS file: patches/patch-authenticate_c
diff -N patches/patch-authenticate_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-authenticate_c29 Mar 2011 07:28:10 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- authenticate.c.origMon Mar 28 13:59:40 2011
authenticate.c Mon Mar 28 13:59:55 2011
+@@ -291,7 +291,7 @@ void auth_client(int fd, const char *user, const char
+ char pass2[MAX_DIGEST_LEN*2];
+
+ if (!user || !*user)
+- user = "nobody";
++ user = "_rsync";
+
+ if (!(pass = getpassf(password_file))
+&& !(pass = getenv("RSYNC_PASSWORD"))) {
Index: patches/patch-clientserver_c
===
RCS file: patches/patch-clientserver_c
diff -N patches/patch-clientserver_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-clientserver_c29 Mar 2011 07:28:10 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- clientserver.c.origMon Mar 28 14:28:49 2011
clientserver.c Mon Mar 28 14:29:08 2011
+@@ -413,8 +413,8 @@ static int rsync_module(int f_in, int f_out, int i, ch
+ int argc;
+ char **argv, **orig_argv, **orig_early_argv, *module_chdir;
+ char line[BIGPATHBUFLEN];
+- uid_t uid = (uid_t)-2; /* canonically "nobody" */
+- gid_t gid = (gid_t)-2;
++ uid_t uid = (uid_t)669; /* canonically "_rsync" */
++ gid_t gid = (gid_t)669;
+ char *p, *err_msg = NULL;
+ char *name = lp_name(i);
+ int use_chroot = lp_use_chroot(i);
Index: patches/patch-configure_sh
===
RCS file: patches/patch-configure_sh
diff -N patches/patch-configure_sh
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_sh 29 Mar 2011 07:28:10 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.sh.orig Mon Mar 28 13:58:00 2011
configure.sh Mon Mar 28 13:59:13 2011
+@@ -4210,7 +4210,7 @@ fi
+
+
+ cat >>confdefs.h <<_ACEOF
+-#define NOBODY_USER "nobody"
++#define NOBODY_USER "_rsync"
+ _ACEOF
+
+
Index: patches/patch-rsync_1
===
RCS file: patches/patch-rsync_1
diff -N patches/patch-rsync_1
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-rsync_1 29 Mar 2011 07:28:10 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- rsync.1.orig Mon Mar 28 13:57:27 2011
rsync.1Mon Mar 28 13:57:35 2011
+@@ -3465,7 +3465,7 @@ consult the remote shell\(cq\&s documentation.
+ .IP "\fBUSER\fP or \fBLOGNAME\fP"
+ The USER or LOGNAME environment variables
+ are used to determine the default username sent to an rsync daemon.
+-If neither is set, the username defaults to \(dq\&nobody\(dq\&.
++If neither is set, the username defaults to \(dq\&_rsync\(dq\&.
+ .IP "\fBHOME\fP"
+ The HOME environment variable is used to find the user\(cq\&s
+ default .cvsignore file.
Index: patches/patch-rsyncd_conf_5
===
RCS file: /cvs/ports/net/rsync/patches/patch-rsyncd_conf_5,v
retrieving revision 1.1
diff -u -u -r1.1 patch-rsyncd_conf_5
--- patches/patch-rsyncd_conf_5 7 Mar 2011 19:48:20 - 1.1
+++ patches/patch-rsyncd_conf_5 29 Mar 2011 07:28:10 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-rsyncd_conf_5,v 1.1 2011/03/07 19:48:20 ajacoutot Exp $
rsyncd.conf.5.orig Thu Dec 31 22:15:51 2009
-+++ rsyncd.conf.5 Tue Feb 22 11:22:44 2011
+--- rsyncd.conf.5.orig Sat Mar 26 22:37:52 2011
rsyncd.conf.5 Mon Mar 28 14:31:04 2011
@@ -67,12 +67,11 @@ When run via inetd you should add a line like this to
and a single line something like this to /etc/inetd.conf:
.PP
@@ -16,6 +16,25 @@
reread its config file.
.PP
Note that you should \fBnot
