CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/06/30 01:58:42 ports/www/py-jwt/patches Update of /cvs/ports/www/py-jwt/patches In directory cvs.openbsd.org:/tmp/cvs-serv2213/patches Log Message: Directory /cvs/ports/www/py-jwt/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2015/06/30 02:57:16 Modified files: devel/p5-Glib2 : Makefile distinfo devel/p5-Glib2/pkg: PLIST Log message: Update to p5-Glib2-1.310.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/06/30 03:02:54 Modified files: x11/vlc: Makefile Log message: remove the BROKEN-amd64 marker; there is a problem, seemingly with ld.so (_dl_cache_grpsym_list in backtrace) and it affects more than just amd64, but the failure doesn't happen every time, so removing the BROKEN marker at least gives us a chance to reattempt builds if it fails. espie@ ajacoutot@ ok with removing the BROKEN marker for now.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2015/06/30 01:51:31 Modified files: lang/ruby/2.0 : Tag: OPENBSD_5_7 Makefile lang/ruby/2.1 : Tag: OPENBSD_5_7 Makefile lang/ruby/2.2 : Tag: OPENBSD_5_7 Makefile Added files: lang/ruby/2.0/patches: Tag: OPENBSD_5_7 patch-lib_rubygems_remote_fetcher_rb lang/ruby/2.1/patches: Tag: OPENBSD_5_7 patch-lib_rubygems_remote_fetcher_rb lang/ruby/2.2/patches: Tag: OPENBSD_5_7 patch-lib_rubygems_remote_fetcher_rb Log message: Security fixes for CVE-2015-3900 and CVE-2015-4020 with jeremy@
Re: CVS: cvs.openbsd.org: ports
On 2015/06/30 03:02, Stuart Henderson wrote: CVSROOT: /cvs Module name: ports Changes by: st...@cvs.openbsd.org 2015/06/30 03:02:54 Modified files: x11/vlc: Makefile Log message: remove the BROKEN-amd64 marker; there is a problem, seemingly with ld.so (_dl_cache_grpsym_list in backtrace) and it affects more than just amd64, but the failure doesn't happen every time, so removing the BROKEN marker at least gives us a chance to reattempt builds if it fails. espie@ ajacoutot@ ok with removing the BROKEN marker for now. To reproduce, build the port: make DEBUG=-g fake then setup env vars .. export PATH=/usr/obj/ports/vlc-2.2.1/fake-amd64/usr/local/bin:$PATH export LD_LIBRARY_PATH=/usr/obj/ports/vlc-2.2.1/fake-amd64/usr/local/lib:$LD_LIBRARY_PATH and run vlc-cache-gen in a loop (adapt paths if necessary): while ! /usr/ports/pobj/vlc-2.2.1/fake-amd64/usr/local/lib/vlc/vlc-cache-gen -f \ /usr/ports/pobj/vlc-2.2.1/fake-amd64/usr/local/lib/vlc/plugins; :; done
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2015/06/30 18:07:08 Modified files: audio/schismtracker: Makefile distinfo Removed files: audio/schismtracker/patches: patch-modplug_snd_gm_c Log message: Create our own release of Schism Tracker, using the code from the tip of the development. Unlike the last release, this version works well and has the benefit of further work. Because versioning is MMDD, when upstream cuts a new release we will be able to move to it without issue. ok jung@
matplotlib Gtk3
I am having issue with matplotlib on 5.7 release. Trying to import matplotlib.pyplot as plt gives 11 except ImportError: --- 12 raise ImportError(Gtk3 backend requires pygobject to be installed.) 13 14 try: ImportError: Gtk3 backend requires pygobject to be installed. Can anyone confirm this? Predrag
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2015/06/30 04:53:18 Modified files: graphics/clutter/core: Makefile distinfo Log message: update to clutter-1.22.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2015/06/30 04:53:28 Modified files: graphics/clutter/clutter-gtk: Makefile distinfo Log message: - update to clutter-gtk-1.6.2 - sync WANTLIB
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/06/30 03:19:48 Modified files: net/icinga/core2: Makefile distinfo net/icinga/core2/pkg: PLIST-main Log message: update to icinga2-2.3.5, still no closer to solving the problems though so it remains marked BROKEN.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/06/30 03:26:06 Modified files: graphics/xanim : Makefile Added files: graphics/xanim/patches: i386-patch Log message: reinstate i386-patch
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/06/30 07:42:16 Modified files: www/py-jwt : Makefile Added files: www/py-jwt/patches: patch-setup_py Log message: don't let setuptools in py-jwt fetch pytest-runner over the network at build time. ok johan huldtgren, landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2015/06/30 07:54:39 Modified files: editors/subtitleeditor: Makefile distinfo editors/subtitleeditor/pkg: PLIST Log message: Update to subtitleeditor-0.52.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/06/30 09:49:00 Modified files: devel/cxxtools : Makefile devel/cxxtools/pkg: PLIST Log message: Use a variable to specify arch for use in cxxtools PLIST. ok jasper@ cxxtools now installs only the header for the current arch, so without this packaging fails on arch other than the one where PLIST was generated.
UPDATE: audio/schismtracker 20100101 = 20150425
Hi ports --
Schism Tracker hasn't seen a release in quite a while, and the last
release (made in 2012) is broken so we never updated to it.
However, upstream appears to be alive and made some commits this year,
so I decided to take the head of the repo and call it a release for our
intents and purposes. It works fine. I'm hosting the tarball myself on
the NYC*BUG server.
Because Schism Tracker uses MMDD as its versioning scheme, when
upstream does decide to cut their own release we'll be able to move to
it without issue.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/audio/schismtracker/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 13 Nov 2013 01:09:51 - 1.1.1.1
+++ Makefile 30 Jun 2015 15:12:30 -
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/11/13 01:09:51 bcallah Exp $
COMMENT = free module tracker editor and player
-# Newer versions are broken.
-DISTNAME = schismtracker-20100101
+DISTNAME = schismtracker-20150425
EXTRACT_SUFX = .tar.bz2
CATEGORIES = audio x11
@@ -12,9 +11,9 @@ MAINTAINER = Brian Callahan bcallah@ope
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += SDL X11 Xext Xv Xxf86misc c m pthread stdc++
+WANTLIB += SDL X11 Xext Xv c m pthread
-MASTER_SITES = http://schismtracker.org/dl/
+MASTER_SITES = http://mirrors.nycbug.org/pub/distfiles/
LIB_DEPENDS = devel/sdl
Index: distinfo
===
RCS file: /cvs/ports/audio/schismtracker/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 13 Nov 2013 01:09:51 - 1.1.1.1
+++ distinfo 30 Jun 2015 15:12:30 -
@@ -1,2 +1,2 @@
-SHA256 (schismtracker-20100101.tar.bz2) = u82C8K6dlzYbohx1KW3jSBuEz+ou2eaKW6+1Nk8qOJQ=
-SIZE (schismtracker-20100101.tar.bz2) = 1047576
+SHA256 (schismtracker-20150425.tar.bz2) = vBBkpG67SATMuPHsVTvXAwkG6ou1zpb4Ne4GW7QOXSU=
+SIZE (schismtracker-20150425.tar.bz2) = 1276317
Index: patches/patch-modplug_snd_gm_c
===
RCS file: patches/patch-modplug_snd_gm_c
diff -N patches/patch-modplug_snd_gm_c
--- patches/patch-modplug_snd_gm_c 13 Nov 2013 01:09:51 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,22 +0,0 @@
-$OpenBSD: patch-modplug_snd_gm_c,v 1.1.1.1 2013/11/13 01:09:51 bcallah Exp $
-
-Taken from FreeBSD.
-
modplug/snd_gm.c.orig Sun Nov 10 15:37:40 2013
-+++ modplug/snd_gm.c Sun Nov 10 15:37:58 2013
-@@ -10,13 +10,14 @@
- #include mplink.h // for 'mp', which we shouldn't need
- #include snd_gm.h
-
-+/*
- #if !defined(HAVE_LOG2) !defined(__USE_ISOC99) !defined(log2)
- static double log2(double d)
- {
- return log(d) / log(2.0);
- }
- #endif
--
-+*/
-
- #define LinearMidivol 1
- #define PitchBendCenter 0x2000
s-nail-14.8.2
Hi,
here's an update to the latest release.
Test reports / comments / oks welcome.
Note that s-nail gained a few tests since its import in the ports tree.
Cheers,
Index: Makefile
===
RCS file: /cvs/ports/mail/s-nail/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile3 Feb 2015 17:41:58 - 1.11
+++ Makefile30 Jun 2015 11:55:32 -
@@ -2,7 +2,7 @@
COMMENT= enhanced, MIME capable Berkeley Mail
-DISTNAME= s-nail-14.7.11
+DISTNAME= s-nail-14.8.2
DISTFILES= ${DISTNAME:S/./_/g}.tar.gz
CATEGORIES=mail
HOMEPAGE= http://sdaoden.users.sourceforge.net/code.html#s-nail
@@ -23,14 +23,15 @@ MAKE_FLAGS= CC=${CC} \
C_INCLUDE_PATH=${LOCALBASE}/include \
LDFLAGS=${LDFLAGS} \
LD_LIBRARY_PATH=${LOCALBASE}/lib \
+ MANDIR=${PREFIX}/man \
SYSCONFDIR=${SYSCONFDIR} \
+ WANT_AUTOCC=0 \
WANT_EDITLINE=1
MAKE_ENV= VERBOSE=Yes
LIB_DEPENDS= devel/libidn
INSTALL_TARGET=packager-install
-NO_TEST= Yes
post-install:
ln -sf ${TRUEPREFIX}/bin/s-nail ${PREFIX}/bin/nail
Index: distinfo
===
RCS file: /cvs/ports/mail/s-nail/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo3 Feb 2015 17:41:58 - 1.7
+++ distinfo30 Jun 2015 12:51:18 -
@@ -1,2 +1,2 @@
-SHA256 (s-nail-14_7_11.tar.gz) = zxxeEIni4Y8euAreQbO3X/Xt2JjjBmrNS+L0IVU51H4=
-SIZE (s-nail-14_7_11.tar.gz) = 525827
+SHA256 (s-nail-14_8_2.tar.gz) = 5jC7/Ovf6rQqQAJr+z9MLwOM/SGBa1XQYw6Frnyki58=
+SIZE (s-nail-14_8_2.tar.gz) = 618008
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
[googlecl] removal
Hi all, Not sure whether anyone has already noticed it but OAuth 1.0 is no longer supported by Google[0], which in turn renders googlecl unusable[1]. Please remove it from the repository. Ta, Raf [0] https://support.google.com/a/answer/6224347 [1] https://code.google.com/p/googlecl/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2015/06/30 13:42:39 Modified files: x11/gnome/file-roller: Makefile distinfo Removed files: x11/gnome/file-roller/patches: patch-src_fr-command-unarchiver_c Log message: update to file-roller-3.16.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2015/06/30 14:07:23 Modified files: converters/convmv: Makefile distinfo Log message: update to convmv-2.0
Re: UPDATE: SMPlayer-14.9.0.6966
Sure! On 30/06, Giovanni Bechis wrote: ; On 06/18/15 23:08, Gonzalo L. Rodriguez wrote: ; Hi, ; ; Update for SMPlayer to 14.9.0.6966: ; ; https://www.assembla.com/code/smplayer/subversion/nodes/6994/smplayer/trunk/Changelog ; ; ; Ok? Comments? ; ; Cheers.- ; ; Update to latest version based on your diff, ok ? ; Cheers ; Giovanni ; Index: Makefile ; === ; RCS file: /var/cvs/ports/x11/smplayer/Makefile,v ; retrieving revision 1.20 ; diff -u -p -r1.20 Makefile ; --- Makefile 23 Apr 2015 14:47:10 - 1.20 ; +++ Makefile 30 Jun 2015 09:58:38 - ; @@ -2,7 +2,7 @@ ; ; COMMENT =complete front-end for MPlayer ; ; -DISTNAME = smplayer-14.9.0.6690 ; +DISTNAME = smplayer-14.9.0.6994 ; ; CATEGORIES = multimedia x11 ; ; Index: distinfo ; === ; RCS file: /var/cvs/ports/x11/smplayer/distinfo,v ; retrieving revision 1.10 ; diff -u -p -r1.10 distinfo ; --- distinfo 23 Apr 2015 14:47:10 - 1.10 ; +++ distinfo 30 Jun 2015 09:58:48 - ; @@ -1,2 +1,2 @@ ; -SHA256 (smplayer-14.9.0.6690.tar.bz2) = Xsih0pEoKOmxn4AOM4Ap5nV/ww45dM9iohtn9GYyvFo= ; -SIZE (smplayer-14.9.0.6690.tar.bz2) = 3813209 ; +SHA256 (smplayer-14.9.0.6994.tar.bz2) = SZP011PymCZn4IjQ8G/M02U12OZe/1rL74LUzeEyswE= ; +SIZE (smplayer-14.9.0.6994.tar.bz2) = 3872223 ; Index: pkg/PLIST ; === ; RCS file: /var/cvs/ports/x11/smplayer/pkg/PLIST,v ; retrieving revision 1.11 ; diff -u -p -r1.11 PLIST ; --- pkg/PLIST 20 Aug 2014 16:24:11 - 1.11 ; +++ pkg/PLIST 30 Jun 2015 09:57:46 - ; @@ -8,9 +8,11 @@ share/doc/smplayer/Changelog ; share/doc/smplayer/Copying.txt ; share/doc/smplayer/Copying_BSD.txt ; share/doc/smplayer/Copying_libmaia.txt ; +share/doc/smplayer/Copying_openssl.txt ; share/doc/smplayer/Finding_subtitles.txt ; share/doc/smplayer/Install.txt ; share/doc/smplayer/Not_so_obvious_things.txt ; +share/doc/smplayer/Notes_about_mpv.txt ; share/doc/smplayer/Portable_Edition.txt ; share/doc/smplayer/Readme.txt ; share/doc/smplayer/Release_notes.txt ; @@ -24,7 +26,6 @@ share/doc/smplayer/en/ ; share/doc/smplayer/en/gpl.html ; share/doc/smplayer/es/ ; share/doc/smplayer/es/gpl.html ; -share/doc/smplayer/eu/ ; share/doc/smplayer/fr/ ; share/doc/smplayer/fr/gpl.html ; share/doc/smplayer/hu/ ; @@ -49,8 +50,6 @@ share/icons/hicolor/192x192/apps/smplaye ; share/icons/hicolor/22x22/apps/smplayer.png ; share/icons/hicolor/256x256/apps/smplayer.png ; share/icons/hicolor/32x32/apps/smplayer.png ; -share/icons/hicolor/512x512/ ; -share/icons/hicolor/512x512/apps/ ; share/icons/hicolor/512x512/apps/smplayer.png ; share/icons/hicolor/64x64/apps/smplayer.png ; share/icons/hicolor/scalable/apps/smplayer.svg ; @@ -97,6 +96,7 @@ share/smplayer/translations/smplayer_ro_ ; share/smplayer/translations/smplayer_ru_RU.qm ; share/smplayer/translations/smplayer_sk.qm ; share/smplayer/translations/smplayer_sl_SI.qm ; +share/smplayer/translations/smplayer_sq_AL.qm ; share/smplayer/translations/smplayer_sr.qm ; share/smplayer/translations/smplayer_sv.qm ; share/smplayer/translations/smplayer_th.qm -- Sending from my toaster.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2015/06/30 13:35:27 Modified files: productivity/projectlibre: Makefile distinfo Log message: update to projectlibre-1.6.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2015/06/30 13:39:23 Modified files: devel/ruby-rspec/specinfra: Makefile distinfo devel/ruby-rspec/specinfra/pkg: PLIST Log message: update to specinfra-2.36.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2015/06/30 01:08:28 Modified files: devel/xulrunner/24/patches: patch-config_system-headers patch-js_src_config_system-headers Log message: Add missing url, so it's clear this came from upstream
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2015/06/30 03:15:32 Modified files: math/hdf5 : Makefile math/hdf5/patches: patch-configure Log message: No need for gnu libtool. ok sthen@
Re: UPDATE: SMPlayer-14.9.0.6966
On 06/18/15 23:08, Gonzalo L. Rodriguez wrote: Hi, Update for SMPlayer to 14.9.0.6966: https://www.assembla.com/code/smplayer/subversion/nodes/6994/smplayer/trunk/Changelog Ok? Comments? Cheers.- Update to latest version based on your diff, ok ? Cheers Giovanni Index: Makefile === RCS file: /var/cvs/ports/x11/smplayer/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile 23 Apr 2015 14:47:10 - 1.20 +++ Makefile 30 Jun 2015 09:58:38 - @@ -2,7 +2,7 @@ COMMENT = complete front-end for MPlayer -DISTNAME = smplayer-14.9.0.6690 +DISTNAME = smplayer-14.9.0.6994 CATEGORIES = multimedia x11 Index: distinfo === RCS file: /var/cvs/ports/x11/smplayer/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo 23 Apr 2015 14:47:10 - 1.10 +++ distinfo 30 Jun 2015 09:58:48 - @@ -1,2 +1,2 @@ -SHA256 (smplayer-14.9.0.6690.tar.bz2) = Xsih0pEoKOmxn4AOM4Ap5nV/ww45dM9iohtn9GYyvFo= -SIZE (smplayer-14.9.0.6690.tar.bz2) = 3813209 +SHA256 (smplayer-14.9.0.6994.tar.bz2) = SZP011PymCZn4IjQ8G/M02U12OZe/1rL74LUzeEyswE= +SIZE (smplayer-14.9.0.6994.tar.bz2) = 3872223 Index: pkg/PLIST === RCS file: /var/cvs/ports/x11/smplayer/pkg/PLIST,v retrieving revision 1.11 diff -u -p -r1.11 PLIST --- pkg/PLIST 20 Aug 2014 16:24:11 - 1.11 +++ pkg/PLIST 30 Jun 2015 09:57:46 - @@ -8,9 +8,11 @@ share/doc/smplayer/Changelog share/doc/smplayer/Copying.txt share/doc/smplayer/Copying_BSD.txt share/doc/smplayer/Copying_libmaia.txt +share/doc/smplayer/Copying_openssl.txt share/doc/smplayer/Finding_subtitles.txt share/doc/smplayer/Install.txt share/doc/smplayer/Not_so_obvious_things.txt +share/doc/smplayer/Notes_about_mpv.txt share/doc/smplayer/Portable_Edition.txt share/doc/smplayer/Readme.txt share/doc/smplayer/Release_notes.txt @@ -24,7 +26,6 @@ share/doc/smplayer/en/ share/doc/smplayer/en/gpl.html share/doc/smplayer/es/ share/doc/smplayer/es/gpl.html -share/doc/smplayer/eu/ share/doc/smplayer/fr/ share/doc/smplayer/fr/gpl.html share/doc/smplayer/hu/ @@ -49,8 +50,6 @@ share/icons/hicolor/192x192/apps/smplaye share/icons/hicolor/22x22/apps/smplayer.png share/icons/hicolor/256x256/apps/smplayer.png share/icons/hicolor/32x32/apps/smplayer.png -share/icons/hicolor/512x512/ -share/icons/hicolor/512x512/apps/ share/icons/hicolor/512x512/apps/smplayer.png share/icons/hicolor/64x64/apps/smplayer.png share/icons/hicolor/scalable/apps/smplayer.svg @@ -97,6 +96,7 @@ share/smplayer/translations/smplayer_ro_ share/smplayer/translations/smplayer_ru_RU.qm share/smplayer/translations/smplayer_sk.qm share/smplayer/translations/smplayer_sl_SI.qm +share/smplayer/translations/smplayer_sq_AL.qm share/smplayer/translations/smplayer_sr.qm share/smplayer/translations/smplayer_sv.qm share/smplayer/translations/smplayer_th.qm
Re: s-nail-14.8.2
Hello!
Jeremie Courreges-Anglas j...@wxcvbn.org wrote:
|here's an update to the latest release.
|Test reports / comments / oks welcome.
This is great, thank you very much for your interest and efforts!
v14.8+ brings in over six months of fulltime development, and is
the first version of the nail/Heirloom mailx/S-nail BSD Mail
codebase branch that is capable message roundtripping without
causing possible message splitting due to faulty From_ line
detection. v14.8 also had a Coverity.com defect density of
0.0 (fwiw).
And for the first time we start to reap the fruit of all that
labour: e.g., it was finally and easily possible to implement
and offer a *ssl-method-HOST* variable, where HOST is the
address (/port) to connect to. It was really hard to get there.
Hmhm, sorry for the noise. ^.^
But now this.
Please note that any v14.8 including v14.8.2 has a really severe
file locking bug and should not be used -- i will release v14.8.3
by the end of the week!
Optionally it is possible to use the attached patch (that was also
send to the list[1]). Because i really hack many changes into
v14.8.3 (the name has to be Startled Chicken because of that
bug) without any forerun -- the opposite of the rest of v14.8! --
you may prefer this more conservative route instead?
[1] http://article.gmane.org/gmane.mail.s-nail.user/276
|Note that s-nail gained a few tests since its import in the ports tree.
Yes, dropping NO_TEST is due. (Tests are still a real dark corner
beside that, especially expect-fail cases etc. Sigh. So to say.)
Btw… Since OpenBSD ships with -lreadline, how about using
WANT_READLINE=yes instead of
|WANT_EDITLINE=1
since it is so much more comfortable? Otherwise the builtin
command line editor may be worth looking at, but maybe without
tabulator expansion (WANT_TABEXPAND=no) to not use wordexp(3).
Yes, it is simple since it lets the terminal deal with the line
(instead of implementing a visible viewpoint like e.g. ksh(1)),
but i think doing so is still more comfortable than editline(3),
especially regarding history handling. Just a suggestion.
Thanks again, and Ciao! from sunny Germany right before leap,
--steffen
commit 7f8ebc0
Author: Steffen (Daode) Nurpmeso sdao...@users.sf.net
Date: 2015-06-29 13:52:34 +0200
dotlock.c:_dot_dir_access(): fix return value (Martin Neitzel)..
It seems that during the rewrite i changed the control flow twice,
and did not carefully enough adjust the return value accordingly,
effectively setting a true value to true again instead of
assigning false in the other case, and another similar case.
---
dotlock.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dotlock.c b/dotlock.c
index df81fd7..43a1cbc 100644
--- a/dotlock.c
+++ b/dotlock.c
@@ -125,11 +125,12 @@ _dot_dir_access(char const *fname)
if ((rv = is_dir(path))) {
for (;;)
- if (!access(path, R_OK | W_OK | X_OK)) {
-rv = TRU1;
+ if (!access(path, R_OK | W_OK | X_OK))
break;
- } else if (errno != EINTR)
+ else if (errno != EINTR) {
+rv = FAL0;
break;
+ }
}
ac_free(path);
@@ -328,7 +329,7 @@ dot_lock(char const *fname, int fd, size_t pollmsecs)
rv = (create_exclusive(path) == 0);
olderrno = errno;
sigprocmask(SIG_SETMASK, oset, NULL);
- if (!rv)
+ if (rv)
goto jleave;
while (!_dot_fcntl_lock(fd, FLOCK_UNLOCK))
fix net/osrtspproxy
Hi,
We have a bunch of local patches to keep osrtspproxy running. I
would like to commit them to OpenBSD. On top of that I have fixed
linker warnings about unsave string operations. I have talked to
grunk@, he appreciates to transfer maintainer to me.
Upstream is dead, but even if we decide to delete this beast, it
is better to have those patches in attic.
ok?
bluhm
Index: net/osrtspproxy/Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/net/osrtspproxy/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- net/osrtspproxy/Makefile11 Mar 2013 11:35:50 - 1.3
+++ net/osrtspproxy/Makefile7 Jan 2015 22:21:52 -
@@ -4,10 +4,11 @@ COMMENT= RTSP proxy reference implement
DISTNAME= osrtspproxy_2_0
PKGNAME= osrtspproxy-2.0
+REVISION= 1
CATEGORIES=net
HOMEPAGE= http://www.rtsp.org/
-MAINTAINER=Alexander von Gernler gr...@pestilenz.org
+MAINTAINER=Alexander Bluhm bl...@openbsd.org
# Real Networks license, permits modification and distribution
PERMIT_PACKAGE_CDROM= Yes
Index: net/osrtspproxy/patches/patch-configure
===
RCS file:
/data/mirror/openbsd/cvs/ports/net/osrtspproxy/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- net/osrtspproxy/patches/patch-configure 10 Jan 2007 10:37:07 -
1.1.1.1
+++ net/osrtspproxy/patches/patch-configure 30 Jun 2015 18:29:34 -
@@ -1,15 +1,24 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2007/01/10 10:37:07 grunk Exp $
+$OpenBSD$
--- configure.orig Fri Feb 9 07:07:26 2001
-+++ configure Wed Jan 10 10:56:04 2007
-@@ -135,6 +135,14 @@ case $UNAME_S in
configure Tue Nov 11 19:12:06 2014
+@@ -135,6 +135,23 @@ case $UNAME_S in
ARFLAGS=-rc
SYSLIBS=-lnsl -lsocket
;;
+ OpenBSD)
++CC=gcc
++CXX=g++
+AR=ar
+ARFLAGS=-rc
-+CFLAGS=${CFLAGS} -DNDEBUG -D_UNIX
-+CXXFLAGS=${CXXFLAGS} -DNDEBUG -D_UNIX
++if [ $DEBUG -ne 0 ]; then
++ CCDBG=-g -Wall
++ LDDBG=-g -Wall
++else
++ CCDBG=-DNDEBUG
++ LDDBG=
++fi
++CFLAGS=${CCDBG} ${CFLAGS} -D_UNIX
++CXXFLAGS=${CCDBG} ${CXXFLAGS} -D_UNIX
+LD=ld
+SYSLIBS=-pthread
+;;
Index: net/osrtspproxy/patches/patch-libapp_bitset_cpp
===
RCS file: net/osrtspproxy/patches/patch-libapp_bitset_cpp
diff -N net/osrtspproxy/patches/patch-libapp_bitset_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ net/osrtspproxy/patches/patch-libapp_bitset_cpp 23 Dec 2014 13:35:08
-
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- libapp/bitset.cpp.orig Tue Jan 30 22:24:19 2001
libapp/bitset.cpp Tue Nov 11 19:12:06 2014
+@@ -72,6 +72,7 @@ CBitSet::CBitSet( CPBYTE pbuf, size_t bitlen )
+ CBitSet::~CBitSet( void )
+ {
+ delete[] m_buf;
++m_buf = NULL;
+ }
+
+ CBitSet CBitSet::operator=( const CBitSet other )
Index: net/osrtspproxy/patches/patch-libapp_dbg_cpp
===
RCS file: net/osrtspproxy/patches/patch-libapp_dbg_cpp
diff -N net/osrtspproxy/patches/patch-libapp_dbg_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ net/osrtspproxy/patches/patch-libapp_dbg_cpp8 Jan 2015 20:02:26
-
@@ -0,0 +1,328 @@
+$OpenBSD$
+--- libapp/dbg.cpp.origFri Feb 9 07:06:37 2001
libapp/dbg.cpp Thu Jan 8 21:02:01 2015
+@@ -20,321 +20,14 @@ void dbgout( const char* fmt, ... )
+ char str[4096];
+ va_list v;
+ va_start( v, fmt );
+-vsprintf( str, fmt, v );
+-strcat( str, \n );
++vsnprintf( str, sizeof(str), fmt, v );
++va_end(v);
+ #ifdef _UNIX
+-fputs( str, stderr );
++fprintf( stderr, %s\n, str );
+ #endif
+ #ifdef _WIN32
+ ::OutputDebugString( str );
+ #endif
+-}
+-
+-/*
+- * Heap management using operator new/delete. These routines use unbalanced
+- * binary trees to keep track of allocations in an attempt to make them fast
+- * yet simple.
+- *
+- * The trees for scalar and vector allocations are completely separate so
+- * that trying to deallocate memory with the wrong version of operator
+- * delete will always fail.
+- *
+- * Global operator new is redefined to pass the file and line where the
+- * allocation occurred to facilitate memory leak debugging. Unfortunately,
+- * it doesn't seem to be possible to redefine operator delete.
+- *
+- * Each block of memory consists of an alloc_node header, the requested
+- * memory block, and two-byte guards before and after the requested memory
+- * block. The requested memory block is filled with a semi-random byte
+- * value to ensure that the caller does not rely on any particular initial
+- * bit pattern (eg. a block of zeros or NULLs). It is refilled with a
+- * (possibly different) byte value after
