Re: UPDATE: png 1.5.15

2013-04-14 Thread Brad Smith
On Sun, Apr 14, 2013 at 10:34:31PM +0100, Stuart Henderson wrote:
> On 2013/04/11 21:42, Brad Smith wrote:
> > Here is an update to png 1.5.15.
> > 
> > OK?
> 
> Have you tested much at runtime with it? Bulk build with this in is
> looking good so far, 5500 ports in and no fallout yet.

I don't see any issues with the browsers / image viewer I use and
other apps using libpng. They just added one new function and some
small bug fixes.

> > 
> > Index: Makefile
> > ===
> > RCS file: /home/cvs/ports/graphics/png/Makefile,v
> > retrieving revision 1.90
> > diff -u -p -r1.90 Makefile
> > --- Makefile25 Mar 2013 00:21:37 -  1.90
> > +++ Makefile12 Apr 2013 01:32:57 -
> > @@ -2,10 +2,10 @@
> >  
> >  COMMENT=   library for manipulating PNG images
> >  
> > -VERSION=   1.5.14
> > +VERSION=   1.5.15
> >  DISTNAME=  libpng-${VERSION}
> >  PKGNAME=   png-${VERSION}
> > -SHARED_LIBS=   png 15.0
> > +SHARED_LIBS=   png 15.1
> >  CATEGORIES=graphics
> >  DPB_PROPERTIES=parallel
> >  MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libpng/}
> > Index: distinfo
> > ===
> > RCS file: /home/cvs/ports/graphics/png/distinfo,v
> > retrieving revision 1.33
> > diff -u -p -r1.33 distinfo
> > --- distinfo25 Mar 2013 00:21:37 -  1.33
> > +++ distinfo12 Apr 2013 01:28:51 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (libpng-1.5.14.tar.gz) = 
> > IgB/gPa21q0rXTe8E13OZwGhek1krubUbt04mL+7EBg=
> > -SIZE (libpng-1.5.14.tar.gz) = 1073008
> > +SHA256 (libpng-1.5.15.tar.gz) = 
> > cmIkt6a1rQAyB4vz+1qE/7WtaDozpi1n975etbw30HY=
> > +SIZE (libpng-1.5.15.tar.gz) = 1083892
> > Index: patches/patch-scripts_libpng_pc_in
> > ===
> > RCS file: /home/cvs/ports/graphics/png/patches/patch-scripts_libpng_pc_in,v
> > retrieving revision 1.25
> > diff -u -p -r1.25 patch-scripts_libpng_pc_in
> > --- patches/patch-scripts_libpng_pc_in  25 Mar 2013 00:21:37 -  
> > 1.25
> > +++ patches/patch-scripts_libpng_pc_in  12 Apr 2013 01:33:15 -
> > @@ -1,6 +1,6 @@
> >  $OpenBSD: patch-scripts_libpng_pc_in,v 1.25 2013/03/25 00:21:37 brad Exp $
> >  scripts/libpng.pc.in.orig  Wed Jan 23 21:59:05 2013
> > -+++ scripts/libpng.pc.in   Sat Mar 23 21:04:52 2013
> > +--- scripts/libpng.pc.in.orig  Wed Mar 27 21:21:27 2013
> >  scripts/libpng.pc.in   Thu Apr 11 21:30:19 2013
> >  @@ -1,10 +1,11 @@
> >   prefix=@prefix@
> >   exec_prefix=@exec_prefix@
> > @@ -10,7 +10,7 @@ $OpenBSD: patch-scripts_libpng_pc_in,v 1
> >   
> >   Name: libpng
> >   Description: Loads and saves PNG files
> > - Version: 1.5.14
> > + Version: 1.5.15
> >  -Libs: -L${libdir} -lpng15
> >  +Libs: -L${libdir} -lpng
> >  +Libs.private: -lz -lm
> > Index: patches/patch-scripts_makefile_openbsd
> > ===
> > RCS file: 
> > /home/cvs/ports/graphics/png/patches/patch-scripts_makefile_openbsd,v
> > retrieving revision 1.39
> > diff -u -p -r1.39 patch-scripts_makefile_openbsd
> > --- patches/patch-scripts_makefile_openbsd  25 Mar 2013 00:21:37 -  
> > 1.39
> > +++ patches/patch-scripts_makefile_openbsd  12 Apr 2013 01:33:07 -
> > @@ -1,6 +1,6 @@
> >  $OpenBSD: patch-scripts_makefile_openbsd,v 1.39 2013/03/25 00:21:37 brad 
> > Exp $
> >  scripts/makefile.openbsd.orig  Wed Jan 23 21:59:05 2013
> > -+++ scripts/makefile.openbsd   Sat Mar 23 21:07:49 2013
> > +--- scripts/makefile.openbsd.orig  Wed Mar 27 21:21:27 2013
> >  scripts/makefile.openbsd   Thu Apr 11 21:29:02 2013
> >  @@ -7,8 +7,10 @@
> >   # and license in png.h
> >   
> > @@ -12,7 +12,7 @@ $OpenBSD: patch-scripts_makefile_openbsd
> >  +INCDIR= ${PREFIX}/include/libpng
> >   
> >   SHLIB_MAJOR=  15
> > - SHLIB_MINOR=  1.5.14
> > + SHLIB_MINOR=  1.5.15
> >  @@ -22,15 +24,34 @@ HDRS=  png.h pngconf.h pnglibconf.h
> >   
> >   CFLAGS+= -W -Wall
> > 
> > -- 
> > This message has been scanned for viruses and
> > dangerous content by MailScanner, and is
> > believed to be clean.
> > 
> 
> -- 
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
> 

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.



lang/gcc: buildtools debugging; sync with 4.8

2013-04-14 Thread Tobias Ulmer
So we have a problem that gnat buildtools sometimes fail to build
(except on my machines, grr). Parallel build issues have pretty much
been ruled out.

The question is now whether egcc fails silently while producing
object code or gnatlink/gnatbind are doing something funny.
Since egcc/gnat1 gets called a lot during the build, I am leaning
towards the later.

