django security fixes for -stable
Hi,
these are the django security fixes for OpenBSD 5.4 and 5.5.
Any ok?
Remi.
Index: Makefile
===
RCS file: /cvs/ports/www/py-django/Makefile,v
retrieving revision 1.28.2.1
diff -u -p -r1.28.2.1 Makefile
--- Makefile30 Oct 2013 12:47:49 - 1.28.2.1
+++ Makefile23 Apr 2014 06:30:46 -
@@ -2,7 +2,7 @@
COMMENT = high-level Python web framework
-MODPY_EGG_VERSION =1.5.5
+MODPY_EGG_VERSION =1.5.6
LNAME =django
DISTNAME = Django-${MODPY_EGG_VERSION}
PKGNAME = py-${LNAME}-${MODPY_EGG_VERSION}
Index: distinfo
===
RCS file: /cvs/ports/www/py-django/distinfo,v
retrieving revision 1.17.2.1
diff -u -p -r1.17.2.1 distinfo
--- distinfo30 Oct 2013 12:47:49 - 1.17.2.1
+++ distinfo23 Apr 2014 06:30:46 -
@@ -1,2 +1,2 @@
-SHA256 (Django-1.5.5.tar.gz) = auacHfv8nQxEroDi++SOWbu7tw6N9mrStwKb05lH1x0=
-SIZE (Django-1.5.5.tar.gz) = 8060441
+SHA256 (Django-1.5.6.tar.gz) = m3/LmdICiRiewPHgbR0r7TtHcuOjk/3b+wBup8P5v68=
+SIZE (Django-1.5.6.tar.gz) = 8068359
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-django/pkg/PLIST,v
retrieving revision 1.18.2.1
diff -u -p -r1.18.2.1 PLIST
--- pkg/PLIST 30 Oct 2013 12:47:49 - 1.18.2.1
+++ pkg/PLIST 23 Apr 2014 06:30:47 -
@@ -7317,6 +7317,8 @@ share/doc/${LNAME}/releases/1.3.txt
share/doc/${LNAME}/releases/1.4-alpha-1.txt
share/doc/${LNAME}/releases/1.4-beta-1.txt
share/doc/${LNAME}/releases/1.4.1.txt
+share/doc/${LNAME}/releases/1.4.10.txt
+share/doc/${LNAME}/releases/1.4.11.txt
share/doc/${LNAME}/releases/1.4.2.txt
share/doc/${LNAME}/releases/1.4.3.txt
share/doc/${LNAME}/releases/1.4.4.txt
@@ -7332,6 +7334,7 @@ share/doc/${LNAME}/releases/1.5.1.txt
share/doc/${LNAME}/releases/1.5.2.txt
share/doc/${LNAME}/releases/1.5.3.txt
share/doc/${LNAME}/releases/1.5.4.txt
+share/doc/${LNAME}/releases/1.5.5.txt
share/doc/${LNAME}/releases/${MODPY_EGG_VERSION}.txt
share/doc/${LNAME}/releases/1.5.txt
share/doc/${LNAME}/releases/index.txt
Index: Makefile
===
RCS file: /cvs/ports/www/py-django/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile28 Oct 2013 14:37:53 - 1.30
+++ Makefile23 Apr 2014 06:30:34 -
@@ -2,7 +2,7 @@
COMMENT = high-level Python web framework
-MODPY_EGG_VERSION =1.5.5
+MODPY_EGG_VERSION =1.5.6
LNAME =django
DISTNAME = Django-${MODPY_EGG_VERSION}
PKGNAME = py-${LNAME}-${MODPY_EGG_VERSION}
Index: distinfo
===
RCS file: /cvs/ports/www/py-django/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo28 Oct 2013 14:37:53 - 1.19
+++ distinfo23 Apr 2014 06:30:34 -
@@ -1,2 +1,2 @@
-SHA256 (Django-1.5.5.tar.gz) = auacHfv8nQxEroDi++SOWbu7tw6N9mrStwKb05lH1x0=
-SIZE (Django-1.5.5.tar.gz) = 8060441
+SHA256 (Django-1.5.6.tar.gz) = m3/LmdICiRiewPHgbR0r7TtHcuOjk/3b+wBup8P5v68=
+SIZE (Django-1.5.6.tar.gz) = 8068359
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-django/pkg/PLIST,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST
--- pkg/PLIST 28 Oct 2013 14:37:53 - 1.20
+++ pkg/PLIST 23 Apr 2014 06:30:35 -
@@ -7317,6 +7317,8 @@ share/doc/${LNAME}/releases/1.3.txt
share/doc/${LNAME}/releases/1.4-alpha-1.txt
share/doc/${LNAME}/releases/1.4-beta-1.txt
share/doc/${LNAME}/releases/1.4.1.txt
+share/doc/${LNAME}/releases/1.4.10.txt
+share/doc/${LNAME}/releases/1.4.11.txt
share/doc/${LNAME}/releases/1.4.2.txt
share/doc/${LNAME}/releases/1.4.3.txt
share/doc/${LNAME}/releases/1.4.4.txt
@@ -7332,6 +7334,7 @@ share/doc/${LNAME}/releases/1.5.1.txt
share/doc/${LNAME}/releases/1.5.2.txt
share/doc/${LNAME}/releases/1.5.3.txt
share/doc/${LNAME}/releases/1.5.4.txt
+share/doc/${LNAME}/releases/1.5.5.txt
share/doc/${LNAME}/releases/${MODPY_EGG_VERSION}.txt
share/doc/${LNAME}/releases/1.5.txt
share/doc/${LNAME}/releases/index.txt
Re: UPDATE: ircd-hybrid 8.1.15
On Wed, Apr 02, 2014 at 11:27:55PM -0400, Brad Smith wrote:
> An update to ircd-hybrid 8.1.15.
>
> OK?
And an update to 8.1.16.
Index: Makefile
===
RCS file: /home/cvs/ports/net/ircd-hybrid/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile4 Feb 2014 09:46:48 - 1.30
+++ Makefile23 Apr 2014 02:15:09 -
@@ -4,7 +4,7 @@ SHARED_ONLY = Yes
COMMENT = Internet Relay Chat server
-DISTNAME = ircd-hybrid-8.1.13
+DISTNAME = ircd-hybrid-8.1.16
CATEGORIES = net
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/}
EXTRACT_SUFX = .tgz
Index: distinfo
===
RCS file: /home/cvs/ports/net/ircd-hybrid/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo4 Feb 2014 09:46:48 - 1.12
+++ distinfo23 Apr 2014 02:15:15 -
@@ -1,2 +1,2 @@
-SHA256 (ircd-hybrid-8.1.13.tgz) = n2nSdsPej8S6W8EcQ1qdqEuR0SEKbEGV/buynISZa5E=
-SIZE (ircd-hybrid-8.1.13.tgz) = 1143544
+SHA256 (ircd-hybrid-8.1.16.tgz) = i4bWasRBYUjQsWdyMAl/fxZRf74rNxjoJBo8OR7wrPc=
+SIZE (ircd-hybrid-8.1.16.tgz) = 1146141
Index: patches/patch-doc_reference_conf
===
RCS file: /home/cvs/ports/net/ircd-hybrid/patches/patch-doc_reference_conf,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-doc_reference_conf
--- patches/patch-doc_reference_conf17 Sep 2013 19:53:00 - 1.2
+++ patches/patch-doc_reference_conf28 Mar 2014 20:58:33 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-doc_reference_conf,v 1.2 2013/09/17 19:53:00 brad Exp $
doc/reference.conf.origSun Aug 18 16:12:33 2013
-+++ doc/reference.conf Sun Sep 15 15:06:50 2013
+--- doc/reference.conf.origTue Feb 25 07:27:21 2014
doc/reference.conf Fri Mar 28 16:56:14 2014
@@ -108,7 +108,7 @@ serverinfo {
* chown . rsa.key
* chmod 0600 rsa.key
@@ -29,7 +29,7 @@ $OpenBSD: patch-doc_reference_conf,v 1.2
/*
* ssl_cipher_list:
@@ -453,7 +453,7 @@ operator {
-* A password should not be defined when this is used; see
+* A password should not be defined when this is used; see
* doc/challenge.txt for more information.
*/
-# rsa_public_key_file = "/usr/local/ircd/etc/oper.pub";
@@ -37,7 +37,7 @@ $OpenBSD: patch-doc_reference_conf,v 1.2
/*
* ssl_certificate_fingerprint: enhances security by additionally
checking
-@@ -1233,8 +1233,8 @@ modules {
+@@ -1234,8 +1234,8 @@ modules {
* path: other paths to search for modules specified below
* and in "/module load".
*/
Index: patches/patch-include_defaults_h
===
RCS file: /home/cvs/ports/net/ircd-hybrid/patches/patch-include_defaults_h,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-include_defaults_h
--- patches/patch-include_defaults_h7 Aug 2013 23:41:08 - 1.6
+++ patches/patch-include_defaults_h23 Apr 2014 02:15:30 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-include_defaults_h,v 1.6 2013/08/07 23:41:08 brad Exp $
include/defaults.h.origThu May 23 16:00:07 2013
-+++ include/defaults.h Thu May 30 18:58:14 2013
-@@ -47,6 +47,11 @@
+--- include/defaults.h.origSun Apr 20 11:06:23 2014
include/defaults.h Tue Apr 22 22:15:23 2014
+@@ -48,15 +48,20 @@
* AUTOMODPATH = directory for autoloaded modules
*/
@@ -11,18 +11,17 @@ $OpenBSD: patch-include_defaults_h,v 1.6
+#endif
+
/* dirs */
- #define DPATH PREFIX
- #define SBINPATHPREFIX "/sbin/"
-@@ -55,9 +60,9 @@
- #define MODPATH LIBDIR "/" PACKAGE "/modules/"
- #define HPATH DATADIR "/" PACKAGE "/help"
- #define AUTOMODPATH MODPATH "/autoload/"
--#define ETCPATH SYSCONFDIR
--#define LOGPATH LOCALSTATEDIR "/log"
--#define RUNPATH LOCALSTATEDIR "/run"
-+#define ETCPATH SYSCONFDIR "/ircd-hybrid/"
-+#define LOGPATH LOCALSTATEDIR "/log/ircd-hybrid"
-+#define RUNPATH LOCALSTATEDIR "/run/ircd-hybrid"
+ #define DPATHPREFIX
+ #define BINPATH PREFIX "/bin/"
+ #define MODPATH LIBDIR "/" PACKAGE "/modules/"
+ #define HPATHDATADIR "/" PACKAGE "/help"
+ #define AUTOMODPATH MODPATH "/autoload/"
+-#define ETCPATH SYSCONFDIR
+-#define LOGPATH LOCALSTATEDIR "/log"
+-#define RUNPATH LOCALSTATEDIR "/run"
++#define ETCPATH SYSCONFDIR "/ircd-hybrid/"
++#define LOGPATH LOCALSTATEDIR "/log/ircd-hybrid"
++#define RUNPATH LOCALSTATEDIR "/run/ircd-hybrid"
/* files */
- #define SPATH SBINPATH "/ircd"/* ircd executable */
+ #define SPATH BINPATH "/ircd" /* ircd executable */
Index: patches/patch-src_ircd_c
==
[NEW] audio/nausea
Hello all, nausea is a "curses audio visualizer". http://git.2f30.org/nausea/ DESCR: This is a simple real-time audio spectrum visualizer. It works well with the mpd music player daemon. Cheers! Lazaros. nausea.tar.gz Description: application/tar-gz
ratpoison-1.4.7
Published two weeks ago, works fine for me.
Index: Makefile
===
RCS file: /cvs/ports/x11/ratpoison/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile26 Feb 2014 20:07:18 - 1.29
+++ Makefile22 Apr 2014 23:58:09 -
@@ -2,8 +2,7 @@
COMMENT= minimal wm based on GNU screen
-DISTNAME= ratpoison-1.4.6
-REVISION= 1
+DISTNAME= ratpoison-1.4.7
CATEGORIES=x11
HOMEPAGE= http://www.nongnu.org/ratpoison/
@@ -18,7 +17,6 @@ WANTLIB+= X11 Xext Xft Xinerama Xtst c
MASTER_SITES= ${MASTER_SITE_SAVANNAH:=ratpoison/}
SEPARATE_BUILD=Yes
-USE_GROFF= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-xterm=${X11BASE}/bin/xterm \
--disable-history
Index: distinfo
===
RCS file: /cvs/ports/x11/ratpoison/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo7 Apr 2013 20:09:23 - 1.15
+++ distinfo8 Apr 2014 18:06:16 -
@@ -1,2 +1,2 @@
-SHA256 (ratpoison-1.4.6.tar.gz) = 6oOW/GnieEF0W49VhGwWK+Re3odaK1C868qCZxcaK/g=
-SIZE (ratpoison-1.4.6.tar.gz) = 460169
+SHA256 (ratpoison-1.4.7.tar.gz) = 56sqC2gn3u6OLdoMeu+ImkroafgiPrPDmfupW/+WCBE=
+SIZE (ratpoison-1.4.7.tar.gz) = 484116
Index: patches/patch-src_actions_c
===
RCS file: patches/patch-src_actions_c
diff -N patches/patch-src_actions_c
--- patches/patch-src_actions_c 26 Feb 2014 20:07:18 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_actions_c,v 1.5 2014/02/26 20:07:18 jca Exp $
-Bugfix for recent firefox versions.
-Applied-Upstream: 782e5d0f60412682ca5facde2d566c02bd176902
src/actions.c.orig Thu Feb 20 02:37:37 2014
-+++ src/actions.c Thu Feb 20 02:40:48 2014
-@@ -1168,6 +1168,8 @@ cmd_meta (int interactive UNUSED, struct cmdarg **args
- if (current_window() == NULL)
- return cmdret_new (RET_FAILURE, NULL);
-
-+ memset(&ev1, 0, sizeof(ev1));
-+
- ev1.xkey.type = KeyPress;
- ev1.xkey.display = dpy;
- ev1.xkey.window = current_window()->w;
Index: patches/patch-src_manage_c
===
RCS file: patches/patch-src_manage_c
diff -N patches/patch-src_manage_c
--- patches/patch-src_manage_c 26 Feb 2014 20:07:18 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_manage_c,v 1.1 2014/02/26 20:07:18 jca Exp $
-Erroneous change introduced in 1.4.6.
-Applied-Upstream: 5201477cbcb276bd13ec07e3d57b8c6cefe8201a
src/manage.c.orig Thu Feb 20 02:41:38 2014
-+++ src/manage.c Thu Feb 20 02:41:13 2014
-@@ -233,7 +233,7 @@ get_wmname (Window w)
-
- if (XGetWMName (dpy, w, &text_prop) == 0)
- {
-- PRINT_ERROR (("XGetWMName failed\n"));
-+ PRINT_DEBUG (("XGetWMName failed\n"));
- return NULL;
- }
-
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/ratpoison/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 7 Apr 2013 20:09:23 - 1.9
+++ pkg/PLIST 8 Apr 2014 18:08:50 -
@@ -9,11 +9,14 @@ share/doc/ratpoison/COPYING
share/doc/ratpoison/ChangeLog
share/doc/ratpoison/NEWS
share/doc/ratpoison/README
+share/emacs/
+share/emacs/site-lisp/
+share/emacs/site-lisp/ratpoison.el
share/ratpoison/
share/ratpoison/allwindows.sh
share/ratpoison/clickframe.pl
share/ratpoison/genrpbindings
-share/ratpoison/ratpoison.el
+share/ratpoison/ratdate.sh
share/ratpoison/rpshowall.sh
share/ratpoison/rpws
share/ratpoison/sloppy.c
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: mpd-0.18.10 (Was: [wip] audio/mpd 0.18.9)
On 2014-04-21 09:55:22, Bryan Linton wrote:
> On 2014-04-18 15:57:06, David Coppa wrote:
>> On Tue, 25 Mar 2014, Landry Breuil wrote:
>>
>>> So, after playing flawlessly for 3 hours, it stopped again. Looked at
>>> the mpdstate file, time had a regular value, but mpd didnt save it yet.
>>> pkill -9 mpd to really force-stop it, at that point it saved the mpdstate
>>> with time: -2147483648
>>> restarted mpd.. mpc still says the currently played track is the one
>>> which was playing before getting stuck. Mpd will only play one track before
>>> getting stuck.
>>> Kill mpd, set time to 0 in mpdstate, restart mpd. works fine.
>>
>> Maybe this is better... Can you try it?
>>
>
> Been running this for three days now. There was one hiccup that I
> thought was similar to what had been happening previously, but I
> have not been able to duplicate it since restarting mpd.
>
> I'd like to run with it for a bit longer to make certain it's
> still pretty stable, but other than that one hiccup, it's been
> running without any issues so far.
>
...And I just had the same bug that was mentioned previously
surface again.
Whatever changed between 0.18.9 and 0.18.10, it is much less
buggy with 0.18.10 than it was with 0.18.9, but it still has a bug
that didn't exist in 0.17.6 (the current version in ports), so I
would recommend against this update going in for the time being
at least.
FWIW, this is on:
OpenBSD 5.5-current (GENERIC.MP) #43: Sat Apr 12 09:39:12 MDT 2014
dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC.MP
cpu0: Genuine Intel(R) CPU T2300 @ 1.66GHz ("GenuineIntel" 686-class) 1.67 GHz
cpu0:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,NXE,SSE3,MWAIT,VMX,EST,TM2,xTPR,PDCM,PERF
real mem = 2682613760 (2558MB)
avail mem = 2626314240 (2504MB)
--
Bryan
Re: [UPDATE] net/prosody 0.8.2 -> 0.9.4
Henrik Friedrichsen writes: > Hey Jérémie, > > > On 04/23/2014 12:37 AM, Jérémie Courrèges-Anglas wrote: >> >> Do you want to maintain this port? > Sure. Then I'll use your @diff.cc mail address. >> I have a problem with your patch, it doesn't let me package prosody >> correctly, because of changes in the installed files (PLIST). > Thanks for pointing that out! Must have slipped through, somehow. > > From what I can see this has an updated PLIST and removes the *.orig > leftovers from the patching? > If so, that's good with me. I'll commit this tomorrow as previously said. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [UPDATE] net/prosody 0.8.2 -> 0.9.4
Hey Jérémie, On 04/23/2014 12:37 AM, Jérémie Courrèges-Anglas wrote: Do you want to maintain this port? Sure. I have a problem with your patch, it doesn't let me package prosody correctly, because of changes in the installed files (PLIST). Thanks for pointing that out! Must have slipped through, somehow. From what I can see this has an updated PLIST and removes the *.orig leftovers from the patching? If so, that's good with me.
Re: [UPDATE] net/prosody 0.8.2 -> 0.9.4
Henrik Friedrichsen writes:
> Bumping this one more time.
Thanks for your patience.
> First patch was submitted at the end of February, unfortunately no
> response from the maintainer since then.
Do you want to maintain this port?
I have a problem with your patch, it doesn't let me package prosody
correctly, because of changes in the installed files (PLIST). Does this
work for you?
One you test it and report that it works properly, I will commit it
(unless there are objections?).
Index: Makefile
===
RCS file: /cvs/ports/net/prosody/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile11 Mar 2013 11:35:55 - 1.27
+++ Makefile22 Apr 2014 22:31:46 -
@@ -3,10 +3,9 @@
SHARED_ONLY= Yes
COMMENT= communications server for Jabber/XMPP written in Lua
-DISTNAME= prosody-0.8.2
+DISTNAME= prosody-0.9.4
CATEGORIES=net
MASTER_SITES= http://prosody.im/downloads/source/
-REVISION= 9
HOMEPAGE= http://prosody.im/
@@ -52,5 +51,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/README \
${PREFIX}/share/doc/prosody
touch ${PREFIX}/share/examples/prosody/prosody.log
+ rm -f ${PREFIX}/share/examples/prosody/certs/Makefile.*
.include
Index: distinfo
===
RCS file: /cvs/ports/net/prosody/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo6 Aug 2012 09:50:50 - 1.6
+++ distinfo22 Apr 2014 22:01:46 -
@@ -1,2 +1,2 @@
-SHA256 (prosody-0.8.2.tar.gz) = 0DFRUPhIf8lgrfVs4FeYVChnmXX5xvP89CSDLSTqrmA=
-SIZE (prosody-0.8.2.tar.gz) = 212170
+SHA256 (prosody-0.9.4.tar.gz) = vofPMZAaJUd4abTr1S4pj2Ol7/rK5SaRGgvodsyC4cY=
+SIZE (prosody-0.9.4.tar.gz) = 265898
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/net/prosody/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 6 Sep 2009 18:40:57 - 1.1.1.1
+++ patches/patch-Makefile 22 Apr 2014 22:01:46 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2009/09/06 18:40:57 jolan Exp $
Makefile.orig Wed Jul 29 12:54:54 2009
-+++ Makefile Sun Sep 6 12:06:00 2009
+$OpenBSD$
+--- Makefile.orig Thu Feb 27 20:03:28 2014
Makefile Thu Feb 27 20:03:41 2014
@@ -1,12 +1,12 @@
include config.unix
Index: patches/patch-certs_Makefile
===
RCS file: /cvs/ports/net/prosody/patches/patch-certs_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-certs_Makefile
--- patches/patch-certs_Makefile8 Oct 2012 09:11:35 - 1.2
+++ patches/patch-certs_Makefile22 Apr 2014 22:01:46 -
@@ -1,14 +1,7 @@
-$OpenBSD: patch-certs_Makefile,v 1.2 2012/10/08 09:11:35 jasper Exp $
-
-- use '.crt' as the certificate extension
-- set correct Make program for this GNU Makefile
-- make sure the permissions are restricted for the .key files
-
certs/Makefile.origSun Jun 12 23:21:39 2011
-+++ certs/Makefile Fri Oct 5 17:08:16 2012
-@@ -1,14 +1,14 @@
--.DEFAULT: localhost.cert
-+.DEFAULT: localhost.crt
+$OpenBSD$
+--- certs/Makefile.origThu Feb 27 20:04:09 2014
certs/Makefile Thu Feb 27 20:05:11 2014
+@@ -2,13 +2,13 @@
keysize=2048
# How to:
@@ -20,23 +13,9 @@ $OpenBSD: patch-certs_Makefile,v 1.2 201
+# Then `${MAKE_PROGRAM} yourhost.key` to create your private key, you can
# include keysize=number to change the size of the key.
-# Then you can either `make yourhost.csr` to generate a certificate
--# signing request that you can submit to a CA, or `make yourhost.cert`
+-# signing request that you can submit to a CA, or `make yourhost.crt`
+# Then you can either `${MAKE_PROGRAM} yourhost.csr` to generate a certificate
+# signing request that you can submit to a CA, or `${MAKE_PROGRAM}
yourhost.crt`
# to generate a self signed certificate.
.PRECIOUS: %.cnf %.key
-@@ -18,7 +18,7 @@ keysize=2048
- openssl req -new -key $(lastword $^) -out $@ -utf8 -config $(firstword
$^)
-
- # Self signed
--%.cert: %.cnf %.key
-+%.crt: %.cnf %.key
- openssl req -new -x509 -nodes -key $(lastword $^) -days 365 \
- -sha1 -out $@ -utf8 -config $(firstword $^)
-
-@@ -28,3 +28,4 @@ keysize=2048
- %.key:
- openssl genrsa $(keysize) > $@
- @chmod 400 $@
-+ @chown _prosody $@
Index: patches/patch-prosody_cfg_lua_dist
===
RCS file: /cvs/ports/net/prosody/patches/patch-prosody_cfg_lua_dist,v
retrieving revision 1.4
diff -u -p -r1.4 patch-prosody_cfg_lua_dist
--- patches/patch-prosody_cfg_lua_dist 5 Oct 2012 14:38:09 - 1.4
+++ patches/patch-prosody_cfg_lua_dist 22 Apr 2014 22:01:46 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-prosody_cfg_
Re: [UPDATE] net/prosody 0.8.2 -> 0.9.4
Bumping this one more time. First patch was submitted at the end of February, unfortunately no response from the maintainer since then. On 04/12/2014 07:01 PM, Henrik Friedrichsen wrote: Hey, I have already submitted a patch to update prosody to 0.9.2 but I didn't get any feedback. Neither has the maintainer responded. Well, here goes: second attempt to update prosody, this time to 0.9.4. OK?
Re: Some current breakage
On Sun, Apr 20, 2014 at 02:03:50PM +, Christian Weisgerber wrote: > lang/pypy I hope to get around to looking at this soon. -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: Some current breakage
Christian Weisgerber writes:
> I don't know how far ahead or behind sthen@'s and espie@'s builds
> are, but here's some of the current ports breakage I'm seeing:
>
> llvm update:
> www/mozilla-firefox
> www/seamonkey
>
> RAND_egd(_bytes) removal:
> graphics/dcmtk
This fixes the build for me.
ok?
Index: Makefile
===
RCS file: /cvs/ports/graphics/dcmtk/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile24 Mar 2014 17:00:08 - 1.13
+++ Makefile21 Apr 2014 17:56:42 -
@@ -3,7 +3,7 @@
COMMENT= DICOM toolkit
DISTNAME= dcmtk-3.5.4
-REVISION= 2
+REVISION= 3
CATEGORIES=graphics
Index: patches/patch-dcmtls_libsrc_tlslayer_cc
===
RCS file: /cvs/ports/graphics/dcmtk/patches/patch-dcmtls_libsrc_tlslayer_cc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-dcmtls_libsrc_tlslayer_cc
--- patches/patch-dcmtls_libsrc_tlslayer_cc 7 Oct 2010 04:19:47 -
1.1
+++ patches/patch-dcmtls_libsrc_tlslayer_cc 21 Apr 2014 17:56:26 -
@@ -1,7 +1,9 @@
$OpenBSD: patch-dcmtls_libsrc_tlslayer_cc,v 1.1 2010/10/07 04:19:47 benoit Exp
$
dcmtls/libsrc/tlslayer.cc.orig Wed Oct 6 22:10:42 2010
-+++ dcmtls/libsrc/tlslayer.cc Wed Oct 6 22:10:53 2010
-@@ -188,7 +188,7 @@
+- picky g++ is picky
+- we don't have RAND_egd anymore
+--- dcmtls/libsrc/tlslayer.cc.orig Thu Dec 8 16:48:28 2005
dcmtls/libsrc/tlslayer.cc Mon Apr 21 19:55:40 2014
+@@ -188,7 +188,7 @@ DcmTLSTransportLayer::DcmTLSTransportLayer(int network
SSLeay_add_all_algorithms();
seedPRNG(randFile);
@@ -10,3 +12,12 @@ $OpenBSD: patch-dcmtls_libsrc_tlslayer_c
switch (networkRole)
{
case DICOM_APPLICATION_ACCEPTOR:
+@@ -375,7 +375,7 @@ void DcmTLSTransportLayer::seedPRNG(const char *randFi
+ #endif
+ if (randFile)
+ {
+-if (RAND_egd(randFile) <= 0)
++if (1)
+ {
+ RAND_load_file(randFile ,-1);
+ }
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/dcmtk/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 10 Apr 2008 10:09:56 - 1.1.1.1
+++ pkg/PLIST 21 Apr 2014 18:23:48 -
@@ -1,50 +1,50 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/04/10 10:09:56 djm Exp $
-bin/dcm2pnm
-bin/dcm2xml
-bin/dcmcjpeg
-bin/dcmconv
-bin/dcmcrle
-bin/dcmdjpeg
-bin/dcmdrle
-bin/dcmdspfn
-bin/dcmdump
-bin/dcmftest
-bin/dcmgpdir
-bin/dcmj2pnm
-bin/dcmmkcrv
-bin/dcmmkdir
-bin/dcmmklut
-bin/dcmodify
-bin/dcmp2pgm
-bin/dcmprscp
-bin/dcmprscu
-bin/dcmpschk
-bin/dcmpsmk
-bin/dcmpsprt
-bin/dcmpsrcv
-bin/dcmpssnd
-bin/dcmqridx
-bin/dcmqrscp
-bin/dcmqrti
-bin/dcmquant
-bin/dcmscale
-bin/dcmsign
-bin/dcod2lum
-bin/dconvlum
-bin/dsr2html
-bin/dsr2xml
-bin/dsrdump
-bin/dump2dcm
-bin/echoscu
-bin/findscu
-bin/movescu
-bin/pdf2dcm
-bin/storescp
-bin/storescu
-bin/termscu
-bin/wlmscpfs
-bin/xml2dcm
-bin/xml2dsr
+@bin bin/dcm2pnm
+@bin bin/dcm2xml
+@bin bin/dcmcjpeg
+@bin bin/dcmconv
+@bin bin/dcmcrle
+@bin bin/dcmdjpeg
+@bin bin/dcmdrle
+@bin bin/dcmdspfn
+@bin bin/dcmdump
+@bin bin/dcmftest
+@bin bin/dcmgpdir
+@bin bin/dcmj2pnm
+@bin bin/dcmmkcrv
+@bin bin/dcmmkdir
+@bin bin/dcmmklut
+@bin bin/dcmodify
+@bin bin/dcmp2pgm
+@bin bin/dcmprscp
+@bin bin/dcmprscu
+@bin bin/dcmpschk
+@bin bin/dcmpsmk
+@bin bin/dcmpsprt
+@bin bin/dcmpsrcv
+@bin bin/dcmpssnd
+@bin bin/dcmqridx
+@bin bin/dcmqrscp
+@bin bin/dcmqrti
+@bin bin/dcmquant
+@bin bin/dcmscale
+@bin bin/dcmsign
+@bin bin/dcod2lum
+@bin bin/dconvlum
+@bin bin/dsr2html
+@bin bin/dsr2xml
+@bin bin/dsrdump
+@bin bin/dump2dcm
+@bin bin/echoscu
+@bin bin/findscu
+@bin bin/movescu
+@bin bin/pdf2dcm
+@bin bin/storescp
+@bin bin/storescu
+@bin bin/termscu
+@bin bin/wlmscpfs
+@bin bin/xml2dcm
+@bin bin/xml2dsr
lib/dcm2xml.dtd
@man man/man1/dcm2pnm.1
@man man/man1/dcm2xml.1
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: ALTQ breakage: pftop and pfstat
OK for the changes but please add big fat XXXes in Makefile, these should
be fixed (pftop in particular should be easy enough, the code is similar
to systat).
On 2014/04/22 12:25, Jérémie Courrèges-Anglas wrote:
>
> As reported by sthen, said ports are currently broken.
> Here's a diff to repair them.
>
> ok?
>
> Index: sysutils/pftop/Makefile
> ===
> RCS file: /cvs/ports/sysutils/pftop/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- sysutils/pftop/Makefile 12 Oct 2013 13:12:43 - 1.27
> +++ sysutils/pftop/Makefile 22 Apr 2014 02:59:48 -
> @@ -4,7 +4,7 @@
> COMMENT= curses-based real time state and rule display for pf
>
> DISTNAME=pftop-0.7
> -REVISION=12
> +REVISION=13
> CATEGORIES= sysutils
>
> HOMEPAGE=http://www.eee.metu.edu.tr/~canacar/pftop/
> Index: sysutils/pftop/patches/patch-config_h
> ===
> RCS file: /cvs/ports/sysutils/pftop/patches/patch-config_h,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-config_h
> --- sysutils/pftop/patches/patch-config_h 30 Nov 2009 09:56:39 -
> 1.5
> +++ sysutils/pftop/patches/patch-config_h 22 Apr 2014 10:18:06 -
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-config_h,v 1.5 2009/11/30 09:56:39 sthen Exp $
> config.h.origWed Nov 7 06:34:18 2007
> -+++ config.h Sun Nov 29 22:27:09 2009
> -@@ -74,11 +74,24 @@
> +XXX remove HAVE_ALTQ hack after bump to 5.6-current
> +--- config.h.origWed Nov 7 07:34:18 2007
> config.h Tue Apr 22 05:05:05 2014
> +@@ -74,11 +74,28 @@
> #define HAVE_PFSYNC_STATE
> #endif
>
> @@ -13,6 +14,10 @@ $OpenBSD: patch-config_h,v 1.5 2009/11/3
> +/* #if OS_LEVEL > 46 */
> +#undef HAVE_RULE_NATPASS
> +/* #endif */
> ++
> ++#if OS_LEVEL > 55 || 1
> ++#undef HAVE_ALTQ
> ++#endif
> +
> #ifdef HAVE_PFSYNC_STATE
> typedef struct pfsync_state pf_state_t;
> Index: net/pfstat/Makefile
> ===
> RCS file: /cvs/ports/net/pfstat/Makefile,v
> retrieving revision 1.31
> diff -u -p -r1.31 Makefile
> --- net/pfstat/Makefile 17 Mar 2014 23:22:02 - 1.31
> +++ net/pfstat/Makefile 22 Apr 2014 10:14:08 -
> @@ -7,7 +7,7 @@ DISTNAME= pfstat-2.3
>
> PKGNAME-main=${DISTNAME}
> PKGNAME-daemon= ${DISTNAME:S/-/d-/}
> -REVISION=6
> +REVISION=7
> CATEGORIES= net
> MASTER_SITES=http://www.benzedrine.cx/
>
> Index: net/pfstat/patches/patch-parse_y
> ===
> RCS file: /cvs/ports/net/pfstat/patches/patch-parse_y,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-parse_y
> --- net/pfstat/patches/patch-parse_y 11 Mar 2013 19:50:04 - 1.1
> +++ net/pfstat/patches/patch-parse_y 22 Apr 2014 10:13:56 -
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-parse_y,v 1.1 2013/03/11 19:50:04 sthen Exp $
> parse.y.orig Sun Feb 24 22:12:50 2013
> -+++ parse.y Sun Feb 24 22:13:05 2013
> +--- parse.y.orig Thu Jan 11 17:01:58 2007
> parse.y Tue Apr 22 12:13:49 2014
> @@ -133,7 +133,7 @@ coldef : GLOBAL STRING STRING
> "short", "normalize", "memory", "bad-timestamp",
> "congestion", "ip-option", "proto-cksum",
> @@ -10,3 +10,12 @@ $OpenBSD: patch-parse_y,v 1.1 2013/03/11
> int i;
>
> $$.type = 0;
> +@@ -181,6 +181,8 @@ coldef : GLOBAL STRING STRING
> + /* NAME pass/drop packet/bytes */
> + | QUEUE STRING STRING STRING
> + {
> ++yyerror("ALTQ-style queues not supported anymore");
> ++YYERROR;
> + $$.type = 2;
> + $$.arg = strdup($2);
> + if (!strcmp($3, "other"))
> Index: net/pfstat/patches/patch-pf_c
> ===
> RCS file: /cvs/ports/net/pfstat/patches/patch-pf_c,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-pf_c
> --- net/pfstat/patches/patch-pf_c 12 Oct 2013 13:11:34 - 1.1
> +++ net/pfstat/patches/patch-pf_c 22 Apr 2014 03:10:06 -
> @@ -1,12 +1,44 @@
> $OpenBSD: patch-pf_c,v 1.1 2013/10/12 13:11:34 sthen Exp $
> pf.c.origSat Oct 12 14:10:22 2013
> -+++ pf.c Sat Oct 12 14:10:25 2013
> -@@ -74,7 +74,7 @@ query_queues(int fd, void (*cb)(int, const char *, int
> +--- pf.c.origTue Apr 22 05:08:25 2014
> pf.c Tue Apr 22 05:10:01 2014
> +@@ -38,10 +38,12 @@ static const char rcsid[] = "$Id: pf.c,v 1.1.1.1 2007/
> + #include
> + #include
> + #include
> ++#if 0
> + #include
> + #include
> + #include
> + #include
> ++#endif
> + #include
> + #include
> + #include
> +@@ -53,6 +55,7 @@ static const char rcsid[] = "$Id: pf.c,v 1.1.1.1 2007/
>
> - /* fetch each
ALTQ breakage: pftop and pfstat
As reported by sthen, said ports are currently broken.
Here's a diff to repair them.
ok?
Index: sysutils/pftop/Makefile
===
RCS file: /cvs/ports/sysutils/pftop/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- sysutils/pftop/Makefile 12 Oct 2013 13:12:43 - 1.27
+++ sysutils/pftop/Makefile 22 Apr 2014 02:59:48 -
@@ -4,7 +4,7 @@
COMMENT= curses-based real time state and rule display for pf
DISTNAME= pftop-0.7
-REVISION= 12
+REVISION= 13
CATEGORIES=sysutils
HOMEPAGE= http://www.eee.metu.edu.tr/~canacar/pftop/
Index: sysutils/pftop/patches/patch-config_h
===
RCS file: /cvs/ports/sysutils/pftop/patches/patch-config_h,v
retrieving revision 1.5
diff -u -p -r1.5 patch-config_h
--- sysutils/pftop/patches/patch-config_h 30 Nov 2009 09:56:39 -
1.5
+++ sysutils/pftop/patches/patch-config_h 22 Apr 2014 10:18:06 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-config_h,v 1.5 2009/11/30 09:56:39 sthen Exp $
config.h.orig Wed Nov 7 06:34:18 2007
-+++ config.h Sun Nov 29 22:27:09 2009
-@@ -74,11 +74,24 @@
+XXX remove HAVE_ALTQ hack after bump to 5.6-current
+--- config.h.orig Wed Nov 7 07:34:18 2007
config.h Tue Apr 22 05:05:05 2014
+@@ -74,11 +74,28 @@
#define HAVE_PFSYNC_STATE
#endif
@@ -13,6 +14,10 @@ $OpenBSD: patch-config_h,v 1.5 2009/11/3
+/* #if OS_LEVEL > 46 */
+#undef HAVE_RULE_NATPASS
+/* #endif */
++
++#if OS_LEVEL > 55 || 1
++#undef HAVE_ALTQ
++#endif
+
#ifdef HAVE_PFSYNC_STATE
typedef struct pfsync_state pf_state_t;
Index: net/pfstat/Makefile
===
RCS file: /cvs/ports/net/pfstat/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- net/pfstat/Makefile 17 Mar 2014 23:22:02 - 1.31
+++ net/pfstat/Makefile 22 Apr 2014 10:14:08 -
@@ -7,7 +7,7 @@ DISTNAME= pfstat-2.3
PKGNAME-main= ${DISTNAME}
PKGNAME-daemon=${DISTNAME:S/-/d-/}
-REVISION= 6
+REVISION= 7
CATEGORIES=net
MASTER_SITES= http://www.benzedrine.cx/
Index: net/pfstat/patches/patch-parse_y
===
RCS file: /cvs/ports/net/pfstat/patches/patch-parse_y,v
retrieving revision 1.1
diff -u -p -r1.1 patch-parse_y
--- net/pfstat/patches/patch-parse_y11 Mar 2013 19:50:04 - 1.1
+++ net/pfstat/patches/patch-parse_y22 Apr 2014 10:13:56 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-parse_y,v 1.1 2013/03/11 19:50:04 sthen Exp $
parse.y.orig Sun Feb 24 22:12:50 2013
-+++ parse.ySun Feb 24 22:13:05 2013
+--- parse.y.orig Thu Jan 11 17:01:58 2007
parse.yTue Apr 22 12:13:49 2014
@@ -133,7 +133,7 @@ coldef : GLOBAL STRING STRING
"short", "normalize", "memory", "bad-timestamp",
"congestion", "ip-option", "proto-cksum",
@@ -10,3 +10,12 @@ $OpenBSD: patch-parse_y,v 1.1 2013/03/11
int i;
$$.type = 0;
+@@ -181,6 +181,8 @@ coldef : GLOBAL STRING STRING
+ /* NAME pass/drop packet/bytes */
+ | QUEUE STRING STRING STRING
+ {
++ yyerror("ALTQ-style queues not supported anymore");
++ YYERROR;
+ $$.type = 2;
+ $$.arg = strdup($2);
+ if (!strcmp($3, "other"))
Index: net/pfstat/patches/patch-pf_c
===
RCS file: /cvs/ports/net/pfstat/patches/patch-pf_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-pf_c
--- net/pfstat/patches/patch-pf_c 12 Oct 2013 13:11:34 - 1.1
+++ net/pfstat/patches/patch-pf_c 22 Apr 2014 03:10:06 -
@@ -1,12 +1,44 @@
$OpenBSD: patch-pf_c,v 1.1 2013/10/12 13:11:34 sthen Exp $
pf.c.orig Sat Oct 12 14:10:22 2013
-+++ pf.c Sat Oct 12 14:10:25 2013
-@@ -74,7 +74,7 @@ query_queues(int fd, void (*cb)(int, const char *, int
+--- pf.c.orig Tue Apr 22 05:08:25 2014
pf.c Tue Apr 22 05:10:01 2014
+@@ -38,10 +38,12 @@ static const char rcsid[] = "$Id: pf.c,v 1.1.1.1 2007/
+ #include
+ #include
+ #include
++#if 0
+ #include
+ #include
+ #include
+ #include
++#endif
+ #include
+ #include
+ #include
+@@ -53,6 +55,7 @@ static const char rcsid[] = "$Id: pf.c,v 1.1.1.1 2007/
- /* fetch each of those queues */
- for (nr = 0; nr < mnr; ++nr) {
-- struct pfioc_qstats pq;
-+ struct pfioc_altqstats pq;
- union altq_stats s;
- u_int64_t c[8];
- int i;
+ #include "pf.h"
+
++#if 0
+ union altq_stats {
+ class_stats_tcbq;
+ struct priq_classstats priq;
+@@ -138,6 +141,7 @@ query_queues(int fd, void (*cb)(int,
Re: WIP: Enable readline in PHP
On 2014-04-22 11:58, Stuart Henderson wrote:
On 2014/04/22 09:19, Edd Barrett wrote:
On Mon, Apr 21, 2014 at 11:27:44AM +0100, Edd Barrett wrote:
> I'll prep a new diff enabling readline on only 5.4/5.5.
New diff below.
I ran the test suite for both 5.4 and 5.5 before and after enabling
readline
to check I didn't break anything. Oddly enough, there is one new
failing
test: on 5.4 ext/ftp/tests/bug37799.phpt. By repeatedly running the
test,
it became clear that this is a non-deterministically failing test, so
meh.
NOTE: the intl multi packages have extra 'm' in WANTLIB (even before
my
changes). Not sure if that is intentional, but can fix in a separate
diff.
was that for all versions or just some? fix if it's easy and can be
done
in Makefile.inc but not worth anything too complicated imho, an extra
lib
in WANTLIB isn't really a problem.
OK?
Index: 5.4/Makefile
===
RCS file: /home/edd/cvsync/cvs/ports/lang/php/5.4/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- 5.4/Makefile6 Apr 2014 12:52:25 - 1.22
+++ 5.4/Makefile21 Apr 2014 21:28:54 -
@@ -9,11 +9,18 @@ USE_LIBTOOL= No
PV=5.4
V= ${PV}.27
+REVISION-main =0
+REVISION-fpm = 0
+REVISION-fastcgi = 0
+
INI_TEMPLATES= development production
CONFIGURE_ARGS+= --enable-mysqlnd
-WANTLIB-main+= stdc++
+# Readline support is broken in PHP 5.3, hence this is not in
Makefile.inc
+CONFIGURE_ARGS += --with-readline
I would prefer a comment like "Move to Makefile.inc when 5.3 is
removed".
Why not do the opposite?
Put it in Makefile.inc and add --without-readline in php-5.3 Makefile ?
--
Antoine
Re: WIP: Enable readline in PHP
On 2014/04/22 09:19, Edd Barrett wrote:
> On Mon, Apr 21, 2014 at 11:27:44AM +0100, Edd Barrett wrote:
> > I'll prep a new diff enabling readline on only 5.4/5.5.
>
> New diff below.
>
> I ran the test suite for both 5.4 and 5.5 before and after enabling readline
> to check I didn't break anything. Oddly enough, there is one new failing
> test: on 5.4 ext/ftp/tests/bug37799.phpt. By repeatedly running the test,
> it became clear that this is a non-deterministically failing test, so meh.
>
> NOTE: the intl multi packages have extra 'm' in WANTLIB (even before my
> changes). Not sure if that is intentional, but can fix in a separate diff.
was that for all versions or just some? fix if it's easy and can be done
in Makefile.inc but not worth anything too complicated imho, an extra lib
in WANTLIB isn't really a problem.
> OK?
>
> Index: 5.4/Makefile
> ===
> RCS file: /home/edd/cvsync/cvs/ports/lang/php/5.4/Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile
> --- 5.4/Makefile 6 Apr 2014 12:52:25 - 1.22
> +++ 5.4/Makefile 21 Apr 2014 21:28:54 -
> @@ -9,11 +9,18 @@ USE_LIBTOOL=No
> PV= 5.4
> V= ${PV}.27
>
> +REVISION-main = 0
> +REVISION-fpm = 0
> +REVISION-fastcgi = 0
> +
> INI_TEMPLATES= development production
>
> CONFIGURE_ARGS+= --enable-mysqlnd
>
> -WANTLIB-main+= stdc++
> +# Readline support is broken in PHP 5.3, hence this is not in Makefile.inc
> +CONFIGURE_ARGS +=--with-readline
I would prefer a comment like "Move to Makefile.inc when 5.3 is removed".
Apart from that it looks good to me, but your tree is out of date so you'll
need to merge conflicts with -current.
Re: devel/json-c update, unbreak devel/droplet and multimedia/yle-dl
On Mon, 21 Apr 2014 18:49:10 +0200 j...@wxcvbn.org (Jérémie Courrèges-Anglas) wrote: > Note: yle-dl could be updated to latest version 2.2.1. Hi, yes quite true the current version isn't working anymore. I sent a patch to some version some time ago, but no one commited it. I suspect that version is now out of date too. I'm too busy at the moment to fix it. -- Antti Harri
runit time_t bugfix
Reported yesterday on the Skarnet supervision mailing list. This fixes
svlogd which logs entries such as:
1900-01-00T00:00:00.76734 ...
1900-01-00T00:00:00.77041 ...
1900-01-00T00:00:00.80672 ...
1900-01-00T00:00:00.80741 ...
1900-01-00T00:00:00.80907 ...
1900-01-00T00:00:00.80991 ...
Adding myself as maintainer. ok?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/runit/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile1 Jan 2014 20:46:28 - 1.13
+++ Makefile22 Apr 2014 08:18:10 -
@@ -3,10 +3,12 @@
COMMENT= daemontools alike replacement for init
DISTNAME= runit-1.7.2
-REVISION= 0
+REVISION= 1
CATEGORIES=sysutils
HOMEPAGE= http://www.smarden.org/runit/
+
+MAINTAINER=Jeremie Courreges-Anglas
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c
Index: patches/patch-src_fmt_ptime_c
===
RCS file: patches/patch-src_fmt_ptime_c
diff -N patches/patch-src_fmt_ptime_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_fmt_ptime_c 21 Apr 2014 23:47:31 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/fmt_ptime.c.orig Tue Nov 21 16:14:12 2006
src/fmt_ptime.cTue Apr 22 01:27:37 2014
+@@ -4,7 +4,7 @@
+
+ unsigned int fmt_ptime2(char *s, struct taia *ta, char sep) {
+ struct tm *t;
+- unsigned long u;
++ time_t u;
+
+ if (ta->sec.x < 4611686018427387914ULL) return(0); /* impossible? */
+ u =ta->sec.x -4611686018427387914ULL;
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: WIP: Enable readline in PHP
On Mon, Apr 21, 2014 at 11:27:44AM +0100, Edd Barrett wrote:
> I'll prep a new diff enabling readline on only 5.4/5.5.
New diff below.
I ran the test suite for both 5.4 and 5.5 before and after enabling readline
to check I didn't break anything. Oddly enough, there is one new failing
test: on 5.4 ext/ftp/tests/bug37799.phpt. By repeatedly running the test,
it became clear that this is a non-deterministically failing test, so meh.
NOTE: the intl multi packages have extra 'm' in WANTLIB (even before my
changes). Not sure if that is intentional, but can fix in a separate diff.
OK?
Index: 5.4/Makefile
===
RCS file: /home/edd/cvsync/cvs/ports/lang/php/5.4/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- 5.4/Makefile6 Apr 2014 12:52:25 - 1.22
+++ 5.4/Makefile21 Apr 2014 21:28:54 -
@@ -9,11 +9,18 @@ USE_LIBTOOL= No
PV=5.4
V= ${PV}.27
+REVISION-main =0
+REVISION-fpm = 0
+REVISION-fastcgi = 0
+
INI_TEMPLATES= development production
CONFIGURE_ARGS+= --enable-mysqlnd
-WANTLIB-main+= stdc++
+# Readline support is broken in PHP 5.3, hence this is not in Makefile.inc
+CONFIGURE_ARGS += --with-readline
+
+WANTLIB-main+= stdc++ ncurses readline
# fpm
PKGNAME-fpm?= php-fpm-${V}
Index: 5.5/Makefile
===
RCS file: /home/edd/cvsync/cvs/ports/lang/php/5.5/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- 5.5/Makefile6 Apr 2014 12:53:41 - 1.13
+++ 5.5/Makefile21 Apr 2014 21:29:02 -
@@ -8,12 +8,18 @@ USE_LIBTOOL= No
PV=5.5
V= ${PV}.11
+REVISION-main =0
+REVISION-fpm = 0
+REVISION-fastcgi = 0
INI_TEMPLATES= development production
CONFIGURE_ARGS+= --enable-mysqlnd
-WANTLIB-main+= stdc++
+# Readline support is broken in PHP 5.3, hence this is not in Makefile.inc
+CONFIGURE_ARGS += --with-readline
+
+WANTLIB-main+= stdc++ ncurses readline
# fpm
PKGNAME-fpm?= php-fpm-${V}
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
