UPDATE: sysutils/pv to 1.4.12
Ahoi ;) # $Id: UPDATE,v 1.1 2013/08/29 22:17:44 dhn Exp $ 2013-08-29 Dennis Herrmann d...@freebsd.org * Update to 1.4.12 [1] [1] https://github.com/jasperla/openbsd-wip/tree/master/sysutils/pv EOF //dhn Index: Makefile === RCS file: /cvs/ports/sysutils/pv/Makefile,v retrieving revision 1.6 diff -u -p -u -r1.6 Makefile --- Makefile7 Aug 2013 21:32:38 - 1.6 +++ Makefile31 Aug 2013 10:15:27 - @@ -2,7 +2,7 @@ COMMENT = monitor the progress of data through a pipeline -DISTNAME = pv-1.2.0 +DISTNAME = pv-1.4.12 CATEGORIES = sysutils HOMEPAGE = http://www.ivarch.com/programs/pv.shtml @@ -10,7 +10,7 @@ HOMEPAGE =http://www.ivarch.com/progra # Artistic License 2.0 PERMIT_PACKAGE_CDROM= Yes -MASTER_SITES = https://pipeviewer.googlecode.com/files/ +MASTER_SITES = http://www.ivarch.com/programs/sources/ WANTLIB = c Index: distinfo === RCS file: /cvs/ports/sysutils/pv/distinfo,v retrieving revision 1.2 diff -u -p -u -r1.2 distinfo --- distinfo16 Feb 2012 22:34:34 - 1.2 +++ distinfo31 Aug 2013 10:15:27 - @@ -1,5 +1,2 @@ -MD5 (pv-1.2.0.tar.gz) = 98xlyFCsmMYBPMRIBQ7uSw== -RMD160 (pv-1.2.0.tar.gz) = 1X6NHp4fJc64rcjnCbneT6uqAx0= -SHA1 (pv-1.2.0.tar.gz) = mIjwcFn3apIyfGvt+8bKitTU5Bs= -SHA256 (pv-1.2.0.tar.gz) = +Tpe2kfUYH41AgYicXreW8Dl7oISOpczEJDxnguQfF8= -SIZE (pv-1.2.0.tar.gz) = 93686 +SHA256 (pv-1.4.12.tar.gz) = Hw8jjDGC2z6HDI1oUWQN23/nHxez6Sud3m/LB0xrebk= +SIZE (pv-1.4.12.tar.gz) = 113095 pgperVnu1FPAa.pgp Description: PGP signature
Re: UPDATE: net/sic
Ohh that's right. I have forget to remove the patches/patch-sic_c. Thanks
for your work ;)
//dhn
2013/8/29 Joerg Jung m...@umaxx.net
Hi,
On Wed, Aug 28, 2013 at 11:50:35AM +0200, Dennis Herrmann wrote:
- Update to 1.2 [1]
[1] https://github.com/jasperla/openbsd-wip/tree/master/net/sic
I think your attached diff missed the removal of patches/patch-sic_c
Otherwise it works fine for me. Please find below an updated diff.
If someone can give me an OK, I will commit this.
Regards,
Joerg
Index: Makefile
===
RCS file: /cvs/ports/net/sic/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile17 Jul 2013 03:27:01 - 1.4
+++ Makefile29 Aug 2013 12:09:26 -
@@ -2,8 +2,7 @@
COMMENT= simple irc client
-DISTNAME= sic-1.1
-REVISION = 1
+DISTNAME= sic-1.2
CATEGORIES=net
Index: distinfo
===
RCS file: /cvs/ports/net/sic/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo10 Jul 2012 14:03:18 - 1.1.1.1
+++ distinfo29 Aug 2013 12:09:26 -
@@ -1,5 +1,2 @@
-MD5 (sic-1.1.tar.gz) = hW0OX6oVGulgJxPufTSi1Q==
-RMD160 (sic-1.1.tar.gz) = OZDB0m1+0Ge97a4GuC13c6lH3RU=
-SHA1 (sic-1.1.tar.gz) = gW1SJ1j20E5q9rc5bIB3wyst37I=
-SHA256 (sic-1.1.tar.gz) = 8k1jx65fNxXzw4hfW9B9Rf+hsK+DCiVSO67JRlNITcI=
-SIZE (sic-1.1.tar.gz) = 5061
+SHA256 (sic-1.2.tar.gz) = rAf5BZleE7osQ5EtegNfu+eKYo17ocJW9MoTcvtWUYU=
+SIZE (sic-1.2.tar.gz) = 4563
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/net/sic/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 10 Jul 2012 14:03:18 - 1.1.1.1
+++ patches/patch-Makefile 29 Aug 2013 12:09:26 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2012/07/10 14:03:18 zinke Exp $
Makefile.orig Mon Jul 9 12:49:37 2012
-+++ Makefile Mon Jul 9 12:54:54 2012
+--- Makefile.orig Sun Jun 16 08:03:32 2013
Makefile Fri Aug 23 08:31:32 2013
@@ -14,14 +14,12 @@ options:
@echo CC = ${CC}
@@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2012/
- @${CC} -c ${CFLAGS} $
+ ${CC} -c ${CFLAGS} $
- ${OBJ}: config.mk
+ ${OBJ}: config.mk util.c
sic: ${OBJ}
- @echo CC -o $@
Index: patches/patch-config_mk
===
RCS file: /cvs/ports/net/sic/patches/patch-config_mk,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-config_mk
--- patches/patch-config_mk 10 Jul 2012 14:03:18 - 1.1.1.1
+++ patches/patch-config_mk 29 Aug 2013 12:09:26 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-config_mk,v 1.1.1.1 2012/07/10 14:03:18 zinke Exp $
config.mk.orig Tue May 25 18:05:48 2010
-+++ config.mk Mon Jul 9 13:12:46 2012
-@@ -4,17 +4,17 @@ VERSION = 1.1
+--- config.mk.orig Sun Jun 16 08:03:32 2013
config.mk Fri Aug 23 08:30:57 2013
+@@ -4,17 +4,17 @@ VERSION = 1.2
# Customize below to fit your system
# paths
Index: patches/patch-sic_c
===
RCS file: patches/patch-sic_c
diff -N patches/patch-sic_c
--- patches/patch-sic_c 10 Jul 2012 14:03:18 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-sic_c,v 1.1.1.1 2012/07/10 14:03:18 zinke Exp $
sic.c.orig Mon Jul 9 16:02:31 2012
-+++ sic.c Mon Jul 9 16:02:41 2012
-@@ -9,7 +9,7 @@
- #include unistd.h
-
- static char *host = irc.oftc.net;
--static char *port = ircd;
-+static char *port = 6667;
- static char *password;
- static char nick[32];
- static char bufin[4096];
Re: UPDATE: misc/dvtm
Ahoi,
For a long time i send a update for misc/dvtm. This is a new patch[1]
without ugly
snprintf patches or etc.
# $Id: UPDATE,v 1.3 2013/08/28 11:10:04 dhn Exp $
2013-08-28 Dennis Herrmann d...@freebsd.org
* Update to 0.9
* Update/Remove some patches
- Update: patches/patch-vt_c
- Remove: patches/patch-dvtm_c
[1] https://github.com/jasperla/openbsd-wip/tree/master/misc/dvtm
2012/12/12 Dennis Herrmann a...@mcx2.org
Stuart Henderson writes:
On 2012/12/04 22:38, Dennis Herrmann wrote:
[03] warning: sprintf() is often misused, please use snprintf()
We're not patching these in ports unless there's a serious
bug - feeding this type of fix upstream is usually the best course
of actionhowever
+ static void send_curs(Vt *t)
+ {
+ char keyseq[16];
+- sprintf(keyseq, \e[%d;%dR, (int)(t-curs_row - t-lines),
t-curs_col);
++ printf(keyseq, \e[%d;%dR, (int)(t-curs_row - t-lines),
t-curs_col);
+ vt_write(t, keyseq, strlen(keyseq));
+ }
+
in this case the patch is bogus, the intent is to print to a string,
it should either be changed to snprintf with a size limit, (and check
the return code to avoid possibly not terminating the escape sequence
properly if the string does get truncated), or (as there is a finite
maximum length the %d can expand to) use a buffer large enough to
hold the longest possible output of the sprintf.
I change the patch a little bit, I hope it looks better?
+ static void send_curs(Vt *t)
+ {
+ char keyseq[16];
+- sprintf(keyseq, \e[%d;%dR, (int)(t-curs_row - t-lines),
t-curs_col);
++ snprintf(keyseq, sizeof(keyseq), \e[%d;%dR, (int)(t-curs_row -
t-lines), t-curs_col);
+ vt_write(t, keyseq, strlen(keyseq));
+ }
/dhn
dvtm_update-0.9.diff
Description: Binary data
UPDATE: net/sic
- Update to 1.2 [1] [1] https://github.com/jasperla/openbsd-wip/tree/master/net/sic sic_update-1.2.diff Description: Binary data
Re: UPDATE: misc/dvtm
Stuart Henderson writes:
On 2012/12/04 22:38, Dennis Herrmann wrote:
[03] warning: sprintf() is often misused, please use snprintf()
We're not patching these in ports unless there's a serious
bug - feeding this type of fix upstream is usually the best course
of actionhowever
+ static void send_curs(Vt *t)
+ {
+ char keyseq[16];
+- sprintf(keyseq, \e[%d;%dR, (int)(t-curs_row - t-lines),
t-curs_col);
++ printf(keyseq, \e[%d;%dR, (int)(t-curs_row - t-lines), t-curs_col);
+ vt_write(t, keyseq, strlen(keyseq));
+ }
+
in this case the patch is bogus, the intent is to print to a string,
it should either be changed to snprintf with a size limit, (and check
the return code to avoid possibly not terminating the escape sequence
properly if the string does get truncated), or (as there is a finite
maximum length the %d can expand to) use a buffer large enough to
hold the longest possible output of the sprintf.
I change the patch a little bit, I hope it looks better?
+ static void send_curs(Vt *t)
+ {
+ char keyseq[16];
+- sprintf(keyseq, \e[%d;%dR, (int)(t-curs_row - t-lines),
t-curs_col);
++ snprintf(keyseq, sizeof(keyseq), \e[%d;%dR, (int)(t-curs_row -
t-lines), t-curs_col);
+ vt_write(t, keyseq, strlen(keyseq));
+ }
/dhn
diff --git a/misc/dvtm/patches/patch-vt_c b/misc/dvtm/patches/patch-vt_c
index 0fbc97d..a44aac7 100644
--- a/misc/dvtm/patches/patch-vt_c
+++ b/misc/dvtm/patches/patch-vt_c
@@ -16,7 +16,7 @@
{
char keyseq[16];
- sprintf(keyseq, \e[%d;%dR, (int)(t-curs_row - t-lines), t-curs_col);
-+ printf(keyseq, \e[%d;%dR, (int)(t-curs_row - t-lines), t-curs_col);
++ snprintf(keyseq, sizeof(keyseq), \e[%d;%dR, (int)(t-curs_row - t-lines), t-curs_col);
vt_write(t, keyseq, strlen(keyseq));
}
pgpn4O3wZaLPP.pgp
Description: PGP signature
UPDATE: misc/dvtm
# $Id: UPDATE,v 1.2 2012/11/11 10:29:47 dhn Exp $
2012-11-11 Dennis Herrmann d...@freebsd.org
* The Maintainer has no more time to work at this port.
So I take the maintainership now. [04]
* Remove: # LGPL: madtty.c in the Makefile,
because madtty.c is no longer a part of the package.
2012-11-10 Dennis Herrmann d...@freebsd.org
* Update to 0.8
* Update/Fix some patches
- Updated: patches/patch-config_mk: [01]
- Fix: patches/patch-dvtm_c: [02]
- Fix: patches/patch-vt_c: [03]
[01] Update for the new release
[02] warning: comparison is always false due to limited range of data type
[03] warning: sprintf() is often misused, please use snprintf()
[04] Approved by: Emilien Gaspar g...@dud-t.org (old maintainer), (via mail)
EOF
Index: Makefile
===
RCS file: /cvs/ports/misc/dvtm/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile24 Apr 2012 19:28:31 - 1.14
+++ Makefile4 Dec 2012 21:34:28 -
@@ -2,15 +2,13 @@
COMMENT= tiling window management for the console
-DISTNAME= dvtm-0.6
-REVISION= 1
+DISTNAME= dvtm-0.8
CATEGORIES=misc
HOMEPAGE= http://www.brain-dump.org/projects/dvtm/
-MAINTAINER=Emilien Gaspar g...@dud-t.org
+MAINTAINER=Dennis Herrmann d...@freebsd.org
# MIT/X
-# LGPL: madtty.c
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM= Yes
Index: distinfo
===
RCS file: /cvs/ports/misc/dvtm/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo24 Nov 2010 08:19:24 - 1.5
+++ distinfo4 Dec 2012 21:34:28 -
@@ -1,5 +1,2 @@
-MD5 (dvtm-0.6.tar.gz) = 23ejdEho3ZGlrlrZi333CQ==
-RMD160 (dvtm-0.6.tar.gz) = GSAcgt8YpMzPRSKKoFZSnJ9KFsM=
-SHA1 (dvtm-0.6.tar.gz) = XVtcdRjq2fCLrijAgb8qu7RHKTM=
-SHA256 (dvtm-0.6.tar.gz) = lhCSLCBnjKls0tm/3o+Xu8KnvV5TbVAVxW34EkaKBIE=
-SIZE (dvtm-0.6.tar.gz) = 26542
+SHA256 (dvtm-0.8.tar.gz) = TIS3wy9s1HbvkhUMTByiEYNu0A8WyovdQImTORKzmng=
+SIZE (dvtm-0.8.tar.gz) = 27543
Index: patches/patch-config_mk
===
RCS file: /cvs/ports/misc/dvtm/patches/patch-config_mk,v
retrieving revision 1.7
diff -u -r1.7 patch-config_mk
--- patches/patch-config_mk 24 Nov 2010 13:09:11 - 1.7
+++ patches/patch-config_mk 4 Dec 2012 21:34:28 -
@@ -1,7 +1,6 @@
-$OpenBSD: patch-config_mk,v 1.7 2010/11/24 13:09:11 jasper Exp $
config.mk.orig Fri Oct 8 18:06:05 2010
-+++ config.mk Wed Nov 24 09:28:42 2010
-@@ -3,15 +3,15 @@ VERSION = 0.6
+--- config.mk.orig Sat Nov 10 21:51:59 2012
config.mk Sat Nov 10 21:53:26 2012
+@@ -3,11 +3,12 @@
# Customize below to fit your system
@@ -10,21 +9,22 @@
+#PREFIX = /usr/local
+MANPREFIX = ${PREFIX}/man
--INCS = -I. -I/usr/include -I/usr/local/include
+-INCS = -I. -I/usr/include -I/usr/local/include
-LIBS = -lc -lutil -lncursesw
--#LIBS = -lc -lutil -lncurses
+INCS = -I. -I/usr/include
+#LIBS = -lc -lutil -lncursesw
+LIBS = -lc -lutil -lncurses
+ # NetBSD
+ #LIBS = -lc -lutil -lcurses
+ # AIX
+@@ -15,9 +16,9 @@
+ # Cygwin
+ #INCS += -I/usr/include/ncurses
-CFLAGS += -std=c99 -Os ${INCS} -DVERSION=\${VERSION}\ -DNDEBUG
-LDFLAGS += -L/usr/lib -L/usr/local/lib ${LIBS}
+CFLAGS += -std=c99 ${INCS} -DVERSION=\${VERSION}\ -DNDEBUG
+LDFLAGS += -L/usr/lib ${LIBS}
-
- # Mouse handling
- CFLAGS += -DCONFIG_MOUSE
-@@ -20,4 +20,4 @@ CFLAGS += -DCONFIG_STATUSBAR
DEBUG_CFLAGS = ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall
Index: patches/patch-dvtm_c
===
RCS file: patches/patch-dvtm_c
diff -N patches/patch-dvtm_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-dvtm_c4 Dec 2012 21:34:28 -
@@ -0,0 +1,11 @@
+--- dvtm.c.origSat Nov 10 21:55:39 2012
dvtm.c Sat Nov 10 21:55:52 2012
+@@ -408,7 +408,7 @@
+ short fg = -1, bg = -1;
+ const ColorRule *r;
+
+- for (i = 0; i countof(colorrules); i++) {
++ for (int i = 0; i countof(colorrules); i++) {
+ r = colorrules[i];
+ if (strstr(c-title, r-title)) {
+ attrs = r-attrs;
Index: patches/patch-madtty_c
===
RCS file: patches/patch-madtty_c
diff -N patches/patch-madtty_c
--- patches/patch-madtty_c 24 Apr 2012 19:28:31 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-madtty_c,v 1.1 2012/04/24 19:28:31 naddy Exp $
madtty.c.orig Tue Apr 24 21:20:01 2012
-+++ madtty.c Tue Apr 24 21:22:45 2012
-@@ -47,6 +47,10 @@
-
- #include madtty.h
-
-+#if defined(__GNUC__) defined(__STRICT_ANSI__)
-+#define alloca(size) __builtin_alloca(size)
-+#endif
-+
- #ifndef NCURSES_ATTR_SHIFT
- # define NCURSES_ATTR_SHIFT 8
UPDATE: audio/milkytracker
# $Id: UPDATE,v 1.1 2012/11/18 21:40:28 dhn Exp $ 2012-11-18 Dennis Herrmann d...@freebsd.org * Update to 0.90.85 * Update HOMEPAGE * Add archivers/zziplib to RUN_DEPENDS * Add: patch-src_tracker_sdl_SDL_Main_cpp [01] * Remove: patch-src_milkyplay_drivers_jack_AudioDriver_JACK_cpp [02] [01] Fixed: Thanks FreeBSD for the patch :) sdl/SDL_Main.cpp: In function 'void processSDLUserEvents(const SDL_UserEvent)': sdl/SDL_Main.cpp:754: error: cast from 'void*' to 'pp_int32' loses precision sdl/SDL_Main.cpp:755: error: cast from 'void*' to 'pp_int32' loses precision sdl/SDL_Main.cpp:764: error: cast from 'void*' to 'pp_int32' loses precision sdl/SDL_Main.cpp:765: error: cast from 'void*' to 'pp_int32' loses precision sdl/SDL_Main.cpp:773: error: cast from 'void*' to 'pp_int32' loses precision sdl/SDL_Main.cpp:774: error: cast from 'void*' to 'pp_int32' loses precision sdl/SDL_Main.cpp:783: error: cast from 'void*' to 'pp_int32' loses precision [02] The patch is already in 0.90.85 [03] https://github.com/jasperla/openbsd-wip/tree/master/audio/milkytracker EOF pgpWEc8psPYdj.pgp Description: PGP signature
Re: UPDATE: audio/milkytracker
Sure ;) 2012/11/19 Stuart Henderson s...@spacehopper.org: Could you send a cvs diff please? On 2012/11/19 13:13, Dennis Herrmann wrote: # $Id: UPDATE,v 1.1 2012/11/18 21:40:28 dhn Exp $ 2012-11-18 Dennis Herrmann d...@freebsd.org * Update to 0.90.85 * Update HOMEPAGE * Add archivers/zziplib to RUN_DEPENDS * Add: patch-src_tracker_sdl_SDL_Main_cpp [01] * Remove: patch-src_milkyplay_drivers_jack_AudioDriver_JACK_cpp [02] [01] Fixed: Thanks FreeBSD for the patch :) sdl/SDL_Main.cpp: In function 'void processSDLUserEvents(const SDL_UserEvent)': sdl/SDL_Main.cpp:754: error: cast from 'void*' to 'pp_int32' loses precision sdl/SDL_Main.cpp:755: error: cast from 'void*' to 'pp_int32' loses precision sdl/SDL_Main.cpp:764: error: cast from 'void*' to 'pp_int32' loses precision sdl/SDL_Main.cpp:765: error: cast from 'void*' to 'pp_int32' loses precision sdl/SDL_Main.cpp:773: error: cast from 'void*' to 'pp_int32' loses precision sdl/SDL_Main.cpp:774: error: cast from 'void*' to 'pp_int32' loses precision sdl/SDL_Main.cpp:783: error: cast from 'void*' to 'pp_int32' loses precision [02] The patch is already in 0.90.85 [03] https://github.com/jasperla/openbsd-wip/tree/master/audio/milkytracker EOF milkytracker-0.90.85.diff Description: Binary data