The diff below first compiles, then binds/links the buildtools with
some ls(1) thrown in between so we can see whether the object exists at
one point or not.

Second part of this diff syncs minor changes from 4.8 to 4.7 and 4.6:
* Absolute path to strip, reduces the gnat package size by 50%
* Cpu core detection
* -j1 for the install target in 4.7, same as the rest

I plan to commit these separate, single diff is only for testing.

Comments? OK?

Index: 4.6/Makefile
===
RCS file: /home/vcs/cvs/openbsd/ports/lang/gcc/4.6/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- 4.6/Makefile21 Mar 2013 08:46:32 -  1.51
+++ 4.6/Makefile14 Apr 2013 22:32:06 -
@@ -30,7 +30,7 @@ REVISION-estdc = 10
 REVISION-f95 = 14
 REVISION-java = 15
 REVISION-objc = 14
-REVISION-ada = 15
+REVISION-ada = 16
 REVISION-go = 14
 
 SHARED_LIBS =  estdc++ 14.0 \
@@ -116,6 +116,7 @@ EXTRA_ENV += am_cv_func_iconv=no JAR=no
 EXTRA_ENV += ac_cv_prog_M4=/usr/bin/m4
 EXTRA_ENV += ac_cv_header_magic_h=no
 EXTRA_ENV += lt_cv_path_SED=/usr/bin/sed
+EXTRA_ENV += STRIP=/usr/bin/strip
 MAKE_FLAGS +=   ac_cv_path_mkdir=/bin/mkdir
 
 CONFIGURE_ENV += ${EXTRA_ENV}
Index: 4.6/patches/patch-gcc_ada_Make-generated_in
===
RCS file: 
/home/vcs/cvs/openbsd/ports/lang/gcc/4.6/patches/patch-gcc_ada_Make-generated_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-gcc_ada_Make-generated_in
--- 4.6/patches/patch-gcc_ada_Make-generated_in 11 Apr 2013 08:34:13 -  
1.2
+++ 4.6/patches/patch-gcc_ada_Make-generated_in 14 Apr 2013 22:32:06 -
@@ -1,26 +1,26 @@
 $OpenBSD: patch-gcc_ada_Make-generated_in,v 1.2 2013/04/11 08:34:13 pascal Exp 
$
 --- gcc/ada/Make-generated.in.orig Sun Nov 13 15:25:58 2011
-+++ gcc/ada/Make-generated.in  Thu Apr 11 09:55:36 2013
 gcc/ada/Make-generated.in  Sun Apr 14 04:12:00 2013
 @@ -27,26 +27,26 @@ $(ADA_GEN_SUBDIR)/treeprs.ads : $(ADA_GEN_SUBDIR)/tree
-$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/treeprs
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/treeprs/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/treeprs
 -  (cd $(ADA_GEN_SUBDIR)/bldtools/treeprs; gnatmake -q xtreeprs ; 
./xtreeprs ../../treeprs.ads )
-+  (cd $(ADA_GEN_SUBDIR)/bldtools/treeprs; gnatmake -j1 xtreeprs ; 
./xtreeprs ../../treeprs.ads )
++  (cd $(ADA_GEN_SUBDIR)/bldtools/treeprs; ls -la; gnatmake -c xtreeprs; 
ls -la;  gnatmake xtreeprs; ls -la; ./xtreeprs ../../treeprs.ads )
  
  $(ADA_GEN_SUBDIR)/einfo.h : $(ADA_GEN_SUBDIR)/einfo.ads 
$(ADA_GEN_SUBDIR)/einfo.adb $(ADA_GEN_SUBDIR)/xeinfo.adb 
$(ADA_GEN_SUBDIR)/ceinfo.adb
-$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/einfo
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/einfo/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/einfo
 -  (cd $(ADA_GEN_SUBDIR)/bldtools/einfo; gnatmake -q xeinfo ; ./xeinfo 
../../einfo.h )
-+  (cd $(ADA_GEN_SUBDIR)/bldtools/einfo; gnatmake -j1 xeinfo ; ./xeinfo 
../../einfo.h )
++  (cd $(ADA_GEN_SUBDIR)/bldtools/einfo; ls -la; gnatmake -c xeinfo; ls 
-la;  gnatmake xeinfo; ls -la; ./xeinfo ../../einfo.h )
  
  $(ADA_GEN_SUBDIR)/sinfo.h : $(ADA_GEN_SUBDIR)/sinfo.ads 
$(ADA_GEN_SUBDIR)/sinfo.adb $(ADA_GEN_SUBDIR)/xsinfo.adb 
$(ADA_GEN_SUBDIR)/csinfo.adb
-$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/sinfo
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/sinfo/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/sinfo
 -  (cd $(ADA_GEN_SUBDIR)/bldtools/sinfo; gnatmake -q xsinfo ; ./xsinfo 
../../sinfo.h )
-+  (cd $(ADA_GEN_SUBDIR)/bldtools/sinfo; gnatmake -j1 xsinfo ; ./xsinfo 
../../sinfo.h )
++  (cd $(ADA_GEN_SUBDIR)/bldtools/sinfo; ls -la; gnatmake -c xsinfo; ls 
-la;  gnatmake xsinfo; ls -la; ./xsinfo ../../sinfo.h )
  
  $(ADA_GEN_SUBDIR)/snames.h $(ADA_GEN_SUBDIR)/snames.ads 
$(ADA_GEN_SUBDIR)/snames.adb : $(ADA_GEN_SUBDIR)/stamp-snames ; @true
  $(ADA_GEN_SUBDIR)/stamp-snames : $(ADA_GEN_SUBDIR)/snames.ads-tmpl 
