svn commit: r306078 - in head/x11/xlockmore: . files
Jason Helfman
jgh at FreeBSD.org
Thu Oct 18 17:56:02 UTC 2012
Author: jgh
Date: Thu Oct 18 17:56:01 2012
New Revision: 306078
URL: http://svn.freebsd.org/changeset/ports/306078
Log:
- address CVE-2012-4524 , http://www.vuxml.org/freebsd/57652765-18aa-11e2-8382-00a0d181e71d.html
Submitted by: jgh@
Approved by: maintainer, marius at nuenneri.ch (private mail)
Feature safe: yes
Added:
head/x11/xlockmore/files/patch-modes__dclock.c (contents, props changed)
Modified:
head/x11/xlockmore/Makefile
Modified: head/x11/xlockmore/Makefile
==============================================================================
--- head/x11/xlockmore/Makefile Thu Oct 18 16:02:29 2012 (r306077)
+++ head/x11/xlockmore/Makefile Thu Oct 18 17:56:01 2012 (r306078)
@@ -7,6 +7,7 @@
PORTNAME= xlockmore
PORTVERSION= 5.40
+PORTREVISION= 1
CATEGORIES?= x11
MASTER_SITES= ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
http://www.tux.org/~bagleyd/xlock/${PORTNAME}-${PORTVERSION}/ \
Added: head/x11/xlockmore/files/patch-modes__dclock.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/xlockmore/files/patch-modes__dclock.c Thu Oct 18 17:56:01 2012 (r306078)
@@ -0,0 +1,52 @@
+--- ./modes/dclock.c.orig 2012-01-23 05:19:21.000000000 -0800
++++ ./modes/dclock.c 2012-10-17 15:20:26.000000000 -0700
+@@ -376,11 +376,11 @@
+ extern char *message;
+
+ static unsigned long
+-timeAtLastNewYear(long timeNow)
++timeAtLastNewYear(time_t timeNow)
+ {
+ struct tm *t;
+
+- t = localtime((const time_t *) &timeNow);
++ t = localtime(&timeNow);
+ return (unsigned long)(t->tm_year);
+ }
+
+@@ -420,7 +420,7 @@
+ }
+
+ static void
+-dayhrminsec(long timeCount, int tzoffset, char *string)
++dayhrminsec(time_t timeCount, int tzoffset, char *string)
+ {
+ int days, hours, minutes, secs;
+ int bufsize, i;
+@@ -675,7 +675,7 @@
+ "%a %b %d %Y", localtime(&(dp->timeold)));
+ }
+ } else {
+- long timeNow, timeLocal;
++ time_t timeNow, timeLocal;
+ timeNow = seconds();
+ timeLocal = timeNow + dp->tzoffset;
+
+@@ -950,7 +950,7 @@
+ {
+ Display *display = MI_DISPLAY(mi);
+ dclockstruct *dp;
+- long timeNow, timeLocal;
++ time_t timeNow, timeLocal;
+ int i, j;
+
+ if (dclocks == NULL) {
+@@ -1252,7 +1252,7 @@
+ dayhrminsec(MAYAN_TIME_START - timeLocal, dp->tzoffset, dp->strnew[1]);
+ dp->strpta[1] = dp->strnew[1];
+ } else {
+- struct tm *t = localtime((const time_t *) &timeLocal);
++ struct tm *t = localtime(&timeLocal);
+
+ if (dp->time24)
+ (void) strftime(dp->strnew[0], STRSIZE, "%H:%M:%S", t);
More information about the svn-ports-all
mailing list