CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2014/04/09 00:16:05 Modified files: editors/libreoffice/patches: patch-configure_ac patch-liborcus_UnpackedTarball_liborcus_mk Added files: editors/libreoffice/patches: patch-i18npool_source_collator_data_ko_charset_txt patch-i18npool_source_collator_data_zh_TW_charset_txt Log message: disable the ko and zh_TW collator charset until the issue with ICU 5.3 is fixed upstream: https://bugs.freedesktop.org/show_bug.cgi?id=77071
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2014/04/09 00:27:56 Modified files: net/zabbix : Makefile net/zabbix/pkg : zabbix_agentd.rc Log message: remove pexp from the zabbix_agentd as it does not change it's process title anymore, noted and a different diff sent by rivo nurges r...@estpak.ee
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/04/09 06:19:53 Modified files: x11/gnome/controlcenter/patches: patch-panels_info_cc-info-panel_c Log message: Pushed upstream.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/04/09 06:30:41 Modified files: x11/qt4: Makefile Log message: Add textproc/icu4c to run_depends since it gets dlopen'd. ok espie@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/04/09 09:20:36 Modified files: print/foo2zjs : Makefile distinfo print/foo2zjs/patches: patch-getweb_in Log message: Update to foo2zjs-20140408.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2014/04/09 09:59:46 Modified files: www/wordpress : Makefile distinfo Log message: Security update for Wordpress: http://wordpress.org/news/2014/04/wordpress-3-8-2/ same diff from kili@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rpoin...@cvs.openbsd.org2014/04/09 13:23:55 Modified files: mail/sylpheed : Makefile distinfo mail/sylpheed/pkg: PLIST Removed files: mail/sylpheed/pkg: PFRAG.shared Log message: update sylpheed to 3.4.1. ok juanfra@ and Amit Kulkarni.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/04/09 13:47:51 Modified files: www/squid/stable: Makefile Log message: missed a bump when I moved this from snapshots/ to stable/, thanks naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2014/04/09 14:45:57 Modified files: sysutils/resmon: Makefile Log message: Bump after the nagios-plugins - monitoring-plugins change. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2014/04/09 15:20:33 Modified files: lang/racket: Makefile Log message: Fix name of libuniaue in WANTLIB to unbreak the build. ok jturner@ juanfra@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2014/04/09 16:11:33 Modified files: www/apache-httpd: Makefile distinfo www/apache-httpd/patches: patch-docs_man_suexec_8 www/apache-httpd/pkg: PLIST Log message: Update www/apache-httpd to 2.2.17. Fixes CVE-2014-0098 and CVE-2013-6438 among other changes. ok sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2014/04/09 18:50:58 Modified files: net/samba : Makefile net/samba/patches: patch-nsswitch_wbinfo_c patch-source3_lib_netapi_group_c patch-source3_lib_netapi_user_c patch-source3_rpc_client_cli_lsarpc_c patch-source3_rpc_client_cli_pipe_c patch-source3_rpcclient_cmd_samr_c patch-source3_smbd_lanman_c patch-source3_utils_net_rpc_c Added files: net/samba/patches: patch-source3_auth_check_samsec_c patch-source3_rpc_server_samr_srv_samr_chgpasswd_c patch-source3_rpc_server_samr_srv_samr_nt_c Log message: Fix a security issue with Samba.. Password lockout not enforced for SAMR password changes. CVE-2013-4496 ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2014/04/09 23:32:52 Modified files: textproc/pod2mdoc: Makefile distinfo Log message: Update to pod2mdoc-0.0.11.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/04/09 23:43:26 Modified files: devel/glib2: Makefile Added files: devel/glib2/patches: patch-glib_gstrfuncs_c Log message: g_str_has_prefix: don't call strlen(str) (BZ #727890). This prevents a segfault when using WebKit browsers.
Re: [NEW] net/gdnsd
Updated like suggested by Stuart others.
Dropped liburcu flavor. Tested it and pthread is faster.
pthread queries/sec:24000
liburcu queries/sec:12000
rc: ${VARBASE} didn't work. Other ports also use fixed path (/var/xxx).
net_gdnsd.tar.gz
Description: GNU Zip compressed data
Thanks,
Regards,
Sam
--
Samuel Streiner
samuel.strei...@gmail.com
Am 07.04.2014 um 18:12 schrieb Stuart Henderson st...@openbsd.org:
On 2014/04/07 17:09, Stuart Henderson wrote:
On 2014/04/07 17:44, Joerg Jung wrote:
On Mon, Apr 07, 2014 at 02:43:43PM +0200, Samuel Streiner wrote:
Please find attached a new port of gdnsd - geographic dns daemon
Please note that the gdnsd port has a flavor liburcu, witch adds a
dependency
(devel/liburcu). This port (devel/liburcu) does not exist jet. Please note
the second mail
[NEW] devel/liburcu. You will only need devel/liburcu if you use the
liburcu flavor.
Per default gdnsd will be build using pthread.
Feedback Testing (also on other platforms than amd64i386) welcome,
Works fine here on amd64.
IMHO this port is in a good shape and mostly ready.
If another ports developer gives an ok, I'm happy to commit this.
Thanks,
Regards,
Joerg
Not tested, but from reading :-
- should be SHARED_ONLY and regen plists (merge pfrag.shared)
- static libraries for plugins not needed; try LIBTOOL_FLAGS=
--tag=disable-static
- .la files for plugins probably not needed, try rm'ing in post-install, but
check it still works without
- DESCR is a bit of a mess
- patches should be generated with 'make update-patches'
CONFIGURE_ARGS+=LIBEV_CFLAGS=-I/usr/local/include \
LIBEV_LIBS=-L/usr/local/lib -lev \
^^
should be ${LOCALBASE}
--with-rootdir=/var/gdnsd
should be ${VARBASE}
BUILD_DEPENDS= devel/libtool \
devel/ragel \
devel/autoconf/2.69 \
devel/automake/1.11
last 2 should be ${MODGNU_AUTOCONF_DEPENDS} and ${MODGNU_AUTOMAKE_DEPENDS}
is gnu libtool just for m4 files for autoconf/automake, or something else?
RUN_DEPENDS=net/GeoIP
are you sure this is only a run dependency, not a LIB_DEPENDS or
BUILD_DEPENDS?
COMMENT=Authoritative-only GeoIP-aware DNS server
lowercase start of comment
gdnsd.rc: daemon=/usr/local/sbin/gdnsd, daemon_flags=-d /var/gdnsd
should use ${TRUEPREFIX} and ${VARBASE}
Oh, another thing, is there really any point adding complexity by
making liburcu optional? Either it's useful, in which case the port
should just use it anyway, or it's not, in which case it should be
dropped.
Re: [NEW] devel/liburcu
Can be dropped. No further use.
Thanks,
Regards,
Sam
--
Samuel Streiner
samuel.strei...@gmail.com
Am 08.04.2014 um 00:42 schrieb Samuel Streiner samuel.strei...@gmail.com:
Sorry for mistakes. My first OpenBSD ports :D
But I'll make them right!
BUILD_DEPENDS= devel/libtool
According to Readme it is needed. (Looking at the src just for
autoconf/automake).
Should be tested on multiple platforms. But according to read me it should
build
on: x86 (i386, i486, i586, i686), x86 64-bit, PowerPC 32/64, S390, S390x,
ARM, MIPS, Alpha, ia64 and Sparcv9 32/6
Thanks again for the feedback.
--
Samuel Streiner
samuel.strei...@gmail.com
Am 07.04.2014 um 18:23 schrieb Stuart Henderson st...@openbsd.org:
On 2014/04/07 14:50, Samuel Streiner wrote:
Hi All,
Please find attached a new port of liburcu - userspace RCU library.
This port is a dependency for net/gdnsd. Please see my other mail [NEW]
net/gdnsd.
FreeBSD got the port below sysutils, but I found it more convenient below
devel.
Still not sure about. - Comments / Advice appreciated
Feedback Testing (also on other platforms than amd64i386) welcome,
Sam
--
Samuel Streiner
samuel.strei...@gmail.com
COMMENT=Userspace read-copy-update (RCU) library
- start with lowercase
V= 0.8.4
- V is pointless here, just list it in DISTNAME
DISTFILES= userspace-rcu-${V}.tar.bz2
- not needed, this already defaults to ${DISTNAME}${EXTRACT_SUFX}
BUILD_DEPENDS= devel/libtool
- is this needed? why?
This looks like something which needs testing on multiple architectures.
Also it's missing SHARED_LIBS handling.
json-c: backport CVE fixes
any comments/OKs?
notable ports depending on this include pulseaudio and syslog-ng
- Forwarded message from Huzaifa Sidhpurwala huzai...@redhat.com -
From: Huzaifa Sidhpurwala huzai...@redhat.com
Date: Wed, 09 Apr 2014 12:07:44 +0530
To: oss-secur...@lists.openwall.com
Reply-To: oss-secur...@lists.openwall.com
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101
Thunderbird/24.3.0
Subject: [oss-security] Two security flaws with json-c
Hi All,
Florian Weimer of the Red Hat Product Security Team discovered two flaws
in json-c, details as follows:
1. CVE-2013-6371 json-c: hash collision DoS
The hash function in the json-c library was weak, and that parsing
smallish JSON strings showed quadratic timing behaviour. This could
cause an application linked to the json-c library, and that processes
some specially-crafted JSON data, to use excessive amounts of CPU.
Reference:
https://bugzilla.redhat.com/show_bug.cgi?id=1032311
2. CVE-2013-6370 json-c: buffer overflow if size_t is larger than int
The printbuf APIs used in the json-c library used ints for counting
buffer lengths, which is inappropriate for 32bit architectures. These
functions need to be changed to using size_t if possible for sizes, or
to be hardened against negative values if not. This could be used to
cause a denial of service in an application linked to the json-c library.
Reference:
https://bugzilla.redhat.com/show_bug.cgi?id=1032322
Both these issues are fixed via the following upstream commit:
https://github.com/json-c/json-c/commit/64e36901a0614bf64a19bc3396469c66dcd0b015
--
Huzaifa Sidhpurwala / Red Hat Security Response Team
- End forwarded message -
Index: Makefile
===
RCS file: /cvs/ports/devel/json-c/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile30 Aug 2013 07:36:56 - 1.9
+++ Makefile9 Apr 2014 12:29:46 -
@@ -2,9 +2,10 @@
COMMENT= JSON implementation in C
-DISTNAME = json-c-0.11
-REVISION= 0
+DISTNAME= json-c-0.11
+REVISION= 1
CATEGORIES=devel
+
SHARED_LIBS += json 2.0 # 1.0
SHARED_LIBS += json-c0.0 # 2.1
@@ -16,5 +17,19 @@ PERMIT_PACKAGE_CDROM=Yes
MASTER_SITES = https://s3.amazonaws.com/json-c_releases/releases/
CONFIGURE_STYLE= gnu
+AUTOMAKE_VERSION= 1.11
+AUTOCONF_VERSION= 2.68
+BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS}
+
+# not enabled by default at present, but we want to make sure we
+# don't use it if it's later enabled as it disables using random(4).
+# (the cpuid code will probably break with PIE on i386 too).
+CONFIGURE_ARGS=--disable-rdrand
+
+post-patch:
+ cd ${WRKSRC} \
+ AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
.include bsd.port.mk
Index: patches/patch-Makefile_am
===
RCS file: patches/patch-Makefile_am
diff -N patches/patch-Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_am 9 Apr 2014 12:29:46 -
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+From 64e36901a0614bf64a19bc3396469c66dcd0b015 Mon Sep 17 00:00:00 2001
+From: Michael Clark mich...@metaparadigm.com
+Date: Wed, 9 Apr 2014 13:48:21 +0800
+Subject: [PATCH] Patch to address the following issues:
+
+* CVE-2013-6371: hash collision denial of service
+* CVE-2013-6370: buffer overflow if size_t is larger than int
+#
+--- Makefile.am.orig Mon Apr 1 15:05:01 2013
Makefile.amWed Apr 9 13:08:18 2014
+@@ -29,7 +29,8 @@ libjson_cinclude_HEADERS = \
+ json_tokener.h \
+ json_util.h \
+ linkhash.h \
+- printbuf.h
++ printbuf.h \
++ random_seed.h
+
+ #libjsonx_includedir = $(libdir)/json-c-@VERSION@
+ #
+@@ -55,7 +56,8 @@ libjson_c_la_SOURCES = \
+ json_tokener.c \
+ json_util.c \
+ linkhash.c \
+- printbuf.c
++ printbuf.c \
++ random_seed.c
+
+
+ distclean-local:
Index: patches/patch-Makefile_am_inc
===
RCS file: patches/patch-Makefile_am_inc
diff -N patches/patch-Makefile_am_inc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_am_inc 9 Apr 2014 12:29:46 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+From 64e36901a0614bf64a19bc3396469c66dcd0b015 Mon Sep 17 00:00:00 2001
+From: Michael Clark mich...@metaparadigm.com
+Date: Wed, 9 Apr 2014 13:48:21 +0800
+Subject: [PATCH] Patch to address the following issues:
+
+* CVE-2013-6371: hash collision denial of service
+* CVE-2013-6370: buffer overflow if size_t is larger than int
+
+--- Makefile.am.inc.orig Mon Apr 1 03:01:09 2013
Makefile.am.incWed Apr 9 13:08:18 2014
+@@ -1,2 +1,2 @@
Re: Preventing substitutions in PLIST ?
On 12/08/13 09:23, Marc Espie wrote:
On Sun, Dec 08, 2013 at 08:41:23AM -0500, Stuart Cassoff wrote:
On 12/07/13 16:42, Marc Espie wrote:
On Sat, Dec 07, 2013 at 03:39:28PM -0500, Stuart Cassoff wrote:
On 12/05/13 05:36, Marc Espie wrote:
On Thu, Dec 05, 2013 at 01:26:47AM -0500, Stuart Cassoff wrote:
I'd like tcllib and tklib to make use of 'tcl modules'.
Every package that can be installed as a tcl module saves one file and
one dir
and there are enough eligible packages that I think it's worth doing.
This makes use of a newer tcl packaging system that's a bit better
and/or faster.
These should always be installend in the dir for lowest tcl version
possible, which is 8.5.
I'm concerned that ${MODTK_VERSION} in the PLIST isn't right.
Here's the result for one package:
So, make sure to look at the result of update-plist, it's not always
right.
How's this? Snippet from the port Makefile diff.
+# We want the lowest Tcl version possible.
+MODTK_VERSION =8.5
+
+# Manual target to adjust PLIST after update-plist.
+adj-plist:
+ perl -pi -e 's/\$${MODTK_VERSION}/8.5/' ${PKGDIR}/PLIST
+
YUCK. A big *NO*.
Did you try the approach I outlined ? Namely provide longer module
variables
that would be FIRST in the substituted list.
It confused and frightened me.
Eventually I manned-up and so with your approach I get this in the PLIST:
lib/tcl/${MODTK_MODPATH}/autoscroll-1.1.tm
Which I don't understand much more.
Either way I get the same package file so maybe I don't actually have a
problem here?
Maybe you don't understand it much more, but it's cleaner, in as much
as there's no extra step to fix the plist after update-plist.
... and it will fix the same problem in (potentially) other ports, without
you needing to special-case each and every port.
Ok I understand now, thanks.
How's this? Should there be a MODTK_MINVERSION as well?
Index: lang/tcl/tcl.port.mk
===
RCS file: /cvs/ports/lang/tcl/tcl.port.mk,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 tcl.port.mk
--- lang/tcl/tcl.port.mk17 Nov 2013 11:08:03 - 1.16
+++ lang/tcl/tcl.port.mk9 Apr 2014 21:26:05 -
@@ -3,6 +3,7 @@
CATEGORIES += lang/tcl
MODTCL_VERSION ?= 8.5
+MODTCL_MINVERSION ?= 8.5
.if ${MODTCL_VERSION} == 8.4
_MODTCL_SPEC = tcl-=${MODTCL_VERSION},8.5
@@ -43,4 +44,4 @@ MODTCL_TCLSH_ADJ =perl -pi \
# Same for 'wish'.
MODTCL_WISH_ADJ = ${MODTCL_TCLSH_ADJ:S/tclsh/wish/}
-SUBST_VARS += MODTCL_VERSION MODTCL_BIN
+SUBST_VARS += MODTCL_MINVERSION MODTCL_VERSION MODTCL_BIN
Index: x11/tk/tk.port.mk
===
RCS file: /cvs/ports/x11/tk/tk.port.mk,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 tk.port.mk
--- x11/tk/tk.port.mk 2 Feb 2013 11:18:28 - 1.12
+++ x11/tk/tk.port.mk 9 Apr 2014 21:26:55 -
@@ -22,7 +22,7 @@ MODTK_LIBDIR ?= ${MODTCL_TCLDIR}/tk${MO
MODTK_CONFIG ?=${MODTK_LIBDIR}/tkConfig.sh
-SUBST_VARS += MODTK_VERSION MODTK_BIN
+SUBST_VARS += MODTCL_MINVERSION MODTK_VERSION MODTK_BIN
MODULES += lang/tcl
Index: port-modules.5
===
RCS file: /cvs/src/share/man/man5/port-modules.5,v
retrieving revision 1.172
diff -u -p -u -p -r1.172 port-modules.5
--- port-modules.5 2 Apr 2014 15:00:27 - 1.172
+++ port-modules.5 9 Apr 2014 21:24:27 -
@@ -933,8 +933,9 @@ Sets
.Ev MODTCL_RUN_DEPENDS ,
.Ev MODTCL_LIB ,
.Ev MODTCL_LIB_DEPENDS ,
+.Ev MODTCL_CONFIG
and
-.Ev MODTCL_CONFIG .
+.Ev MODTCL_MINVERSION .
.Ev MODTCL_VERSION
is the default version used by all Tcl ports and may be overridden.
Provides
@@ -946,6 +947,10 @@ Also affects
.Ev CATEGORIES
and
.Ev SUBST_VARS .
+.Ev MODTCL_MINVERSION
+may be used to prevent unwanted
+.Ev MODTCL_VERSION
+substitutions in PLISTs.
.It perl
This module is documented in the main
.Xr bsd.port.mk 5
Re: [NEW] security/keybase-node-client
Hi Andrew, On Mon, Apr 07, 2014 at 09:45:33PM -0700, Andrew Fresh wrote: I am not too sure how to port a node package, this confused me quite a bit, but it seems to work. Feedback is much appreciated. Seems to work. A few comments: * License is just 3 clause BSD, no? * Strictly speaking, either security/gnupg or security/gnupg2 are a suitable RUN_DEPEND, although I am not aware of a way of encoding that in a port. (I use gnupg2 so I can use gpg-agent). * It's kind of annoying that it packages 30 dependent node packages statically. I guess in an ideal world, we would make a port for these and use system versions. (or would we?). * Probably want to disable 'keybase update' as it clearly won't work. Food for thought. -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: [NEW] security/keybase-node-client
On Thu, Apr 10, 2014 at 01:03:47AM +0100, Edd Barrett wrote: Food for thought. Also, uninstall is not clean: wilfred:~ sudo pkg_delete keybase-node-client keybase-node-client-0.2.18: ok Read shared items: ok --- -keybase-node-client-0.2.18 --- Error deleting directory /usr/local/lib/keybase/node_modules/request/node_modules/http-signature/node_modules/ctype/man: Directory not empty Error deleting directory /usr/local/lib/keybase/node_modules/request/node_modules/http-signature/node_modules/ctype: Directory not empty Error deleting directory /usr/local/lib/keybase/node_modules/request/node_modules/http-signature/node_modules: Directory not empty Error deleting directory /usr/local/lib/keybase/node_modules/request/node_modules/http-signature: Directory not empty Error deleting directory /usr/local/lib/keybase/node_modules/request/node_modules: Directory not empty Error deleting directory /usr/local/lib/keybase/node_modules/request: Directory not empty Error deleting directory /usr/local/lib/keybase/node_modules: Directory not empty Error deleting directory /usr/local/lib/keybase: Directory not empty -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
NEW: www/wallabag-1.6.0
Hi all, Attached is an OpenBSD port for Wallabag [0]. This is a self-hosted read-it-later application offering similar functionality as Readability or Poche. The port is pretty trivial, apart from some playing around with dependencies: Wallabag provides an archive (vendor.zip) containing a few PHP libraries from various vendors on which the webapp depends. While the port works well at the moment, I suspect there might be an issue when this vendor.zip archive needs be updated, as checksums might fail then. It would probably be better to have a vendor-1.6.0.zip archive, so we're sure what version we're getting (Wallabag devs are Cc'd to this email so they are aware of this potential issue). Apart from that, the port and webapp work nicely on 5.4-stable with httpd and php-5.3. [0] https://www.wallabag.org/ -- Olivier Mehani sht...@ssji.net PGP fingerprint: 4435 CF6A 7C8D DD9B E2DE F5F9 F012 A6E2 98C6 6655 Confidentiality cannot be guaranteed on emails sent or received unencrypted. pgpYMEoq_XnPY.pgp Description: PGP signature
UPDATE: Xine-lib 1.2.4
Here is an update to Xine-lib 1.2.5.
OK?
Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/xine-lib/Makefile,v
retrieving revision 1.108
diff -u -p -u -p -r1.108 Makefile
--- Makefile8 Jan 2014 00:17:53 - 1.108
+++ Makefile10 Apr 2014 02:30:18 -
@@ -4,13 +4,12 @@ SHARED_ONLY= Yes
COMMENT= multimedia decoding library
-DISTNAME= xine-lib-1.2.4
-REVISION= 0
+DISTNAME= xine-lib-1.2.5
CATEGORIES=multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS= xine30.2
+SHARED_LIBS= xine31.0
HOMEPAGE= http://www.xine-project.org/
@@ -21,12 +20,12 @@ PERMIT_PACKAGE_CDROM= patents
PERMIT_PACKAGE_FTP=Yes
WANTLIB= FLAC GL GLU ICE SDL SM X11 Xext Xinerama Xv XvMCW a52 avcodec \
- avutil bluray c cdio dca dvdnav dvdread expat faad fontconfig \
- freetype iso9660 jpeg m mad modplug mpcdec mng ogg postproc \
- pthread pthread-stubs sndio speex theora usbhid vcdinfo vorbis \
- wavpack xcb-shape xcb-shm xcb-xv xcb xdg-basedir xml2 z
+ avformat avutil bluray c cdio dca dvdnav dvdread expat faad \
+ fontconfig freetype iso9660 jpeg m mad modplug mpcdec mng ogg \
+ postproc pthread pthread-stubs sndio speex theora usbhid
vcdinfo \
+ vorbis wavpack xcb-shape xcb-shm xcb-xv xcb xdg-basedir xml2 z
-XINEAPI_REV= 2.3
+XINEAPI_REV= 2.4
SUBST_VARS+= XINEAPI_REV
MODULES= devel/gettext
@@ -43,7 +42,7 @@ LIB_DEPENDS= audio/faad \
audio/speex \
audio/wavpack \
devel/sdl \
- graphics/ffmpeg=2026 \
+ graphics/ffmpeg=20130319 \
graphics/jpeg \
graphics/libmng \
graphics/vcdimager \
@@ -69,6 +68,7 @@ CONFIGURE_ARGS+=--disable-aalib \
--disable-optimizations \
--disable-real-codecs \
--disable-samba \
+ --disable-vpx \
--disable-w32dll \
--with-external-dvdnav \
--with-fontconfig \
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/xine-lib/distinfo,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 distinfo
--- distinfo30 Nov 2013 22:13:37 - 1.26
+++ distinfo10 Apr 2014 02:03:12 -
@@ -1,2 +1,2 @@
-SHA256 (xine-lib-1.2.4.tar.xz) = nFsbTve9BZGWLDIqOvpwnuqluuZkZ4VI8TQOZPQ6u90=
-SIZE (xine-lib-1.2.4.tar.xz) = 4954992
+SHA256 (xine-lib-1.2.5.tar.xz) = yOpAkNH6g/i2iHEYcwVHqpGIYtYPQ+pnAIn5BT5Uq3w=
+SIZE (xine-lib-1.2.5.tar.xz) = 5007012
Index: patches/patch-src_combined_ffmpeg_Makefile_in
===
RCS file: patches/patch-src_combined_ffmpeg_Makefile_in
diff -N patches/patch-src_combined_ffmpeg_Makefile_in
--- patches/patch-src_combined_ffmpeg_Makefile_in 30 Nov 2013 22:13:37
- 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_combined_ffmpeg_Makefile_in,v 1.3 2013/11/30 22:13:37 brad
Exp $
-
-Improve locating of avcodec.h by replacing the sed scripts.
-
src/combined/ffmpeg/Makefile.in.orig Wed Nov 20 18:40:06 2013
-+++ src/combined/ffmpeg/Makefile.inWed Nov 20 18:40:47 2013
-@@ -998,7 +998,7 @@ avcodec_video.list: AV_CODECS:=/CODEC_ID_MPEG1VIDEO/,/
- # that weird shell call just yields full path of the avcodec.h file
- avcodec_audio.list avcodec_video.list: $(shell \
- echo '#include $(srcdir)/ffmpeg_decoder.h' | $(AV_CPP) -M - |\
-- sed -e 's/ \+/\n/g;' | sed -n -e '/avcodec\.h/p;')
-+ sed -e '/avcodec\.h/! d; s%^.* \([^ ]*/avcodec\.h\) .*%\1%')
- $(AM_V_GEN)echo '#include $(srcdir)/ffmpeg_decoder.h' | $(AV_CPP) - |\
- sed -e $(AV_CODECS)'! d; s/^[ \t]*//; s/[=,].*//; /^$$/ d' $@
-
Index: patches/patch-src_demuxers_demux_flv_c
===
RCS file: patches/patch-src_demuxers_demux_flv_c
diff -N patches/patch-src_demuxers_demux_flv_c
--- patches/patch-src_demuxers_demux_flv_c 30 Nov 2013 22:13:37 -
1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,39 +0,0 @@
-$OpenBSD: patch-src_demuxers_demux_flv_c,v 1.4 2013/11/30 22:13:37 brad Exp $
-
-Add audio language info.
-
src/demuxers/demux_flv.c.orig Wed Nov 20 21:13:27 2013
-+++ src/demuxers/demux_flv.c Wed Nov 20 21:13:39 2013
-@@ -1034,11 +1034,31 @@ static int demux_flv_get_stream_length (demux_plugin_t
- }
-
- static uint32_t demux_flv_get_capabilities(demux_plugin_t *this_gen) {
-- return DEMUX_CAP_NOCAP;
-+ return DEMUX_CAP_AUDIOLANG;
- }
-
- static int demux_flv_get_optional_data(demux_plugin_t *this_gen,
-void *data, int data_type) {
-+ demux_flv_t *this = (demux_flv_t *)