$(ADA_GEN_SUBDIR)/snames.adb-tmpl $(ADA_GEN_SUBDIR)/snames.h-tmpl 
$(ADA_GEN_SUBDIR)/xsnamest.adb $(ADA_GEN_SUBDIR)/xutil.ads 
$(ADA_GEN_SUBDIR)/xutil.adb
@@ -28,7 +28,7 @@ $OpenBSD: patch-gcc_ada_Make-generated_i
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/snamest/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/snamest
 -  (cd $(ADA_GEN_SUBDIR)/bldtools/snamest; gnatmake -q xsnamest ; 
./xsnamest )
-+  (cd $(ADA_GEN_SUBDIR)/bldtools/snamest; gnatmake -j1 xsnamest ; 
./xsnamest )
++  (cd $(ADA_GEN_SUBDIR)/bldtools/snames

Re: (almost) [NEW] mosh-1.2.4

2013-04-14 Thread Jérémie Courrèges-Anglas
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:

> Stuart Henderson  writes:

[...]

>> This tries to force PIE, which I suspect will result in broken binaries
>> on arm/hppa. I think it's probably better to remove this as we enable
>> PIE by default where possible, but comments from others on this would
>> be welcome. Other than that it looks good to me.
>
> Ah, nice catch.  Thinking about it, the default --enable-hardening
> parameter doesn't seem to help much, does it?
>
> * -fno-strict-overflow - on by default with -O2
> * -D_FORTIFY_SOURCE=2  - no-op afaik
> * SSP  - on by default
> * PIE  - on by default, where applicable
>
> No idea about these and their usefulness on OpenBSD:
>
> * ld -z,relro
> * ld -z,now

[...]

I asked for advice[1] on the tech@ mailing-list; -z relro is a no-op,
and -z now doesn't bring anything to mosh.

OK to import, with the following modification?

[1] http://marc.info/?l=openbsd-tech&m=136597510228697&w=2
-- 
Jérémie Courrèges-Anglas
PGP Key fingerprint: 61DB D9A0 00A4 67CF 2A90  8961 6191 8FBF 06A1 1494

--- Makefile.oldMon Apr 15 00:03:31 2013
+++ MakefileMon Apr 15 00:02:58 2013
@@ -24,6 +24,7 @@
 
 SEPARATE_BUILD =   Yes
 CONFIGURE_STYLE =  gnu
+CONFIGURE_ARGS =   --disable-hardening
 CONFIGURE_ENV =ac_cv_have_decl_htobe64=yes
 
 # upstream says 1.3 will ship with tests



Re: UPDATE: png 1.5.15

2013-04-14 Thread Stuart Henderson
On 2013/04/11 21:42, Brad Smith wrote:
> Here is an update to png 1.5.15.
> 
> OK?

Have you tested much at runtime with it? Bulk build with this in is
looking good so far, 5500 ports in and no fallout yet.


> 
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/graphics/png/Makefile,v
> retrieving revision 1.90
> diff -u -p -r1.90 Makefile
> --- Makefile  25 Mar 2013 00:21:37 -  1.90
> +++ Makefile  12 Apr 2013 01:32:57 -
> @@ -2,10 +2,10 @@
>  
>  COMMENT= library for manipulating PNG images
>  
> -VERSION= 1.5.14
> +VERSION= 1.5.15
>  DISTNAME=libpng-${VERSION}
>  PKGNAME= png-${VERSION}
> -SHARED_LIBS= png 15.0
> +SHARED_LIBS= png 15.1
>  CATEGORIES=  graphics
>  DPB_PROPERTIES=  parallel
>  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=libpng/}
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/graphics/png/distinfo,v
> retrieving revision 1.33
> diff -u -p -r1.33 distinfo
> --- distinfo  25 Mar 2013 00:21:37 -  1.33
> +++ distinfo  12 Apr 2013 01:28:51 -
> @@ -1,2 +1,2 @@
> -SHA256 (libpng-1.5.14.tar.gz) = IgB/gPa21q0rXTe8E13OZwGhek1krubUbt04mL+7EBg=
> -SIZE (libpng-1.5.14.tar.gz) = 1073008
> +SHA256 (libpng-1.5.15.tar.gz) = cmIkt6a1rQAyB4vz+1qE/7WtaDozpi1n975etbw30HY=
> +SIZE (libpng-1.5.15.tar.gz) = 1083892
> Index: patches/patch-scripts_libpng_pc_in
> ===
> RCS file: /home/cvs/ports/graphics/png/patches/patch-scripts_libpng_pc_in,v
> retrieving revision 1.25
> diff -u -p -r1.25 patch-scripts_libpng_pc_in
> --- patches/patch-scripts_libpng_pc_in25 Mar 2013 00:21:37 -  
> 1.25
> +++ patches/patch-scripts_libpng_pc_in12 Apr 2013 01:33:15 -
> @@ -1,6 +1,6 @@
>  $OpenBSD: patch-scripts_libpng_pc_in,v 1.25 2013/03/25 00:21:37 brad Exp $
>  scripts/libpng.pc.in.origWed Jan 23 21:59:05 2013
> -+++ scripts/libpng.pc.in Sat Mar 23 21:04:52 2013
> +--- scripts/libpng.pc.in.origWed Mar 27 21:21:27 2013
>  scripts/libpng.pc.in Thu Apr 11 21:30:19 2013
>  @@ -1,10 +1,11 @@
>   prefix=@prefix@
>   exec_prefix=@exec_prefix@
> @@ -10,7 +10,7 @@ $OpenBSD: patch-scripts_libpng_pc_in,v 1
>   
>   Name: libpng
>   Description: Loads and saves PNG files
> - Version: 1.5.14
> + Version: 1.5.15
>  -Libs: -L${libdir} -lpng15
>  +Libs: -L${libdir} -lpng
>  +Libs.private: -lz -lm
> Index: patches/patch-scripts_makefile_openbsd
> ===
> RCS file: 
> /home/cvs/ports/graphics/png/patches/patch-scripts_makefile_openbsd,v
> retrieving revision 1.39
> diff -u -p -r1.39 patch-scripts_makefile_openbsd
> --- patches/patch-scripts_makefile_openbsd25 Mar 2013 00:21:37 -  
> 1.39
> +++ patches/patch-scripts_makefile_openbsd12 Apr 2013 01:33:07 -
> @@ -1,6 +1,6 @@
>  $OpenBSD: patch-scripts_makefile_openbsd,v 1.39 2013/03/25 00:21:37 brad Exp 
> $
>  scripts/makefile.openbsd.origWed Jan 23 21:59:05 2013
> -+++ scripts/makefile.openbsd Sat Mar 23 21:07:49 2013
> +--- scripts/makefile.openbsd.origWed Mar 27 21:21:27 2013
>  scripts/makefile.openbsd Thu Apr 11 21:29:02 2013
>  @@ -7,8 +7,10 @@
>   # and license in png.h
>   
> @@ -12,7 +12,7 @@ $OpenBSD: patch-scripts_makefile_openbsd
>  +INCDIR= ${PREFIX}/include/libpng
>   
>   SHLIB_MAJOR=15
> - SHLIB_MINOR=1.5.14
> + SHLIB_MINOR=1.5.15
>  @@ -22,15 +24,34 @@ HDRS=png.h pngconf.h pnglibconf.h
>   
>   CFLAGS+= -W -Wall
> 
> -- 
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
> 



NEW: comms/fldigi

2013-04-14 Thread Stuart Henderson
OK to import?


Fldigi is a software modem for Amateur Radio use. It is a sound card based
program that is used for both transmitting and receiving data in any of the
following modes:

BPSK and QPSK31, 63, 125, 250 (both), and 63F and 500 (BPSK only)
PSKR 125, 250, and 500
CW   speeds from 5 to 200 wpm
DominoEX 4, 5, 8, 11, 16 and 22; also with FEC
HellschreiberFeld Hell, Slow Hell, Hell x5/x9, FSKHell(-105) and Hell 80
MFSK 4, 8, 11, 16, 22, 31, 32 and 64; most with image support
MT63 500, 1000 and 2000
OLIVIA   various tones and bandwidths
RTTY various baud rates, shifts, nbr. of data bits, etc.
THOR 4, 5, 8, 11, 16 and 22
Throb and ThrobX 1, 2, and 4
WWV  receive only - calibrate your sound card to WWV
Frequency Analysis   receive only - measure the frequency of a carrier

Fldigi can also control a transceiver using Hamlib or RigCAT I/O, perform online
or cdrom QRZ queries, log QSOs with the built-in logbook or Xlog, and send
reception reports to the PSK Automatic Propagation Reporter.



fldigi.tgz
Description: application/tar-gz


[UPDATE] scribus -> 1.4.2

2013-04-14 Thread Jiri B
Simple diff, looks working OK on amd64, tested with
couple of my n00b documents.

Index: Makefile
===
RCS file: /cvs/ports/print/scribus/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile11 Mar 2013 23:04:32 -  1.48
+++ Makefile14 Apr 2013 21:01:57 -
@@ -3,9 +3,8 @@
 SHARED_ONLY=   Yes
 
 COMMENT=   DTP program
-DISTNAME=  scribus-1.4.1
+DISTNAME=  scribus-1.4.2
 CATEGORIES=print
-REVISION=  2
 
 HOMEPAGE=  http://www.scribus.net/
 
@@ -18,7 +17,7 @@ WANTLIB +=tiff util xml2 z ${MODPY_WANT
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=scribus/}
 
-EXTRACT_SUFX=  .tar.bz2
+EXTRACT_SUFX=  .tar.xz
 
 MODULES=   x11/qt4 \
devel/cmake \
@@ -45,8 +44,6 @@ LIB_DEPENDS=  devel/libexecinfo \
 
 FLAVORS=   debug
 FLAVOR?=
-
-WRKDIST=   ${WRKDIR}/Scribus
 
 CONFIGURE_ARGS +=  -DCMAKE_SKIP_RPATH:BOOL=1 \
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
Index: distinfo
===
RCS file: /cvs/ports/print/scribus/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo28 May 2012 12:32:04 -  1.9
+++ distinfo14 Apr 2013 21:01:57 -
@@ -1,5 +1,2 @@
-MD5 (scribus-1.4.1.tar.bz2) = qmt0UowpUVOrO9qIyGug1g==
-RMD160 (scribus-1.4.1.tar.bz2) = etqiTbhzMVu5WN4BZJI5TvtxMDE=
-SHA1 (scribus-1.4.1.tar.bz2) = fgwBIu1Vfr9PhWkODmk5I2cYutI=
-SHA256 (scribus-1.4.1.tar.bz2) = 82A8od5scPSmorCVcVk1gdTlqu2GO2xZhuN6OiRpgBs=
-SIZE (scribus-1.4.1.tar.bz2) = 68006491
+SHA256 (scribus-1.4.2.tar.xz) = uVHUeRPoALMWdf7JSuToHcLuAkdQapIYIR22LaY4ZWM=
+SIZE (scribus-1.4.2.tar.xz) = 64405272
Index: pkg/PLIST
===
RCS file: /cvs/ports/print/scribus/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST   28 May 2012 12:32:04 -  1.13
+++ pkg/PLIST   14 Apr 2013 21:01:57 -
@@ -122,6 +122,9 @@ include/scribus/docitemattrprefs.h
 include/scribus/docsections.h
 include/scribus/documentchecker.h
 include/scribus/documentinformation.h
+include/scribus/downloadmanager/
+include/scribus/downloadmanager/scdlmgr.h
+include/scribus/downloadmanager/scdlthread.h
 include/scribus/editor.h
 include/scribus/effectsdialog.h
 include/scribus/exif.h
@@ -429,6 +432,7 @@ include/scribus/plugins/tools/2geomtools
 include/scribus/plugins/tools/2geomtools/pathalongpath/pathdialog.h
 include/scribus/plugins/tools/hunspellcheck/
 include/scribus/plugins/tools/hunspellcheck/hunspelldialog.h
+include/scribus/plugins/tools/hunspellcheck/hunspelldict.h
 include/scribus/plugins/tools/hunspellcheck/hunspellplugin.h
 include/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.h
 include/scribus/plugins/tools/hunspellcheck/hunspellpluginstructs.h
@@ -628,6 +632,7 @@ include/scribus/tt/simpletreemodel/treem
 include/scribus/ui/
 include/scribus/ui/copypagetomasterpagedialog.h
 include/scribus/ui/createrange.h
+include/scribus/ui/downloaddictionaries.h
 include/scribus/ui/edittoolbar.h
 include/scribus/ui/filetoolbar.h
 include/scribus/ui/modetoolbar.h
@@ -716,7 +721,6 @@ share/doc/scribus/LINKS
 share/doc/scribus/NEWS
 share/doc/scribus/PACKAGING
 share/doc/scribus/README
-share/doc/scribus/README.MacOSX
 share/doc/scribus/TODO
 share/doc/scribus/TRANSLATION
 share/doc/scribus/de/
@@ -1128,12 +1132,14 @@ share/doc/scribus/en/WwStyles.html
 share/doc/scribus/en/WwText.html
 share/doc/scribus/en/about1.html
 share/doc/scribus/en/about2.html
+share/doc/scribus/en/add_colors.html
 share/doc/scribus/en/bugreport.html
 share/doc/scribus/en/cli.html
 share/doc/scribus/en/cms.html
 share/doc/scribus/en/cms2.html
 share/doc/scribus/en/cms3.html
 share/doc/scribus/en/codingstandards.html
+share/doc/scribus/en/collect4output.html
 share/doc/scribus/en/color1.html
 share/doc/scribus/en/color2.html
 share/doc/scribus/en/color3.html
@@ -1142,9 +1148,11 @@ share/doc/scribus/en/color5.html
 share/doc/scribus/en/color6.html
 share/doc/scribus/en/color7.html
 share/doc/scribus/en/color8.html
+share/doc/scribus/en/color_editing.html
 share/doc/scribus/en/colorwheel.html
 share/doc/scribus/en/config.html
 share/doc/scribus/en/contributions.html
+share/doc/scribus/en/createlinks.html
 share/doc/scribus/en/developers.html
 share/doc/scribus/en/doccopyright.html
 share/doc/scribus/en/docinfo.html
@@ -1158,6 +1166,7 @@ share/doc/scribus/en/fonts1.html
 share/doc/scribus/en/fonts2.html
 share/doc/scribus/en/gettexthowto.html
 share/doc/scribus/en/gsview.html
+share/doc/scribus/en/help.html
 share/doc/scribus/en/hyphenator.html
 share/doc/scribus/en/images/
 share/doc/scribus/en/images/Cover_en1-page1.png
@@ -1198,7 +1207,15 @@ share/doc/scribus/en/images/Scripter.png
 share/doc/scribus/en/images/SwB.png
 share/doc/scribus/en/images/XYZ_Prop.png
 share/doc/scribus/en/images/XYZ_Prop1.png
+share/doc/scribus/en/images/add_colors1.png
+share/doc/scribus/en/

Re: tests invited: rtl-sdr

2013-04-14 Thread Zoran Ivanić
On Sun, Apr 14, 2013 at 04:09:49PM +, Jona Joachim wrote:
> On 2013-04-12, Stuart Henderson  wrote:
> >
> > --5L6AZ1aJH5mDrqCQ
> > Content-Type: text/plain; charset=us-ascii
> > Content-Disposition: inline
> >
> > I thought I'd write a port for this while I wait for my dongle to arrive
> > and thought I'd send it out in case anyone wants to give it a try.
> > No idea if it works on OpenBSD as-is or if it needs more work :)
> 
> It actually seems to work pretty well:
> 
> ugen2 at uhub0 port 2 "Realtek RTL2838UHIDIR" rev 2.00/1.00 addr 2
> 
> asterix% rtl_test -t
> Found 1 device(s):
>   0:  ezcap USB 2.0 DVB-T/DAB/FM dongle
> 
> Using device 0: ezcap USB 2.0 DVB-T/DAB/FM dongle
> Found Elonics E4000 tuner
> Supported gain values (14): -1.0 1.5 4.0 6.5 9.0 11.5 14.0 16.5 19.0
> 21.5 24.0 29.0 34.0 42.0 
> Benchmarking E4000 PLL...
> [E4K] PLL not locked for 5200 Hz!
> [E4K] PLL not locked for 00 Hz!
> [E4K] PLL not locked for 111200 Hz!
> [E4K] PLL not locked for 124800 Hz!
> E4K range: 53 to 2221 MHz
> E4K L-band gap: 1112 to 1248 MHz
> 
> asterix% uname -a
> OpenBSD asterix.my.domain 5.3 GENERIC.MP#60 amd64
> 
> I was able to capture samples but I don't know yet how to exploit them.
> Are you aware for example of a way to play FM radio samples?
>
Here are some examples:
http://kmkeen.com/rtl-demod-guide/index.html,
but i rtl_fm coredumps:

rtl_fm -W -f 98.2M 
Found 1 device(s):
  0:  Realtek, RTL2838UHIDIR, SN: 0009

Using device 0: ezcap USB 2.0 DVB-T/DAB/FM dongle
Found Elonics E4000 tuner
Oversampling input by: 2x.
Oversampling output by: 4x.
Buffer size: 6.02ms
Tuned to 98556000 Hz.
Sampling at 136 Hz.
Output at 32000 Hz.
Exact sample rate is: 136.050439 Hz
Tuner gain set to automatic.
Abort trap (core dumped) 
---
gdb /usr/local/bin/rtl_fm rtl_fm.core  
GNU gdb 6.3
Copyright 2004 Free Software Foundation, Inc.
GDB is free software, covered by the GNU General Public License, and you
are
welcome to change it and/or distribute copies of it under certain
conditions.
Type "show copying" to see the conditions.
There is absolutely no warranty for GDB.  Type "show warranty" for
details.
This GDB was configured as "amd64-unknown-openbsd5.3"...
Core was generated by `rtl_fm'.
Program terminated with signal 6, Aborted.
Reading symbols from /usr/lib/libpthread.so.17.0...done.
Loaded symbols for /usr/lib/libpthread.so.17.0
Loaded symbols for /usr/local/bin/rtl_fm
Reading symbols from /usr/local/lib/librtlsdr.so.0.0...done.
Loaded symbols for /usr/local/lib/librtlsdr.so.0.0
Reading symbols from /usr/local/lib/libusb-1.0.so.1.0...done.
Loaded symbols for /usr/local/lib/libusb-1.0.so.1.0
Symbols already loaded for /usr/lib/libpthread.so.17.0
Reading symbols from /usr/lib/libm.so.8.0...done.
Loaded symbols for /usr/lib/libm.so.8.0
Reading symbols from /usr/lib/libc.so.67.0...done.
Loaded symbols for /usr/lib/libc.so.67.0
Reading symbols from /usr/libexec/ld.so...done.
Loaded symbols for /usr/libexec/ld.so
#0  0x1f104264a9da in kill () at :2
2   : No such file or directory.
in 
(gdb) bt
#0  0x1f104264a9da in kill () at :2
#1  0x1f10426ae2ca in abort () at
/usr/src/lib/libc/stdlib/abort.c:70
#2  0x1f1048d9a8a5 in pthread_mutex_unlock (mutexp=Variable "mutexp"
is not available.
) at /usr/src/lib/librthread/rthread_sync.c:218
#3  0x1f0e3f1029d6 in full_demod (fm=0x7f7fffdfab70) at
/usr/ports/pobj/rtl-sdr-0.20130412/rtl-sdr-0.20130412/src/rtl_fm.c:583
#4  0x1f0e3f102bb4 in demod_thread_fn (arg=Variable "arg" is not
available.
) at
/usr/ports/pobj/rtl-sdr-0.20130412/rtl-sdr-0.20130412/src/rtl_fm.c:641
#5  0x1f1048d9913e in _rthread_start (v=Variable "v" is not
available.
) at /usr/src/lib/librthread/rthread.c:122
#6  0x1f10426363bb in __tfork_thread () at
/usr/src/lib/libc/arch/amd64/sys/tfork_thread.S:75
Cannot access memory at address 0x1f1049225000
---
Another thing im not sure about is tuned frequency and ctrl+c doesn't
work:
rtl_sdr capture1.bin -s 1.8e6 -f 98.2M
Found 1 device(s):
  0:  Realtek, RTL2838UHIDIR, SN: 0013

Using device 0: ezcap USB 2.0 DVB-T/DAB/FM dongle
Found Rafael Micro R820T tuner
Tuned to 1 Hz.
Reading samples in async mode...
^CSignal caught, exiting!
^CSignal caught, exiting!
^CSignal caught, exiting!
Hangup
---
Dumping eprom seems to work:
rtl_eeprom -r E4000-Edump.bin 
Found 1 device(s):
  0:  ezcap USB 2.0 DVB-T/DAB/FM dongle

Using device 0: ezcap USB 2.0 DVB-T/DAB/FM dongle
Found Elonics E4000 tuner

Current configuration:
__
Vendor ID:  0x0bda
Product ID: 0x2838
Manufacturer:   Realtek
Product:RTL2838UHIDIR
Serial number:  0009
Serial number enabled:  yes
IR endpoint enabled:yes
Remote wakeup enab

[update] productivity/taskwarrior 2.2.0

2013-04-14 Thread Aaron Bieber
Hola!

This update brings taskwarrior to 2.2.0 ( removing one of our maintained
patches ), and adds myself as maintainer.

OK?

Index: Makefile
===
RCS file: /cvs/ports/productivity/taskwarrior/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile11 Mar 2013 11:37:55 -  1.9
+++ Makefile14 Apr 2013 16:56:24 -
@@ -2,12 +2,14 @@
 
 COMMENT =  command line todo list manager
 
-VERSION =  2.1.2
+VERSION =  2.2.0
 DISTNAME = task-${VERSION}
 PKGNAME =  taskwarrior-${VERSION}
 CATEGORIES =   productivity
 
 HOMEPAGE = http://www.taskwarrior.org/
+
+MAINTAINER=Aaron Bieber 
 
 MASTER_SITES = ${HOMEPAGE}/download/
 
Index: distinfo
===
RCS file: /cvs/ports/productivity/taskwarrior/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo25 Sep 2012 18:52:14 -  1.4
+++ distinfo14 Apr 2013 16:56:24 -
@@ -1,2 +1,2 @@
-SHA256 (task-2.1.2.tar.gz) = z1FxtUttLS3NnFWfQ3z4oss4NsdjHt+WoW77+LQ4PjY=
-SIZE (task-2.1.2.tar.gz) = 4639841
+SHA256 (task-2.2.0.tar.gz) = OeJd0oXmvIR0M3pYaMsuxVZ1l4+h8IyALm2li0GB7hQ=
+SIZE (task-2.2.0.tar.gz) = 1190905
Index: patches/patch-src_util_cpp
===
RCS file: patches/patch-src_util_cpp
diff -N patches/patch-src_util_cpp
--- patches/patch-src_util_cpp  11 May 2012 09:44:30 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_util_cpp,v 1.1 2012/05/11 09:44:30 jasper Exp $
 src/util.cpp.orig  Fri May 11 11:20:27 2012
-+++ src/util.cpp   Fri May 11 11:20:36 2012
-@@ -406,7 +406,7 @@ int execute(const std::string& executable, std::vector
- 
-   // create command line before forking because the parent process also needs 
this for 
-   // calling context.debug()
--  char shell[] = "bash";
-+  char shell[] = "sh";
-   char opt[]   = "-c";
- 
-   std::string cmdline = executable;
Index: pkg/PLIST
===
RCS file: /cvs/ports/productivity/taskwarrior/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   15 Sep 2012 22:53:42 -  1.3
+++ pkg/PLIST   14 Apr 2013 16:56:24 -
@@ -16,6 +16,8 @@ share/taskwarrior/AUTHORS
 share/taskwarrior/i18n/
 share/taskwarrior/i18n/tips.de-DE
 share/taskwarrior/i18n/tips.en-US
+share/taskwarrior/i18n/tips.es-ES
+share/taskwarrior/i18n/tips.fr-FR
 share/taskwarrior/i18n/tips.it-IT
 share/taskwarrior/i18n/tips.ja-JP
 share/taskwarrior/i18n/tips.sv-SE
@@ -55,6 +57,7 @@ share/taskwarrior/scripts/add-ons/export
 share/taskwarrior/scripts/add-ons/export-html.pl
 share/taskwarrior/scripts/add-ons/export-ical.pl
 share/taskwarrior/scripts/add-ons/export-sql.py
+share/taskwarrior/scripts/add-ons/export-tsv.pl
 share/taskwarrior/scripts/add-ons/export-xml.pl
 share/taskwarrior/scripts/add-ons/export-xml.py
 share/taskwarrior/scripts/add-ons/export-xml.rb
@@ -65,13 +68,6 @@ share/taskwarrior/scripts/add-ons/import
 share/taskwarrior/scripts/add-ons/update-holidays.pl
 share/taskwarrior/scripts/bash/
 share/taskwarrior/scripts/bash/task.sh
-share/taskwarrior/scripts/extensions/
-share/taskwarrior/scripts/extensions/command.lua
-share/taskwarrior/scripts/extensions/dom.lua
-share/taskwarrior/scripts/extensions/format.lua
-share/taskwarrior/scripts/extensions/program_hook.lua
-share/taskwarrior/scripts/extensions/task_hook.lua
-share/taskwarrior/scripts/extensions/uda.lua
 share/taskwarrior/scripts/fish/
 share/taskwarrior/scripts/fish/task.fish
 share/taskwarrior/scripts/vim/



Re: tests invited: rtl-sdr

2013-04-14 Thread Jona Joachim
On 2013-04-12, Stuart Henderson  wrote:
>
> --5L6AZ1aJH5mDrqCQ
> Content-Type: text/plain; charset=us-ascii
> Content-Disposition: inline
>
> I thought I'd write a port for this while I wait for my dongle to arrive
> and thought I'd send it out in case anyone wants to give it a try.
> No idea if it works on OpenBSD as-is or if it needs more work :)

It actually seems to work pretty well:

ugen2 at uhub0 port 2 "Realtek RTL2838UHIDIR" rev 2.00/1.00 addr 2

asterix% rtl_test -t
Found 1 device(s):
  0:  ezcap USB 2.0 DVB-T/DAB/FM dongle

Using device 0: ezcap USB 2.0 DVB-T/DAB/FM dongle
Found Elonics E4000 tuner
Supported gain values (14): -1.0 1.5 4.0 6.5 9.0 11.5 14.0 16.5 19.0
21.5 24.0 29.0 34.0 42.0 
Benchmarking E4000 PLL...
[E4K] PLL not locked for 5200 Hz!
[E4K] PLL not locked for 00 Hz!
[E4K] PLL not locked for 111200 Hz!
[E4K] PLL not locked for 124800 Hz!
E4K range: 53 to 2221 MHz
E4K L-band gap: 1112 to 1248 MHz

asterix% uname -a
OpenBSD asterix.my.domain 5.3 GENERIC.MP#60 amd64

I was able to capture samples but I don't know yet how to exploit them.
Are you aware for example of a way to play FM radio samples?

Best regards,
Jona



[update] net/snort 2.9.4.5

2013-04-14 Thread Markus Lude
Hello,

here's an update to the latest snort version 2.9.4.5.

Please test, comment, commit, ...

Builds on sparc64, run since 2 days on a sparc64 test machine (with low
traffic).

Regards,
Markus

Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.77
diff -u -p -r1.77 Makefile
--- Makefile29 Mar 2013 04:22:59 -  1.77
+++ Makefile14 Apr 2013 14:04:32 -
@@ -4,7 +4,7 @@ SHARED_ONLY =   Yes
 
 COMMENT =  highly flexible sniffer/NIDS
 
-VERSION =  2.9.4.1
+VERSION =  2.9.4.5
 DISTNAME = snort-${VERSION}
 
 CATEGORIES =   net security
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo29 Mar 2013 04:22:59 -  1.22
+++ distinfo14 Apr 2013 14:04:32 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.4.1.tar.gz) = L0Ilbp9LYTIB6nnlr1S2RairAplysj9vvGSesA5vHa4=
-SIZE (snort-2.9.4.1.tar.gz) = 5296045
+SHA256 (snort-2.9.4.5.tar.gz) = TwWSQfgLFAGYgCvxbYa4gSzhXw3T8JujXySFz4suygs=
+SIZE (snort-2.9.4.5.tar.gz) = 5255794
Index: patches/patch-etc_snort_conf
===
RCS file: /cvs/ports/net/snort/patches/patch-etc_snort_conf,v
retrieving revision 1.8
diff -u -p -r1.8 patch-etc_snort_conf
--- patches/patch-etc_snort_conf16 Jan 2013 04:52:53 -  1.8
+++ patches/patch-etc_snort_conf14 Apr 2013 14:04:32 -
@@ -2,11 +2,8 @@ $OpenBSD: patch-etc_snort_conf,v 1.8 201
 
 reputation preprocessor disabled, still experimental
 
-load the new Snort rule files since they have been reorganized:
-http://blog.snort.org/2012/10/rule-category-reorganization-phase-3.html
-
 etc/snort.conf.origThu Nov 15 17:54:40 2012
-+++ etc/snort.conf Thu Jan 10 23:43:15 2013
+--- etc/snort.conf.origThu Mar 21 14:09:05 2013
 etc/snort.conf Thu Apr  4 22:31:37 2013
 @@ -101,17 +101,17 @@ ipvar AIM_SERVERS [64.12.24.0/23,64.12.28.0/23,64.12.1
  # Path to your rules files (this can be a relative path)
  # Note for Windows users:  You are advised to make this an absolute path,
@@ -57,7 +54,7 @@ http://blog.snort.org/2012/10/rule-categ
  
  ###
  # Step #6: Configure output plugins
-@@ -542,42 +543,93 @@ include reference.config
+@@ -542,8 +543,9 @@ include reference.config
  ###
  
  # site specific rules
@@ -65,95 +62,10 @@ http://blog.snort.org/2012/10/rule-categ
 +#include $RULE_PATH/local.rules
  
 +# Official Sourcefire VRT rules from http://www.snort.org/snort-rules/
-+include $RULE_PATH/app-detect.rules
+ include $RULE_PATH/app-detect.rules
  include $RULE_PATH/attack-responses.rules
  include $RULE_PATH/backdoor.rules
- include $RULE_PATH/bad-traffic.rules
- include $RULE_PATH/blacklist.rules
- include $RULE_PATH/botnet-cnc.rules
-+include $RULE_PATH/browser-chrome.rules
-+include $RULE_PATH/browser-firefox.rules
-+include $RULE_PATH/browser-ie.rules
-+include $RULE_PATH/browser-other.rules
-+include $RULE_PATH/browser-plugins.rules
-+include $RULE_PATH/browser-webkit.rules
- include $RULE_PATH/chat.rules
- include $RULE_PATH/content-replace.rules
- include $RULE_PATH/ddos.rules
- include $RULE_PATH/dns.rules
- include $RULE_PATH/dos.rules
-+include $RULE_PATH/experimental.rules
-+include $RULE_PATH/exploit-kit.rules
- include $RULE_PATH/exploit.rules
-+include $RULE_PATH/file-executable.rules
-+include $RULE_PATH/file-flash.rules
- include $RULE_PATH/file-identify.rules
-+include $RULE_PATH/file-image.rules
-+include $RULE_PATH/file-multimedia.rules
-+include $RULE_PATH/file-office.rules
-+include $RULE_PATH/file-other.rules
-+include $RULE_PATH/file-pdf.rules
- include $RULE_PATH/finger.rules
- include $RULE_PATH/ftp.rules
--include $RULE_PATH/icmp.rules
- include $RULE_PATH/icmp-info.rules
-+include $RULE_PATH/icmp.rules
- include $RULE_PATH/imap.rules
-+include $RULE_PATH/indicator-compromise.rules
-+include $RULE_PATH/indicator-obfuscation.rules
-+include $RULE_PATH/indicator-shellcode.rules
- include $RULE_PATH/info.rules
-+include $RULE_PATH/malware-backdoor.rules
-+include $RULE_PATH/malware-cnc.rules
-+include $RULE_PATH/malware-other.rules
-+include $RULE_PATH/malware-tools.rules
- include $RULE_PATH/misc.rules
- include $RULE_PATH/multimedia.rules
- include $RULE_PATH/mysql.rules
- include $RULE_PATH/netbios.rules
- include $RULE_PATH/nntp.rules
- include $RULE_PATH/oracle.rules
-+include $RULE_PATH/os-linux.rules
-+include $RULE_PATH/os-other.rules
-+include $RULE_PATH/os-solaris.rules
-+include $RULE_PATH/os-windows.rules
- include $RULE_PATH/other-ids.rules
- include $RULE_PATH/p2p.rules
- include $RULE_PATH/phishing-spam.rules
-+include $RULE_PATH/policy-multimedia.rules
-+include $RULE_PATH/policy-other.rules
- i

Re: new: opam-1.0.0

2013-04-14 Thread Anil Madhavapeddy
On 17 Mar 2013, at 22:34, James Turner  wrote:

> On Fri, Mar 15, 2013 at 09:49:57PM -0400, James Turner wrote:
>> Attached is a new port for opam an OCaml source-based package manager.
>> Tested on amd64 and loongson. On amd64 the binaries produced are native
>> code while on loongson they are OCaml bytecode; so WANTLIB and PLIST
>> vary slightly for these type of platforms. However having the extra
>> WANTLIBs (c & m) and the @bin markers doesn't seem to be a problem on
>> the bytecode using platforms. Is this alright or should special checks
>> be put in place?
>> 
>> I would appreciate if OCaml people give this a go. I did limited testing
>> using opam init and opam installing some packages.
>> 
>> oks?
>> 
>> Information for inst:opam-1.0.0
>> 
>> Comment: OCaml source-based package manager
>> 
>> Description: OPAM is a source-based package manager for OCaml. It
>> supports multiple simultaneous compiler installations, flexible package
>> constraints, and a Git-friendly development workflow.
>> 
>> Maintainer: The OpenBSD ports mailing-list 
>> 
>> WWW: http://opam.ocamlpro.com/
>> 
> 
> jca@ noticed some issues with opam's build system, ocp-build, when
> building this port with SYSTRACE=Yes. The build system would download a
> few libraries at build time and basically statically compile them into
> the opam binary. jca@ discovered another distfile we can use that
> already contains these files. I've updated the port and it's attached
> here.
> 
> The other option would be to import the additional libraries as separate
> ports and rely on an alternate build target to build opam which would
> utilize the system libraries.
> 
> Preferences, thoughts?

ocp-build is a bit less packaging friendly than ocamlbuild.  There's a
'make with-ocamlbuild' target that will use that in preference to ocp-build
(however, ocp-build is far nicer for day-to-day development and will
eventually be packaging friendly too).

There's an opam-1.0.0-full.tar.gz which contains all the dependencies.
Since the final output is just a binary and has no LIB_DEPENDS on the
OCaml libraries, it may be simpler to package that instead.  It's already
been broken up though, so this is no big deal for the moment.

However, I did notice that the make with-ocamlbuild target seems to be
missing a cudf3 dependency on 1.0.0, so created an issue to look at it
later:
https://github.com/OCamlPro/opam/issues/591

-anil